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/net/chrony/Makefile b/net/chrony/Makefile
index ab2caf55d69..ba417ed3d78 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/28 09:13:58 jlam Exp $
 
 DISTNAME=	chrony-1.17
 PKGREVISION=	1
@@ -33,5 +33,5 @@ post-install:
 	done
 
 .include "../../devel/readline/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 172b3bb483d..2606c9a5365 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/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=		ettercap-0.6.9
 PKGREVISION=		3
@@ -22,6 +22,6 @@ MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 BUILD_DIRS=		${WRKSRC} ${WRKSRC}/plugins
 INSTALL_DIRS=		${WRKSRC} ${WRKSRC}/plugins
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index e33588e6778..531cab47163 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	mtr-0.54
@@ -23,7 +23,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8/mtr-gtk.8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr-gtk
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 3cc8a9f747a..d92bf33ec51 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.32 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	mtr-0.54
@@ -22,5 +22,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/nap/Makefile b/net/nap/Makefile
index bd4f7710239..4434ac24304 100644
--- a/net/nap/Makefile
+++ b/net/nap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/28 09:13:58 jlam Exp $
 
 DISTNAME=	nap-1.4.4
 PKGREVISION=	1
@@ -22,5 +22,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/nap.conf.dist \
 		${PREFIX}/share/examples/nap/nap.conf
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ncftp3/Makefile b/net/ncftp3/Makefile
index c27e2f278ad..bb90bb230d0 100644
--- a/net/ncftp3/Makefile
+++ b/net/ncftp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/27 22:57:32 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:58 jlam Exp $
 
 DISTNAME=	ncftp-3.1.6-src
 PKGNAME=	ncftp3-3.1.6
@@ -18,5 +18,5 @@ post-patch:
 	@${SED} -e "s:/etc/ncftp.firewall:${PREFIX}/etc/ncftp.firewall:" \
 		< ${WRKSRC}/ncftp/pref.h.in > ${WRKSRC}/ncftp/pref.h
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 0020a18ef17..0eb65a49974 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.27 2003/09/28 09:13:58 jlam Exp $
 
 DISTNAME=		ntop-1.1
 PKGREVISION=		2
@@ -17,6 +17,6 @@ CONFIGURE_ARGS+=	--enable-threads=no
 INSTALL_TARGET=		install install-man
 
 .include "../../net/libpcap/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/scli/Makefile b/net/scli/Makefile
index b28babe87dd..8f17158217b 100644
--- a/net/scli/Makefile
+++ b/net/scli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=		scli-0.2.12
@@ -31,5 +31,5 @@ LDFLAGS+=		-L${BUILDLINK_PREFIX.${_p_}}/lib
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/slurm/Makefile b/net/slurm/Makefile
index ea5f457d520..54bf529a006 100644
--- a/net/slurm/Makefile
+++ b/net/slurm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	slurm-0.2.1
@@ -19,5 +19,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/slurm ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/man/man1
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index c25007f6d08..a14046a6bc8 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=		sniffit.0.3.5
@@ -23,5 +23,5 @@ do-install:
 	${INSTALL_MAN}     ${WRKSRC}/sniffit.5 ${PREFIX}/man/man5
 	${INSTALL_MAN}     ${WRKSRC}/sniffit.8 ${PREFIX}/man/man8
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index e39d8171152..714e91d28d9 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	tn5250-0.12.51
@@ -13,5 +13,5 @@ COMMENT=	Implementation of the IBM 5250 telnet protocol
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wap-utils/Makefile b/net/wap-utils/Makefile
index 1576ac3a1bc..a675311ca00 100644
--- a/net/wap-utils/Makefile
+++ b/net/wap-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:38 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:58 jlam Exp $
 #
 
 DISTNAME=	ap-utils-1.3.2
@@ -17,5 +17,5 @@ USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_NCURSES=		# redrawwin()
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"