Convert to buildlink3.

6 files changed, 38 insertions, 20 deletions

diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index 272bf3ad287..f623ff93525 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/26 21:50:24 bouyer Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/26 22:34:17 snj Exp $
 #
 
 DISTNAME=	gpsim-0.21.2
@@ -9,9 +9,9 @@ MAINTAINER=	snoonan@tbearsiberians.com
 HOMEPAGE=	http://www.dattalo.com/gnupic/gpsim.html
 COMMENT=	PIC emulator with X interface
 
-USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-exdbm=${BUILDLINK_PREFIX.eXdbm}
+USE_BUILDLINK3=	YES
+USE_LANGUAGES=	c c++
 
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
@@ -22,8 +22,8 @@ USE_GNU_READLINE=	# rl_callback_read_char, rl_copy_text,
 
 CONFLICTS=	eXdbm-[0-9]*
 
-.include "../../devel/popt/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../x11/gtk+extra/buildlink2.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk+extra/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gpsim/distinfo b/emulators/gpsim/distinfo
index d6770c0bc8e..f46e60d49af 100644
--- a/emulators/gpsim/distinfo
+++ b/emulators/gpsim/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/04/26 21:50:24 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2004/04/26 22:34:17 snj Exp $
 
 SHA1 (gpsim-0.21.2.tar.gz) = 9c16a1288f0c83923395d01e9749d56a087707f9
 Size (gpsim-0.21.2.tar.gz) = 721817 bytes
+SHA1 (patch-aa) = 3d548f5ed918f35384b3e813453d63b8adfceebc
diff --git a/emulators/gpsim/patches/patch-aa b/emulators/gpsim/patches/patch-aa
new file mode 100644
index 00000000000..1978d4470f6
--- /dev/null
+++ b/emulators/gpsim/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.3 2004/04/26 22:34:17 snj Exp $
+
+--- gui/Makefile.in.orig	2004-04-26 15:24:07.000000000 -0700
++++ gui/Makefile.in	2004-04-26 15:24:23.000000000 -0700
+@@ -116,9 +116,9 @@ libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_
+ 
+ pixmapdir = $(datadir)/gpsim
+ 
+-CFLAGS = @CFLAGS@ -D DATADIR=\"~/.gpsim/\"
+-CXXFLAGS = @CXXFLAGS@ -D DATADIR=\"~/.gpsim/\"
+-CPPFLAGS = @CPPFLAGS@ -D DATADIR=\"~/.gpsim/\"
++CFLAGS = @CFLAGS@ -DDATADIR=\"~/.gpsim/\"
++CXXFLAGS = @CXXFLAGS@ -DDATADIR=\"~/.gpsim/\"
++CPPFLAGS = @CPPFLAGS@ -DDATADIR=\"~/.gpsim/\"
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/misc/ooqstart/Makefile b/misc/ooqstart/Makefile
index 8f2d31bc7da..6852621a757 100644
--- a/misc/ooqstart/Makefile
+++ b/misc/ooqstart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/26 22:34:17 snj Exp $
 #
 
 DISTNAME=	ooqstart-0.8.3
@@ -13,7 +13,7 @@ COMMENT=	OpenOffice quickstart applet for GNOME
 
 DEPENDS+=	gnome-applets>=1.4.0:../../x11/gnome-applets
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_DIRS+=	xdg-1.1
 USE_GNU_TOOLS+=	make
 USE_X11BASE=	YES
@@ -32,6 +32,6 @@ do-install:
 		${PREFIX}/gnome/help/ooqstart_applet/C
 .endfor
 
-.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index e3f0f034c5e..f077af310a9 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/04/14 16:15:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.34 2004/04/26 22:34:17 snj Exp $
 
 DISTNAME=	gnapster-1.5.0
 PKGREVISION=	9
@@ -11,14 +11,14 @@ COMMENT=	Simple client for the online mp3 community
 
 BUILD_USES_MSGFMT=	YES
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index 0893ce667cd..c4fa944aaa7 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/26 22:34:17 snj Exp $
 #
 
 DISTNAME=	gtm-0.4.12
@@ -12,14 +12,14 @@ COMMENT=	Gnome Transfer Manager
 
 DEPENDS+=	wget-[0-9]*:../../net/wget
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"