diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2009-10-23 12:45:51 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2009-10-23 12:45:51 +0000 |
| commit | 17199afa2b5efb61b4b49b63c12d6bf4dbe307a6 (patch) | |
| tree | 090050a52b8dc72ff3de081df2d03b12aaa2b31b | |
| parent | Respect CFLAGS, LDFLAGS (bug #240132), build parallel, separate CFLAGS and CP... (diff) | |
| download | historical-17199afa2b5efb61b4b49b63c12d6bf4dbe307a6.tar.gz historical-17199afa2b5efb61b4b49b63c12d6bf4dbe307a6.tar.bz2 historical-17199afa2b5efb61b4b49b63c12d6bf4dbe307a6.zip | |
Apply the include patch too (bug #240132), remove the NULL define, remove patching hack from ebuild.
Package-Manager: portage-2.2_rc46/cvs/Linux i686
| -rw-r--r-- | app-text/hnb/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/hnb/Manifest | 5 | ||||
| -rw-r--r-- | app-text/hnb/files/hnb-1.9.18-include.patch | 13 | ||||
| -rw-r--r-- | app-text/hnb/hnb-1.9.18-r1.ebuild | 7 |
4 files changed, 24 insertions, 8 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/Manifest b/app-text/hnb/Manifest index 06f5187968c5..a604b95a7a62 100644 --- a/app-text/hnb/Manifest +++ b/app-text/hnb/Manifest @@ -1,8 +1,9 @@ AUX hnb-1.9.18-flags.patch 3198 RMD160 9dda00853ffc17baeaefe0fba6baaa0ead38e645 SHA1 d503a9852adec828b762720ebd9860ec4bfdb018 SHA256 d12d00d02bb9d493dc8ff06928406f72366115279b512d0fd93c101c84bbf487 +AUX hnb-1.9.18-include.patch 339 RMD160 cb4b5bfb7d013d4729c57091c3c199379a2df67f SHA1 443a21159aae0d66f8e79b5178dd26d16f0a04ed SHA256 6ee944d5a6e866049e8e48318408f03447d24a8edd0513a3e276d13f34b69727 DIST hnb-1.9.17.tar.gz 143700 RMD160 1363eac8a785a3bad2ac319ae38726cd826268cf SHA1 b5204a9bda13b42ef04921e71f52e5bfe5412f13 SHA256 c233c00aaef5b7fb93759d7888c885f99f40aec689a7f3e0d5d8b5797bf80cd4 DIST hnb-1.9.18.tar.gz 166043 RMD160 d2a5da7a5501d83630074703de12fbff6eb3df09 SHA1 dde18ce916cec31d473ac7f95f5106b120422854 SHA256 b9a1e567d904dc9d3eb262e4f6fd46a4494339452333c35d77e154c7b0d5031f EBUILD hnb-1.9.17.ebuild 603 RMD160 fb536e559cc6c44dc192b552f248c95e6c61957f SHA1 8621900f82a75f05185d35bc6fdea8c4c6f9d098 SHA256 5c3f7af44f764bf795d32bfbf232576cdd8203996f95ba45fdc04d8cf2b65c05 -EBUILD hnb-1.9.18-r1.ebuild 766 RMD160 50028d08945ad214a40bd686a9c1478443a4f30c SHA1 af4bb570ffc0da3521b2777583936027ae35732a SHA256 4f49300c3cb13159770c26542800cb3957a0ec7a96110183b1f0bca1db2da83f +EBUILD hnb-1.9.18-r1.ebuild 730 RMD160 fc7994cfddcba366964421c1c741435e9dae4c12 SHA1 ff8c8900faced3e9ea16873316dee1259d3d4fd0 SHA256 ccd38679125358185a0330fbdb67a34b82bee08ebf7e9feae1a1690d26c5afbb EBUILD hnb-1.9.18.ebuild 618 RMD160 a2ff09c27e08d2e8ccfb07072b9a7cd0c15cfd04 SHA1 2840a85a69f9d1f4a853d0a7e58c315531f2dd9b SHA256 86a1b0b24f5a8036b767f3e97eaecdfd4ff8d7f6f873728374616cdae45a1f7c -MISC ChangeLog 2201 RMD160 af7b6432e360de8b841594f951bf277602da0408 SHA1 d4c22762baec8b0d05a55a65dd29aa6f3fac1681 SHA256 7d41cdd43f2e72d667310e17d83485a03a61513ae4a1924423b6ea6a7e8f223e +MISC ChangeLog 2411 RMD160 b58060c13ab4439a88162de04ff673e88695299d SHA1 77bbe6ebd6ffe11b5c283c106b66cd14215489c6 SHA256 642e9bc292a87caeb307cf67402bf1ddd586fbbf6950dfad593e92e4df2d3bea MISC metadata.xml 517 RMD160 666ee03634660440df9f4520af06c83da1c5cf97 SHA1 b60dd709e2d2924594843e1bfb5e2043a172bb3b SHA256 846bc7fd7e9c81b772e323e60ac25cebe78e8c16f255c4e73b21f158324678b3 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() { |