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.

7 files changed, 14 insertions, 14 deletions

diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index 0a446b2a8ae..a7688438d91 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=	ircii-pana-1.0c19
@@ -38,7 +38,7 @@ post-patch:
 		${WRKSRC}/doc/BitchX.1.orig > ${WRKSRC}/doc/BitchX.1
 
 .include "../../archivers/bzip2/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index f47d83cfc24..dacbda193df 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.31 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=	centericq-4.9.6
@@ -40,7 +40,7 @@ CPPFLAGS+=		-DAUDIO_PLAYER=\"\\\"${SOX_PREFIX}/bin/play\\\"\"
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index b3993a60b33..f8b8bd7a891 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=	ekg-1.3
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=--without-debug
 CONFIGURE_ARGS+=--with-pthread
 .endif
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
diff --git a/chat/ekg/buildlink2.mk b/chat/ekg/buildlink2.mk
index 32f0c0c18a0..5bc3063dec3 100644
--- a/chat/ekg/buildlink2.mk
+++ b/chat/ekg/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/09/28 09:13:56 jlam Exp $
 
 .if !defined(EKG_BUILDLINK2_MK)
 EKG_BUILDLINK2_MK=	# defined
@@ -12,7 +12,7 @@ BUILDLINK_PREFIX.ekg_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.ekg=	include/libgadu*.h
 BUILDLINK_FILES.ekg+=	lib/libgadu.*
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
diff --git a/chat/licq-gui-console/Makefile b/chat/licq-gui-console/Makefile
index c423e9a9777..19fcd844ae6 100644
--- a/chat/licq-gui-console/Makefile
+++ b/chat/licq-gui-console/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=	licq-1.2.6
@@ -20,6 +20,6 @@ WRKSRC=		${WRKDIR:=/${DISTNAME}/plugins/console}
 
 INCOMPAT_CURSES=	NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/naim/Makefile b/chat/naim/Makefile
index b481bfcbdf4..13bf3db25d9 100644
--- a/chat/naim/Makefile
+++ b/chat/naim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.24 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=	naim-0.11.6.1
@@ -17,6 +17,6 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_NCURSES=		# assertion "COLOR_PAIRS >= (COLORS*COLORS)" failed: file "./win.c", line 250, function "wsetup_colors"
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/tirc/Makefile b/chat/tirc/Makefile
index bc0f414eafa..289c13c6415 100644
--- a/chat/tirc/Makefile
+++ b/chat/tirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=	tirc-1.2
@@ -30,5 +30,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tirc
 	${INSTALL_DATA} ${WRKSRC}/dot.tircrc ${PREFIX}/share/tirc/tircrc
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"