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.

3 files changed, 77 insertions, 16 deletions

diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 891b723b9ae..7690b9f2667 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/02/18 15:14:15 seb Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/25 18:38:45 jlam Exp $
 #
 
 DISTNAME=	readline-4.2
@@ -9,7 +9,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/readline/
 COMMENT=	GNU library that can recall and edit previous input
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
 
@@ -18,18 +18,5 @@ INSTALL_TARGET=		install-la
 
 INFO_FILES=		readline.info history.info
 
-# Remove -I$(includedir) from the INCLUDES passed to the compiler as this
-# defeats buildlink.
-#
-post-patch:
-	cd ${WRKSRC};							\
-	files="Makefile.in";						\
-	for file in $${files}; do					\
-		${MV} -f $${file} $${file}.fixme;			\
-		${SED} -e "s|[  ]*-I\$$(includedir)||"			\
-			$${file}.fixme > $${file};			\
-		${RM} $${file}.fixme;					\
-	done
-
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk
index 6424de84007..eacedb24ede 100644
--- a/devel/readline/buildlink.mk
+++ b/devel/readline/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.19 2002/08/07 19:29:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.20 2002/08/25 18:38:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use readline().
 #
diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk
new file mode 100644
index 00000000000..e8dce31bd34
--- /dev/null
+++ b/devel/readline/buildlink2.mk
@@ -0,0 +1,74 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:46 jlam Exp $
+#
+# Optionally define USE_GNU_READLINE to force use of GNU readline.
+#
+# NOTE:	You may need to do some more work to get libedit recognized over
+#	libreadline, especially by GNU configure scripts.
+
+.if !defined(READLINE_BUILDLINK2_MK)
+READLINE_BUILDLINK2_MK=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_DEPENDS.readline?=	readline>=2.2
+BUILDLINK_PKGSRCDIR.readline?=	../../devel/readline
+
+.if defined(USE_GNU_READLINE)
+_NEED_GNU_READLINE=	YES
+.else
+.  if exists(/usr/include/readline.h) || \
+      exists(/usr/include/readline/readline.h)
+_NEED_GNU_READLINE=	NO
+.  else
+_NEED_GNU_READLINE=	YES
+.  endif
+#
+# 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_READLINE=	SunOS-*-*
+INCOMPAT_READLINE?=	# empty
+.  for _pattern_ in ${_INCOMPAT_READLINE} ${INCOMPAT_READLINE}
+.    if !empty(MACHINE_PLATFORM:M${_pattern_})
+_NEED_GNU_READLINE=	YES
+.    endif
+.  endfor
+.endif
+
+.if ${_NEED_GNU_READLINE} == "YES"
+BUILDLINK_PACKAGES+=		readline
+EVAL_PREFIX+=			BUILDLINK_PREFIX.readline=readline
+BUILDLINK_PREFIX.readline_DEFAULT=	${LOCALBASE}
+.else
+BUILDLINK_PREFIX.readline=		/usr
+.endif
+BUILDLINK_PREFIX.history=		${BUILDLINK_PREFIX.readline}
+
+BUILDLINK_FILES.readline=	include/readline.h
+BUILDLINK_FILES.readline+=	include/readline/*
+BUILDLINK_FILES.readline+=	lib/libreadline.*
+
+BUILDLINK_FILES.history=	include/history.h
+BUILDLINK_FILES.history+=	lib/libhistory.*
+
+.if ${_NEED_GNU_READLINE} == "NO"
+_BLNK_LIBEDIT_LIST!=		${ECHO} /usr/lib/libedit.*
+.  if ${_BLNK_LIBEDIT_LIST} != "/usr/lib/libedit.*"
+BUILDLINK_FILES.readline+=	lib/libedit.*
+BUILDLINK_TRANSFORM.readline=	-e "s|/readline.h|/readline/readline.h|g"
+BUILDLINK_TRANSFORM+=		l:readline:edit
+
+BUILDLINK_FILES.history+=	lib/libedit.*
+BUILDLINK_TRANSFORM.history=	-e "s|/history.h|/readline/history.h|g"
+BUILDLINK_TRANSFORM+=		l:history:edit
+.  endif
+.endif
+
+BUILDLINK_TARGETS+=	readline-buildlink
+BUILDLINK_TARGETS+=	history-buildlink
+
+readline-buildlink: _BUILDLINK_USE
+history-buildlink: _BUILDLINK_USE
+
+.endif	# READLINE_BUILDLINK2_MK