bl3ify

8 files changed, 45 insertions, 39 deletions

diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index f3e7c35984a..202b867e1e5 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:26:35 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/05 12:05:54 jlam Exp $
 #
 
 DISTNAME=      conserver-7.2.7
@@ -9,7 +9,9 @@ MAINTAINER=    tech-pkg@NetBSD.org
 HOMEPAGE=      http://www.conserver.com/
 COMMENT=       Application that allows multiple users to watch serial consoles
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 
 GNU_CONFIGURE=		YES
@@ -35,5 +37,5 @@ NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64
 pre-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 
-.include "../../security/tcp_wrappers/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 4701e3e7694..6be89d74c1c 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/12/19 13:45:59 adam Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/05 11:54:07 jlam Exp $
 #
 
 DISTNAME=	freetype-2.1.5
@@ -17,7 +17,9 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.freetype.org/
 COMMENT=	Font rendering engine and library API
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_DIRS=		${WRKSRC}/builds/unix
@@ -36,5 +38,5 @@ post-configure:
 	${MKDIR} ${WRKSRC}/.libs
 .endif
 
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 367868606b3..43aaa906d3b 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/08/11 13:28:08 seb Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/05 11:53:39 jlam Exp $
 
 DISTNAME=       xpm-3.4k
 PKGREVISION=	1
@@ -10,28 +10,15 @@ MAINTAINER=	mycroft@NetBSD.org
 HOMEPAGE=	http://www.inria.fr/koala/lehors/xpm.html
 COMMENT=	The X Pixmap library
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 USE_IMAKE=	# defined
 
-.include "../../mk/bsd.prefs.mk"
-
-# Check if we got Xpm distributed with XFree86 4.x or Solaris 9.
-.if ${OPSYS} != "SunOS"
-.  if exists(${X11BASE}/include/X11/xpm.h) && \
-      exists(${X11BASE}/lib/X11/config/X11.tmpl)
-_IS_BUILTIN_XPM!=	${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
-.    if ${OPSYS} == "IRIX"
-_IS_BUILTIN_XPM=	1
-.    endif
-.  else
-_IS_BUILTIN_XPM=	0
-.  endif
-.else
-_IS_BUILTIN_XPM!=	(/usr/sbin/pkgchk -l SUNWxwinc | ${EGREP} -c xpm.h) || ${TRUE}
-.endif
+BUILDLINK_CHECK_BUILTIN.xpm=	YES
+
+.include "buildlink3.mk"
 
-.if ${_IS_BUILTIN_XPM} != "0"
-PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
+.if ${BUILDLINK_IS_BUILTIN.xpm} == "YES"
+#PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
 .endif
 
 .if (${OPSYS} == SunOS)
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 8c8d8e845e1..2d46ca4b31e 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/06 13:59:18 cjep Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/05 11:56:49 jlam Exp $
 #
 
 DISTNAME=       awk
@@ -13,10 +13,15 @@ COMMENT=	Brian Kernighan's pattern-directed scanning and processing language
 
 DIST_SUBDIR=	${PKGNAME}
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
 MAKEFILE=	makefile
-MAKEFLAGS+=	CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	CC=${BUILDLINK_CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
 ALL_TARGET=	a.out
 
+INSTALLATION_DIRS=	bin man/man1
+
 post-build:
 	${SED} -e 's|awk|nawk|g' -e 's/Awk/Nawk/g' \
 		${WRKSRC}/awk.1 > ${WRKSRC}/nawk.1
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 0ba48f942c6..08f8dc417da 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/10/19 21:05:35 bouyer Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/05 12:00:10 jlam Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
@@ -13,7 +13,9 @@ COMMENT=	Implementation of MIME, the Multipurpose Internet Mail Extensions
 
 CONFLICTS+=	elm>=2.5.5 mm-2.7
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_X11=		YES
 
@@ -23,10 +25,12 @@ MAKE_ENV+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 EGDIR=		${PREFIX}/share/examples/metamail
 CONF_FILES=	${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
 
+INSTALLATION_DIRS=	bin man/man1 man/man4
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-CFLAGS+=		-DSYSV
+CFLAGS+=	-DSYSV
 .endif
 
 post-patch:
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 3c0e0e4e08c..ca59607c882 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/11/03 22:43:38 kim Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/05 12:01:14 jlam Exp $
 #
 
 DISTNAME=	procmail-3.22
@@ -9,7 +9,9 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.procmail.org/
 COMMENT=	Local mail delivery agent
 
-USE_BUILDLINK2=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	YES
 MAKE_ENV+=	SHELL=${SH} CHMOD=${CHMOD}
 INSTALL_TARGET=	install-suid install.man
 
@@ -29,7 +31,7 @@ pre-configure:
 	>> ${WRKSRC}/config.h
 	${ECHO} "#define ETCRCS \"${PKG_SYSCONFDIR}/procmailrcs/\""	\
 	>> ${WRKSRC}/config.h
-.ifdef(PROCMAIL_MAILSPOOLHOME)
+.if defined(PROCMAIL_MAILSPOOLHOME)
 	${ECHO} "#define MAILSPOOLHOME \"/${PROCMAIL_MAILSPOOLHOME}\""	\
 	>> ${WRKSRC}/src/authenticate.h
 .endif
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 5144294c280..5a3ab729579 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2003/12/01 15:18:27 ben Exp $
+# $NetBSD: Makefile,v 1.51 2004/01/05 12:10:01 jlam Exp $
 
 DISTNAME=	screen-4.0.1
 PKGREVISION=	2
@@ -10,7 +10,9 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/screen/screen.html
 COMMENT=	Multi-screen window manager
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 INFO_FILES=		screen.info
 PLIST_SUBST=		DISTNAME=${DISTNAME}
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index fddad7c42e4..e7fccd73428 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:53:19 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/05 12:04:20 jlam Exp $
 
 DISTNAME= 	tcp_wrappers_7.6-ipv6.1
 PKGNAME=	tcp_wrappers-7.6.1
@@ -12,8 +12,10 @@ COMMENT=	Monitor and filter incoming requests for network services
 
 ONLY_FOR_PLATFORM=	IRIX-*-* Darwin-*-* SunOS-*-* Linux-*-*	# in NetBSD base system
 
-USE_BUILDLINK2=	# defined
-USE_LIBTOOL=	# defined
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
+USE_LIBTOOL=	yes
 
 .include "../../mk/bsd.prefs.mk"