summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjschauma <jschauma>2003-09-07 17:22:15 +0000
committerjschauma <jschauma>2003-09-07 17:22:15 +0000
commit43cc3c06144e7137a8bd1ef6c68798758c69d7fd (patch)
tree4419e10a7a4f446645525bcb72ed364c2b08086c /graphics
parentdd2298d7730e270d0d3a75acadd24147da7a3f95 (diff)
downloadpkgsrc-43cc3c06144e7137a8bd1ef6c68798758c69d7fd.tar.gz
Make this compile on Irix.
(use 'ar rs' instead of ranlib on Irix, don't use '-fPIC', make sure strdup is properly prototyped)
Diffstat (limited to 'graphics')
-rw-r--r--graphics/netpbm/distinfo6
-rw-r--r--graphics/netpbm/patches/patch-aa37
-rw-r--r--graphics/netpbm/patches/patch-ad12
-rw-r--r--graphics/netpbm/patches/patch-ae12
4 files changed, 54 insertions, 13 deletions
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 8458e2d24df..23ed51c9218 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.17 2003/06/11 07:10:46 wiz Exp $
+$NetBSD: distinfo,v 1.18 2003/09/07 17:22:15 jschauma Exp $
SHA1 (netpbm-10.11.8.tgz) = ecfe6e59688bb3a44c178a6b6bfb923039c4229e
Size (netpbm-10.11.8.tgz) = 1911118 bytes
-SHA1 (patch-aa) = 58e17af135a46342ff048c25c971c05e51f95104
+SHA1 (patch-aa) = 22de5096922df8353e8a42da59b9adb65afd6dd8
SHA1 (patch-ac) = cd8bb4318828a9872cce2793635c4bc51272d199
+SHA1 (patch-ad) = 21c7cce58e010d9323bbfac514e7d0bd39f4723c
+SHA1 (patch-ae) = 8a46f8c0b1c0efe57533dba55d18459135e796ea
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 8c990c63952..de60b5c9732 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.25 2003/06/11 07:10:47 wiz Exp $
+$NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
---- Makefile.config.in.orig Wed Oct 16 03:17:21 2002
-+++ Makefile.config.in Wed Jun 11 15:29:48 2003
+--- Makefile.config.in.orig Tue Oct 15 10:17:21 2002
++++ Makefile.config.in Sun Sep 7 12:39:12 2003
@@ -33,7 +33,7 @@
#CC = gcc
# Note that 'cc' is usually an alias for whatever is the main compiler
@@ -29,7 +29,18 @@ $NetBSD: patch-aa,v 1.25 2003/06/11 07:10:47 wiz Exp $
# If you don't want to strip the binaries, just leave it null:
#STRIPFLAG =
-@@ -131,7 +131,7 @@
+@@ -83,7 +83,9 @@
+ AR = ar
+ RANLIB = ranlib
+ # IRIX, SCO don't have Ranlib:
+-#RANLIB = true
++ifeq ($(OPSYS),IRIX)
++RANLIB = ar rs
++endif
+ LEX = flex
+ # Solaris:
+ # LEX = flex -e
+@@ -131,7 +133,7 @@
# Solaris, SunOS, NetBSD:
#NEED_RUNTIME_PATH = Y
@@ -38,7 +49,7 @@ $NetBSD: patch-aa,v 1.25 2003/06/11 07:10:47 wiz Exp $
# Eunice users may want to use -noshare so that the executables can
# run standalone:
#LDFLAGS = -noshare
-@@ -171,6 +171,14 @@
+@@ -171,6 +173,14 @@
#AIX:
#LDSHLIB = ???
@@ -53,7 +64,7 @@ $NetBSD: patch-aa,v 1.25 2003/06/11 07:10:47 wiz Exp $
# On older systems, you have to make shared libraries out of position
# independent code, so you need -fpic or fPIC here. (The rule is: if
# -fpic works, use it. If it bombs, go to fPIC). On newer systems,
-@@ -188,11 +196,15 @@
+@@ -188,11 +198,19 @@
CFLAGS_SHLIB =
# Solaris or SunOS with gcc, and NetBSD:
#CFLAGS_SHLIB = -fpic
@@ -67,10 +78,14 @@ $NetBSD: patch-aa,v 1.25 2003/06/11 07:10:47 wiz Exp $
+CFLAGS_SHLIB = -fno-common
+endif
+
++ifeq ($(OPSYS),IRIX)
++CFLAGS_SHLIB = -KPIC
++endif
++
# SHLIB_CLIB is the link option to include the C library in a shared library,
# normally "-lc". On typical systems, this serves no purpose. On some,
# though, it causes information about which C library to use to be recorded
-@@ -244,8 +256,8 @@
+@@ -244,8 +262,8 @@
#TIFFLIB = libtiff.so
#TIFFHDR_DIR = /usr/include/libtiff
#NetBSD:
@@ -81,7 +96,7 @@ $NetBSD: patch-aa,v 1.25 2003/06/11 07:10:47 wiz Exp $
# OSF, Tru64:
#TIFFLIB = /usr/local1/DEC/lib/libtiff.so
#TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -273,8 +285,8 @@
+@@ -273,8 +291,8 @@
#JPEGLIB = libjpeg.so
#JPEGHDR_DIR = /usr/include/jpeg
# Netbsd:
@@ -92,7 +107,7 @@ $NetBSD: patch-aa,v 1.25 2003/06/11 07:10:47 wiz Exp $
# OSF, Tru64:
#JPEGLIB = /usr/local1/DEC/libjpeg.so
#JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -297,8 +309,8 @@
+@@ -297,8 +315,8 @@
#PNGLIB = libpng$(PNGVER).so
#PNGHDR_DIR = /usr/include/libpng$(PNGVER)
# NetBSD:
@@ -103,7 +118,7 @@ $NetBSD: patch-aa,v 1.25 2003/06/11 07:10:47 wiz Exp $
# OSF/Tru64:
#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
#PNGHDR_DIR = /usr/local1/DEC/include
-@@ -308,8 +320,8 @@
+@@ -308,8 +326,8 @@
# NONE for the PNG library, it doesn't matter what you specify here --
# it won't get used.
@@ -114,7 +129,7 @@ $NetBSD: patch-aa,v 1.25 2003/06/11 07:10:47 wiz Exp $
#ZLIB = libz.so
# The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -337,7 +349,7 @@
+@@ -337,7 +355,7 @@
# network functions is the option in ppmtompeg to run it on multiple
# computers simultaneously.
diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad
new file mode 100644
index 00000000000..d354deecabe
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.13 2003/09/07 17:22:16 jschauma Exp $
+
+--- converter/other/pstopnm.c.orig Sat Sep 6 21:22:44 2003
++++ converter/other/pstopnm.c Sat Sep 6 21:22:36 2003
+@@ -7,7 +7,6 @@
+ -----------------------------------------------------------------------------*/
+
+ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */
+-#define _XOPEN_SOURCE /* Make sure fdopen() is in stdio.h */
+
+ #include <string.h>
+ #include <unistd.h>
diff --git a/graphics/netpbm/patches/patch-ae b/graphics/netpbm/patches/patch-ae
new file mode 100644
index 00000000000..b41bd836956
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.9 2003/09/07 17:22:16 jschauma Exp $
+
+--- generator/pbmtextps.c.orig Sat Sep 6 23:31:49 2003
++++ generator/pbmtextps.c Sat Sep 6 23:32:23 2003
+@@ -13,7 +13,6 @@
+ * PostScript is a registered trademark of Adobe Systems International.
+ *
+ */
+-#define _XOPEN_SOURCE /* Make sure popen() is in stdio.h */
+ #define _BSD_SOURCE /* Make sure stdrup() is in string.h */
+ #include <stdio.h>
+ #include <stdlib.h>