bl3ify

6 files changed, 30 insertions, 18 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 1cb220caac0..f08c9ddbc5d 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2003/12/16 21:25:53 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2004/01/05 23:20:29 jlam Exp $
 
 DISTNAME=		autoconf-2.59
 CATEGORIES=		devel
@@ -15,12 +15,13 @@ DEPENDS=		m4>=1.4:../../devel/m4
 # which had autoconf-devel as PKGNAME.
 CONFLICTS=		autoconf-devel-[0-9]*
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-lispdir
 CONFIGURE_ENV+=		AWK="${AWK}"
-M4=			${PREFIX}/bin/gm4
+M4=			${LOCALBASE}/bin/gm4
 
 INFO_FILES=		autoconf.info standards.info
 
@@ -35,5 +36,5 @@ TEST_TARGET=		check
 post-install:
 	${RM} -rf ${WRKSRC}/lib/emacs/no
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index c807d5ead66..ec8e971b23f 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/09 10:44:36 seb Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/05 23:20:29 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp
 #
 
@@ -16,14 +16,16 @@ DEPENDS=	m4>=1.4:../../devel/m4
 CONFLICTS=		autoconf-devel-[0-9]*
 CONFLICTS=		autoconf<2.50
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		AWK="${AWK}"
 CONFIGURE_ARGS+=	--program-transform-name='s/$$/-2.13/'
-M4=			${PREFIX}/bin/gm4
+M4=			${LOCALBASE}/bin/gm4
 
 USE_MAKEINFO=		YES
 INFO_FILES=		autoconf213.info
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index f8f5458b6fb..2f5f3bf43e7 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2003/12/11 16:32:34 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2004/01/05 23:20:29 jlam Exp $
 #
 
 DISTNAME=	automake-1.8
@@ -13,6 +13,8 @@ COMMENT=	GNU Standards-compliant Makefile generator
 
 DEPENDS=	autoconf>=2.58:../../devel/autoconf
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 PLIST_SUBST+=		PKG_DIR_VERSION=1.8
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
@@ -31,5 +33,5 @@ PERL5_REQD=		5.5
 
 TEST_TARGET=		check
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index b873cd41475..8a0fd79954a 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/12/03 00:14:16 recht Exp $
+# $NetBSD: Makefile,v 1.34 2004/01/05 23:22:51 jlam Exp $
 #
 
 DISTNAME=		gc6.2
@@ -11,11 +11,14 @@ MAINTAINER=		recht@NetBSD.org
 HOMEPAGE=		http://www.hpl.hp.com/personal/Hans_Boehm/gc/
 COMMENT=		Garbage collection and memory leak detection for C and C++
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+INSTALLATION_DIRS=	man/man3
 
 MAKE_ENV+=		COPTS="${CFLAGS}"
 
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index ea5f22ddbd8..1590b2d35ff 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/12/12 22:33:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/05 23:22:51 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/07/12 22:59:19 steve Exp $
 
 DISTNAME=	pcre-4.5
@@ -11,7 +11,9 @@ MAINTAINER=	proff@NetBSD.org
 HOMEPAGE=	http://www.pcre.org/
 COMMENT=	Perl Compatible Regular Expressions library
 
-USE_BUILDLINK2=		yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
 USE_LIBTOOL=		yes
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 20db73de745..32483d69ee3 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/11/24 19:13:19 gson Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/05 23:22:51 jlam Exp $
 #
 
 DISTNAME=	popt-1.7
@@ -12,16 +12,18 @@ MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/		\
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Command line option parsing library
 
-BUILD_USES_MSGFMT=	yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CONFLICTS=		ORBit<=0.5.3
 
-USE_BUILDLINK2=		yes
+BUILD_USES_MSGFMT=	yes
+
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"