Using the included jasper library is a total crapshoot because netpbm

strips out the logic that determines which integer types are available,
and yet building the jasper library relies on those integer types to
be correctly provided.  Just punt on the whole thing and use the
graphics/jasper dependency instead.  This fixes building netpbm on
Solaris and older versions of FreeBSD.

Bump the PKGREVISION to 1.  The jasper library is only linked into two
executables, so there is no need to do a recursive PKGREVISION bump.

3 files changed, 22 insertions, 17 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index b115a6707bd..8031c4713ea 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.122 2005/08/22 11:59:31 adam Exp $
+# $NetBSD: Makefile,v 1.123 2005/08/31 08:04:58 jlam Exp $
 
 DISTNAME=	netpbm-10.29
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
@@ -46,14 +47,12 @@ SUBST_FILES.bash=	converter/other/anytopnm			\
 MAKE_ENV+=	BUILD_FIASCO=N
 .endif
 
-.if ${OPSYS} == "SunOS"
-.  include "../../graphics/jasper/buildlink3.mk"
 MAKE_ENV+=	JASPERLIB="${LDFLAGS} -ljasper"
 MAKE_ENV+=	JASPERHDR_DIR=${CPPFLAGS:Q}
-.else
-MAKE_ENV+=	JASPERLIB='$$(INTERNAL_JASPERLIB)'
-MAKE_ENV+=	JASPERHDR_DIR='$$(INTERNAL_JASPERHDR_DIR)'
-.endif
+
+.include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 
 pre-configure:
 	${CP} ${WRKSRC}/Makefile.config.in ${WRKSRC}/Makefile.config
@@ -79,6 +78,4 @@ post-install:
 	${PAX} -rwpppm . ${PREFIX}
 	${RM} -fr ${STAGEDIR}
 
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 8f86e83631d..44346b83996 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2005/08/22 11:59:31 adam Exp $
+$NetBSD: distinfo,v 1.42 2005/08/31 08:04:58 jlam Exp $
 
 SHA1 (netpbm-10.29.tgz) = 0733a0e1a7413e48eeb060aed1d1cc326e12ef8d
 RMD160 (netpbm-10.29.tgz) = c88d01b1106c7eb1f087d98a5570c0c61200d083
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = 900c36d6ab145c807ecb3dec6b77ae2ad50d4dad
 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
 SHA1 (patch-af) = 82e366af1c8b644cf374706c2eb113c370447de9
-SHA1 (patch-ah) = e80a111a0e0253111fbadf115eeef3b659399ac0
+SHA1 (patch-ah) = be2ebb908859da6e030b04acb9e33b6c774137ad
 SHA1 (patch-ai) = 1d8c9585a08f96422f4180719ecc26e305929c62
diff --git a/graphics/netpbm/patches/patch-ah b/graphics/netpbm/patches/patch-ah
index 52e42b26a2b..370fa54280b 100644
--- a/graphics/netpbm/patches/patch-ah
+++ b/graphics/netpbm/patches/patch-ah
@@ -1,15 +1,23 @@
-$NetBSD: patch-ah,v 1.6 2005/08/22 11:59:31 adam Exp $
+$NetBSD: patch-ah,v 1.7 2005/08/31 08:04:58 jlam Exp $
 
---- converter/other/cameratopam/camera.c.orig	2005-08-15 06:12:51.000000000 +0000
+--- converter/other/cameratopam/camera.c.orig	Mon Aug 15 06:12:51 2005
 +++ converter/other/cameratopam/camera.c
-@@ -22,6 +22,10 @@
+@@ -4,6 +4,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <assert.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
  
- #include "camera.h"
+ #ifdef HAVE_JPEG
+@@ -21,6 +22,10 @@
+ #include "dng.h"
  
+ #include "camera.h"
++
 +#ifdef __sun
 +#define setenv(x, y, z) putenv(x"="y)
 +#endif
-+
+ 
  #if HAVE_INT64
     typedef int64_t INT64;
-    static bool const have64BitArithmetic = true;