diff options
Diffstat (limited to 'graphics/netpbm/patches')
| -rw-r--r-- | graphics/netpbm/patches/patch-aa | 45 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ab | 6 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ac | 18 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ag | 12 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ca | 12 |
5 files changed, 47 insertions, 46 deletions
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index 14309465732..0e42e6bb92b 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ +$NetBSD: patch-aa,v 1.35.2.1 2006/06/26 07:06:35 ghen Exp $ ---- Makefile.config.in.orig 2006-01-03 01:15:17.000000000 +0100 -+++ Makefile.config.in +--- Makefile.config.in.orig 2006-06-18 21:23:40.000000000 +0200 ++++ Makefile.config.in 2006-06-25 17:21:17.000000000 +0200 @@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge # and skip it on those systems unless you want to debug it and fix it. # OpenBSD: @@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ # Solaris: # LEX = flex -e # Or just skip parts that need Lex: -@@ -219,7 +221,7 @@ EXE = +@@ -220,7 +222,7 @@ EXE = # Here, $(SONAME) resolves to the soname for the shared library being created. # The following are gcc options. This works on GNU libc systems. @@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ # You need -nostart instead of -shared on BeOS. Though the BeOS compiler is # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc # documentation and doesn't exist in at least one non-BeOS installation. -@@ -252,6 +254,18 @@ LDRELOC = NONE +@@ -253,6 +255,19 @@ LDRELOC = NONE #LDRELOC = ld --reloc #LDRELOC = ld -r @@ -69,7 +69,8 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ +endif + +ifeq ($(OPSYS),Darwin) -+LDSHLIB = -dynamiclib -install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib ++LDSHLIB = -dynamiclib -install_name $(PREFIX)/lib/libnetpbm.$(MAJ).dylib \ ++ -compatibility_version $(MAJ) -current_version $(MAJ).$(MIN) +endif + +ifeq ($(OPSYS),Interix) @@ -79,7 +80,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam 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 -@@ -274,11 +288,23 @@ LDRELOC = NONE +@@ -275,11 +290,23 @@ LDRELOC = NONE CFLAGS_SHLIB = # Solaris or SunOS with gcc, and NetBSD: #CFLAGS_SHLIB = -fpic @@ -104,7 +105,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ # 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 -@@ -347,8 +373,8 @@ TIFFHDR_DIR = +@@ -348,8 +375,8 @@ TIFFHDR_DIR = #TIFFLIB = libtiff.so #TIFFHDR_DIR = /usr/include/libtiff #NetBSD: @@ -115,7 +116,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ # OSF, Tru64: #TIFFLIB = /usr/local1/DEC/lib/libtiff.so #TIFFHDR_DIR = /usr/local1/DEC/include -@@ -378,8 +404,8 @@ JPEGHDR_DIR = +@@ -379,8 +406,8 @@ JPEGHDR_DIR = #JPEGLIB = libjpeg.so #JPEGHDR_DIR = /usr/include/jpeg # Netbsd: @@ -126,7 +127,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ # OSF, Tru64: #JPEGLIB = /usr/local1/DEC/libjpeg.so #JPEGHDR_DIR = /usr/local1/DEC/include -@@ -403,8 +429,8 @@ PNGVER = +@@ -404,8 +431,8 @@ PNGVER = #PNGLIB = libpng$(PNGVER).so #PNGHDR_DIR = /usr/include/libpng$(PNGVER) # NetBSD: @@ -137,7 +138,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ # OSF/Tru64: #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so #PNGHDR_DIR = /usr/local1/DEC/include -@@ -414,8 +440,8 @@ PNGVER = +@@ -415,8 +442,8 @@ PNGVER = # NONE for the PNG library, it doesn't matter what you specify here -- # it won't get used. @@ -148,7 +149,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ #ZLIB = libz.so # The JBIG lossless image compression library (aka JBIG-KIT): -@@ -424,8 +450,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb +@@ -425,8 +452,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig # The Jasper JPEG-2000 image compression library (aka JasPer): @@ -159,7 +160,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ # 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. -@@ -461,7 +487,7 @@ OMIT_NETWORK = +@@ -471,7 +498,7 @@ OMIT_NETWORK = # built into the standard C library, so this can be null. This is irrelevant # if OMIT_NETWORK is "y". @@ -168,3 +169,21 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ # Solaris, SunOS: #NETWORKLD = -lsocket -lnsl # SCO: +@@ -525,7 +552,7 @@ SUFFIXMANUALS5 = 5 + #Netpbm library functions. The value is used only in make file tests. + # "unixshared" means a unix-style shared library, typically named like + # libxyz.so.2.3 +-NETPBMLIBTYPE = unixshared ++NETPBMLIBTYPE? = unixshared + # "unixstatic" means a unix-style static library, (like libxyz.a) + #NETPBMLIBTYPE = unixstatic + # "dll" means a Windows DLL shared library +@@ -536,7 +563,7 @@ NETPBMLIBTYPE = unixshared + #NETPBMLIBSUFFIX is the suffix used on whatever kind of library is + #selected above. All this is used for is to construct library names. + #The make files never examine the actual value. +-NETPBMLIBSUFFIX = so ++NETPBMLIBSUFFIX?= so + + # "a" is the suffix for unix-style static libraries. It is also + # traditionally used for shared libraries on AIX. The Visual Age C diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab index edb42533900..f1b2dda3168 100644 --- a/graphics/netpbm/patches/patch-ab +++ b/graphics/netpbm/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.19 2006/02/27 22:01:16 adam Exp $ +$NetBSD: patch-ab,v 1.19.2.1 2006/06/26 07:06:35 ghen Exp $ ---- converter/other/Makefile.orig 2006-02-25 20:15:20.000000000 +0100 +--- converter/other/Makefile.orig 2006-05-28 01:16:09.000000000 +0200 +++ converter/other/Makefile -@@ -108,6 +108,13 @@ all: $(BINARIES) $(SUBDIRS:%=%/all) +@@ -126,6 +126,13 @@ all: $(BINARIES) $(SUBDIRS:%=%/all) include $(SRCDIR)/Makefile.common diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac deleted file mode 100644 index 46afb83e0e2..00000000000 --- a/graphics/netpbm/patches/patch-ac +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ac,v 1.14 2005/01/18 14:16:20 adam Exp $ - ---- converter/ppm/ppmtompeg/param.c.orig 2004-12-03 05:05:39.000000000 +0000 -+++ converter/ppm/ppmtompeg/param.c -@@ -7,13 +7,6 @@ - - /* COPYRIGHT INFORMATION IS AT THE END OF THIS FILE */ - --#define _XOPEN_SOURCE 1 -- /* This makes sure popen() is in stdio.h. In GNU libc 2.1.3, -- _POSIX_C_SOURCE = 2 is sufficient, but on AIX 4.3, the higher level -- _XOPEN_SOURCE is required. 2000.09.09 -- */ -- -- - /*==============* - * HEADER FILES * - *==============*/ diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag deleted file mode 100644 index 470b1da8669..00000000000 --- a/graphics/netpbm/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.14 2006/03/02 23:17:36 adam Exp $ - ---- other/Makefile.orig 2006-03-02 22:46:54.000000000 +0100 -+++ other/Makefile -@@ -67,6 +67,6 @@ install.bin.local: $(PKGDIR)/bin - # In February 2006, pamdepth replaced pnmdepth - cd $(PKGDIR)/bin ; \ - rm -f pnmsdepth ; \ -- $(SYMLINK) pnmsdepth$(EXE) pnmdepth -+ $(SYMLINK) pamdepth$(EXE) pnmdepth - - FORCE: diff --git a/graphics/netpbm/patches/patch-ca b/graphics/netpbm/patches/patch-ca new file mode 100644 index 00000000000..92141bd32e8 --- /dev/null +++ b/graphics/netpbm/patches/patch-ca @@ -0,0 +1,12 @@ +$NetBSD: patch-ca,v 1.1.2.2 2006/06/26 07:06:35 ghen Exp $ + +--- converter/other/rlatopam.c.orig 2006-01-08 00:02:13.000000000 -0500 ++++ converter/other/rlatopam.c +@@ -13,6 +13,7 @@ + **/ + + ++#include <sys/types.h> + #include <netinet/in.h> /* For ntohs, htons */ + #include <string.h> + #include <errno.h> |