Create new variables INCOMPAT_ZLIB, INCOMPAT_BZIP2, INCOMPAT_READLINE,

INCOMPAT_GETTEXT that are analogous to INCOMPAT_ICONV and contain lists of
shell wildcards intended to match against ${MACHINE_PLATFORM}.  These
variables are used to note those platforms that have the named packages in
the base system but are incompatible in some way from the pkgsrc version
of the same package.  Change INCOMPAT_CURSES to have the same sematics as
above.  These variables allow much greater precision in specifying which
platforms have broken (for the purposes of pkgsrc) versions of software in
the base system that must be ignored.

The buildlink.mk files for these packages define private _INCOMPAT_*
versions of these variables, and they contain the default lists of
platforms that are known to have incompatible software bits.

This addresses pkg/17775 submitted by Julien T. Letessier
<julien.letessier at sun dot com>.

1 files changed, 32 insertions, 33 deletions

diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk
index 9617e3e8bb7..80325b14729 100644
--- a/devel/ncurses/buildlink.mk
+++ b/devel/ncurses/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.18 2002/01/31 14:50:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.19 2002/08/07 06:10:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ncurses.
 #
@@ -24,26 +24,31 @@ BUILDLINK_DEPENDS.ncurses?=	ncurses>=5.0
 .if defined(USE_NCURSES)
 _NEED_NCURSES=		YES
 .else
-.include "../../mk/bsd.prefs.mk"
 _NEED_NCURSES=		NO
-.if ${OPSYS} == "NetBSD"
-_INCOMPAT_CURSES=	0.* 1.[0123]* 1.4.* 1.4[A-X] ${INCOMPAT_CURSES}
-.for PATTERN in ${_INCOMPAT_CURSES}
-.if ${OS_VERSION:M${PATTERN}} != ""
-_NEED_NCURSES=		YES
-.endif
-.endfor
-.else
-.if ${OPSYS} != "SunOS"
+#
+# 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]-*
+INCOMPAT_CURSES?=	# empty
+.  for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
+.    if !empty(MACHINE_PLATFORM:M${_pattern_})
 _NEED_NCURSES=		YES
-.endif
-.endif
+.    endif
+.  endfor
 .endif
 
 .if ${_NEED_NCURSES} == "YES"
 EVAL_PREFIX+=			BUILDLINK_PREFIX.ncurses=ncurses
 BUILDLINK_PREFIX.ncurses_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.ncurses=	include/cursesapp.h
+DEPENDS+=			${BUILDLINK_DEPENDS.ncurses}:../../devel/ncurses
+.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
@@ -63,30 +68,20 @@ BUILDLINK_FILES.ncurses+=	lib/libmenu.*
 BUILDLINK_FILES.ncurses+=	lib/libncurses++.*
 BUILDLINK_FILES.ncurses+=	lib/libncurses.*
 BUILDLINK_FILES.ncurses+=	lib/libpanel.*
-DEPENDS+=			${BUILDLINK_DEPENDS.ncurses}:../../devel/ncurses
-.else
-BUILDLINK_PREFIX.ncurses=	/usr
-BUILDLINK_FILES.ncurses=	include/curses.h
-BUILDLINK_FILES.ncurses+=	include/eti.h
-BUILDLINK_FILES.ncurses+=	include/form.h
-BUILDLINK_FILES.ncurses+=	include/menu.h
-BUILDLINK_FILES.ncurses+=	include/termcap.h
-BUILDLINK_FILES.ncurses+=	include/unctrl.h
+
+.if ${_NEED_NCURSES} == "NO"
+_BLNK_LIBNCURSES_LIST!=		${ECHO} /usr/lib/libncurses.*
+.  if ${_BLNK_LIBNCURSES_LIST} == "/usr/lib/libncurses.*"
 BUILDLINK_FILES.ncurses+=	lib/libcurses.*
-BUILDLINK_FILES.ncurses+=	lib/libform.*
-BUILDLINK_FILES.ncurses+=	lib/libmenu.*
 BUILDLINK_TRANSFORM.ncurses=	-e "s|libcurses\.|libncurses.|g"
 BUILDLINK_TRANSFORM.ncurses+=	-e "s|/curses.h|/ncurses.h|g"
 REPLACE_LIBNAMES_SED+=		-e "s|-lncurses|-lcurses|g"
+.  endif
 .endif
 
 BUILDLINK_TARGETS.ncurses+=	ncurses-buildlink
-.if defined(USE_BUILDLINK_ONLY)
 BUILDLINK_TARGETS.ncurses+=	ncurses-curses-h
-.endif
-.if ${_NEED_NCURSES} == "NO"
 BUILDLINK_TARGETS.ncurses+=	ncurses-extra-includes-buildlink
-.endif
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.ncurses}
 
 pre-configure: ${BUILDLINK_TARGETS.ncurses}
@@ -94,17 +89,21 @@ ncurses-buildlink: _BUILDLINK_USE
 
 ncurses-extra-includes-buildlink:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${ECHO_BUILDLINK_MSG} "Touching extra ncurses headers in ${BUILDLINK_DIR}."; \
 	extra_includes="						\
 		include/term.h						\
 	";								\
 	for file in $${extra_includes}; do				\
-		${TOUCH} ${TOUCH_FLAGS} ${BUILDLINK_DIR}/$${file};	\
+		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}					\
-	${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
+	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_BUILDLINK_MK