summaryrefslogtreecommitdiff
path: root/graphics/tiff/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/tiff/patches/patch-ab')
-rw-r--r--graphics/tiff/patches/patch-ab29
1 files changed, 20 insertions, 9 deletions
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
index 9f037ed4507..e8ee934af36 100644
--- a/graphics/tiff/patches/patch-ab
+++ b/graphics/tiff/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2001/02/27 09:45:13 skrll Exp $
+$NetBSD: patch-ab,v 1.10 2001/05/28 02:50:25 jlam Exp $
---- libtiff/Makefile.in.orig Sun Nov 28 21:15:36 1999
-+++ libtiff/Makefile.in Mon Jan 3 17:34:04 2000
-@@ -35,7 +35,8 @@
+--- 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 =
@@ -12,7 +12,17 @@ $NetBSD: patch-ab,v 1.9 2001/02/27 09:45:13 skrll Exp $
AR = @AR@
AROPTS = @AROPTS@
RANLIB = @RANLIB@
-@@ -135,7 +136,7 @@
+ 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 \
${NULL}
@@ -21,7 +31,7 @@ $NetBSD: patch-ab,v 1.9 2001/02/27 09:45:13 skrll Exp $
all: ${TARGETS}
if [ @DSO@dso != nodso ]; then \
-@@ -144,9 +145,9 @@
+@@ -144,9 +150,10 @@
true; \
fi
@@ -29,12 +39,13 @@ $NetBSD: patch-ab,v 1.9 2001/02/27 09:45:13 skrll Exp $
- ${AR} ${AROPTS} libtiff.a $?
- ${RANLIB} libtiff.a
+libtiff.la: ${OBJS}
-+ ${CC} -o $@ ${OBJS:.o=.lo} -rpath @DIR_LIB@ -Wl,-R@DIR_LIB@ -L@DIR_LIB@ -ljpeg -lz -lm \
-+ -version-info @DIST_MAJOR@:@DIST_MINOR@
++ ${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 +335,7 @@
+@@ -334,7 +341,7 @@
fi
install: all installHdrs
${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@