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.

10 files changed, 20 insertions, 20 deletions

diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index aa81800320e..49a5835b594 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:55 jlam Exp $
 
 DISTNAME=	aumix-2.8
 PKGREVISION=	2
@@ -24,6 +24,6 @@ CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--without-gtk1
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 44ea6fe9c83..875f8e18a9a 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=	cmp3-2.0pre5
@@ -25,5 +25,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3
 	${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/emixer/Makefile b/audio/emixer/Makefile
index bee9c1585f6..2a6f9b0cd5b 100644
--- a/audio/emixer/Makefile
+++ b/audio/emixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=	emixer-0.05.5
@@ -18,5 +18,5 @@ USE_BUILDLINK2=	YES
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index be1e6fc1406..9e2b8ec650b 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:55 jlam Exp $
 
 DISTNAME=	mp3info-0.8.4
 PKGNAME=	g${DISTNAME}
@@ -20,7 +20,7 @@ USE_X11=		YES
 # wgetnstr()
 INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
index e16ca5b487f..168067d0d72 100644
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=	juke-0.7
@@ -34,5 +34,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/juke.conf ${EGDIR}/juke.conf.default
 	${INSTALL_DATA} ${WRKSRC}/MANUAL ${PREFIX}/share/doc/juke/
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 5052f28ad3a..4d4885a1f79 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.30 2003/09/28 09:13:55 jlam Exp $
 #
 
 VERS=		3.93.1
@@ -41,5 +41,5 @@ CFLAGS+=	-O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \
 		-finline-functions -DFLOAT=double
 .endif
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 7fd21c83116..950f1ceabbe 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.31 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=	mikmod-3.1.6-a
@@ -16,5 +16,5 @@ GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 
 .include "../../audio/libmikmod/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index d5d8cde581f..e596f3c9d98 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:55 jlam Exp $
 
 DISTNAME=	mp3blaster-3.1.3
 PKGREVISION=	3
@@ -26,6 +26,6 @@ CONFIGURE_ARGS+=	--enable-newthreads
 .endif
 
 .include "../../audio/libvorbis/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 82a5d087409..588972dbeba 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.42 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=	TiMidity++-2.11.3
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=--enable-vt100 --enable-audio=sun,vorbis --disable-debug \
 USE_BUILDLINK2=	yes
 
 .include "../../audio/libvorbis/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/xaw.buildlink2.mk"
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index bb77c85f866..7212e2a80be 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.44 2003/09/28 09:13:55 jlam Exp $
 
 DISTNAME=	xmcd-3.0.2
 PKGREVISION=    3
@@ -55,7 +55,7 @@ post-install:
 		done;							\
 	fi
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/motif.buildlink2.mk"