From a788cee01f33aa6eccdb1939b4336fbc545e2e1d Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 6 Sep 2002 12:09:08 +0000 Subject: Convert to buildlink2. --- devel/libglade/Makefile | 15 +++++------ devel/libglade/distinfo | 4 +-- devel/libglade/patches/patch-aa | 57 +---------------------------------------- games/xarchon/Makefile | 14 +++++----- games/xarchon/distinfo | 3 +-- games/xarchon/patches/patch-ab | 16 ------------ 6 files changed, 19 insertions(+), 90 deletions(-) delete mode 100644 games/xarchon/patches/patch-ab diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index 2322f4ea58b..ab9a0c539d6 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2002/08/25 19:22:31 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2002/09/06 12:09:08 wiz Exp $ # DISTNAME= libglade-0.17 @@ -12,7 +12,7 @@ COMMENT= Runtime interpreter for GLADE gui files BUILD_USES_MSGFMT= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES GNU_CONFIGURE= YES @@ -22,16 +22,15 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -.include "../../databases/db/buildlink.mk" +.include "../../databases/db/buildlink2.mk" CPPFLAGS+= -I${BUILDLINK_DIR}/include/db2 .endif pre-configure: ${RM} ${WRKSRC}/libgladeConf.sh -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" -.include "../../x11/gnome-libs/buildlink.mk" -.include "../../audio/esound/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" +.include "../../x11/gnome-libs/buildlink2.mk" +.include "../../audio/esound/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libglade/distinfo b/devel/libglade/distinfo index cf75168520a..b29b143c9a3 100644 --- a/devel/libglade/distinfo +++ b/devel/libglade/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/04/09 23:05:42 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/09/06 12:09:08 wiz Exp $ SHA1 (libglade-0.17.tar.gz) = 66dbb90ffcfe80c551d2f3a296729ceab527cbc0 Size (libglade-0.17.tar.gz) = 418921 bytes -SHA1 (patch-aa) = 758bdbf941d60c3c4ed69aac8ad19cdc5f012f51 +SHA1 (patch-aa) = 44cbfcb19c8ecb351cde94246512da3ff062d87e SHA1 (patch-ab) = b7832173e36810c9e5e29aace918c8169de6f5ad diff --git a/devel/libglade/patches/patch-aa b/devel/libglade/patches/patch-aa index 6729f4d534e..1e9a214263e 100644 --- a/devel/libglade/patches/patch-aa +++ b/devel/libglade/patches/patch-aa @@ -1,51 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2002/04/09 23:05:43 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2002/09/06 12:09:09 wiz Exp $ --- configure.orig Thu Sep 6 23:00:42 2001 +++ configure -@@ -7145,8 +7145,8 @@ - echo "$as_me: error: Couldn't find xml-config" >&2;} - { (exit 1); exit 1; }; } - fi --XML_LIBS=`xml-config --libs` --XML_CFLAGS=`xml-config --cflags` -+XML_LIBS=`$XML_CONFIG --libs` -+XML_CFLAGS=`$XML_CONFIG --cflags` - - old_LIBS="$LIBS" - LIBS="$XML_LIBS $LIBS" -@@ -7412,8 +7412,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 - if test x = xfailure; then -@@ -7431,8 +7431,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 -@@ -7451,8 +7451,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 - if test x = xfailure; then @@ -7643,7 +7643,7 @@ echo "$as_me:7643: checking for BONOBO - version >= $min_bonobo_version" >&5 echo $ECHO_N "checking for BONOBO - version >= $min_bonobo_version... $ECHO_C" >&6 @@ -55,14 +11,3 @@ $NetBSD: patch-aa,v 1.5 2002/04/09 23:05:43 jlam Exp $ no_bonobo=yes else BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo bonobox` -@@ -7860,8 +7860,8 @@ - echo $ECHO_N "checking for gnome-db... $ECHO_C" >&6 - if test x$GNOMEDB_CONFIG != xno; then - have_gnomedb=true -- GNOMEDB_CFLAGS="`gnomedb-config --cflags`" -- GNOMEDB_LIBS="`gnomedb-config --libs`" -+ GNOMEDB_CFLAGS="`$GNOMEDB_CONFIG --cflags`" -+ GNOMEDB_LIBS="`$GNOMEDB_CONFIG --libs`" - echo "$as_me:7865: result: found" >&5 - echo "${ECHO_T}found" >&6 - else diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile index 8238fe0a8ad..ae6f44c19bd 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/08/15 20:40:01 zuntum Exp $ +# $NetBSD: Makefile,v 1.18 2002/09/06 12:17:38 wiz Exp $ # DISTNAME= xarchon-0.50 @@ -10,8 +10,10 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://xarchon.seul.org/ COMMENT= Chess-like strategy game with battle options -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_GMAKE= YES +GNU_CONFIGURE= YES +USE_X11= YES .include "../../mk/bsd.prefs.mk" @@ -19,7 +21,7 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= CC="${CC}" .endif -.include "../../audio/esound/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" +.include "../../audio/esound/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xarchon/distinfo b/games/xarchon/distinfo index ad2d241fe40..35e1160b930 100644 --- a/games/xarchon/distinfo +++ b/games/xarchon/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/08/15 20:40:01 zuntum Exp $ +$NetBSD: distinfo,v 1.4 2002/09/06 12:17:38 wiz Exp $ SHA1 (xarchon-0.50.tar.gz) = cee35cc80344cc54ff0be888c7f65c751cd45b45 Size (xarchon-0.50.tar.gz) = 371299 bytes -SHA1 (patch-ab) = 2b78007af08762199a51e40a59284f0119751228 diff --git a/games/xarchon/patches/patch-ab b/games/xarchon/patches/patch-ab deleted file mode 100644 index 98ea3b65470..00000000000 --- a/games/xarchon/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2001/08/15 20:40:02 zuntum Exp $ - ---- src/Makefile.in.orig Wed Oct 13 05:28:34 1999 -+++ src/Makefile.in Wed Oct 13 05:35:10 1999 -@@ -58,8 +58,9 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --CC = @CC@ --CXX = @CXX@ -+# This mess should be done differently - HF -+CC = cc -I${X11BASE}/include -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -I. -I.. `${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` -+CXX = c++ -I${X11BASE}/include -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -I. -I.. `${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` - ESD_CFLAGS = @ESD_CFLAGS@ - ESD_CONFIG = @ESD_CONFIG@ - ESD_LIBS = @ESD_LIBS@ -- cgit v1.2.3