bl3ify

6 files changed, 40 insertions, 25 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 72af084ad8d..597b722aa2a 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.137 2004/01/06 07:06:30 jlam Exp $
 
 DISTNAME=	fetchmail-6.2.5
 PKGREVISION=	1
@@ -10,9 +10,11 @@ MAINTAINER=	frueauf@NetBSD.org
 HOMEPAGE=	http://catb.org/~esr/fetchmail/
 COMMENT=	Batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 BUILD_USES_MSGFMT=	YES
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -28,7 +30,7 @@ LDFLAGS+=		${CFLAGS}
 FETCHMAIL_USE_SSL?=	YES
 
 .if defined(FETCHMAIL_USE_SSL) && ${FETCHMAIL_USE_SSL} == YES
-.  include "../../security/openssl/buildlink2.mk"
+.  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 .else
 CONFIGURE_ARGS+=	--without-ssl
@@ -79,5 +81,5 @@ post-install:
 	   fetchmail-FAQ.html fetchmail-features.html \
 	   design-notes.html ${FDOC}
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 7f4d94534bd..c766a379f05 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/12/27 19:16:04 heinz Exp $
+# $NetBSD: Makefile,v 1.38 2004/01/06 07:08:13 jlam Exp $
 
 DISTNAME=	Mail-SpamAssassin-${PKGVERSION}
 PKGNAME=	spamassassin-2.61
@@ -15,6 +15,8 @@ COMMENT=	Mail filter to identify spam
 
 CONFLICTS=	p5-Mail-SpamAssassin-[1-9]*
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_DEPENDS.perl=	perl>=5.6.0  # MakeMaker >= 5.45 needed
@@ -30,7 +32,7 @@ DEPENDS+=	p5-DB_File-[0-9]*:../../databases/p5-DB_File
 SPAMASSASSIN_USE_SSL?=	YES
 
 .if !empty(SPAMASSASSIN_USE_SSL:M[yY][eE][sS])
-.  include "../../security/openssl/buildlink2.mk"
+.  include "../../security/openssl/buildlink3.mk"
 DEPENDS+=		p5-IO-Socket-SSL>=0.92:../../security/p5-IO-Socket-SSL
 CONFIGURE_ARGS+=	--enable-ssl
 MAKE_PARAMS=		ENABLE_SSL=yes
@@ -41,7 +43,7 @@ MAKE_PARAMS=		ENABLE_SSL=no
 SA_SSLCERTS=		'$$LOCAL_RULES_DIR/certs'
 .endif
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 PKG_SYSCONFSUBDIR=	spamassassin
 
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index 531cab47163..99f8e4fe58f 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/06 07:05:24 jlam Exp $
 #
 
 DISTNAME=	mtr-0.54
@@ -12,18 +12,22 @@ MAINTAINER=	sommerfeld@NetBSD.org
 HOMEPAGE=	http://www.bitwizard.nl/mtr/
 COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_X11=	yes
 
+INSTALLATION_DIRS=	man/man8 sbin
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr-gtk
 	${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin/mtr-gtk
 	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8/mtr-gtk.8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr-gtk
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index d92bf33ec51..d4f2ffde2ad 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/06 07:05:24 jlam Exp $
 #
 
 DISTNAME=	mtr-0.54
@@ -11,10 +11,13 @@ MAINTAINER=	sommerfeld@NetBSD.org
 HOMEPAGE=	http://www.bitwizard.nl/mtr/
 COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--without-gtk
+INSTALLATION_DIRS=	man/man8 sbin
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr
@@ -22,5 +25,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 31444ca6dcb..ed6012324f3 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 22:51:31 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/06 07:08:50 jlam Exp $
 
 DISTNAME=	openslp-1.0.11
 CATEGORIES=	net
@@ -8,7 +8,9 @@ MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.openslp.org/
 COMMENT=	Open-source implementation of the Service Location Protocol
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/print/cups/Makefile b/print/cups/Makefile
index b617519a555..1c87ad5fff8 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2004/01/03 18:49:51 reed Exp $
+# $NetBSD: Makefile,v 1.68 2004/01/06 07:09:25 jlam Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -26,8 +26,10 @@ COMMENT=		Common UNIX Printing System
 
 CONFLICTS+=		LPRng-[0-9]* LPRng-core-[0-9]*
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 UNLIMIT_RESOURCES=	datasize memorysize
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
@@ -53,7 +55,7 @@ CONFIGURE_ENV+=		DSOFLAGS="${LDFLAGS}"
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_PAM)
-.  include "../../security/PAM/buildlink2.mk"
+.  include "../../security/PAM/buildlink3.mk"
 BUILD_DEFS+=		USE_PAM
 CONFIGURE_ARGS+=	--enable-pam
 PLIST_SRC=		${PKGDIR}/PLIST.pam
@@ -128,12 +130,12 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/cups.pam ${EGDIR}
 .endif
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../net/openslp/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../net/openslp/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"