bl3ify

9 files changed, 61 insertions, 30 deletions

diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 477588d5def..9a6c9f4a80f 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/08/09 10:44:45 seb Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/05 11:34:26 jlam Exp $
 #
 
 DISTNAME=	m4-1.4
@@ -10,7 +10,9 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/directory/gnum4.html
 COMMENT=	GNU version of Unix m4 macro-processor
 
-USE_BUILDLINK2=		yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 INFO_FILES=		m4.info
 USE_MAKEINFO=		yes
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index d06d40ac728..e55261473b6 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/11/10 23:12:47 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/05 11:28:07 jlam Exp $
 #
 
 DISTNAME=	ocaml-3.06
@@ -10,17 +10,20 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://caml.inria.fr/ocaml/
 COMMENT=	The latest implementation of the Caml dialect of ML
 
-DEPENDS+=	tk>=8.3.2:../../x11/tk
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	-prefix ${LOCALBASE}
-CONFIGURE_ARGS+=	-tklibs -L${LOCALBASE}/lib
-CONFIGURE_ARGS+=	-tkdefs "-I${LOCALBASE}/include "
-CONFIGURE_ARGS+=	-libs "${OCAML_LDFLAGS}"
-OCAML_LDFLAGS=		-Wl,${RPATH_FLAG}${X11BASE}/lib			\
-			-Wl,${RPATH_FLAG}${LOCALBASE}/lib
-FIX_RPATH+=		OCAML_LDFLAGS
+USE_BUILDLINK3=		yes
+USE_GMAKE=		yes
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	-prefix ${PREFIX}
+CONFIGURE_ARGS+=	-tkdefs "${OCAML_CPPFLAGS}"
+CONFIGURE_ARGS+=	-tklibs "${OCAML_LDFLAGS}"
+CONFIGURE_ARGS+=	-libs "${OCAML_LIBS}"
+
+OCAML_CPPFLAGS=		${CPPFLAGS}
+OCAML_LDFLAGS=		${LDFLAGS:M-L*}
+OCAML_LIBS=		${LDFLAGS:N-L*}
+FIX_RPATH+=		OCAML_LIBS
 
 ALL_TARGET=	world
 
@@ -44,7 +47,7 @@ PLIST_SRC=	${PKGDIR}/PLIST
 .endif
 
 PTHREAD_OPTS+=	native
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
 CONFIGURE_ARGS+=	-with-pthread
@@ -56,4 +59,5 @@ PLIST_SUBST+=		NATIVE_THREADS=
 
 PLIST_SRC+=		${PKGDIR}/PLIST.common_end
 
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 091de691b51..c8df30369da 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/11/23 01:23:58 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/05 11:29:41 jlam Exp $
 
 DISTNAME=	nc110
 PKGNAME=	netcat-1.10
@@ -17,7 +17,9 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.atstake.com/research/tools/network_utilities/
 COMMENT=	Read and write data across network connections
 
-USE_BUILDLINK2=	yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
 MAKE_ENV+=	DFLAGS="-DGAPING_SECURITY_HOLE -DTELNET"
 ALL_TARGET=	${LOWER_OPSYS}
 
@@ -26,6 +28,8 @@ EXAMPLE_DIR=	share/examples/nc
 
 PLIST_SRC=	${PKGDIR}/PLIST ${WRKSRC}/data/PLIST.data
 
+INSTALLATION_DIRS=	man/man1 sbin
+
 post-build:
 	@cd ${WRKSRC}/data && ${SETENV} ${MAKE_ENV} ${MAKE} ${EXTRA_PROGS}
 
diff --git a/net/unison/Makefile b/net/unison/Makefile
index e7c919d226a..f2404ae0676 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/21 17:11:26 martti Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/05 11:28:52 jlam Exp $
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.1
@@ -11,11 +11,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	File-synchronization tool
 
-BUILD_DEPENDS=	ocaml>=3.00:../../lang/ocaml
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 # docs: unison-manual.pdf/html/ps/dvi
+USE_BUILDLINK3=	yes
 USE_GMAKE=	yes
 MAKE_FLAGS+=	CFLAGS="" UISTYLE=text
 MAKE_ENV+=	HOME=${WRKDIR}
@@ -28,12 +29,14 @@ MAKE_FLAGS+=	NATIVE=true
 MAKE_FLAGS+=	NATIVE=false
 .endif
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
 MAKE_FLAGS+=	THREADS=true
 .endif
 
+INSTALLATION_DIRS=	bin
+
 post-install:
 		${INSTALL_MAN_DIR} ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${PREFIX}/share/doc/unison
@@ -46,4 +49,5 @@ post-install:
 		${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/TODO.txt ${PREFIX}/share/doc/unison
 
+.include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/digest/Makefile b/pkgtools/digest/Makefile
index 5b9c95b1f9e..581b2894203 100644
--- a/pkgtools/digest/Makefile
+++ b/pkgtools/digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/07/17 22:52:13 grant Exp $
+# $NetBSD: Makefile,v 1.38 2004/01/05 11:32:40 jlam Exp $
 #
 # When adding new digest algorithms, please use rmd160 as the template,
 # and bump the VERSION definition.
@@ -12,8 +12,9 @@ MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/Documentation/software/packages.html
 COMMENT=	Message digest wrapper utility
 
-USE_BUILDLINK2=		# defined
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_BUILDLINK3=		# defined
 GNU_CONFIGURE=		# defined
 
 NO_PKGTOOLS_REQD_CHECK=	# defined
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index 4edf771f553..6af3046026a 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/09/15 16:16:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2004/01/05 11:32:40 jlam Exp $
 #
 
 DISTNAME=	pkgdiff-0.113
@@ -11,13 +11,15 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/Packages.txt
 COMMENT=	Tools to ease creating and maintaining patches for pkgsrc
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 PERL5_REQD=	5.6.0
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR:Q}
 
@@ -34,6 +36,8 @@ NROFF=		nroff
 DIFF?=		diff
 .endif
 
+INSTALLATION_DIRS=	bin man/cat1 man/man1
+
 do-build:
 .for FILE in mkpatches patchdiff
 	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
@@ -63,5 +67,5 @@ do-install:
 .   endif
 .endfor
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 9bc4af20575..32470872c72 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.173 2003/12/24 09:54:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.174 2004/01/05 11:32:40 jlam Exp $
 #
 
 DISTNAME=	pkglint-3.66
@@ -13,8 +13,11 @@ COMMENT=	Verifier for NetBSD packages and complete pkgsrc tree
 
 DEPENDS+=	digest>=20010101:../../pkgtools/digest
 
-USE_PERL5=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_PERL5=	yes
+
+NO_BUILDLINK=	yes
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 
@@ -22,6 +25,8 @@ MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR:Q}
 
 DISTVER=	${DISTNAME:S/pkglint-//}
 
+INSTALLATION_DIRS=	bin man/cat1 man/man1
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile
index fdb695fdca1..7f73f44d8bf 100644
--- a/security/audit-packages/Makefile
+++ b/security/audit-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/01/01 23:35:28 agc Exp $
+# $NetBSD: Makefile,v 1.40 2004/01/05 11:36:40 jlam Exp $
 
 DISTNAME=	audit-packages-1.28
 WRKSRC=		${WRKDIR}
@@ -9,10 +9,15 @@ DISTFILES=	# empty
 MAINTAINER=	agc@NetBSD.org
 COMMENT=	Tools to show vulnerabilities in installed packages
 
-NO_CHECKSUM=    yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DEPENDS+=	digest-[0-9]*:../../pkgtools/digest
 
+USE_BUILDLINK3=	yes
+NO_CHECKSUM=    yes
+
+INSTALLATION_DIRS=	man/cat8 man/man8 sbin
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX"
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 847598de40f..070d1daf15f 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2003/11/03 22:43:38 kim Exp $
+# $NetBSD: Makefile,v 1.62 2004/01/05 11:37:13 jlam Exp $
 #
 
 DISTNAME=		sudo-1.6.7p5
@@ -15,7 +15,9 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.courtesan.com/sudo/
 COMMENT=		Allow others to run commands as root
 
-USE_BUILDLINK2=		yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes