7 files changed, 28 insertions, 26 deletions
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 51cb9a5d88d..36b2769de76 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2004/04/25 01:46:11 snj Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -28,8 +28,8 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index c544e7770e9..3352cc391e3 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/25 01:46:11 snj Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -28,8 +28,8 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index bde96131a9b..c16efe8da26 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/25 01:46:11 snj Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -28,8 +28,8 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/motif.buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index ce3c9c6162c..31ac71925aa 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2004/01/20 12:14:06 agc Exp $
+# $NetBSD: Makefile.common,v 1.36 2004/04/25 01:46:11 snj Exp $
 
 VIM_VERSION=		6.2
 VIM_PATCHLEVEL=		0
@@ -23,7 +23,7 @@ HOMEPAGE=		http://www.vim.org/
 CONFLICTS+=		vim-kde-[0-9]*
 
 WRKSRC=			${WRKDIR}/vim62/src
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
 # See "configure --help" extra options. These might affect the installed
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index c3a75413cf2..09c572a85ad 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/25 01:46:11 snj Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -27,6 +27,8 @@ XAW_TYPE=		standard
 MAKE_ENV+=		XAW_LIB="Xaw"
 .endif
 
+LIBS+=			-lXaw
+
 post-install:
 	for f in gvim.1 gview.1 rgvim.1 rgview.1; do			\
 		${RM} -f ${PREFIX}/man/man1/$$f;			\
@@ -37,8 +39,8 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/xaw.buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 3feed4a1941..979bf57d9e1 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/12/14 10:14:28 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2004/04/25 01:46:11 snj Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -25,6 +25,6 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;			\
 	done
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 3219b4bbfa9..5ebccdb2f1b 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/25 01:52:25 snj Exp $
 #
 
 DISTNAME=	gpaint-0.2
@@ -10,14 +10,14 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://gpaint.sourceforge.net/
 COMMENT=	Simple, easy-to-use paint program for GNOME
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_GNU_GETTEXT=	YES
 USE_X11BASE=		YES
 
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
-.include "../../print/gnome-print/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
+.include "../../print/gnome-print/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"