buildlink1 -> buildlink2

3 files changed, 13 insertions, 85 deletions

diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 865b57ceed3..0474fd4ce7a 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2002/08/25 19:23:27 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2002/08/29 08:42:50 jlam Exp $
 
 DISTNAME=		control-center-1.4.0.4
 CATEGORIES=		x11 gnome
@@ -10,11 +10,10 @@ COMMENT=		GNOME control-center development library
 
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.gnome-libs=	gnome-libs>=1.4.1.2nb1
-
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
+
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
@@ -23,29 +22,17 @@ LOCALSTATEDIR=		${X11PREFIX}/var/gnome
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
 
-# Remove -I$(includedir) from the INCLUDES passed to the compiler as this
-# defeats buildlink.  Also replace "imlib-config" with "$(IMLIB_CONFIG)"
-# so we use the config wrapper script.
-#
 post-patch:
-	cd ${WRKSRC};							\
-	files="control-center/Makefile.in capplets/*/Makefile.in";	\
-	for file in $${files}; do					\
-                ${SED}	-e "s|[ 	]*-I\$$(includedir)||"		\
-			-e "s|imlib-config|\$$(IMLIB_CONFIG)|g"		\
-                        $${file} > $${file}.fixed;			\
-                ${MV} -f $${file}.fixed $${file};			\
-        done
 	@${ECHO} >>${WRKSRC}/control-center/cappletConf.sh.in ""
 
 post-install:
 	${MKDIR} ${PREFIX}/share/control-center/capplets
 
-.include "../../devel/popt/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../sysutils/gnome-vfs/buildlink.mk"
-.include "../../textproc/scrollkeeper/buildlink.mk"
-.include "../../x11/gnome-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../sysutils/gnome-vfs/buildlink2.mk"
+.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/controlcenter/distinfo b/x11/controlcenter/distinfo
index da3619b9f4c..9f10b796fc1 100644
--- a/x11/controlcenter/distinfo
+++ b/x11/controlcenter/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2002/04/09 21:39:24 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/08/29 08:42:50 jlam Exp $
 
 SHA1 (control-center-1.4.0.4.tar.gz) = 7f18cbcdadcebfc967d4a9abac7804d513d4298f
 Size (control-center-1.4.0.4.tar.gz) = 3567130 bytes
 SHA1 (patch-aa) = 423ad6c931885f1975311b8cc90d9de636e9c808
-SHA1 (patch-ab) = 75dc367d6c7e4c54754105a1d56953cbd5f47f6a
+SHA1 (patch-ab) = 64b3fdd656ba029a092086d040c48c55679edfd9
 SHA1 (patch-ac) = 2fc67976315b8a203233e71d1f311f3e097aa499
 SHA1 (patch-af) = fa276788e2ff16fd82674c7031b8ed806cc37ddf
diff --git a/x11/controlcenter/patches/patch-ab b/x11/controlcenter/patches/patch-ab
index 654bcdbca1a..b5ae1d84eb3 100644
--- a/x11/controlcenter/patches/patch-ab
+++ b/x11/controlcenter/patches/patch-ab
@@ -1,40 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2002/04/09 21:39:24 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2002/08/29 08:42:52 jlam Exp $
 
 --- configure.orig	Sun Feb 10 16:36:55 2002
 +++ configure
-@@ -1307,8 +1307,8 @@
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 		
--		ORBIT_CFLAGS=`orbit-config --cflags client server`
--		ORBIT_LIBS=`orbit-config --use-service=name --libs client server`
-+		ORBIT_CFLAGS=`$ORBIT_CONFIG --cflags client server`
-+		ORBIT_LIBS=`$ORBIT_CONFIG --use-service=name --libs client server`
- 		
- 		
- 	else
-@@ -1325,8 +1325,8 @@
-   
- 		gnome_cv_gnorba_found=no
- 		if test x$gnome_cv_orbit_found = xyes; then
--			GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--			GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+			GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+			GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 			if test -n "$GNORBA_LIBS"; then
- 				gnome_cv_gnorba_found=yes
- 			fi
-@@ -1346,8 +1346,8 @@
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 		
--		GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--		GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+		GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+		GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 		
- 		
- 	else
 @@ -7570,7 +7570,7 @@
  
                                
@@ -56,29 +23,3 @@ $NetBSD: patch-ab,v 1.4 2002/04/09 21:39:24 jlam Exp $
  for ac_hdr in dlfcn.h dl.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-@@ -8815,7 +8820,7 @@
- fi
- 
- 
--CFLAGS="`gnome-config --cflags gdk_pixbuf`${CFLAGS}"
-+CFLAGS="`$GNOME_CONFIG --cflags gdk_pixbuf`${CFLAGS}"
- 
- have_libesd=no
- # Check whether --with-esd-prefix or --without-esd-prefix was given.
-@@ -9329,10 +9334,13 @@
- 
- echo $ac_n "checking for gnome-vfs library >= 0.9""... $ac_c" 1>&6
- echo "configure:9332: checking for gnome-vfs library >= 0.9" >&5
--VFS_CFLAGS=`gnome-vfs-config --cflags`
--VFS_LIBS=`gnome-vfs-config --libs`
-+if test x${GNOME_VFS_CONFIG+set} != xset ; then
-+  GNOME_VFS_CONFIG=gnome-vfs-config
-+fi
-+VFS_CFLAGS=`$GNOME_VFS_CONFIG --cflags`
-+VFS_LIBS=`$GNOME_VFS_CONFIG --libs`
- if test "x$VFS_CFLAGS" != x ; then
--    vers=`gnome-vfs-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+    vers=`$GNOME_VFS_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-     if test "$vers" -ge 0009000; then
-         echo "$ac_t""found" 1>&6
-     else