buildlink1 -> buildlink2

3 files changed, 33 insertions, 36 deletions

diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index f8c2bf9b086..1c385e73e79 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/09/10 16:06:45 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/24 10:20:06 jlam Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
@@ -11,38 +11,37 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnome.org/guppi/
 COMMENT=	Plot program with integrated statistics capabilities
 
+.if exists(/usr/include/wctype.h)
+#
 # "guppi" only accepts newer versions of the "gnumeric" package which
 # cannot be build on all platforms. We only enable "gnumeric" support
 # on platforms which can build the "gnumeric" 1.0.x packages.
-.if exists(/usr/include/wctype.h)
-DEPENDS+=	gnumeric>=1.0.9:../../math/gnumeric
-
-CONFIGURE_ARGS=	--enable-gnumeric
-PLIST_SUBST+=	GNUMERIC=
+#
+DEPENDS+=		gnumeric>=1.0.9:../../math/gnumeric
+CONFIGURE_ARGS=		--enable-gnumeric
+PLIST_SUBST+=		GNUMERIC=
 .else
-CONFIGURE_ARGS=	--disable-gnumeric
-PLIST_SUBST+=	GNUMERIC="@comment "
+CONFIGURE_ARGS=		--disable-gnumeric
+PLIST_SUBST+=		GNUMERIC="@comment "
 .endif
-DEPENDS+=	guile>=1.4:../../lang/guile
+DEPENDS+=		guile>=1.4:../../lang/guile
 
-BUILDLINK_DEPENDS.gnome-core=		gnome-core>=1.4.0.4nb1
-BUILDLINK_DEPENDS.gdk-pixbuf=		gdk-pixbuf>=0.11.0nb1
-BUILDLINK_DEPENDS.gdk-pixbuf-gnome=	gdk-pixbuf-gnome>=0.11.0nb1
+USE_BUILDLINK2=		YES
+USE_X11BASE=		YES
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
 
-GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
-USE_LIBTOOL=	YES
-USE_X11BASE=	YES
-
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/libguppi.m4 \
-	  ${LOCALBASE}/share/aclocal/libguppi.m4
+		${LOCALBASE}/share/aclocal/libguppi.m4
+
+.include "../../devel/libglade/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
 
-.include "../../devel/libglade/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../x11/gnome-core/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/bbappconf/Makefile b/misc/bbappconf/Makefile
index 48f801458bc..a5edca72bfa 100644
--- a/misc/bbappconf/Makefile
+++ b/misc/bbappconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/08/05 21:42:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/24 10:20:29 jlam Exp $
 #
 
 DISTNAME=	bbappconf-0.0.1-peak3
@@ -11,9 +11,9 @@ MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://bbtools.windsofstorm.net
 COMMENT=	Configure the behaviour of an application under Blackbox
 
-GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
+GNU_CONFIGURE=		YES
 
 post-patch:
 	${SED} -e 's,@PREFIX@,${PREFIX},' ${WRKSRC}/data/bbappconf.1.tmp > \
@@ -26,5 +26,4 @@ post-install:
 	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/data/bbappconf.1 ${PREFIX}/man/man1
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index 3f142d9af6e..a2d6492485c 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/12/12 18:13:25 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/24 10:20:19 jlam Exp $
 #
 
 DISTNAME=	gperiodic-1.2.6
@@ -10,13 +10,12 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://gperiodic.seul.org/
 COMMENT=	Displays a periodic table of the elements
 
-BUILD_USES_MSGFMT=	yes
+BUILD_USES_MSGFMT=	# defined
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_X11BASE=	yes
-
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		# defined
+USE_X11BASE=		# defined
+USE_GMAKE=		# defined
+GNU_CONFIGURE=		# defined
 
 pre-configure:
 .for f in config.cache config.h config.log config.status
@@ -26,7 +25,7 @@ pre-configure:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/gperiodic.1 ${PREFIX}/man/man1/
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"