buildlink1 -> buildlink2

8 files changed, 54 insertions, 44 deletions

diff --git a/archivers/cxunzip/Makefile b/archivers/cxunzip/Makefile
index d7d88d46d8c..43f40e6226f 100644
--- a/archivers/cxunzip/Makefile
+++ b/archivers/cxunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/25 02:42:32 fredb Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/21 00:38:46 jlam Exp $
 
 DISTNAME=	cxunzip-0.96
 CATEGORIES=	archivers
@@ -8,10 +8,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://gurb.ton.tut.fi/gnome
 COMMENT=	Cloned Xunzip is a GNOME zip-archive uncompressing program
 
+USE_BUILDLINK2=	yes
+USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 #USE_LIBTOOL=	yes
 
-.include "../../x11/gnome-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index a5ec4a5b336..b428c8a6d78 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/07/24 13:51:33 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2002/09/21 00:31:17 jlam Exp $
 
 DISTNAME=		dap-2.1.2
 PKGREVISION=		1
@@ -15,7 +15,7 @@ MAKEFILE=		Makefile.netbsd
 MAKE_ENV+=		X11PREFIX=${X11PREFIX}
 
 USE_X11BASE=		yes
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/dap
@@ -23,8 +23,8 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/TODO ${WRKSRC}/COPYING \
 		${WRKSRC}/FEATURES ${PREFIX}/share/doc/dap
 
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../x11/xforms/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/xforms/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile
index b7acb78533b..2c6539e0c16 100644
--- a/cad/xchiplogo/Makefile
+++ b/cad/xchiplogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/04/17 04:45:08 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/21 00:32:58 jlam Exp $
 #
 
 DISTNAME=	xchiplogo
@@ -11,13 +11,14 @@ MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.eleceng.adelaide.edu.au/Personal/moini/chiplogo.html
 COMMENT=	Program for generating pretty logos on VLSI chips
 
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	xforms>=0.9999:../../x11/xforms
-
+USE_BUILDLINK2=	YES
 USE_X11=	YES
-USE_XPM=	YES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${LOCALBASE}/bin/xchiplogo
 
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/xforms/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index 6c1fa727c94..3c1e6695dd7 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/04/17 04:45:08 fredb Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/21 00:34:57 jlam Exp $
 #
 
 DISTNAME=		xisp-2.6p1
@@ -12,15 +12,16 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://xisp.hellug.gr/
 COMMENT=		User-friendly X11 interface to pppd/chat
 
-DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		xforms>=0.9999:../../x11/xforms
-
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
-USE_XPM=		YES
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xisp
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xisp/
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/xisp/
 
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/xforms/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index c35c9290d70..3dcbcec1fb4 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/04/17 04:45:09 fredb Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/21 00:33:54 jlam Exp $
 #
 
 DISTNAME=	xmysql-1.10
@@ -10,14 +10,17 @@ MAINTAINER=	bad@netbsd.org
 HOMEPAGE=	http://web.wt.net/~dblhack
 COMMENT=	Graphical front end to the MySQL database engine
 
-DEPENDS+=	mysql-client>=3.23.35:../../databases/mysql-client
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	xforms>=0.9999:../../x11/xforms
+BUILDLINK_DEPENDS.mysql-client=	mysql-client>=3.23.35
 
-MAKE_ENV+=	X11PREFIX=${X11PREFIX}
+USE_BUILDLINK2=	YES
 USE_X11=	YES
-USE_XPM=	YES
+MAKE_ENV+=	X11PREFIX=${X11PREFIX}
 
 ALL_TARGET=	xmysql
 
+.include "../../databases/mysql-client/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/xforms/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index e8a9a778f50..b5f17e092e3 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/05/11 23:26:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/21 00:35:10 jlam Exp $
 #
 
 DISTNAME=	xmysqladmin-1.0
@@ -14,15 +14,17 @@ MAINTAINER=	bad@netbsd.org
 HOMEPAGE=	http://www.mysql.com/
 COMMENT=	Graphical front end for administering MySQL databases
 
-DEPENDS=	mysql-client>=3.23.35:../../databases/mysql-client
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	xforms>=0.9999:../../x11/xforms
-
-MAKE_ENV+=	X11PREFIX=${X11PREFIX}
+BUILDLINK_DEPENDS.mysql-client=	mysql-client>=3.23.35
 
+USE_BUILDLINK2=	YES
 USE_X11=	YES
-USE_XPM=	YES
+MAKE_ENV+=	X11PREFIX=${X11PREFIX}
 
 ALL_TARGET=	xmysqladmin
 
+.include "../../databases/mysql-client/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/xforms/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 43e91a263c9..a1714176db0 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/04/17 04:45:14 fredb Exp $
+# $NetBSD: Makefile,v 1.24 2002/09/21 00:40:54 jlam Exp $
 
 DISTNAME=		xfmail-1.4.7
 PKGREVISION=		1
@@ -19,8 +19,8 @@ RESTRICTED=		"Selling this software requires permission of the authors."
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
-USE_XPM=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
@@ -32,9 +32,10 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfmail
 	${INSTALL_DATA} ${WRKSRC}/Copyright ${PREFIX}/share/doc/xfmail
 
-.include "../../databases/gdbm/buildlink.mk"
-.include "../../devel/glib/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../x11/xforms/buildlink.mk"
+.include "../../databases/gdbm/buildlink2.mk"
+.include "../../devel/glib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/xforms/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 689072aa195..d0a6ff2c0f6 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/04/17 04:45:15 fredb Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/21 00:41:06 jlam Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/09/26 23:18:07 steve Exp
 #
 
@@ -14,14 +14,11 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://sunsite.math.klte.hu/mirrors/xldlas/
 COMMENT=		XForms-based statistics package
 
-DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		xforms>=0.9999:../../x11/xforms
-
 ONLY_FOR_PLATFORM=      NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \
 			NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc
 
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-USE_XPM=		yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xldlas ${PREFIX}/bin
@@ -29,4 +26,8 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xldlas
 	${CP} -R ${WRKSRC}/help ${PREFIX}/share/xldlas
 
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/xforms/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"