Fixed the build on IRIX, which had been broken since about one year,

when the build on Solaris had been fixed, "not affecting other
platforms". ;)

4 files changed, 22 insertions, 9 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 067d3d3ec2f..9dd3992d0ee 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.150 2007/01/17 23:47:20 wiz Exp $
+# $NetBSD: Makefile,v 1.151 2007/02/19 02:25:19 rillig Exp $
 
 DISTNAME=	netpbm-10.34
 PKGREVISION=	1
@@ -27,6 +27,8 @@ LIBS.SunOS+=	-lsocket -lnsl
 MAKE_ENV+=	NETWORKLD=${LIBS:Q}
 MAKE_FLAGS+=	PKGMANDIR=${PKGMANDIR}
 
+WRAPPER_REORDER_CMDS+=	reorder:l:rle:netpbm
+
 # Several of the netpbm shell scripts use bashisms, so force using
 # bash for all of the shell scripts.
 #
@@ -56,9 +58,6 @@ MAKE_ENV+=	NETPBMLIBTYPE="dylib" NETPBMLIBSUFFIX="dylib"
 MAKE_ENV+=	NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so"
 .endif
 
-MAKE_ENV+=	JASPERLIB="${LDFLAGS} -ljasper"
-MAKE_ENV+=	JASPERHDR_DIR=${CPPFLAGS:Q}
-
 .if ${PKGSRC_COMPILER} == "ido"
 CPPFLAGS+=	-DSGI_IDO_CC
 .endif
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 3ce522c7f82..60b04718df3 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.65 2007/01/13 01:16:17 dmcmahill Exp $
+$NetBSD: distinfo,v 1.66 2007/02/19 02:25:19 rillig Exp $
 
 SHA1 (netpbm-10.34.tgz) = 530458871f9d3dc763a1bf82f227eeb79098c601
 RMD160 (netpbm-10.34.tgz) = 57a596efa6cacb981135d554a72cbaffc4cfe72c
 Size (netpbm-10.34.tgz) = 2507007 bytes
-SHA1 (patch-aa) = dbb17588aa8f8628ad98af43935adc710f870d0f
+SHA1 (patch-aa) = 28cfd7950d72a041cd4a7fe6660849561846c582
 SHA1 (patch-ab) = 7781c51e9a8cc9de953540a04e19303244ef8d57
 SHA1 (patch-ac) = 0dd7205df79267045d6884ee59e07480e3192341
 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1
@@ -34,3 +34,4 @@ SHA1 (patch-da) = 37b30f7b6674150685d406570802a7250dce51a6
 SHA1 (patch-db) = 028f1c8b879d640f3f04dfb252c5efca21949031
 SHA1 (patch-dc) = 8ed1365dccf5abb0e158a4f7a65749ff5b244ef3
 SHA1 (patch-dd) = b64f1826549ffd949e19cb986e1e367918ccf5ba
+SHA1 (patch-ppmdraw) = d901a690f8f21a1af940129d1edef509b369ea1a
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 0afe376d83b..4b6ff715a5c 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.38 2006/06/25 06:35:58 adam Exp $
+$NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
 
 --- Makefile.config.in.orig	2006-06-18 21:23:40.000000000 +0200
 +++ Makefile.config.in
@@ -160,8 +160,8 @@ $NetBSD: patch-aa,v 1.38 2006/06/25 06:35:58 adam Exp $
  # The Jasper JPEG-2000 image compression library (aka JasPer):
 -JASPERLIB = $(INTERNAL_JASPERLIB)
 -JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
-+#JASPERLIB = $(INTERNAL_JASPERLIB)
-+#JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
++JASPERLIB = -ljasper
++JASPERHDR_DIR = /doesnt-matter
  # JASPERDEPLIBS is the libraries (-l options or file names) on which
  # The Jasper library depends -- i.e. what you have to link into any
  # executable that links in the Jasper library.
diff --git a/graphics/netpbm/patches/patch-ppmdraw b/graphics/netpbm/patches/patch-ppmdraw
new file mode 100644
index 00000000000..5aa212a3b23
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ppmdraw
@@ -0,0 +1,13 @@
+$NetBSD: patch-ppmdraw,v 1.1 2007/02/19 02:25:19 rillig Exp $
+
+--- editor/ppmdraw.c.orig	Sun Apr 23 21:01:54 2006
++++ editor/ppmdraw.c	Sun Feb 18 20:35:09 2007
+@@ -1,4 +1,8 @@
++#if defined(__sgi)
++#define _XOPEN_SOURCE 500	/* Needed for strdup(3) */
++#else
+ #define _XOPEN_SOURCE    /* Make sure M_PI is in math.h */
++#endif
+ #define _BSD_SOURCE      /* Make sure strdup is in string.h */
+ 
+ #include <string.h>