From e33663a96a09df20986ded55bdc081992c20d056 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Oct 2002 11:55:54 +0000 Subject: buildlink1 -> buildlink2. --- audio/aumix/Makefile | 10 +++++----- audio/gtkmserv/Makefile | 6 +++--- audio/gtkmserv/distinfo | 4 ++-- audio/gtkmserv/patches/patch-aa | 8 +++----- devel/pilrc/Makefile | 6 +++--- editors/manedit/Makefile | 6 +++--- math/euler/Makefile | 6 +++--- misc/bidwatcher/Makefile | 5 +++-- sysutils/mtoolsfm/Makefile | 5 +++-- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile index ecacd813eac..554a1196108 100644 --- a/audio/aumix/Makefile +++ b/audio/aumix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/29 04:54:49 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/10/13 11:55:54 wiz Exp $ DISTNAME= aumix-2.7 CATEGORIES= audio @@ -14,12 +14,12 @@ COMMENT= Set mix levels BUILD_USES_MSGFMT= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-own-labels CONFIGURE_ARGS+= --enable-nls -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/ncurses/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gtkmserv/Makefile b/audio/gtkmserv/Makefile index f3d6b9994f3..83822bff47d 100644 --- a/audio/gtkmserv/Makefile +++ b/audio/gtkmserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/02/26 01:37:20 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/10/13 12:04:19 wiz Exp $ # DISTNAME= gtkmserv-0.5.2 @@ -11,10 +11,10 @@ COMMENT= gtk-based GUI client for the audio/mserv package WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gtkMserv ${PREFIX}/bin -.include "../../x11/gtk/buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gtkmserv/distinfo b/audio/gtkmserv/distinfo index ed93fbdf0b9..02089075121 100644 --- a/audio/gtkmserv/distinfo +++ b/audio/gtkmserv/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/03/04 17:32:50 jmc Exp $ +$NetBSD: distinfo,v 1.4 2002/10/13 12:04:19 wiz Exp $ SHA1 (gtkmserv-0.5.2.tar.gz) = 59829ef0c2a438b6f35577effbeaff5ed91ccd0d Size (gtkmserv-0.5.2.tar.gz) = 22441 bytes -SHA1 (patch-aa) = 8659232560b7b8f88a520513af5cbd538e5f7015 +SHA1 (patch-aa) = e338fee23f059ff943698f1bc0d924efdd4b630e diff --git a/audio/gtkmserv/patches/patch-aa b/audio/gtkmserv/patches/patch-aa index d77a942aed0..e73b4ed28b0 100644 --- a/audio/gtkmserv/patches/patch-aa +++ b/audio/gtkmserv/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2002/03/04 17:32:51 jmc Exp $ +$NetBSD: patch-aa,v 1.3 2002/10/13 12:04:20 wiz Exp $ --- Makefile.in.orig Tue Jan 30 02:20:31 2001 +++ Makefile.in Mon Mar 4 17:25:06 2002 @@ -1,7 +1,7 @@ -CC = gcc -Wall -ggdb --LIBS = `gtk-config --libs` +CC = gcc -Wall -+LIBS = `${GTK_CONFIG} --libs` + LIBS = `gtk-config --libs` LIBS_DEBUG = -lefence --CFLAGS = `gtk-config --cflags` -+CFLAGS = `${GTK_CONFIG} --cflags` + CFLAGS = `gtk-config --cflags` SRCS = main.c menu.c mserv.c on.c setup.c utils.c window.c album.c \ queue.c diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile index 8afb2fb2e96..2f198d39d38 100644 --- a/devel/pilrc/Makefile +++ b/devel/pilrc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:30 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/13 12:01:46 wiz Exp $ # DISTNAME= pilrc-2.8p4 @@ -21,7 +21,7 @@ COMMENT= generate resources for PalmOS applications from textual description #EXTRACT_CMD= unzip -aq ${DOWNLOADED_DISTFILE} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES DOCDIR= ${PREFIX}/share/doc/html/pilrc @@ -31,7 +31,7 @@ DOCDIR= ${PREFIX}/share/doc/html/pilrc PILRC_USE_GTK?= YES .if ${PILRC_USE_GTK} == YES -.include "../../x11/gtk/buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" PLIST_SUBST+= PILRCUI='' .else CONFIGURE_ARGS+=--disable-pilrcui diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile index 750fd56be69..f7ca7114dcb 100644 --- a/editors/manedit/Makefile +++ b/editors/manedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/08/17 21:16:50 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/13 12:03:30 wiz Exp $ # DISTNAME= ${PKGNAME:S,manedit-,manedit,} @@ -13,7 +13,7 @@ COMMENT= UNIX Manual (man, manpage) page editor, viewer, and browser for X11 WRKSRC= ${WRKDIR}/${DISTNAME}/manedit -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES MAKE_ENV+= CPP="${CXX}" @@ -32,5 +32,5 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} manedit.xpm \ ${PREFIX}/share/manedit/icons -.include "../../x11/gtk/buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/euler/Makefile b/math/euler/Makefile index 36d76574981..5ee58bc2d59 100644 --- a/math/euler/Makefile +++ b/math/euler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/04 01:49:09 jtb Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/13 11:56:33 wiz Exp $ DISTNAME= euler-1.60.2 CATEGORIES= math @@ -11,7 +11,7 @@ COMMENT= Interactive numerical analysis and graphics program WRKSRC= ${WRKDIR}/euler-1.60/source MAKEFILE= makefile ALL_TARGET= euler -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined -.include "../../x11/gtk/buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile index 4ad4a9123c0..44d44e185e4 100644 --- a/misc/bidwatcher/Makefile +++ b/misc/bidwatcher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/10/12 15:32:15 tron Exp $ +# $NetBSD: Makefile,v 1.16 2002/10/13 12:00:30 wiz Exp $ DISTNAME= bidwatcher-1.3.5 CATEGORIES= misc @@ -13,6 +13,7 @@ HOMEPAGE= http://sourceforge.net/projects/bidwatcher/ COMMENT= eBay snipe tool GNU_CONFIGURE= YES +USE_BUILDLINK2= YES USE_GMAKE= YES AUTOMAKE_OVERRIDE= NO @@ -27,5 +28,5 @@ post-install: ${INSTALL_DATA_DIR} ${HTMLDIR} ${INSTALL_DATA} ${WRKSRC}/quick_start.html ${HTMLDIR} -.include "../../x11/gtk/buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mtoolsfm/Makefile b/sysutils/mtoolsfm/Makefile index a31d3dc418b..09e0a7d3706 100644 --- a/sysutils/mtoolsfm/Makefile +++ b/sysutils/mtoolsfm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/06/09 22:47:51 agc Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/13 11:57:36 wiz Exp $ # DISTNAME= MToolsFM-1.9-3 @@ -12,8 +12,9 @@ COMMENT= Easy MS-DOS disk access without learning MS-DOS commands DEPENDS+= mtools>=3.9.7:../../sysutils/mtools +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-conffile=${PREFIX}/etc/mtoolsfm.conf -.include "../../x11/gtk/buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3