diff options
| author | adam <adam> | 2006-02-14 21:57:44 +0000 |
|---|---|---|
| committer | adam <adam> | 2006-02-14 21:57:44 +0000 |
| commit | ea43f16ecea7af298612860bbb631e38a21521f5 (patch) | |
| tree | 7fd3a51bcd73d351a3cfe3febe6786b3f0e718e6 /graphics | |
| parent | f4b8b63394cd8923d924bbba37193d110c48ccbd (diff) | |
| download | pkgsrc-ea43f16ecea7af298612860bbb631e38a21521f5.tar.gz | |
Fix build on FreeBSD 6 (PR-32234)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/netpbm/Makefile | 4 | ||||
| -rw-r--r-- | graphics/netpbm/distinfo | 4 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-af | 12 |
3 files changed, 11 insertions, 9 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 9da466d8ede..b5a2499b377 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.130 2006/02/05 23:09:36 joerg Exp $ +# $NetBSD: Makefile,v 1.131 2006/02/14 21:57:44 adam Exp $ DISTNAME= netpbm-10.31 PKGREVISION= 2 @@ -19,7 +19,7 @@ MAKE_ENV+= INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \ pkgdir=${STAGEDIR:Q} MAKEFILE= GNUmakefile PLIST_SRC= ${WRKDIR}/PLIST_STAGE -REPLACE_PERL= editor/ppmfade editor/ppmshadow editor/pnmquant \ +REPLACE_PERL+= editor/ppmfade editor/ppmshadow editor/pnmquant \ generator/ppmrainbow manweb editor/pnmflip editor/ppmquant STAGEDIR= ${WRKDIR}/staging diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 9d64f2176d2..dcab3b0fdb1 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2006/02/04 12:23:55 markd Exp $ +$NetBSD: distinfo,v 1.50 2006/02/14 21:57:44 adam Exp $ SHA1 (netpbm-10.31.tgz) = c85d5c439e2bb81a5c5f7a5ab1068391c553caaa RMD160 (netpbm-10.31.tgz) = abeb8b44ce3496f7b4127ca6e1a89bd11e5ef2bb @@ -8,6 +8,6 @@ SHA1 (patch-ab) = 86bc267115349c9ef52dc01b1ab425ad6d5e2193 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1 -SHA1 (patch-af) = 82e366af1c8b644cf374706c2eb113c370447de9 +SHA1 (patch-af) = 41c3506dcd267ce15d5b7e5ff9b0c1ee97b54e26 SHA1 (patch-ag) = f291e9b45313c01b6aeeb2fc62cd9498e13baf72 SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26 diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af index 20b8d4229eb..70bb1b7ce90 100644 --- a/graphics/netpbm/patches/patch-af +++ b/graphics/netpbm/patches/patch-af @@ -1,18 +1,20 @@ -$NetBSD: patch-af,v 1.10 2005/08/22 11:59:31 adam Exp $ +$NetBSD: patch-af,v 1.11 2006/02/14 21:57:44 adam Exp $ ---- converter/other/cameratopam/identify.c.orig 2005-08-15 06:07:25.000000000 +0000 +--- converter/other/cameratopam/identify.c.orig 2005-08-27 19:29:58.000000000 +0200 +++ converter/other/cameratopam/identify.c -@@ -23,7 +23,9 @@ +@@ -23,7 +23,11 @@ static loadRawFn load_raw; +#include <sys/param.h> -+#if !(defined(__GLIBC__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 300000000))) ++#if !(defined(__GLIBC__) \ ++ || (defined(__NetBSD__) && (__NetBSD_Version__ >= 300000000)) \ ++ || (defined(__FreeBSD__) && (__FreeBSD_version >= 600000))) /* 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 +36,7 @@ static const char *memmem (const char *h +@@ -34,6 +38,7 @@ static const char *memmem (const char *h return c; return NULL; } |