From 8bb49be09c8d978896ed349534287863353cf669 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 18 Jun 2001 21:32:23 +0000
Subject: Mark these packages as USE_BUILDLINK_ONLY.

---
 graphics/tiff/Makefile          |  7 ++-----
 graphics/tiff/files/config.site | 10 +++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'graphics/tiff')

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 85e33fc02cc..caab854d6b0 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/06/11 02:05:11 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2001/06/18 21:32:24 jlam Exp $
 
 DISTNAME=	tiff-v3.5.5
 PKGNAME=	tiff-3.5.5
@@ -22,8 +22,7 @@ CONFIGURE_ENV+=	CC="${CC}"
 .include "../../devel/zlib/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 
-ZLIBDIR_DEFAULT=	/usr/lib
-EVAL_PREFIX+=		ZLIBDIR=zlib
+USE_BUILDLINK_ONLY=	# defined
 
 .if defined(USE_GIF)
 DISTFILES+=	libtiff-lzw-compression-kit-1.1.tar.gz
@@ -38,9 +37,7 @@ post-patch:
 
 CPPFLAGS+=	-Dunix
 CONFIGURE_ENV+=	PREFIX="${PREFIX}"
-CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV+=	ENVOPTS="${CFLAGS} ${CPPFLAGS}"
-CONFIGURE_ENV+=	ZLIBDIR="${ZLIBDIR}"
 CONFIGURE_ENV+=	BUILDLINK_DIR="${BUILDLINK_DIR}"
 
 pre-patch:
diff --git a/graphics/tiff/files/config.site b/graphics/tiff/files/config.site
index 655f521a935..8aafed35fa6 100644
--- a/graphics/tiff/files/config.site
+++ b/graphics/tiff/files/config.site
@@ -1,4 +1,4 @@
-# $NetBSD: config.site,v 1.7 2001/06/11 02:05:11 jlam Exp $
+# $NetBSD: config.site,v 1.8 2001/06/18 21:32:24 jlam Exp $
 
 DIR_BIN=${PREFIX}/bin			# destination for applications
 DIR_LIB=${PREFIX}/lib			# destination for library
@@ -10,14 +10,14 @@ DIRS_LIBINC=${BUILDLINK_DIR}/include	# dirs to search for ancillary includes
 # JPEG support
 #
 JPEG=yes
-DIR_JPEGLIB=${LOCALBASE}/lib
-LIBJPEG="-Wl,-R${DIR_JPEGLIB} -L${BUILDLINK_DIR}/lib -ljpeg"
+DIR_JPEGLIB=${BUILDLINK_DIR}/lib
+LIBJPEG="${LDFLAGS} -ljpeg"
 
 # ZLIB compression support
 #
 ZIP=yes
-DIR_GZLIB=${ZLIBDIR}
-LIBGZ="-Wl,-R${DIR_GZLIB} -L${BUILDLINK_DIR}/lib -lz"
+DIR_GZLIB=${BUILDLINK_DIR}/lib
+LIBGZ="${LDFLAGS} -lz"
 
 DSO=no				# don't use libtiff's shared lib mechanism
 
-- 
cgit v1.2.3