summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-10-23 12:45:51 +0000
committerJeroen Roovers <jer@gentoo.org>2009-10-23 12:45:51 +0000
commit46a922d943a88b737fd8140ad329e674960edde0 (patch)
treec6db5e7ca65b9935500f914228cd3eb621f7fb4b /app-text/hnb
parentRespect CFLAGS, LDFLAGS (bug #240132), build parallel, separate CFLAGS and CP... (diff)
downloadgentoo-2-46a922d943a88b737fd8140ad329e674960edde0.tar.gz
gentoo-2-46a922d943a88b737fd8140ad329e674960edde0.tar.bz2
gentoo-2-46a922d943a88b737fd8140ad329e674960edde0.zip
Apply the include patch too (bug #240132), remove the NULL define, remove patching hack from ebuild.
(Portage version: 2.2_rc46/cvs/Linux i686)
Diffstat (limited to 'app-text/hnb')
-rw-r--r--app-text/hnb/ChangeLog7
-rw-r--r--app-text/hnb/files/hnb-1.9.18-include.patch13
-rw-r--r--app-text/hnb/hnb-1.9.18-r1.ebuild7
3 files changed, 21 insertions, 6 deletions
diff --git a/app-text/hnb/ChangeLog b/app-text/hnb/ChangeLog
index b7acc350ea22..8494e943c4ab 100644
--- a/app-text/hnb/ChangeLog
+++ b/app-text/hnb/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/hnb
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/ChangeLog,v 1.20 2009/10/23 12:31:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/ChangeLog,v 1.21 2009/10/23 12:45:50 jer Exp $
+
+ 23 Oct 2009; Jeroen Roovers <jer@gentoo.org> hnb-1.9.18-r1.ebuild,
+ +files/hnb-1.9.18-include.patch:
+ Apply the include patch too (bug #240132), remove the NULL define, remove
+ patching hack from ebuild.
*hnb-1.9.18-r1 (23 Oct 2009)
diff --git a/app-text/hnb/files/hnb-1.9.18-include.patch b/app-text/hnb/files/hnb-1.9.18-include.patch
new file mode 100644
index 000000000000..6c00386331d4
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-include.patch
@@ -0,0 +1,13 @@
+--- hnb-1.9.18/src/expanded.c.orig 2003-08-27 04:50:59.000000000 +0200
++++ hnb-1.9.18/src/expanded.c 2009-10-23 14:40:16.000000000 +0200
+@@ -18,9 +18,9 @@
+ * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++#include <string.h>
+ #include "tree.h"
+ #include "cli.h"
+-#define NULL 0
+
+ #include "evilloop.h"
+ #include "ctype.h"
diff --git a/app-text/hnb/hnb-1.9.18-r1.ebuild b/app-text/hnb/hnb-1.9.18-r1.ebuild
index b20a85e21cde..cf622bad3b43 100644
--- a/app-text/hnb/hnb-1.9.18-r1.ebuild
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/hnb-1.9.18-r1.ebuild,v 1.1 2009/10/23 12:31:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/hnb-1.9.18-r1.ebuild,v 1.2 2009/10/23 12:45:50 jer Exp $
EAPI="2"
@@ -19,10 +19,7 @@ DEPEND=""
RDEPEND=""
src_prepare() {
- for i in $(find . -name Makefile); do
- cp -av "${i}"{,.orig}
- done
- epatch "${FILESDIR}/${P}-flags.patch"
+ epatch "${FILESDIR}/${P}-flags.patch" "${FILESDIR}/${P}-include.patch"
}
src_compile() {