summaryrefslogtreecommitdiff
path: root/graphics/tiff/patches/patch-ad
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/tiff/patches/patch-ad')
-rw-r--r--graphics/tiff/patches/patch-ad40
1 files changed, 30 insertions, 10 deletions
diff --git a/graphics/tiff/patches/patch-ad b/graphics/tiff/patches/patch-ad
index e33a1631cec..33d13c19343 100644
--- a/graphics/tiff/patches/patch-ad
+++ b/graphics/tiff/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2002/03/05 10:33:36 martti Exp $
+$NetBSD: patch-ad,v 1.10 2004/04/27 20:38:48 tv Exp $
---- libtiff/Makefile.in.orig Sun Sep 9 17:56:04 2001
-+++ libtiff/Makefile.in Mon Mar 4 16:05:30 2002
-@@ -36,12 +36,18 @@
+--- libtiff/Makefile.in.orig Mon Nov 17 04:24:41 2003
++++ libtiff/Makefile.in
+@@ -36,12 +36,18 @@ SRCDIR = @LIBSRCDIR@
SHELL = @SCRIPT_SH@
SCRIPT_SH = @SCRIPT_SH@
NULL =
@@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.9 2002/03/05 10:33:36 martti Exp $
#
# If JPEG support is to be included and the Independent JPEG
# Software distribution is not installed then DIR_JPEG must
-@@ -138,7 +144,7 @@
+@@ -143,7 +149,7 @@ OBJS = \
tif_write.o \
tif_zip.o \
${NULL}
@@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.9 2002/03/05 10:33:36 martti Exp $
all: ${TARGETS}
if [ @DSO@dso != nodso ]; then \
-@@ -147,9 +153,10 @@
+@@ -152,9 +158,10 @@ all: ${TARGETS}
true; \
fi
@@ -45,7 +45,7 @@ $NetBSD: patch-ad,v 1.9 2002/03/05 10:33:36 martti Exp $
#
# NB: The configure script verifies that the configured
-@@ -277,8 +284,13 @@
+@@ -294,8 +301,13 @@ tif_dir.o: ${SRCDIR}/tif_dir.c
${CC} -c ${CFLAGS} ${SRCDIR}/tif_dir.c
tif_dirinfo.o: ${SRCDIR}/tif_dirinfo.c
${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirinfo.c
@@ -59,12 +59,32 @@ $NetBSD: patch-ad,v 1.9 2002/03/05 10:33:36 martti Exp $
tif_dirwrite.o: ${SRCDIR}/tif_dirwrite.c
${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirwrite.c
tif_dumpmode.o: ${SRCDIR}/tif_dumpmode.c
-@@ -377,7 +389,7 @@
+@@ -368,7 +380,7 @@ INCS = ${SRCDIR}/tiff.h ${SRCDIR}/tiffio
+ INCS_PRIVATE = ${SRCDIR}/tiffiop.h ${SRCDIR}/tif_dir.h ${SRCDIR}/port.h
+
+ installHdrs: ${INCS}
+- ${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_INC@
++ ${INSTALL} -idb tiff.sw.dev -m ${PKGDIRMODE} -dir ${DESTDIR}@DIR_INC@
+ for i in ${INCS}; do \
+ f=`basename $$i`; \
+ ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_INC@ \
+@@ -376,7 +388,7 @@ installHdrs: ${INCS}
+ done
+
+ installPrivateHdrs: ${INCS_PRIVATE}
+- ${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_INC@
++ ${INSTALL} -idb tiff.sw.dev -m ${PKGDIRMODE} -dir ${DESTDIR}@DIR_INC@
+ for i in ${INCS_PRIVATE}; do \
+ f=`basename $$i`; \
+ ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_INC@ \
+@@ -397,8 +409,8 @@ installDSO: @DSO@dso
+ fi
install: all installHdrs
- ${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_LIB@
+- ${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_LIB@
- ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_LIB@ -O libtiff.a
-+ ${LIBTOOL} ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@
++ ${INSTALL} -idb tiff.sw.dev -m ${PKGDIRMODE} -dir ${DESTDIR}@DIR_LIB@
++ ${LIBTOOL} ${BSD_INSTALL_SCRIPT} libtiff.la @DIR_LIB@
if [ @DSO@dso != nodso ]; then \
${MAKE} -${MAKEFLAGS} installDSO; \
else \