Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

10 files changed, 109 insertions, 132 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index d769d2a5077..f33391e122b 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2001/06/19 05:06:27 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2002/08/25 18:38:38 jlam Exp $
 
 DISTNAME=		ncurses-${NC_VERS}
 NC_VERS=		5.2
@@ -12,7 +12,7 @@ HOMEPAGE=		http://dickey.his.com/ncurses/ncurses.html
 COMMENT=		CRT screen handling and optimization package
 
 USE_LIBTOOL=		# defined
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-libtool
diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk
index 29d33cf7b7d..2c1cba3221f 100644
--- a/devel/ncurses/buildlink.mk
+++ b/devel/ncurses/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.20 2002/08/07 19:29:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.21 2002/08/25 18:38:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ncurses.
 #
diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk
new file mode 100644
index 00000000000..adeec58d5b4
--- /dev/null
+++ b/devel/ncurses/buildlink2.mk
@@ -0,0 +1,105 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:38 jlam 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.0
+BUILDLINK_PKGSRCDIR.ncurses?=	../../devel/ncurses
+
+.if defined(USE_NCURSES)
+_NEED_NCURSES=		YES
+.else
+_NEED_NCURSES=		NO
+#
+# 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-*-*
+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/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 file in $${extra_includes}; do				\
+		if [ ! -f ${BUILDLINK_DIR}/$${file} ]; then		\
+			${ECHO_BUILDLINK_MSG} "Touching extra ncurses header ($${file}) in ${BUILDLINK_DIR}."; \
+			${TOUCH} ${TOUCH_FLAGS} ${BUILDLINK_DIR}/$${file}; \
+		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/ncurses/distinfo b/devel/ncurses/distinfo
index 90dff8ba4f7..8c84a4f2e2b 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/06/19 05:35:38 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 18:38:39 jlam Exp $
 
 SHA1 (ncurses-5.2.tar.gz) = 47e13874118568c48bdb6034d716dcf424f3bf12
 Size (ncurses-5.2.tar.gz) = 1743818 bytes
 SHA1 (patch-aa) = 235774ae5a52a31b833ff3a8a48d4b3e8ead9d3b
 SHA1 (patch-ab) = c523e86cf4faf08930c95f0aee59be85c962a147
-SHA1 (patch-ac) = 905fb542adc987817b5ad8c1b760e9f0109ed8a4
-SHA1 (patch-ad) = ae507553363a7c0514a18848b47bcd3de18d35c4
-SHA1 (patch-ae) = 5a2d1f13c0b202ddec6f966576498b9c6c693bf0
-SHA1 (patch-af) = aba9d358b7f79a432a8981eeb01e39bba74cb171
-SHA1 (patch-ag) = 5210e65902a912bb560dce856ddc93171fc1123a
-SHA1 (patch-ah) = 18565f7fdfbb3dbdf6e4e8a938ebb679ed8e1a36
diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac
deleted file mode 100644
index 5789c2adab0..00000000000
--- a/devel/ncurses/patches/patch-ac
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2001/06/19 05:35:39 jlam Exp $
-
---- configure.orig	Fri Oct 20 18:58:49 2000
-+++ configure
-@@ -6999,17 +6999,6 @@
- if test "$srcdir" != "."; then
- 	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../include"
- fi
--if test "$GCC" != yes; then
--	CPPFLAGS="$CPPFLAGS -I\$(includedir)"
--elif test "$includedir" != "/usr/include"; then
--	if test "$includedir" = '${prefix}/include' ; then
--		if test $prefix != /usr ; then
--			CPPFLAGS="$CPPFLAGS -I\$(includedir)"
--		fi
--	else
--		CPPFLAGS="$CPPFLAGS -I\$(includedir)"
--	fi
--fi
- 
- 
- 
-@@ -7017,17 +7006,6 @@
- if test "$srcdir" != "."; then
- 	ACPPFLAGS="$ACPPFLAGS -I\$(srcdir)/../../include"
- fi
--if test "$GCC" != yes; then
--	ACPPFLAGS="$ACPPFLAGS -I\$(includedir)"
--elif test "$includedir" != "/usr/include"; then
--	if test "$includedir" = '${prefix}/include' ; then
--		if test $prefix != /usr ; then
--			ACPPFLAGS="$ACPPFLAGS -I\$(includedir)"
--		fi
--	else
--		ACPPFLAGS="$ACPPFLAGS -I\$(includedir)"
--	fi
--fi
- 
- 
- 
-@@ -7191,11 +7169,11 @@
- 	fi
- done
- echo "$ac_t""$cf_cv_src_modules" 1>&6
--TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS"
-+TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
- 
- 
- 
--PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS"
-+PROG_ARGS="-L${LIB_DIR} $PROG_ARGS"
- 
- 
- SRC_SUBDIRS="man include"
diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad
deleted file mode 100644
index b490171f073..00000000000
--- a/devel/ncurses/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2001/06/19 05:35:39 jlam Exp $
-
---- c++/Makefile.in.orig	Sat Oct 14 20:43:38 2000
-+++ c++/Makefile.in
-@@ -87,9 +87,9 @@
- LIBNAME_NORMAL	= @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
- LIBNAME		= @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
- 
--LINK_FLAGS	= @EXTRA_LDFLAGS@ -L../lib -L$(libdir) -l$(LIBROOT)
-+LINK_FLAGS	= @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)
- 
--LINK_LIBTOOL	= @EXTRA_LDFLAGS@ -L../lib -L$(libdir) ../lib/$(LIBNAME)
-+LINK_LIBTOOL	= @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME)
- LINK_NORMAL	= $(LINK_FLAGS)
- LINK_DEBUG	= $(LINK_FLAGS)
- LINK_PROFILE	= $(LINK_FLAGS)
diff --git a/devel/ncurses/patches/patch-ae b/devel/ncurses/patches/patch-ae
deleted file mode 100644
index 228aa4bcfa0..00000000000
--- a/devel/ncurses/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2001/06/19 05:35:39 jlam Exp $
-
---- form/Makefile.in.orig	Sat Oct 14 13:57:02 2000
-+++ form/Makefile.in
-@@ -85,7 +85,7 @@
- LINK		= $(LIBTOOL) $(CC)
- LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
- 
--SHLIB_DIRS	= -L../lib -L$(libdir)
-+SHLIB_DIRS	= -L../lib
- SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
- 
- MK_SHARED_LIB	= @MK_SHARED_LIB@
diff --git a/devel/ncurses/patches/patch-af b/devel/ncurses/patches/patch-af
deleted file mode 100644
index 82ae744520b..00000000000
--- a/devel/ncurses/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.6 2001/06/19 05:35:39 jlam Exp $
-
---- menu/Makefile.in.orig	Sat Oct 14 13:57:02 2000
-+++ menu/Makefile.in
-@@ -85,7 +85,7 @@
- LINK		= $(LIBTOOL) $(CC)
- LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
- 
--SHLIB_DIRS	= -L../lib -L$(libdir)
-+SHLIB_DIRS	= -L../lib
- SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
- 
- MK_SHARED_LIB	= @MK_SHARED_LIB@
diff --git a/devel/ncurses/patches/patch-ag b/devel/ncurses/patches/patch-ag
deleted file mode 100644
index 6b0c9c1fff7..00000000000
--- a/devel/ncurses/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2001/06/19 05:35:39 jlam Exp $
-
---- ncurses/Makefile.in.orig	Sat Oct 14 18:55:35 2000
-+++ ncurses/Makefile.in
-@@ -99,7 +99,7 @@
- LINK		= $(LIBTOOL) $(CC)
- LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
- 
--SHLIB_DIRS	= -L../lib -L$(libdir)
-+SHLIB_DIRS	= -L../lib
- SHLIB_LIST	= $(SHLIB_DIRS) @SHLIB_LIST@
- TINFO_LIST	= $(SHLIB_DIRS) @TINFO_LIST@
- 
diff --git a/devel/ncurses/patches/patch-ah b/devel/ncurses/patches/patch-ah
deleted file mode 100644
index 4c96720bc74..00000000000
--- a/devel/ncurses/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2001/06/19 05:35:39 jlam Exp $
-
---- panel/Makefile.in.orig	Sat Oct 14 13:57:02 2000
-+++ panel/Makefile.in
-@@ -86,7 +86,7 @@
- LINK		= $(LIBTOOL) $(CC)
- LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
- 
--SHLIB_DIRS	= -L../lib -L$(libdir)
-+SHLIB_DIRS	= -L../lib
- SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
- 
- MK_SHARED_LIB	= @MK_SHARED_LIB@