buildlink1 -> buildlink2

7 files changed, 23 insertions, 32 deletions

diff --git a/audio/freezetag/Makefile b/audio/freezetag/Makefile
index a853cbb5229..59cb6d9ba39 100644
--- a/audio/freezetag/Makefile
+++ b/audio/freezetag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/12/06 03:04:30 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/21 00:44:25 jlam Exp $
 #
 
 DISTNAME=	freezetag-0.9.2
@@ -9,9 +9,9 @@ MAINTAINER=	kleink@netbsd.org
 HOMEPAGE=	http://katz.linuxpower.org/freezetag/
 COMMENT=	Id3 tag editor for GTK+-1.2.0 and higher
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
 
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index b55d1e5d547..a6da0ad778b 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/07 06:10:33 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/21 00:44:10 jlam Exp $
 
 DISTNAME=	mp3info-0.8.2
 PKGNAME=	g${DISTNAME}
@@ -13,13 +13,13 @@ COMMENT=	Utility to read and modify the ID3 tags of MP3 files
 
 CONFLICTS=	mp3info-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
-USE_CONFIG_WRAPPER=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 
 # wgetnstr()
 INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
 
-.include "../../devel/ncurses/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmp3info/distinfo b/audio/gmp3info/distinfo
index 066839657b2..5f20c6cfbe7 100644
--- a/audio/gmp3info/distinfo
+++ b/audio/gmp3info/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/09/30 09:34:49 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/09/21 00:44:10 jlam Exp $
 
 SHA1 (mp3info-0.8.2.tgz) = 33873f3fbed58c93b8fbb081c67b2160513c9e77
 Size (mp3info-0.8.2.tgz) = 35395 bytes
-SHA1 (patch-aa) = 795f851b06caea541710dcf7925e9668d9cad0e0
+SHA1 (patch-aa) = 8d371ae15a05bd3d4f52ad0b850b9e739fcb0b54
diff --git a/audio/gmp3info/patches/patch-aa b/audio/gmp3info/patches/patch-aa
index b66a9799e22..bdb78044d55 100644
--- a/audio/gmp3info/patches/patch-aa
+++ b/audio/gmp3info/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/09/30 09:34:49 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2002/09/21 00:44:10 jlam Exp $
 
 --- Makefile.orig	Fri Aug 18 17:42:22 2000
 +++ Makefile
@@ -21,21 +21,12 @@ $NetBSD: patch-aa,v 1.2 2001/09/30 09:34:49 wiz Exp $
 -LIBS = -lncurses
 -CC = gcc
 -CFLAGS = -g -O2 -Wall
-+LIBS = -L$(BUILDLINK_DIR)/lib -Wl,-R$(LOCALBASE)/lib -lncurses
++LIBS = -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lncurses
 +#CC = gcc
 +#CFLAGS = -g -O2 -Wall
  
  all: mp3info gmp3info doc
  
-@@ -55,7 +54,7 @@
- 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
- 
- gmp3info: $(XSRC) $(XOBJ) 
--	$(CC) $(XSRC) $(CFLAGS) -o $@ $(XOBJ) `gtk-config --cflags --libs`
-+	$(CC) $(XSRC) $(CFLAGS) -o $@ $(XOBJ) `${GTK_CONFIG} --cflags --libs`
- 
- mp3info.txt: mp3info.1
- 	groff -t -e -mandoc -Tascii mp3info.1 | col -bx > mp3info.txt
 @@ -69,11 +68,9 @@
  	$(RM) -f mp3info.txt
  
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index e34c594697d..4c2964d2885 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/08 02:43:01 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/21 00:46:08 jlam Exp $
 #
 
 DISTNAME=	Mixer.app-1.7.0
@@ -10,13 +10,13 @@ MAINTAINER=	ptiJo@noos.fr
 HOMEPAGE=	http://www.student.hk-r.se/~pt96pli/mixer/
 COMMENT=	Another mixer intended for the windowmaker dockapp
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Mixer.app ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Mixer.app
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Mixer.app
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mixer.app/distinfo b/audio/mixer.app/distinfo
index 3b6884067fa..cde0e2dc6c4 100644
--- a/audio/mixer.app/distinfo
+++ b/audio/mixer.app/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/08 02:43:01 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/09/21 00:46:08 jlam Exp $
 
 SHA1 (Mixer.app-1.7.0.tar.gz) = 76e5cd55155d63c9a5130280fdb56c8b1b9141d8
 Size (Mixer.app-1.7.0.tar.gz) = 19101 bytes
-SHA1 (patch-aa) = d1263ef171185fbe8b6d23a20ccb96648397b3cc
+SHA1 (patch-aa) = 5af6ac73896573c81659fef91d37e9e0c21b71be
 SHA1 (patch-ab) = 40a73805ca71cb743005324fb7637d0d0a60f1dd
diff --git a/audio/mixer.app/patches/patch-aa b/audio/mixer.app/patches/patch-aa
index c1b6a1d6af9..81977080430 100644
--- a/audio/mixer.app/patches/patch-aa
+++ b/audio/mixer.app/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/08 02:43:01 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/21 00:46:09 jlam Exp $
 
 --- Makefile.orig	Mon May 21 21:21:47 2001
 +++ Makefile	Mon May 21 21:22:44 2001
@@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/08 02:43:01 wiz Exp $
 -CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include
 -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
 +#CXX=c++
-+CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I${BUILDLINK_DIR}/include
-+LDFLAGS += -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib -L${BUILDLINK_DIR}/lib -lXpm -lXext -lX11	-lossaudio
++CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I${X11BASE}/include
++LDFLAGS += -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib -L${X11BASE}/lib -lXpm -lXext -lX11	-lossaudio
  
  OBJECTS = Main.o Mixer.o Xpm.o