Use libtool to create the shared library. Strip binaries using

BSD_INSTALL_PROGRAM.

4 files changed, 187 insertions, 31 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 45bd9b0c87e..e9173ca91d7 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/07/15 11:24:51 agc Exp $
+# $NetBSD: Makefile,v 1.15 1998/07/20 15:51:29 tv Exp $
 
 DISTNAME=	tiff-v3.4beta037
 PKGNAME=	tiff-3.4
@@ -10,11 +10,12 @@ EXTRACT_SUFX=	-tar.gz
 
 MAINTAINER=	tron@netbsd.org
 
+BUIL_DDEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--noninteractive --site ${FILESDIR}
-CONFIGURE_ENV+=		PREFIX=${PREFIX}
+CONFIGURE_ENV+=		PREFIX=${PREFIX} GCOPTS=-O
 MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}" LN="${LN}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tiff/files/config.site b/graphics/tiff/files/config.site
index 9f31b08cee1..e5839e81a13 100644
--- a/graphics/tiff/files/config.site
+++ b/graphics/tiff/files/config.site
@@ -5,6 +5,7 @@ DIR_GZLIB=/usr/lib
 DIR_INC=$PREFIX/include
 DIR_JPEGLIB=$PREFIX/lib
 DIR_MAN=$PREFIX/man
+DSO=no
 INSTALL=
 JPEG=yes
 MANSCHEME=bsd-source-strip
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
index 5d589859881..3b2be5c9ea9 100644
--- a/graphics/tiff/patches/patch-ab
+++ b/graphics/tiff/patches/patch-ab
@@ -1,11 +1,42 @@
---- configure.orig	Sat Nov 29 22:50:13 1997
-+++ configure	Sat Nov 29 22:50:24 1997
-@@ -1138,7 +1138,7 @@
- 	TIFFLIBREF='-L${DEPTH}/libtiff -R'${DIR_LIB}' -ltiff'
- 	;;
-     *-netbsd*)
--	DSOSUF=so.${DIST_MAJOR}.0
-+	DSOSUF=so.${DIST_MAJOR}.${DIST_MINOR}
- 	LIBCOPTS='-fPIC'
- 	DSO=NETBSD
- 	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
+--- libtiff/Makefile.in.orig	Mon Jul 20 11:13:09 1998
++++ libtiff/Makefile.in	Mon Jul 20 11:40:13 1998
+@@ -35,7 +35,7 @@
+ #
+ SHELL	= @SCRIPT_SH@
+ NULL	=
+-CC	= @CCOMPILER@
++CC	= ${PREFIX}/bin/libtool @CCOMPILER@
+ AR	= @AR@
+ AROPTS	= @AROPTS@
+ RANLIB	= @RANLIB@
+@@ -135,7 +135,7 @@
+ 	tif_write.o \
+ 	tif_zip.o \
+ 	${NULL}
+-TARGETS	= libtiff.a
++TARGETS	= libtiff.la
+ 
+ all:	${TARGETS}
+ 	if [ @DSO@dso != nodso ]; then \
+@@ -144,9 +144,9 @@
+ 	    true; \
+ 	fi
+ 
+-libtiff.a: ${OBJS}
+-	${AR} ${AROPTS} libtiff.a $?
+-	${RANLIB} libtiff.a
++libtiff.la: ${OBJS}
++	${CC} -o libtiff.la ${OBJS:.o=.lo} -rpath ${PREFIX}/lib \
++		-version-info 3:4
+ 
+ #
+ # NB: The configure script verifies that the configured
+@@ -328,7 +328,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
++	${PREFIX}/bin/libtool --mode=install ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@
+ 	if [ @DSO@dso != nodso ]; then					\
+ 	    ${MAKE} installDSO;						\
+ 	else								\
diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac
index 87e727f2c52..b80e3ffb956 100644
--- a/graphics/tiff/patches/patch-ac
+++ b/graphics/tiff/patches/patch-ac
@@ -1,18 +1,141 @@
---- libtiff/Makefile.in.orig	Tue Sep  2 18:54:19 1997
-+++ libtiff/Makefile.in	Wed May 13 10:26:19 1998
-@@ -197,7 +197,14 @@
- 	@rm -f libtiff_pic.a
- 	@${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q`
- 	${RANLIB} libtiff_pic.a
--	${LD} -x -Bshareable -Bforcearchive -o libtiff.@DSOSUF@ libtiff_pic.a
-+	case `uname -m` in						\
-+	alpha)								\
-+		${LD} -x -Bshareable -o libtiff.@DSOSUF@ libtiff_pic.a ;; \
-+	pmax)								\
-+ 		${LD} -x -shared -o libtiff.@DSOSUF@ -soname libtiff.so.${DIST_MAJOR} --whole-archive libtiff_pic.a --no-whole-archive ;; \
-+	*)								\
-+		${LD} -x -Bshareable -Bforcearchive -o libtiff.@DSOSUF@ libtiff_pic.a ;; \
-+	esac
- 	rm -f libtiff_pic.a
- 	touch $@
- # linux ELF shared lib rule
+--- tools/Makefile.in.orig	Mon Jul 20 11:17:11 1998
++++ tools/Makefile.in	Mon Jul 20 11:43:58 1998
+@@ -47,10 +47,10 @@
+ IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
+ CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
+ #
+-TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF@
++TIFFLIB	= ${DEPTH}/libtiff/libtiff.la
+ LIBJPEG	= @LIBJPEG@
+ LIBGZ	= @LIBGZ@
+-LIBTIFF	= @TIFFLIBREF@
++LIBTIFF	= ../libtiff/libtiff.la
+ LIBPORT	= @LIBPORT@
+ MACHLIBS= @MACHDEPLIBS@
+ LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
+@@ -107,7 +107,7 @@
+ 	fi
+ install: all
+ 	${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
+-	${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
++	${PREFIX}/bin/libtool ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
+ 	@if [ "@LIBIMAGE@" = yes ]; then \
+ 	    ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
+ 	else \
+@@ -127,37 +127,37 @@
+ #
+ 
+ tiffinfo: tiffinfo.o ${TIFFLIB}
+-	${CC} -o tiffinfo ${CFLAGS} tiffinfo.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o tiffinfo ${CFLAGS} tiffinfo.o ${LIBS}
+ tiffinfo.o: ${SRCDIR}/tiffinfo.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffinfo.c
+ 
+ tiffcmp:tiffcmp.o ${TIFFLIB}
+-	${CC} -o tiffcmp ${CFLAGS} tiffcmp.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o tiffcmp ${CFLAGS} tiffcmp.o ${LIBS}
+ tiffcmp.o: ${SRCDIR}/tiffcmp.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffcmp.c
+ 
+ tiffcp:	tiffcp.o ${TIFFLIB}
+-	${CC} -o tiffcp ${CFLAGS} tiffcp.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o tiffcp ${CFLAGS} tiffcp.o ${LIBS}
+ tiffcp.o: ${SRCDIR}/tiffcp.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffcp.c
+ 
+ tiffdump: tiffdump.o
+-	${CC} -o tiffdump ${CFLAGS} tiffdump.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o tiffdump ${CFLAGS} tiffdump.o ${LIBS}
+ tiffdump.o: ${SRCDIR}/tiffdump.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffdump.c
+ 
+ tiffmedian: tiffmedian.o ${TIFFLIB}
+-	${CC} -o tiffmedian ${CFLAGS} tiffmedian.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o tiffmedian ${CFLAGS} tiffmedian.o ${LIBS}
+ tiffmedian.o: ${SRCDIR}/tiffmedian.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffmedian.c
+ 
+ tiffsplit: tiffsplit.o ${TIFFLIB}
+-	${CC} -o tiffsplit ${CFLAGS} tiffsplit.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o tiffsplit ${CFLAGS} tiffsplit.o ${LIBS}
+ tiffsplit.o: ${SRCDIR}/tiffsplit.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffsplit.c
+ 
+ tiff2ps: tiff2ps.o ${TIFFLIB}
+-	${CC} -o tiff2ps ${CFLAGS} tiff2ps.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o tiff2ps ${CFLAGS} tiff2ps.o ${LIBS}
+ tiff2ps.o: ${SRCDIR}/tiff2ps.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/tiff2ps.c
+ 
+@@ -168,61 +168,61 @@
+ 
+ # convert RGB image to B&W
+ tiff2bw: tiff2bw.o ${TIFFLIB}
+-	${CC} -o tiff2bw ${CFLAGS} tiff2bw.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o tiff2bw ${CFLAGS} tiff2bw.o ${LIBS}
+ tiff2bw.o: ${SRCDIR}/tiff2bw.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/tiff2bw.c
+ 
+ # convert B&W image to bilevel w/ FS dithering
+ tiffdither: tiffdither.o ${TIFFLIB}
+-	${CC} -o tiffdither ${CFLAGS} tiffdither.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o tiffdither ${CFLAGS} tiffdither.o ${LIBS}
+ tiffdither.o: ${SRCDIR}/tiffdither.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffdither.c
+ 
+ # simple Sun rasterfile converter
+ ras2tiff: ras2tiff.o ${TIFFLIB}
+-	${CC} -o ras2tiff ${CFLAGS} ras2tiff.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o ras2tiff ${CFLAGS} ras2tiff.o ${LIBS}
+ ras2tiff.o: ${SRCDIR}/ras2tiff.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/ras2tiff.c
+ 
+ # simple GIF converter
+ gif2tiff: gif2tiff.o ${TIFFLIB}
+-	${CC} -o gif2tiff ${CFLAGS} gif2tiff.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o gif2tiff ${CFLAGS} gif2tiff.o ${LIBS}
+ gif2tiff.o: ${SRCDIR}/gif2tiff.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/gif2tiff.c
+ 
+ # very limited PBM converter
+ ppm2tiff: ppm2tiff.o ${TIFFLIB}
+-	${CC} -o ppm2tiff ${CFLAGS} ppm2tiff.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o ppm2tiff ${CFLAGS} ppm2tiff.o ${LIBS}
+ ppm2tiff.o: ${SRCDIR}/ppm2tiff.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/ppm2tiff.c
+ 
+ # Group 3/4 FAX file converter
+ fax2tiff: fax2tiff.o ${TIFFLIB}
+-	${CC} -o fax2tiff ${CFLAGS} fax2tiff.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o fax2tiff ${CFLAGS} fax2tiff.o ${LIBS}
+ fax2tiff.o: ${SRCDIR}/fax2tiff.c
+ 	${CC} -c -I${LIBDIR} -I${DEPTH}/libtiff ${CFLAGS} ${SRCDIR}/fax2tiff.c
+ 
+ # Group 3/4 FAX to encoded PS converter
+ fax2ps: fax2ps.o ${TIFFLIB}
+-	${CC} -o fax2ps ${CFLAGS} fax2ps.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o fax2ps ${CFLAGS} fax2ps.o ${LIBS}
+ fax2ps.o: ${SRCDIR}/fax2ps.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/fax2ps.c
+ 
+ # convert Palette image to RGB
+ pal2rgb: pal2rgb.o ${TIFFLIB}
+-	${CC} -o pal2rgb ${CFLAGS} pal2rgb.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o pal2rgb ${CFLAGS} pal2rgb.o ${LIBS}
+ pal2rgb.o: ${SRCDIR}/pal2rgb.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/pal2rgb.c
+ 
+ # convert RGB image to YCbCr
+ rgb2ycbcr: rgb2ycbcr.o ${TIFFLIB}
+-	${CC} -o rgb2ycbcr ${CFLAGS} rgb2ycbcr.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o rgb2ycbcr ${CFLAGS} rgb2ycbcr.o ${LIBS}
+ rgb2ycbcr.o: ${SRCDIR}/rgb2ycbcr.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/rgb2ycbcr.c
+ 
+ # generate thumbnail images from fax (example of SubIFD usage)
+ thumbnail: thumbnail.o ${TIFFLIB}
+-	${CC} -o thumbnail ${CFLAGS} thumbnail.o ${LIBS}
++	${PREFIX}/bin/libtool ${CC} -o thumbnail ${CFLAGS} thumbnail.o ${LIBS}
+ thumbnail.o: ${SRCDIR}/thumbnail.c
+ 	${CC} -c ${CFLAGS} ${SRCDIR}/thumbnail.c
+