bl3ify

11 files changed, 49 insertions, 26 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 20e1fa8ebae..65c65ab7cd1 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2003/12/08 14:33:47 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/05 20:52:56 jlam Exp $
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "Makefile.common"
 
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index c80b64c4117..1bda491c7c9 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2003/12/09 01:04:23 reed Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/01/05 20:52:56 jlam Exp $
 
 DISTNAME=	libao-0.8.4
 CATEGORIES=	audio devel
@@ -11,7 +11,7 @@ DISTINFO_FILE=	${.CURDIR}/../../audio/libao/distinfo
 PATCHDIR=	${.CURDIR}/../../audio/libao/patches
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 
@@ -32,5 +32,5 @@ CONFIGURE_ARGS+=	--disable-alsa09
 CONFIGURE_ARGS+=	--disable-arts
 CONFIGURE_ARGS+=	--disable-esd
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 310e72a1277..d40574bb20e 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/10/05 10:17:15 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/05 20:52:56 jlam Exp $
 
 DISTNAME=		audiofile-0.2.4
 PKGNAME=		lib${DISTNAME}
@@ -11,7 +11,9 @@ MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://andromeda.68k.org/~michael/audiofile/
 COMMENT=		Sound library for SGI audio file
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index c3b1ff091fc..cbf0a8b2ab6 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/12/08 14:36:51 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/05 20:52:56 jlam Exp $
 
 DISTNAME=	libogg-1.1
 CATEGORIES=	devel audio
@@ -8,7 +8,9 @@ MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/ogg/
 COMMENT=	Ogg project codecs library
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 8a3c7c8f122..5af9b9c45d8 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/11/14 10:09:06 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/05 20:50:01 jlam Exp $
 
 DISTNAME=	oss-${OSS_VERSION}	# Overridden below
 PKGNAME=	oss-${OSS_VERSION}
@@ -14,6 +14,8 @@ ONLY_FOR_PLATFORM=	NetBSD-1.6-i386 NetBSD-1.6.*-i386
 ONLY_FOR_PLATFORM+=	NetBSD-1.6_*-i386
 OSVERSION_SPECIFIC=	yes
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 DISTNAME=		oss${OSS_VERSION:S/.//g}-netbsd-v1.6.1
 OSS_VERSION=		3.9.8b
 
@@ -23,7 +25,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 NO_CONFIGURE=		yes
 
@@ -47,6 +49,7 @@ SUPPORT_FILES+=		${OSSLIBDIR}/${FILE} /etc/${FILE}
 .endfor
 SUPPORT_FILES+=		${OSSLIBDIR}/license.asc.eval ${OSSLIBDIR}/license.asc
 RCD_SCRIPTS=		oss
+INSTALLATION_DIRS=	bin sbin
 
 post-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/databases/db/Makefile b/databases/db/Makefile
index 23c65f566c4..3220051ccef 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/12/04 04:18:13 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/05 20:48:01 jlam Exp $
 
 DISTNAME=	db-2.7.7
 PKGREVISION=	1
@@ -14,7 +14,9 @@ COMMENT=	Sleepycat Software's Berkeley DB version 2
 
 NO_PKGTOOLS_REQD_CHECK=	# defined (needed for pkgtools/pkg_install)
 
-USE_BUILDLINK2=		yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
@@ -22,6 +24,8 @@ CONFIGURE_ARGS+=	--enable-compat185
 
 USE_GNU_TOOLS+=		awk
 
+INSTALLATION_DIRS=	bin include/db2 lib share/doc/html
+
 post-install:
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/html/db
 
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index f817dd3623b..db6a028f428 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/10/20 15:28:23 agc Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/05 20:48:01 jlam Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	db3-3.11.2
@@ -15,7 +15,9 @@ PATCH_SITES=	http://www.sleepycat.com/update/3.3.11/
 PATCHFILES=	patch.3.3.11.1 patch.3.3.11.2
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -p0
 
-USE_BUILDLINK2=		yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKDIR}/${DISTNAME}/build_unix/libtool
 GNU_CONFIGURE=		yes
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index 48fa520eba8..ae2afb5ec04 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/08 23:15:05 seb Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/05 20:48:01 jlam Exp $
 
 DISTNAME=		db-4.2.52
 PKGNAME=		${DISTNAME:S/db/db4/}
@@ -10,11 +10,13 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.sleepycat.com/
 COMMENT=		Berkeley DB version 4 from Sleepycat Software
 
-USE_BUILDLINK2=	YES
-USE_GCC_SHLIB=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
+USE_GCC_SHLIB=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKDIR}/${DISTNAME}/build_unix/libtool
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	../dist/configure
 
 CONFIGURE_ARGS+=	--enable-cxx
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index cc542df2843..ed2bfdc1549 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2003/09/17 19:40:13 grant Exp $
+# $NetBSD: Makefile,v 1.64 2004/01/05 20:57:52 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -15,7 +15,9 @@ COMMENT=		Some useful routines for C programming
 
 CONFLICTS=		gtk+-1.0.*
 
-USE_BUILDLINK2=		yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -83,5 +85,5 @@ post-configure:
 	done
 .endif
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 98be75b08ae..63d0645e5d5 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/08/27 20:45:22 heinz Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/05 20:52:10 jlam Exp $
 #
 
 DISTNAME=	pkgconfig-0.15.0
@@ -9,7 +9,9 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.freedesktop.org/software/pkgconfig/
 COMMENT=	System for managing library compile/link flags
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/glib-1.2.8/libtool
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 7d3ae13793d..6f54823900f 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2003/07/17 21:33:13 grant Exp $
+# $NetBSD: Makefile,v 1.60 2004/01/05 20:48:45 jlam Exp $
 #
 
 DISTNAME=		pth-2.0.0
@@ -11,7 +11,9 @@ COMMENT=		GNU Portable Thread library
 
 CONFLICTS=		pth-current-[0-9]* pth-syscall<1.4.1nb1
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES