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.

8 files changed, 16 insertions, 16 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index e8efc2f7067..825548855ff 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		otp_src_R9C-0
 PKGNAME=		erlang-9.2
@@ -20,7 +20,7 @@ USE_JAVA=		yes
 USE_JAVA2=		yes
 
 .include "../../security/openssl/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/java-vm.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index ff441fed05c..d6665463aed 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.46 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		guile-1.6.3
 #PKGREVISION=		1
@@ -27,6 +27,6 @@ USE_MAKEINFO=		YES
 INFO_FILES=		guile.info guile-tut.info goops.info r5rs.info
 
 .include "../../devel/libtool/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index 125c9dff2f3..8b702b5d3d6 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		guile-1.4.1
 PKGNAME=		guile14-1.4.1
@@ -29,7 +29,7 @@ INFO_FILES=		guile.info
 CFLAGS+=		${PTHREAD_CFLAGS}
 
 .include "../../devel/libtool/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 4eb368c927e..d1008a7d58c 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/27 17:07:36 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		mercury-compiler-0.11.0
 PKGNAME=		mercury-0.11.0
@@ -38,5 +38,5 @@ do-install:
 	cd ${WRKSRC}/samples && ${PAX} -rw . ${PREFIX}/share/examples/mercury
 
 .include "../../devel/readline/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 95951d177ed..c104c2cd62f 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		nhc98src-1.16
 PKGNAME=		nhc98-1.16
@@ -35,5 +35,5 @@ PLIST_SUBST+=		HARCH=${HARCH}
 post-extract:
 	@${FIND} ${WRKSRC}/docs -type d -name \*CVS\* | ${XARGS} ${RM} -rf
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index 3560e807c4e..628a1339c53 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/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:57 jlam Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -104,5 +104,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^(doc|ext)\///}
 .endfor
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index cadbc45b39a..1cdba144347 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.24 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		pl-lite-5.0.10
 PKGNAME=		swi-prolog-5.0.10
@@ -33,6 +33,6 @@ PLIST_SUBST+=		BITS=64
 PLIST_SUBST+=		BITS=32
 .endif
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile
index 801cba98afa..7bbeb81e9d5 100644
--- a/lang/yabasic/Makefile
+++ b/lang/yabasic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:57 jlam Exp $
 
 DISTNAME=		yabasic-2.722
 PKGREVISION=		1
@@ -18,5 +18,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/yabasic.htm \
 		${PREFIX}/share/doc/html/yabasic
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"