bl3ify

3 files changed, 16 insertions, 16 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 9e09c08ba15..b8d091a607b 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2004/01/03 17:24:07 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2004/01/05 11:44:22 jlam Exp $
 #
 
 DISTNAME=	cvs-1.11.11
@@ -12,12 +12,14 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.cvshome.org/
 COMMENT=	Concurrent Versions System
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS+=		USE_INET6
-USE_BUILDLINK2=		yes
 
 .if defined(USE_INET6) && ${USE_INET6} == "YES" && 	\
 	empty(MACHINE_PLATFORM:MSunOS-5.[89]-*) && empty(MACHINE_PLATFORM:MLinux-*)
@@ -51,5 +53,5 @@ INFO_FILES=	cvs.info cvsclient.info
 USE_MAKEINFO=		yes
 TEXINFO_REQD?=		4.0
 
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 0436bcf11de..35ab1521f36 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/10/05 09:45:13 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/05 11:45:05 jlam Exp $
 #
 
 DISTNAME=	nasm-0.98.38
@@ -9,6 +9,9 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://nasm.sourceforge.net/
 COMMENT=	General-purpose x86 assembler
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+USE_BUILDLINK3=	YES
+
 ALL_TARGET=	everything
 INSTALL_TARGET=	install_everything
 GNU_CONFIGURE=	yes
@@ -20,4 +23,6 @@ INFO_FILES=	nasm.info
 MAKE_ENV+=	PERL5="${PERL5}"			\
 		INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
 
+INSTALLATION_DIRS=	bin info man/man1 share/doc/html
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile
index 1be638cb45a..3fdf32ccf26 100644
--- a/devel/zlib/Makefile
+++ b/devel/zlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 21:34:17 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/05 11:44:01 jlam Exp $
 
 DISTNAME=	zlib-1.1.4
 PKGREVISION=	1
@@ -12,19 +12,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gzip.org/zlib/
 COMMENT=	General purpose data compression library
 
-BUILD_DEPENDS+=	libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
+USE_LIBTOOL=		# defined
 HAS_CONFIGURE=		# defined
-NOT_FOR_PLATFORM=	NetBSD-1.[4-9]*-* # in base NetBSD system
-
-# To avoid circular dependences we must not use "USE_LIBTOOL" but
-# depend on the "libtool-base" package manually.
-#
-LIBTOOL=	${LOCALBASE}/bin/libtool
-PKGLIBTOOL=	${BUILDLINK_LIBTOOL}
-CONFIGURE_ENV+=	LIBTOOL="${PKGLIBTOOL} ${LIBTOOL_FLAGS}"
-MAKE_ENV+=	LIBTOOL="${PKGLIBTOOL} ${LIBTOOL_FLAGS}"
+INSTALLATION_DIRS=	include lib
 
 post-extract:
 	${CP} ${FILESDIR}/lt.mk ${WRKSRC}