pkg/32234: netpbm does not build on FreeBSD 6 + fix

[lminder%gmx.net@localhost]

>Number:         32234
>Category:       pkg
>Synopsis:       netpbm does not build on FreeBSD 6 + fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Dec 04 02:10:01 +0000 2005
>Originator:     Lorenz Minder
>Release:        FreeBSD 6  + pkgsrc from CVS
>Organization:
>Environment:
FreeBSD lorenzdesktop 6.0-STABLE FreeBSD 6.0-STABLE #1: Sun Nov 13 19:09:46 CET 
2005     lorinder@lorenzdesktop:/usr/obj/usr/src/sys/MYKERNEL  i386
>Description:
netpbm does not build because it defines the memmem() function which is already 
in the FreeBSD 6 libc.
>How-To-Repeat:
Try to build graphics/netpbm on FreeBSD 6.
>Fix:
Patch possibly mangled through the web interface, sorry.

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/netpbm/distinfo,v
retrieving revision 1.45
diff -u -u -r1.45 distinfo
--- distinfo    19 Oct 2005 09:30:08 -0000      1.45
+++ distinfo    4 Dec 2005 01:58:41 -0000
@@ -7,6 +7,6 @@
 SHA1 (patch-ab) = 900c36d6ab145c807ecb3dec6b77ae2ad50d4dad
 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
-SHA1 (patch-af) = 82e366af1c8b644cf374706c2eb113c370447de9
+SHA1 (patch-af) = 5092dc49761e69d204730083dc1e3c85cb9b73dd
 SHA1 (patch-ah) = f9cd1864c3298fbba7241646a49fe845bbc716ba
 SHA1 (patch-ai) = 1d8c9585a08f96422f4180719ecc26e305929c62
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/netpbm/patches/patch-af,v
retrieving revision 1.10
diff -u -u -r1.10 patch-af
--- patches/patch-af    22 Aug 2005 11:59:31 -0000      1.10
+++ patches/patch-af    4 Dec 2005 01:58:41 -0000
@@ -1,18 +1,20 @@
 $NetBSD: patch-af,v 1.10 2005/08/22 11:59:31 adam Exp $
 
---- converter/other/cameratopam/identify.c.orig        2005-08-15 
06:07:25.000000000 +0000
-+++ converter/other/cameratopam/identify.c
-@@ -23,7 +23,9 @@
+--- converter/other/cameratopam/identify.c.orig        Sun Dec  4 02:47:40 2005
++++ converter/other/cameratopam/identify.c     Sun Dec  4 02:48:21 2005
+@@ -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 @@
        return c;
    return NULL;
  }