diff options
Diffstat (limited to 'graphics/tiff/patches/patch-ab')
| -rw-r--r-- | graphics/tiff/patches/patch-ab | 74 |
1 files changed, 20 insertions, 54 deletions
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab index e8ee934af36..7ecf6943e11 100644 --- a/graphics/tiff/patches/patch-ab +++ b/graphics/tiff/patches/patch-ab @@ -1,56 +1,22 @@ -$NetBSD: patch-ab,v 1.10 2001/05/28 02:50:25 jlam Exp $ +$NetBSD: patch-ab,v 1.11 2001/08/23 00:07:18 abs Exp $ ---- libtiff/Makefile.in.orig Sun Nov 28 15:15:36 1999 -+++ libtiff/Makefile.in Sun May 27 22:19:44 2001 -@@ -35,12 +35,18 @@ - # - SHELL = @SCRIPT_SH@ - NULL = --CC = @CCOMPILER@ -+CCOMPILER = @CCOMPILER@ -+CC = ${LIBTOOL} ${CCOMPILER} - AR = @AR@ - AROPTS = @AROPTS@ - RANLIB = @RANLIB@ - INSTALL = @INSTALL@ - -+LIBJPEG = @LIBJPEG@ -+LIBGZ = @LIBGZ@ -+LIBPORT = @LIBPORT@ -+MACHLIBS = @MACHDEPLIBS@ -+ - # - # If JPEG support is to be included and the Independent JPEG - # Software distribution is not installed then DIR_JPEG must -@@ -135,7 +141,7 @@ - tif_write.o \ - tif_zip.o \ +--- html/Makefile.in.orig Mon Mar 27 17:05:55 2000 ++++ html/Makefile.in +@@ -76,8 +76,6 @@ + v3.5.1.html \ + v3.5.2.html \ + v3.5.3.html \ +- v3.5.4.html \ +- v3.5.5.html \ ${NULL} --TARGETS = libtiff.a -+TARGETS = libtiff.la - - all: ${TARGETS} - if [ @DSO@dso != nodso ]; then \ -@@ -144,9 +150,10 @@ - true; \ - fi - --libtiff.a: ${OBJS} -- ${AR} ${AROPTS} libtiff.a $? -- ${RANLIB} libtiff.a -+libtiff.la: ${OBJS} -+ ${CC} -o $@ ${OBJS:.o=.lo} -rpath @DIR_LIB@ \ -+ -version-info @DIST_MAJOR@:@DIST_MINOR@ \ -+ ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} - - # - # NB: The configure script verifies that the configured -@@ -334,7 +341,7 @@ - fi - install: all installHdrs - ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@ -- ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a -+ ${LIBTOOL} ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@ - if [ @DSO@dso != nodso ]; then \ - ${MAKE} installDSO; \ - else \ + IMAGES=\ + images/back.gif \ +@@ -85,6 +83,8 @@ + images/cat.gif \ + images/cover.jpg \ + images/cramps.gif \ ++ images/dave.gif \ ++ images/info.gif \ + images/jello.jpg \ + images/jim.gif \ + images/note.gif \ |