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.

5 files changed, 10 insertions, 10 deletions

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 1585482a94f..9fa115429f6 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.25 2003/09/28 09:13:58 jlam Exp $
 
 DISTNAME=		apcupsd-3.8.6
 PKGREVISION=		1
@@ -23,7 +23,7 @@ PKG_SYSCONFSUBDIR= apcupsd
 # which has a curses interface
 #
 #CONFIGURE_ARGS+=	--enable-http		# include http support
-#.include "../../mk/curses.buildlink2.mk"
+#.include "../../devel/ncurses/buildlink2.mk"
 #CONFIGURE_ARGS+=	--enable-threads	# compile threading code
 #CONFIGURE_ARGS+=	--enable-powerflute	# compile powerflute program
 
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 79825b41d40..cd5041d0602 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	grub-0.93
@@ -42,5 +42,5 @@ CONFIGURE_ARGS+=	${GRUB_SCAN_ARGS}
 .endif
 
 .include "../../devel/binutils/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index b0b8f6f27ca..3d5c0853ff8 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	vifm-0.1
@@ -23,6 +23,6 @@ pre-configure:
 		${WRKSRC}/src/vifmrc0.1 > ${WRKSRC}/src/vifmrc0.1.new && \
 		${MV} ${WRKSRC}/src/vifmrc0.1.new ${WRKSRC}/src/vifmrc0.1
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
index c1145833c7c..c5e2c51db1e 100644
--- a/sysutils/whowatch/Makefile
+++ b/sysutils/whowatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	whowatch-1.4
@@ -14,5 +14,5 @@ COMMENT=	Interactive who-like program displaying real-time user information
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wtail/Makefile b/sysutils/wtail/Makefile
index ed53a74071b..57ae0513744 100644
--- a/sysutils/wtail/Makefile
+++ b/sysutils/wtail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/28 09:13:59 jlam Exp $
 #
 
 DISTNAME=	wtail-0.2.2
@@ -14,5 +14,5 @@ USE_BUILDLINK2=	YES
 
 MAKE_ENV+=	SED="${SED}"
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"