buildlink1 -> buildlink2

2 files changed, 11 insertions, 27 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 95372c7891c..ed28a551a24 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.10 2002/04/09 22:50:03 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/29 09:51:09 jlam Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
 COMMENT=	Screen saver and locker for the X window system (with GNOME support)
 
-BUILDLINK_DEPENDS.control-center=	control-center>=1.4.0.1nb1
+CONFLICTS+=	xscreensaver-[0-9]*
 
-CONFLICTS+=		xscreensaver-[0-9]*
-
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=	yes
+USE_X11=	yes
 
 .include "../../x11/xscreensaver/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-gnome=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-gnome=${BUILDLINK_PREFIX.gnome-libs}
 CONFIGURE_ARGS+=	--with-configdir=${PREFIX}/share/control-center/screensavers
 
 PLIST_SRC=	${.CURDIR}/PLIST
 
-.include "../../x11/controlcenter/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/controlcenter/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index bb0e8a8604c..c981057a3ab 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2002/08/26 17:39:32 jlam Exp $
+# $NetBSD: Makefile.common,v 1.35 2002/08/29 09:51:08 jlam Exp $
 #
 
 DISTNAME=		xscreensaver-4.02
@@ -15,17 +15,10 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-hackdir=${PREFIX}/libexec/xscreensaver
 CONFIGURE_ARGS+=	--with-gl
 CONFIGURE_ARGS+=	--with-gle
-.if defined(USE_BUILDLINK2)
 CONFIGURE_ARGS+=	--with-gtk=${BUILDLINK_PREFIX.gtk}
 CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
 CONFIGURE_ARGS+=	--with-gdk-pixbuf=${BUILDLINK_PREFIX.gdk-pixbuf}
 CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml}
-.else
-CONFIGURE_ARGS+=	--with-gtk=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-gdk-pixbuf=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_DIR}
-.endif
 CONFIGURE_ARGS+=	--with-zippy=/usr/games/fortune
 
 CONFIGURE_ARGS+=	--without-motif
@@ -49,15 +42,15 @@ MAKEFLAGS+=		PERL_VERSION="${PERL_VERSION}"
 .endif
 
 .if (${OPSYS} == "NetBSD")
-.if defined(KERBEROS)
+.  if defined(KERBEROS)
 CFLAGS+=		-I/usr/include/kerberosIV
-.else
+.  else
 CONFIGURE_ARGS+=	--without-kerberos
-.endif
+.  endif
 .endif
 
 .if (${MACHINE_ARCH} == "arm32")
-. include "../../lang/gcc/Makefile.gcc"
+.  include "../../lang/gcc/Makefile.gcc"
 .endif
 
 post-patch:
@@ -66,14 +59,7 @@ post-patch:
 	[ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
 	${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f
 
-.if defined(USE_BUILDLINK2)
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
 .include "../../graphics/gle/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
-.else
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../graphics/gle/buildlink.mk"
-.include "../../textproc/libxml/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.endif