Find location of zlib using EVAL_PREFIX. Use buildlink.mk files to find

the required headers and libraries for jpeg and zlib.

5 files changed, 43 insertions, 27 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 178bf782d11..f54e759e601 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/05/03 13:22:50 skrll Exp $
+# $NetBSD: Makefile,v 1.31 2001/05/28 02:50:24 jlam Exp $
 
 DISTNAME=	tiff-v3.5.5
 PKGNAME=	tiff-3.5.5
@@ -13,21 +13,17 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.libtiff.org/
 COMMENT=	library and tools for reading and writing TIFF data files
 
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-
 USE_LIBTOOL=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--noninteractive --site=${FILESDIR}
 CONFIGURE_ENV+=	CC="${CC}"
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../devel/zlib/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
 
-.if (${OPSYS} == "SunOS")
-ZLIBDIR=	${LOCALBASE}/lib
-DEPENDS+=	zlib-*:../../devel/zlib
-.else
-ZLIBDIR=	/usr/lib
-.endif
+ZLIBDIR_DEFAULT=	/usr/lib
+EVAL_PREFIX+=		ZLIBDIR=zlib
 
 .if defined(USE_GIF)
 DISTFILES+=	libtiff-lzw-compression-kit-1.1.tar.gz
@@ -41,8 +37,12 @@ post-patch:
 .endif
 
 CPPFLAGS+=	-Dunix
-CONFIGURE_ENV+=	PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" \
-		ENVOPTS="${CFLAGS} ${CPPFLAGS}" ZLIBDIR="${ZLIBDIR}"
+CONFIGURE_ENV+=	PREFIX="${PREFIX}"
+CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV+=	ENVOPTS="${CFLAGS} ${CPPFLAGS}"
+CONFIGURE_ENV+=	ZLIBDIR="${ZLIBDIR}"
+CONFIGURE_ENV+=	BUILDLINK_INCDIR=${BUILDLINK_INCDIR}
+CONFIGURE_ENV+=	BUILDLINK_LIBDIR=${BUILDLINK_LIBDIR}
 
 pre-patch:
 	# reference correct relative man page when using .so
@@ -58,4 +58,6 @@ pre-patch:
 	${SED}	-e "s,\(\$${CC} -o\),\$${LIBTOOL} \1,g" \
 		${WRKSRC}/tools/Makefile.in.in  > ${WRKSRC}/tools/Makefile.in
 
+pre-configure: ${BUILDLINK_TARGETS}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk
index 414b8785eec..82e8a6704c6 100644
--- a/graphics/tiff/buildlink.mk
+++ b/graphics/tiff/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/05/26 16:30:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/05/28 02:50:24 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libtiff.
 #
@@ -16,6 +16,9 @@
 .if !defined(TIFF_BUILDLINK_MK)
 TIFF_BUILDLINK_MK=	# defined
 
+.include "../../devel/zlib/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
+
 TIFF_REQD?=		3.5.4
 DEPENDS+=		tiff>=${TIFF_REQD}:../../graphics/tiff
 
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 8a4c01a8ecd..cc67e195398 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2001/05/05 15:52:18 hubertf Exp $
+$NetBSD: distinfo,v 1.5 2001/05/28 02:50:24 jlam Exp $
 
 SHA1 (tiff-v3.5.5.tar.gz) = e86acf234ea5d1423ff98d6607d49b150d822075
 Size (tiff-v3.5.5.tar.gz) = 900890 bytes
 SHA1 (libtiff-lzw-compression-kit-1.1.tar.gz) = ef9874616cdadcd717e2abd5b6a4abbc4fb247ac
 Size (libtiff-lzw-compression-kit-1.1.tar.gz) = 18685 bytes
 SHA1 (patch-aa) = 622053a43caf20c552c31e8a9bbf00c4845682a3
-SHA1 (patch-ab) = 0e030a9e57fff45ab96ba4a9ab170e13a6ed1306
+SHA1 (patch-ab) = 0cc2841a803ae4de250e2d3d5a8c51190ba7ee39
 SHA1 (patch-ac) = 593b5d3ef434f1befa74ec59acfae05dbb48d82b
 SHA1 (patch-ad) = 29d528c5d18ab5f47ac74faf7fe8b8d9e23257b4
 SHA1 (patch-ae) = 2dbeeec944c356dd6f658bde895117d8d9dbd3da
diff --git a/graphics/tiff/files/config.site b/graphics/tiff/files/config.site
index 79e467f385f..b28b4f59d4d 100644
--- a/graphics/tiff/files/config.site
+++ b/graphics/tiff/files/config.site
@@ -1,23 +1,23 @@
-# $NetBSD: config.site,v 1.5 2000/12/06 16:59:32 jlam Exp $
+# $NetBSD: config.site,v 1.6 2001/05/28 02:50:25 jlam Exp $
 
 DIR_BIN=${PREFIX}/bin			# destination for applications
 DIR_LIB=${PREFIX}/lib			# destination for library
 DIR_INC=${PREFIX}/include		# destination for include files
 DIR_MAN=${PREFIX}/man			# destination for man pages
 DIR_HTML=${PREFIX}/share/doc/html/tiff	# destination for html documentation
-DIRS_LIBINC=${LOCALBASE}/include	# dirs to search for ancillary includes
+DIRS_LIBINC=${BUILDLINK_INCDIR}		# dirs to search for ancillary includes
 
 # JPEG support
 #
 JPEG=yes
 DIR_JPEGLIB=${LOCALBASE}/lib
-LIBJPEG="-Wl,-R${DIR_JPEGLIB} -L${DIR_JPEGLIB} -ljpeg"
+LIBJPEG="-Wl,-R${DIR_JPEGLIB} -L${BUILDLINK_LIBDIR} -ljpeg"
 
 # ZLIB compression support
 #
 ZIP=yes
 DIR_GZLIB=${ZLIBDIR}
-LIBGZ="-Wl,-R${DIR_GZLIB} -L${DIR_GZLIB} -lz"
+LIBGZ="-Wl,-R${DIR_GZLIB} -L${BUILDLINK_LIBDIR} -lz"
 
 DSO=no				# don't use libtiff's shared lib mechanism
 
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@