diff options
Diffstat (limited to 'graphics/netpbm/patches/patch-aa')
| -rw-r--r-- | graphics/netpbm/patches/patch-aa | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index ee29dbc0ec3..a568e2cffff 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $ +$NetBSD: patch-aa,v 1.32 2005/08/21 04:47:24 grant Exp $ ---- Makefile.config.in.orig 2005-01-12 21:50:04.000000000 -0600 +--- Makefile.config.in.orig 2005-05-25 06:15:26.000000000 +1000 +++ Makefile.config.in @@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge # and skip it on those systems unless you want to debug it and fix it. @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $ # The linker. LD = $(CC) -@@ -86,7 +86,7 @@ LD_FOR_BUILD = $(LD) +@@ -92,7 +92,7 @@ LD_FOR_BUILD = $(LD) # MAKE is set automatically by Make to what was used to invoke Make. @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $ #Solaris: #INSTALL = /usr/ucb/install #Tru64: -@@ -98,7 +98,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s +@@ -104,7 +104,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s # STRIPFLAG is the option you pass to the above install program to make it # strip unnecessary information out of binaries. @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $ # If you don't want to strip the binaries, just leave it null: #STRIPFLAG = -@@ -117,8 +117,10 @@ MANPAGE_FORMAT = nroff +@@ -123,8 +123,10 @@ MANPAGE_FORMAT = nroff AR = ar RANLIB = ranlib # IRIX, SCO don't have Ranlib: @@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $ # Solaris: # LEX = flex -e # Or just skip parts that need Lex: -@@ -204,7 +206,7 @@ EXE = +@@ -210,7 +212,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.31 2005/06/30 15:58:59 minskim 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. -@@ -237,6 +239,18 @@ LDRELOC = NONE +@@ -243,6 +245,18 @@ LDRELOC = NONE #LDRELOC = ld --reloc #LDRELOC = ld -r @@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim 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 -@@ -255,11 +269,23 @@ LDRELOC = NONE +@@ -265,11 +279,23 @@ LDRELOC = NONE CFLAGS_SHLIB = # Solaris or SunOS with gcc, and NetBSD: #CFLAGS_SHLIB = -fpic @@ -104,7 +104,7 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim 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 -@@ -328,8 +354,8 @@ TIFFHDR_DIR = +@@ -338,8 +364,8 @@ TIFFHDR_DIR = #TIFFLIB = libtiff.so #TIFFHDR_DIR = /usr/include/libtiff #NetBSD: @@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $ # OSF, Tru64: #TIFFLIB = /usr/local1/DEC/lib/libtiff.so #TIFFHDR_DIR = /usr/local1/DEC/include -@@ -359,8 +385,8 @@ JPEGHDR_DIR = +@@ -369,8 +395,8 @@ JPEGHDR_DIR = #JPEGLIB = libjpeg.so #JPEGHDR_DIR = /usr/include/jpeg # Netbsd: @@ -126,7 +126,7 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $ # OSF, Tru64: #JPEGLIB = /usr/local1/DEC/libjpeg.so #JPEGHDR_DIR = /usr/local1/DEC/include -@@ -384,8 +410,8 @@ PNGVER = +@@ -394,8 +420,8 @@ PNGVER = #PNGLIB = libpng$(PNGVER).so #PNGHDR_DIR = /usr/include/libpng$(PNGVER) # NetBSD: @@ -137,7 +137,7 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $ # OSF/Tru64: #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so #PNGHDR_DIR = /usr/local1/DEC/include -@@ -395,8 +421,8 @@ PNGVER = +@@ -405,8 +431,8 @@ PNGVER = # NONE for the PNG library, it doesn't matter what you specify here -- # it won't get used. @@ -148,7 +148,18 @@ $NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $ #ZLIB = libz.so # The JBIG lossless image compression library (aka JBIG-KIT): -@@ -437,7 +463,7 @@ OMIT_NETWORK = +@@ -415,8 +441,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb + JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig + + # 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) + # 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. +@@ -452,7 +478,7 @@ OMIT_NETWORK = # built into the standard C library, so this can be null. This is irrelevant # if OMIT_NETWORK is "y". |