pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/tiff nb2: Obey PKGDIRMODE, and install shlibs...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ad1a58fdf534
branches: trunk
changeset: 474342:ad1a58fdf534
user: tv <tv%pkgsrc.org@localhost>
date: Tue Apr 27 20:38:48 2004 +0000
description:
nb2: Obey PKGDIRMODE, and install shlibs as executable.
diffstat:
graphics/tiff/Makefile | 5 +++--
graphics/tiff/distinfo | 10 +++++-----
graphics/tiff/patches/patch-ad | 40 ++++++++++++++++++++++++++++++----------
graphics/tiff/patches/patch-ae | 19 +++++++++++++++----
graphics/tiff/patches/patch-af | 10 ++++++----
graphics/tiff/patches/patch-ah | 13 +++++++++++--
6 files changed, 70 insertions(+), 27 deletions(-)
diffs (217 lines):
diff -r e749e52ec949 -r ad1a58fdf534 graphics/tiff/Makefile
--- a/graphics/tiff/Makefile Tue Apr 27 20:31:08 2004 +0000
+++ b/graphics/tiff/Makefile Tue Apr 27 20:38:48 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2004/04/24 18:24:56 tv Exp $
+# $NetBSD: Makefile,v 1.53 2004/04/27 20:38:48 tv Exp $
DISTNAME= tiff-v3.6.1
PKGNAME= tiff-3.6.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \
http://libtiff.maptools.org/dl/
@@ -30,6 +30,7 @@
USE_LIBTOOL= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --noninteractive --site=${FILESDIR} --prefix=${PREFIX}
+MAKE_ENV+= PKGDIRMODE=${PKGDIRMODE}
.include "../../mk/bsd.prefs.mk"
diff -r e749e52ec949 -r ad1a58fdf534 graphics/tiff/distinfo
--- a/graphics/tiff/distinfo Tue Apr 27 20:31:08 2004 +0000
+++ b/graphics/tiff/distinfo Tue Apr 27 20:38:48 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2004/04/12 14:41:03 jschauma Exp $
+$NetBSD: distinfo,v 1.15 2004/04/27 20:38:48 tv Exp $
SHA1 (tiff-3.6.1/tiff-v3.6.1.tar.gz) = f7817145d8756152cc341804df6477f37ef93c38
Size (tiff-3.6.1/tiff-v3.6.1.tar.gz) = 1072165 bytes
@@ -9,8 +9,8 @@
SHA1 (patch-aa) = f7e1947a088c519a87be89b464eebf362962aeab
SHA1 (patch-ab) = 186b597cb44768570d844d55a4f4358a89974633
SHA1 (patch-ac) = 754a02bb0561f8944fa1c870ab8dd6c1d6bf0c49
-SHA1 (patch-ad) = 9c8c96d1f57902222541ba9b5f439c94d575d9eb
-SHA1 (patch-ae) = d82547ecce837e667ce8f821e0cf8c8a25af2187
-SHA1 (patch-af) = 51cbd54bff7999af84d6f4d49972f5ee519dd2e0
+SHA1 (patch-ad) = c0939dafb160caae77c78dc1b6c4b103242718e6
+SHA1 (patch-ae) = 8272e39a8a0324b0f8a1e661721b5c9367c0d8e7
+SHA1 (patch-af) = d6c9fd4f10c26e6b2ad8eb5ec51e9205504b62c7
SHA1 (patch-ag) = 169a504fc9c4180b3b14a7d2f0e2318af9879f17
-SHA1 (patch-ah) = b824c4aaf1f97787afe1937ec471823164d03685
+SHA1 (patch-ah) = 44ecf92862dc20cdb5e4b1dd4cdbf7c765dc95e2
diff -r e749e52ec949 -r ad1a58fdf534 graphics/tiff/patches/patch-ad
--- a/graphics/tiff/patches/patch-ad Tue Apr 27 20:31:08 2004 +0000
+++ b/graphics/tiff/patches/patch-ad Tue Apr 27 20:38:48 2004 +0000
@@ -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 @@
#
# 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 @@
all: ${TARGETS}
if [ @DSO@dso != nodso ]; then \
-@@ -147,9 +153,10 @@
+@@ -152,9 +158,10 @@ all: ${TARGETS}
true; \
fi
@@ -45,7 +45,7 @@
#
# 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 @@
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 \
diff -r e749e52ec949 -r ad1a58fdf534 graphics/tiff/patches/patch-ae
--- a/graphics/tiff/patches/patch-ae Tue Apr 27 20:31:08 2004 +0000
+++ b/graphics/tiff/patches/patch-ae Tue Apr 27 20:38:48 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2004/01/03 18:33:24 reed Exp $
+$NetBSD: patch-ae,v 1.8 2004/04/27 20:38:48 tv Exp $
---- man/Makefile.in.orig Fri Nov 21 19:28:59 2003
+--- man/Makefile.in.orig Mon Dec 22 03:22:15 2003
+++ man/Makefile.in
-@@ -354,9 +354,7 @@ apps/Makefile:
+@@ -363,9 +363,7 @@ apps/Makefile:
${ECHO} 'install:'; \
for i in *.1; do \
f=${MANAPPNAME}; \
@@ -13,7 +13,7 @@
done \
)>apps/Makefile
lib/Makefile:
-@@ -367,9 +365,7 @@ lib/Makefile:
+@@ -376,17 +374,15 @@ lib/Makefile:
${ECHO} 'install:'; \
for i in *.3t; do \
f=${MANLIBNAME}; \
@@ -24,3 +24,14 @@
done \
)>lib/Makefile
+ install: all
+- ${INSTALL} -m 755 -dir -idb tiff.man.tools ${DESTDIR}${MAN}
+- ${INSTALL} -m 755 -dir -idb tiff.man.tools ${DESTDIR}${MAN}/${MANAPPS}
++ ${INSTALL} -m ${PKGDIRMODE} -dir -idb tiff.man.tools ${DESTDIR}${MAN}
++ ${INSTALL} -m ${PKGDIRMODE} -dir -idb tiff.man.tools ${DESTDIR}${MAN}/${MANAPPS}
+ cd apps; ${MAKE} -${MAKEFLAGS} install
+- ${INSTALL} -m 755 -dir -idb tiff.man.dev ${DESTDIR}${MAN}/${MANLIB}
++ ${INSTALL} -m ${PKGDIRMODE} -dir -idb tiff.man.dev ${DESTDIR}${MAN}/${MANLIB}
+ cd lib; ${MAKE} -${MAKEFLAGS} install
+
+ clean:
diff -r e749e52ec949 -r ad1a58fdf534 graphics/tiff/patches/patch-af
--- a/graphics/tiff/patches/patch-af Tue Apr 27 20:31:08 2004 +0000
+++ b/graphics/tiff/patches/patch-af Tue Apr 27 20:38:48 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.7 2004/01/03 18:33:24 reed Exp $
+$NetBSD: patch-af,v 1.8 2004/04/27 20:38:48 tv Exp $
---- tools/Makefile.in.orig Fri Nov 21 19:35:56 2003
+--- tools/Makefile.in.orig Thu Nov 27 10:08:12 2003
+++ tools/Makefile.in
@@ -48,10 +48,10 @@ OPTIMIZER=@OPTIMIZER@
IPATH = -I. -I${SRCDIR} -I${LIBDIR}
@@ -15,13 +15,15 @@
LIBPORT = @LIBPORT@
MACHLIBS= @MACHDEPLIBS@
LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
-@@ -114,9 +114,8 @@ all: ${TARGETS}
+@@ -115,10 +115,9 @@ all: ${TARGETS}
+ true; \
fi
install: all
- ${INSTALL} -idb tiff.sw.tools -m 755 \
+- ${INSTALL} -idb tiff.sw.tools -m 755 \
- -dir ${DESTDIR}@DIR_BIN@
- ${INSTALL} -idb tiff.sw.tools -m 755 \
- -F ${DESTDIR}@DIR_BIN@ -O ${TARGETS}
++ ${INSTALL} -idb tiff.sw.tools -m ${PKGDIRMODE} \
+ -dir @DIR_BIN@
+ ${LIBTOOL} ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
@if [ "@LIBIMAGE@" = yes ]; then \
diff -r e749e52ec949 -r ad1a58fdf534 graphics/tiff/patches/patch-ah
--- a/graphics/tiff/patches/patch-ah Tue Apr 27 20:31:08 2004 +0000
+++ b/graphics/tiff/patches/patch-ah Tue Apr 27 20:38:48 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1 2004/01/03 18:33:25 reed Exp $
+$NetBSD: patch-ah,v 1.2 2004/04/27 20:38:48 tv Exp $
---- html/Makefile.in.orig Wed Oct 2 08:14:34 2002
+--- html/Makefile.in.orig Wed Oct 2 11:14:34 2002
+++ html/Makefile.in
@@ -86,6 +86,8 @@ HTMLFILES=\
v3.5.5.html \
@@ -11,3 +11,12 @@
${NULL}
IMAGES=\
images/back.gif \
+@@ -110,7 +112,7 @@ TARGETS=
+ all: ${TARGETS}
+
+ install: all
+- ${INSTALL} -m 755 -dir -idb tiff.man.html ${DESTDIR}${HTML} ${DESTDIR}${HTML}/images
++ ${INSTALL} -m ${PKGDIRMODE} -dir -idb tiff.man.html ${DESTDIR}${HTML} ${DESTDIR}${HTML}/images
+ for i in ${HTMLFILES} ${IMAGES}; do \
+ ${INSTALL} -idb tiff.man.html -m 444 -F ${DESTDIR}${HTML} \
+ -src ${SRCDIR}/$$i -O $$i; \
Home |
Main Index |
Thread Index |
Old Index