Add patch to build on FreeBSD 6, and keyword ~x86-fbsd.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 47 insertions, 12 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 47d78e4563a8..7e55363043ae 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.111 2006/03/31 23:30:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.112 2006/04/16 12:08:14 flameeyes Exp $
+
+  16 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netpbm-10.33-memmem.patch, netpbm-10.33.ebuild:
+  Add patch to build on FreeBSD 6, and keyword ~x86-fbsd.
 
 *netpbm-10.33 (31 Mar 2006)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 5b1cfa2837f5..e902bf8dd9a6 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7385a8cdf4aaf68f1d5a856b872cb463 ChangeLog 15896
-RMD160 9b603c894923082fe251c75956277e322c4a1ded ChangeLog 15896
-SHA256 92b88804c5c4a54d3da331fba68e3c8cfbf8bfd402d193a4965eaf29bac3513f ChangeLog 15896
+MD5 5db78a056c1a0db96fca2266d3947242 ChangeLog 16068
+RMD160 5bd0d19221f1eeaf19b6de7290d7db4458d8461d ChangeLog 16068
+SHA256 d3049519a5fc93cc24191b19b1b287d409f513470860a5c5b0d7f5df59eef18e ChangeLog 16068
 MD5 0ddde32893ebaac2d3fb25e7b258202c files/digest-netpbm-10.26.25 509
 RMD160 43b0ce1241a32396b6a1bcf7492421b5e87c16a5 files/digest-netpbm-10.26.25 509
 SHA256 4cffdbdd12e81a734589972355414988a77f16fb01bcb7fcc702f7f414fd2e4f files/digest-netpbm-10.26.25 509
@@ -61,6 +61,9 @@ SHA256 453465c99f8ac7ab2a6194c4c78e48a3f53744bba2a8697a33742908e588d826 files/ne
 MD5 70aa9be30c8c1414d89150960dbe4267 files/netpbm-10.33-lib-objs.patch 480
 RMD160 7423ba678a4fca9950a850b98fc75d4847e5cd28 files/netpbm-10.33-lib-objs.patch 480
 SHA256 816ebb913ba1bf012b39e10ac6ae575c3d834a36e833049e782fce3b95bad229 files/netpbm-10.33-lib-objs.patch 480
+MD5 db2e68f379c700c432b32a33d4a77cd6 files/netpbm-10.33-memmem.patch 928
+RMD160 50736127328f376a4ed51737da9832e845ee455f files/netpbm-10.33-memmem.patch 928
+SHA256 6149cba425d7e5d5fc7818377d02e263690c4e02a618b7f1bd92c8649e7e18b3 files/netpbm-10.33-memmem.patch 928
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab metadata.xml 224
 SHA256 06e3a779a82014f8783ebfc67e1b11107bcb670aacdf1f81faa361642046ba23 metadata.xml 224
@@ -82,13 +85,13 @@ SHA256 d7e14b2bb73a23bb46f74e8081ab717265ee1db5322b57adf5a4cc8297e9388a netpbm-1
 MD5 660ee730672b4783ad855e2f3f6d1790 netpbm-10.32.ebuild 2936
 RMD160 9f55a32dcf1010272cb7647a3260314d8b85f5d9 netpbm-10.32.ebuild 2936
 SHA256 badbc1c51bc823ab1ee550b630bddb9802f633af6e7ab3178f0d6a86f9583895 netpbm-10.32.ebuild 2936
-MD5 a2f9d0d3530491b1b16d286dfa5fc2c4 netpbm-10.33.ebuild 2885
-RMD160 decf83ab94db75b30a903a4edfd71f4a8842b85f netpbm-10.33.ebuild 2885
-SHA256 ac53b82ae6e196c7e802386dced58d86bd1535043acd5c5c0c1723df31009ca3 netpbm-10.33.ebuild 2885
+MD5 f599f454b25ff27b6c54efd82514f5fb netpbm-10.33.ebuild 2938
+RMD160 535604c17a4a7435adc0a35372145b5694484a77 netpbm-10.33.ebuild 2938
+SHA256 13c2af353bbf147b928281460ec281199e24b3a3649cd4ff41f044ea6df5c775 netpbm-10.33.ebuild 2938
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFELbu82+ySkm8kpY0RAkyJAJ4ifKHReUklNjw596KP6KS/DpY7KACeIUcl
-Erc3i9SZ4LgWEItTpDPoYPE=
-=jMAR
+iD8DBQFEQjL+AiZjviIA2XgRAheVAJ9RPeNgWJjfH6XlnYJhe9xG5dJOxwCg6XcV
+uNdbabsZl8fLkRilMALvW7Y=
+=vVrq
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/netpbm-10.33-memmem.patch b/media-libs/netpbm/files/netpbm-10.33-memmem.patch
new file mode 100644
index 000000000000..fe945b24d41a
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.33-memmem.patch
@@ -0,0 +1,27 @@
+Index: netpbm-10.33/converter/other/cameratopam/identify.c
+===================================================================
+--- netpbm-10.33.orig/converter/other/cameratopam/identify.c
++++ netpbm-10.33/converter/other/cameratopam/identify.c
+@@ -1,4 +1,5 @@
+ #define _BSD_SOURCE   /* Make sure strcasecmp() is in string.h */
++#define _GNU_SOURCE   /* To have memset() */
+ #include <string.h>
+ 
+ #include "pm.h"
+@@ -23,7 +24,7 @@
+ 
+ static loadRawFn load_raw;
+ 
+-
++#if !defined(__GLIBC__) && ( !defined(__FreeBSD__) || __FreeBSD__ < 6 )
+ /* This does the same as the function of the same name in the GNU C library */
+ static const char *memmem (const char *haystack, size_t haystacklen,
+                      const char *needle, size_t needlelen)
+@@ -34,6 +35,7 @@ static const char *memmem (const char *h
+       return c;
+   return NULL;
+ }
++#endif
+ 
+ /*
+    Thanks to Adobe for providing these excellent CAM -> XYZ matrices!
diff --git a/media-libs/netpbm/netpbm-10.33.ebuild b/media-libs/netpbm/netpbm-10.33.ebuild
index 22ed12e05e12..c71857b4a2af 100644
--- a/media-libs/netpbm/netpbm-10.33.ebuild
+++ b/media-libs/netpbm/netpbm-10.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.33.ebuild,v 1.1 2006/03/31 23:30:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.33.ebuild,v 1.2 2006/04/16 12:08:14 flameeyes Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="svga jpeg tiff png zlib"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
@@ -50,6 +50,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/netpbm-10.31-build.patch
 	epatch "${FILESDIR}"/netpbm-10.33-lib-objs.patch
+	epatch "${FILESDIR}/${P}-memmem.patch"
 
 	rm -f configure
 	cp Makefile.config.in Makefile.config