buildlink1 -> buildlink2

3 files changed, 16 insertions, 26 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 4957972d416..80844f68e57 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/07/16 12:17:12 agc Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/21 08:33:48 jlam Exp $
 #
 
 DISTNAME=		anjuta-0.1.9
@@ -14,18 +14,21 @@ DEPENDS+=               pkgconfig>=0.8.0:../../devel/pkgconfig
 DEPENDS+=		xml-i18n-tools>=0.9:../../textproc/xml-i18n-tools
 
 BUILD_USES_MSGFMT=	YES
-GNU_CONFIGURE=		YES
+
+USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=        --localstatedir=${LOCALSTATEDIR}
+
 LOCALSTATEDIR=          ${X11PREFIX}/var/gnome
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../sysutils/gnome-vfs/buildlink.mk"
-.include "../../textproc/libxml/buildlink.mk"
-.include "../../textproc/scrollkeeper/buildlink.mk"
-.include "../../x11/gnome-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../sysutils/gnome-vfs/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index a7a1a75e982..5166234268b 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/04/23 02:08:52 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2002/09/21 08:42:10 jlam Exp $
 #
 
 DISTNAME=	ddd-3.3
@@ -9,7 +9,7 @@ MAINTAINER=     frueauf@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/ddd/
 COMMENT=	Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
@@ -47,8 +47,8 @@ post-install:
 test:
 	(cd ${WRKSRC} ; ${MAKE_PROGRAM} check)
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ddd/patches/patch-ab b/devel/ddd/patches/patch-ab
deleted file mode 100644
index c4614129548..00000000000
--- a/devel/ddd/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/07/03 20:00:26 jlam Exp $
-
---- readline/Makefile.in.orig	Mon May 29 13:35:42 2000
-+++ readline/Makefile.in
-@@ -61,7 +61,7 @@
- LOCAL_DEFS = @LOCAL_DEFS@
- 
- # For libraries which include headers from other libraries.
--INCLUDES = -I. -I$(srcdir) -I$(includedir)
-+INCLUDES = -I. -I$(srcdir)
- 
- CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(CPPFLAGS) $(INCLUDES) $(LOCAL_CFLAGS) $(CFLAGS)
-