buildlink1 -> buildlink2. This should fix pkg/15160 by Brad Forschinger

<bnjf@optushome.com.au>.

5 files changed, 17 insertions, 20 deletions

diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 9a09ed4481d..3b799e95373 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/03/24 19:38:54 martti Exp $
+# $NetBSD: Makefile,v 1.32 2002/09/14 00:10:46 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -9,8 +9,7 @@ COMMENT=		Vim editor (vi clone) with X11 GTK+ GUI
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-xaw-[0-9]*
 
-USE_BUILDLINK_ONLY=	yes
-
+USE_X11=		yes
 CONFIGURE_ARGS+=	--enable-gui=gtk
 CONFIGURE_ARGS+=	--with-tlib=ncurses
 
@@ -27,8 +26,8 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../devel/ncurses/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 4c17b90860a..98c817a6660 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2002/03/25 08:04:02 martti Exp $
+# $NetBSD: Makefile.common,v 1.29 2002/09/14 00:10:46 jlam Exp $
 
 VIM_VERSION=		6.1
 VIM_PATCHLEVEL=		0
@@ -20,6 +20,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		martti@netbsd.org
 HOMEPAGE=		http://www.vim.org/
 
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 WRKSRC=			${WRKDIR}/vim61/src
 
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index e0f958f37a5..16827f0d702 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.24 2002/03/24 19:39:09 martti Exp $
+$NetBSD: distinfo,v 1.25 2002/09/14 00:10:46 jlam Exp $
 
 SHA1 (vim/vim-6.1.tar.bz2) = 110629d4072c1e2e64a4baef7aaa15ebe726b02c
 Size (vim/vim-6.1.tar.bz2) = 2890049 bytes
-SHA1 (patch-aa) = 1c824f222a05c858dd4619d122364de35338e9ae
 SHA1 (patch-ad) = c4be7ae53ee6308b3d3077320f4de7a7a5ad3c32
 SHA1 (patch-zb) = 41f58d90a14f47b0bf242bb90178f0c872e4b022
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index d7827916b03..7f0334d0c6a 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/03/24 19:39:19 martti Exp $
+# $NetBSD: Makefile,v 1.22 2002/09/14 00:10:46 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -9,7 +9,7 @@ COMMENT=		Vim editor (vi clone) with X11 Athena GUI
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]*
 
-USE_BUILDLINK_ONLY=	yes
+USE_X11=		yes
 CONFIGURE_ARGS+=	--enable-gui=athena
 CONFIGURE_ARGS+=	--with-tlib=ncurses
 
@@ -35,8 +35,8 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../devel/ncurses/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/xaw.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/xaw.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index b0b8697e71f..b7d7cf92589 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2002/03/24 19:38:25 martti Exp $
+# $NetBSD: Makefile,v 1.43 2002/09/14 00:10:45 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -10,8 +10,6 @@ DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
 
 CONFLICTS+=		vim-xaw-[0-9]* vim-gtk-[0-9]*
 
-USE_BUILDLINK_ONLY=	# defined
-
 CONFIGURE_ARGS+=	--enable-gui=no --without-x
 CONFIGURE_ARGS+=	--with-tlib=ncurses
 
@@ -24,5 +22,5 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;			\
 	done
 
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"