Back out last change related to moving ncurses/buildlink2.mk to

curses.buildlink2.mk.  This was wrong because we _really_ do want to
express that we want _n_curses when we include the buildlink2.mk file.

We should have a better way to say that the NetBSD curses doesn't
quite work well enough.  In fact, it's far better to depend on ncurses
by default, and exceptionally note when it's okay to use NetBSD curses
for specific packages.  We will look into this again in the future.

16 files changed, 32 insertions, 32 deletions

diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index c2f9f52c2a3..159693f78ae 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=	bvi-1.3.0.src
@@ -16,5 +16,5 @@ USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 MAKE_ENV+=	SHELL=${SH}
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile
index 86f898265ab..b62b068fc96 100644
--- a/editors/ce-x11/Makefile
+++ b/editors/ce-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/28 09:13:56 jlam Exp $
 #
 
 .include "../ce/Makefile.common"
@@ -13,5 +13,5 @@ USE_X11=		# defined
 ALL_TARGET=		xce
 INSTALL_TARGET=		install-x11 man-install-x11
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ce/Makefile b/editors/ce/Makefile
index 9a057869026..40e34304b2d 100644
--- a/editors/ce/Makefile
+++ b/editors/ce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/28 09:13:56 jlam Exp $
 #
 
 .include "Makefile.common"
@@ -11,5 +11,5 @@ USE_BUILDLINK2=		# defined
 ALL_TARGET=		ce
 INSTALL_TARGET=		install man-install
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 56c14571acd..032e88d8007 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=	hexedit-1.2.2
@@ -21,5 +21,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hexedit
 .endfor
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index 6a276649931..cf70a4dad9c 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=	hnb-1.8.1
@@ -16,6 +16,6 @@ GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/mined/Makefile b/editors/mined/Makefile
index fcb96044cc4..85694763bc1 100644
--- a/editors/mined/Makefile
+++ b/editors/mined/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=	mined-2000.7
@@ -15,5 +15,5 @@ USE_BUILDLINK2=	yes
 
 MAKEFILE=	makefile.bsd
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index e3fb6b8b95c..91ff37be73c 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:56 jlam Exp $
 
 DISTNAME=	nano-1.0.9
 PKGREVISION=	1
@@ -16,5 +16,5 @@ USE_PKGLOCALEDIR=	yes
 INFO_FILES=	nano.info
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index bffc8171ba9..07617522b61 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.47 2003/09/28 09:13:56 jlam Exp $
 
 DISTNAME=	pine4.58
 PKGNAME=	pico-4.6
@@ -47,5 +47,5 @@ do-install:
 	cd ${WRKSRC}/pico && \
 	${INSTALL_DATA} *.h ${PREFIX}/include/pico
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 09a9c2e0833..58c6b80e5c9 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.35 2003/09/28 09:13:56 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp
 
 DISTNAME=		vile-9.4
@@ -37,6 +37,6 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR};		\
 	done
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index d17748fe45e..51cb9a5d88d 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.39 2003/09/28 09:13:56 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -28,7 +28,7 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index cc6eda348b8..6a6f2253d84 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:57 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -28,7 +28,7 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index 089ff0864ac..845013f57fc 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=	kvim-${KVIM_VERSION}
 PKGNAME=	vim-kde-${KVIM_VERSION}
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--with-tlib=ncurses
 post-configure:
 	${TOUCH} ${WRKSRC}/auto/configure ${WRKSRC}/auto/config.mk
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index c93b138561c..bde96131a9b 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/28 09:13:57 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -28,7 +28,7 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/motif.buildlink2.mk"
 
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index fe04362d446..c3a75413cf2 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.28 2003/09/28 09:13:57 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -37,7 +37,7 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/xaw.buildlink2.mk"
 
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 1e707cb5175..96bc87b7df3 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.49 2003/09/28 09:13:56 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -24,5 +24,5 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;			\
 	done
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 4ea917c5703..5a7416c0d16 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		zile-1.6.2
 PKGREVISION=		1
@@ -15,5 +15,5 @@ USE_BUILDLINK2= 	yes
 USE_MAKEINFO=		YES
 INFO_FILES=		zile.info
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"