move ncurses/buildlink2.mk to mk/curses.buildlink2.mk, as it provides

support for base system curses/ncurses as well as ncurses itself.

suggested by wiz.

14 files changed, 26 insertions, 144 deletions

diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index d265c822065..405c18aac28 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/13 13:51:03 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/09/27 17:07:35 grant Exp $
 #
 
 DISTNAME=		latestCDK
@@ -30,6 +30,6 @@ post-install:
 		${INSTALL_DATA} $${file} ${PREFIX}/share/examples/cdk/; \
 	done
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
index 084be9e136c..3173d706d12 100644
--- a/devel/cdk/buildlink2.mk
+++ b/devel/cdk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:51:04 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:35 grant Exp $
 
 .if !defined(CDK_BUILDLINK2_MK)
 CDK_BUILDLINK2_MK=     # defined
@@ -25,7 +25,7 @@ BUILDLINK_PREFIX.cdk=		/usr
 BUILDLINK_FILES.cdk=	include/cdk/*.h
 BUILDLINK_FILES.cdk+=	lib/libcdk.*
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 
 BUILDLINK_TARGETS+=	cdk-buildlink
 
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 8069f107c6e..df188966607 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:43:17 martti Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/27 17:07:35 grant Exp $
 #
 
 DISTNAME=	cmake-1.6.6
@@ -20,5 +20,5 @@ post-patch:
 	${SED} 's;@prefix@;${PREFIX};g' ${WRKSRC}/Modules/FindCurses.cmake.bak > \
 		${WRKSRC}/Modules/FindCurses.cmake
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index db747931967..55030de5873 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:29:57 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:35 grant Exp $
 #
 
 DISTNAME=	coconut-0.3.0
@@ -27,7 +27,7 @@ pre-configure:
 .include "../../graphics/gtkglext/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../devel/papaya/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../net/gnet1/buildlink2.mk"
diff --git a/devel/coconut/buildlink2.mk b/devel/coconut/buildlink2.mk
index 6975e7b2836..de6d7527ade 100644
--- a/devel/coconut/buildlink2.mk
+++ b/devel/coconut/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:51:05 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/09/27 17:07:35 grant Exp $
 #
 # This Makefile fragment is included by packages that use coconut.
 #
@@ -26,7 +26,7 @@ BUILDLINK_FILES.coconut+=	lib/libcoconut_gtk.*
 .include "../../graphics/gtkglext/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../devel/papaya/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../net/gnet1/buildlink2.mk"
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index a4d3ae10434..24157e02c62 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/08/02 18:17:44 kristerw Exp $
+# $NetBSD: Makefile,v 1.28 2003/09/27 17:07:35 grant Exp $
 #
 
 DISTNAME=	cscope-15.4
@@ -27,5 +27,5 @@ LEX=			${LOCALBASE}/bin/flex
 
 CONFIGURE_ENV+=		LEX=${LEX}
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 2f4ccb442ca..00803b7572e 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2003/07/17 21:31:40 grant Exp $
+# $NetBSD: Makefile,v 1.44 2003/09/27 17:07:35 grant Exp $
 #
 
 DISTNAME=	slang-1.4.9
@@ -39,7 +39,7 @@ post-patch:
 		${WRKSRC}/src/Makefile.in.tmp &&		\
 		${MV} ${WRKSRC}/src/Makefile.in.tmp ${WRKSRC}/src/Makefile.in
 
-. include "../../devel/ncurses/buildlink2.mk"
+. include "../../mk/curses.buildlink2.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk
deleted file mode 100644
index 5e8700a23d9..00000000000
--- a/devel/ncurses/buildlink2.mk
+++ /dev/null
@@ -1,118 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.11 2003/09/27 10:27:39 grant Exp $
-#
-# Optionally define:
-#
-# USE_NCURSES		force use of ncurses
-# INCOMPAT_CURSES	specify MACHINE_PLATFORM versions that are missing
-#			some needed functions.
-
-.if !defined(NCURSES_BUILDLINK2_MK)
-NCURSES_BUILDLINK2_MK=	# defined
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_DEPENDS.ncurses?=	ncurses>=5.3nb1
-BUILDLINK_PKGSRCDIR.ncurses?=	../../devel/ncurses
-
-.if defined(USE_NCURSES)
-_NEED_NCURSES=		YES
-.else
-_NEED_NCURSES=		NO
-
-#                
-# Handle the base system not having (n)curses.
-#
-.  if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h))
-_NEED_NCURSES=		YES
-.  endif
-#
-# These versions of NetBSD didn't have a curses library that was capable of
-# replacing ncurses.
-#
-_INCOMPAT_CURSES=	NetBSD-0.*-* NetBSD-1.[0123]*-*
-_INCOMPAT_CURSES+=	NetBSD-1.4.*-* NetBSD-1.4[A-X]-*
-#
-# This catch-all for SunOS is probably too broad, but better to err on
-# the safe side.  We can narrow down the match when we have better
-# information.
-#
-_INCOMPAT_CURSES+=	SunOS-*-*
-#
-# Similarly for IRIX and Darwin
-#
-_INCOMPAT_CURSES+=	IRIX-*-*
-_INCOMPAT_CURSES+=	Darwin-*-* 
-INCOMPAT_CURSES?=	# empty
-.  for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
-.    if !empty(MACHINE_PLATFORM:M${_pattern_})
-_NEED_NCURSES=		YES
-.    endif
-.  endfor
-.endif
-
-.if ${_NEED_NCURSES} == "YES"
-BUILDLINK_PACKAGES+=		ncurses
-EVAL_PREFIX+=			BUILDLINK_PREFIX.ncurses=ncurses
-BUILDLINK_PREFIX.ncurses_DEFAULT= ${LOCALBASE}
-.else
-BUILDLINK_PREFIX.ncurses=	/usr
-.endif
-
-BUILDLINK_FILES.ncurses+=	include/curses.h
-BUILDLINK_FILES.ncurses+=	include/cursesapp.h
-BUILDLINK_FILES.ncurses+=	include/cursesf.h
-BUILDLINK_FILES.ncurses+=	include/cursesm.h
-BUILDLINK_FILES.ncurses+=	include/cursesp.h
-BUILDLINK_FILES.ncurses+=	include/cursesw.h
-BUILDLINK_FILES.ncurses+=	include/cursslk.h
-BUILDLINK_FILES.ncurses+=	include/eti.h
-BUILDLINK_FILES.ncurses+=	include/etip.h
-BUILDLINK_FILES.ncurses+=	include/form.h
-BUILDLINK_FILES.ncurses+=	include/menu.h
-BUILDLINK_FILES.ncurses+=	include/ncurses.h
-BUILDLINK_FILES.ncurses+=	include/ncurses_dll.h
-BUILDLINK_FILES.ncurses+=	include/panel.h
-BUILDLINK_FILES.ncurses+=	include/term.h
-BUILDLINK_FILES.ncurses+=	include/termcap.h
-BUILDLINK_FILES.ncurses+=	include/unctrl.h
-BUILDLINK_FILES.ncurses+=	lib/libform.*
-BUILDLINK_FILES.ncurses+=	lib/libmenu.*
-BUILDLINK_FILES.ncurses+=	lib/libncurses++.*
-BUILDLINK_FILES.ncurses+=	lib/libncurses.*
-BUILDLINK_FILES.ncurses+=	lib/libpanel.*
-
-.if ${_NEED_NCURSES} == "NO"
-_BLNK_LIBNCURSES_LIST!=		${ECHO} /usr/lib/libncurses.*
-.  if ${_BLNK_LIBNCURSES_LIST} == "/usr/lib/libncurses.*"
-BUILDLINK_FILES.ncurses+=	lib/libcurses.*
-BUILDLINK_TRANSFORM.ncurses+=	-e "s|/curses.h|/ncurses.h|g"
-BUILDLINK_TRANSFORM+=		l:ncurses:curses
-.  endif
-.endif
-
-BUILDLINK_TARGETS+=	ncurses-buildlink
-BUILDLINK_TARGETS+=	ncurses-curses-h
-BUILDLINK_TARGETS+=	ncurses-extra-includes-buildlink
-
-ncurses-buildlink: _BUILDLINK_USE
-
-ncurses-extra-includes-buildlink:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	extra_includes="						\
-		include/term.h						\
-	";								\
-	for f in $${extra_includes}; do					\
-		if [ ! -f ${BUILDLINK_DIR}/$${f} ]; then		\
-			${ECHO_BUILDLINK_MSG} "Touching extra ncurses header ($${f}) in ${BUILDLINK_DIR}."; \
-			${TOUCH} ${TOUCH_FLAGS} ${BUILDLINK_DIR}/$${f}; \
-		fi;							\
-	done
-
-ncurses-curses-h:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	if [ ! -f ${BUILDLINK_DIR}/include/curses.h ]; then		\
-		${ECHO_BUILDLINK_MSG} "Linking curses.h to ncurses.h in ${BUILDLINK_DIR}."; \
-		${LN} -s ${BUILDLINK_PREFIX.ncurses}/include/ncurses.h ${BUILDLINK_DIR}/include/curses.h; \
-	fi
-
-.endif	# NCURSES_BUILDLINK2_MK
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index 33eaf3d3d86..3cb0994dee6 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/08/09 10:44:47 seb Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/27 17:07:35 grant Exp $
 #
 
 DISTNAME=	${OPENCM_VERSION}-1-src
@@ -31,7 +31,7 @@ CPPFLAGS+=	-D__unix__
 MAKE_ENV+=	GZIP_CMD=${GZIP_CMD:Q}
 
 .include "../../devel/boehm-gc/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index 30f886c0d17..552298728a3 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/21 16:43:35 martti Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:35 grant Exp $
 # FreeBSD Id: Makefile,v 1.8 1998/04/04 13:58:26 vanilla Exp
 #
 
@@ -23,6 +23,6 @@ MAKE_PARAMS=	PANELS
 pre-configure:
 	@${LN} -sf ${WRKSRC}/hints/c-netbsd.ncurses.h ${WRKSRC}/c-config.h
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile
index 018c65c6dd6..ca2ef4d5466 100644
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:14 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/27 17:07:35 grant Exp $
 #
 
 DISTNAME=	prc-tools-2.2
@@ -62,5 +62,5 @@ pre-patch:
 		&& ${PATCH} --quiet -p0 < ${WRKSRC}/${DIST_GDB}.palmos.diff
 
 .include "../../mk/autoconf.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index f506f1cab80..7ec256d8d10 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/09/14 14:16:53 recht Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/27 17:07:35 grant Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-curses-0
@@ -33,5 +33,5 @@ do-patch:
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile
index 6fec0d16090..6c881d57f75 100644
--- a/devel/py-cursespanel/Makefile
+++ b/devel/py-cursespanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/09 11:50:12 recht Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:35 grant Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-cursespanel-0
@@ -32,5 +32,5 @@ do-patch:
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
 .include "../../devel/py-curses/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index 527584bff01..1ce484d2595 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:51:27 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:35 grant Exp $
 #
 
 DISTNAME=		tvision-0.7
@@ -14,5 +14,5 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"