buildlink1 -> buildlink2

3 files changed, 30 insertions, 33 deletions

diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile
index 0965750d001..ffab24cd894 100644
--- a/graphics/ogle_gui/Makefile
+++ b/graphics/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/10 16:06:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/22 10:16:16 jlam Exp $
 
 DISTNAME=	ogle_gui-0.8.5
 PKGREVISION=	1
@@ -9,28 +9,24 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=	GUI for the Ogle DVD player
 
-DEPENDS+=	ogle>=0.8.5:../../graphics/ogle
-# Normally, we would use the "../../devel/libglade/buildlink.mk" file,
-# but this doesn't work here, because ogle_gui wants libxml2 and the
-# buildlink file for libglade would also link it with libxml1.
-# This would result in an core dump. Thats why ogle_gui dlopens
-# libglade.
-DEPENDS+=	libglade>=0.17nb1:../../devel/libglade
-
-CONFIGURE_ARGS+=--bindir=${PREFIX}/lib/ogle
+USE_BUILDLINK2=		yes
+USE_X11=		yes
+USE_GMAKE=		yes
 
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
-USE_CONFIG_WRAPPER=	yes
-#USE_LIBTOOL=		yes
-#LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CONFIGURE_ARGS+=	--bindir=${PREFIX}/lib/ogle
 
-LDFLAGS+=	-Wl,-R${LOCALBASE}/lib/ogle -L${LOCALBASE}/lib/ogle
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../devel/binutils/buildlink.mk"
+LDFLAGS+=	${BUILDLINK_LDFLAGS.ogle}
+
+.include "../../devel/binutils/buildlink2.mk"
 .include "../../lang/gcc/Makefile.gcc"
 
-.include "../../textproc/libxml2/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/libglade/buildlink2.mk"
+.include "../../graphics/ogle/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 84c0863380f..11703d773c2 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/03/13 17:37:13 fredb Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/22 10:15:16 jlam Exp $
 #
 
 DISTNAME=	GD-1.32
@@ -12,7 +12,8 @@ MAINTAINER=	damon@brodiefamily.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/GD/GD.html
 COMMENT=	Perl5 interface to gd graphics library
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/.packlist
 
 MAKE_ENV+=		GD_LIBS="${LDFLAGS}"
@@ -20,7 +21,7 @@ MAKE_ENV+=		GD_LIBS="${LDFLAGS}"
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include "../../graphics/gd/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/gd/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile
index 5a94d775a86..09cd43b32af 100644
--- a/graphics/php4-gd/Makefile
+++ b/graphics/php4-gd/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:15 fredb Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/22 10:19:57 jlam Exp $
 
 MODNAME=		gd
 CATEGORIES+=		graphics
 PKGREVISION=		2
 COMMENT=		PHP4 extension for GD graphics library
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 
 .include "../../www/php4/Makefile.module"
 
-CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-jpeg-dir=shared,${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-png-dir=shared,${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-xpm-dir=shared,${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-ttf=shared,${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.gd}
+CONFIGURE_ARGS+=	--with-jpeg-dir=shared,${BUILDLINK_PREFIX.jpeg}
+CONFIGURE_ARGS+=	--with-png-dir=shared,${BUILDLINK_PREFIX.png}
+CONFIGURE_ARGS+=	--with-xpm-dir=shared,${BUILDLINK_PREFIX.xpm}
+CONFIGURE_ARGS+=	--with-ttf=shared,${BUILDLINK_PREFIX.freetype}
 CONFIGURE_ARGS+=	--enable-${MODNAME}-native-ttf
 CONFIGURE_ARGS+=	--without-freetype-dir
 CONFIGURE_ARGS+=	--without-t1lib
 
-.include "../../graphics/gd/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/gd/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"