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.

12 files changed, 24 insertions, 24 deletions

diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index 1b8e03ccdc0..ba53de61231 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.27 2003/09/28 09:13:57 jlam Exp $
 #
 
 DISTNAME=	angband-3.0.3
@@ -36,5 +36,5 @@ post-install:
 	${CHOWN} -R bin:games ${PREFIX}/share/games/angband
 	${FIND} ${PREFIX}/share/games/angband -name delete.me -exec ${RM} {} \;
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 57add819b48..ffc55ce3bb6 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		dopewars-1.5.9
 PKGREVISION=		2
@@ -30,5 +30,5 @@ USE_NCURSES=		# KEY_RESIZE
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 9fe44bddddd..9bc73db009b 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/28 09:13:57 jlam Exp $
 #
 
 DISTNAME=		freesci-0.3.4a
@@ -21,7 +21,7 @@ post-install:
 
 .include "../../devel/SDL/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 #.include "../../mk/motif.buildlink2.mk"
 #.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 30a0d8a2647..25f058d2d8d 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/28 09:13:57 jlam Exp $
 #
 
 DISTNAME=	frotz-2.43
@@ -31,6 +31,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY ${DOCDIR}
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 716bd71a0c3..6f1fe70534c 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.56 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		gnome-games-1.4.0.4
 PKGREVISION=		7
@@ -65,7 +65,7 @@ post-install:
 	${LN} -s same-gnome ${PREFIX}/share/gnome/help/samegnome
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 # Required for ports which don't build "libgtop".
 .include "../../lang/guile/buildlink2.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/games/gnome-games/buildlink2.mk b/games/gnome-games/buildlink2.mk
index de31903217c..c5518bde3ff 100644
--- a/games/gnome-games/buildlink2.mk
+++ b/games/gnome-games/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:57 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-games.
 #
@@ -20,7 +20,7 @@ BUILDLINK_FILES.gnome-games+=	lib/gnome-stones/objects/libgnomekoban.*
 BUILDLINK_FILES.gnome-games+=	lib/libgdkcardimage.*
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/guile14/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 31f500c18e4..b803a227e09 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		gnome-games-2.2.1
 PKGREVISION=		4
@@ -67,7 +67,7 @@ GCONF2_SCHEMAS+=	same-gnome.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 "../../mk/bsd.pkg.mk"
diff --git a/games/gnome2-games/buildlink2.mk b/games/gnome2-games/buildlink2.mk
index a756429d9a1..e7868c206a4 100644
--- a/games/gnome2-games/buildlink2.mk
+++ b/games/gnome2-games/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:57 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-games.
 #
@@ -20,7 +20,7 @@ BUILDLINK_FILES.gnome-games+=	lib/gnome-stones/objects/libgnomekoban.*
 BUILDLINK_FILES.gnome-games+=	lib/libgdkcardimage.*
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/guile14/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 
diff --git a/games/level9/Makefile b/games/level9/Makefile
index 95ecd658376..d84236ec661 100644
--- a/games/level9/Makefile
+++ b/games/level9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/28 09:13:57 jlam Exp $
 #
 
 DISTNAME=		Level9_3.0_Source
@@ -24,5 +24,5 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/level9.txt ${PREFIX}/share/doc/level9
 	${INSTALL_PROGRAM} ${WRKSRC}/level9 ${PREFIX}/bin
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/omega/Makefile b/games/omega/Makefile
index 5bdbfe6cd8a..42965b3a9c0 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=	omega-0.90-pa4
 PKGNAME=	omega-0.90.4
@@ -37,5 +37,5 @@ post-install:
 		${INSTALL_DATA} $${file} ${PREFIX}/share/doc/omega;	\
 	done
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pag/Makefile b/games/pag/Makefile
index 25601efb4ac..bda61301445 100644
--- a/games/pag/Makefile
+++ b/games/pag/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 $
 #
 
 DISTNAME=	pag-0.91
@@ -16,6 +16,6 @@ USE_NCURSES=	yes # missing function stdscr
 
 ALL_TARGET=	compile
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/aalib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/vms-empire/Makefile b/games/vms-empire/Makefile
index ad53136f3e2..09bb00a5cc0 100644
--- a/games/vms-empire/Makefile
+++ b/games/vms-empire/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 $
 #
 
 DISTNAME=	vms-empire-1.4
@@ -16,5 +16,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vms-empire ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/vms-empire.6 ${PREFIX}/man/man6/vms-empire.6
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"