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.

9 files changed, 18 insertions, 18 deletions

diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index f7798e03404..516bc5a37de 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/28 09:13:58 jlam Exp $
 
 DISTNAME=       dialog-0.6z
 PKGREVISION=	2
@@ -27,5 +27,5 @@ post-install:
 		${INSTALL_SCRIPT} $${file} ${EGDIR};			\
 	done
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 590ed568e7d..7d840ad990d 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.65 2003/09/28 09:13:58 jlam Exp $
 
 DISTNAME=		gnome-utils-1.4.1.2
 PKGREVISION=		4
@@ -33,7 +33,7 @@ CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 .include "../../devel/gnome-objc/buildlink2.mk"
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../devel/libgtop/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 #.include "../../lang/guile14/buildlink2.mk"	# XXX: req. guile1[46] fix first
 .include "../../www/gtkhtml/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 8451134c364..670771a89d3 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=		gnome-utils-2.2.1
@@ -32,7 +32,7 @@ GCONF2_SCHEMAS+=	gdict.schemas
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libgnome/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/guile/buildlink2.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-panel/buildlink2.mk"
diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index 6e73449fecd..146b9670c47 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=		iselect-1.2.0
@@ -16,5 +16,5 @@ GNU_CONFIGURE=		# defined
 post-configure:
 	touch ${WRKSRC}/config_ac.h.in
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile
index 67aff1b876b..2ab9a531d57 100644
--- a/misc/multitail/Makefile
+++ b/misc/multitail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	multitail-2.4
@@ -17,5 +17,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/multitail ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/multitail.1 ${PREFIX}/man/man1/
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 742b3bfbe47..d3b34098273 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=		pinfo-0.6.1
@@ -34,7 +34,7 @@ post-install:
 .if defined(PINFO_USE_NATIVE_CURSES) && ${PINFO_USE_NATIVE_CURSES} == "YES"
 CONFIGURE_ARGS+=	--with-vcurses
 .else
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-ncurses=${BUILDLINK_PREFIX.ncurses}
 .endif
 
diff --git a/misc/reed/Makefile b/misc/reed/Makefile
index 50429f5ea2a..83eb1ca019a 100644
--- a/misc/reed/Makefile
+++ b/misc/reed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/28 09:13:58 jlam Exp $
 
 DISTNAME=	reed-5.4
 PKGREVISION=	1
@@ -29,5 +29,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/reed
 	${INSTALL_DATA} ${WRKSRC}/help ${PREFIX}/share/reed/
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 1e07c049660..7c8017a65d5 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.38 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=       siag-3.5.7
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=--with-xawm=neXtaw
 CONFIGURE_ARGS+=--with-xawm=Xaw
 .endif
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/guile14/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../x11/mowitz/buildlink2.mk"
diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile
index 07b12ab6463..9707ac62f91 100644
--- a/misc/vfu/Makefile
+++ b/misc/vfu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.33 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	vfu-3.04
@@ -36,6 +36,6 @@ post-install:
 	cd ${WRKSRC};							\
 	${INSTALL_DATA} ${WRKSRC}/vfu.conf ${EGDIR}/vfu.conf
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"