Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> variables.

5 files changed, 82 insertions, 94 deletions

diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index b1c4bbb1ba6..c5dbab449e4 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,14 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
 
-.if !defined(BINUTILS_BUILDLINK3_MK)
-BINUTILS_BUILDLINK3_MK=	# defined
+.include "../../mk/bsd.prefs.mk"
 
 .if !empty(BINUTILS_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
-
+BUILDLINK_PACKAGES+=			binutils
 BUILDLINK_DEPENDS.binutils?=		binutils>=2.14.0
 BUILDLINK_PKGSRCDIR.binutils?=		../../devel/binutils
 BUILDLINK_DEPMETHOD.binutils?=		build
@@ -21,18 +19,18 @@ BUILDLINK_IS_BUILTIN.binutils=	YES
 .endif
 
 .if defined(USE_BINUTILS)
-_NEED_BINUTILS=	YES
+BUILDLINK_USE_BUILTIN.binutils=	NO
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.binutils:M[yY][eE][sS])
-_NEED_BINUTILS=	NO
+BUILDLINK_USE_BUILTIN.binutils=	YES
 .endif
 
-.if !defined(_NEED_BINUTILS)
+.if !defined(BUILDLINK_USE_BUILTIN.binutils)
 .  if !empty(BUILDLINK_IS_BUILTIN.binutils:M[nN][oO])
-_NEED_BINUTILS=	YES
+BUILDLINK_USE_BUILTIN.binutils=	NO
 .  else
-_NEED_BINUTILS=	NO
+BUILDLINK_USE_BUILTIN.binutils=	YES
 #
 # These versions of NetBSD didn't have a toolchain that was capable of
 # replacing binutils.
@@ -46,23 +44,22 @@ _INCOMPAT_BINUTILS+=	NetBSD-1.5.*-* NetBSD-1.5[A-X]-*
 INCOMPAT_BINUTILS?=       # empty
 .    for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
 .      if !empty(MACHINE_PLATFORM:M${_pattern_})
-_NEED_BINUTILS=          YES
+BUILDLINK_USE_BUILTIN.binutils=	NO
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=	_NEED_BINUTILS="${_NEED_BINUTILS}"
+MAKEFLAGS+=	\
+	BUILDLINK_USE_BUILTIN.binutils="${BUILDLINK_USE_BUILTIN.binutils}"
 .endif
 
-.if ${_NEED_BINUTILS} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	binutils
 .  endif
 .endif
 
 .if !empty(BINUTILS_BUILDLINK3_MK:M+)
-.  if ${_NEED_BINUTILS} == "YES"
-BUILDLINK_PACKAGES+=		binutils
-
+.  if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
 AR=	${BUILDLINK_PREFIX.binutils}/bin/ar
 AS=	${BUILDLINK_PREFIX.binutils}/bin/as
 LD=	${BUILDLINK_PREFIX.binutils}/bin/ld
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 1f6f13c0f25..875a1cbc947 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
 
-.if !empty(GETTEXT_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
+.if !empty(GETTEXT_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		gettext
 BUILDLINK_DEPENDS.gettext?=	gettext-lib>=0.10.35nb1
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 .endif	# GETTEXT_BUILDLINK3_MK
@@ -19,24 +20,28 @@ BUILDLINK_IS_BUILTIN.gettext=	YES
 .  endif
 .endif
 
+.if defined(USE_GNU_GETTEXT)
+BUILDLINK_USE_BUILTIN.gettext=	NO
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.gettext:M[yY][eE][sS])
-_NEED_GNU_GETTEXT=	NO
+BUILDLINK_USE_BUILTIN.gettext=	YES
 .endif
 
-.if !defined(_NEED_GNU_GETTEXT)
+.if !defined(BUILDLINK_USE_BUILTIN.gettext)
 .  if !empty(BUILDLINK_IS_BUILTIN.gettext:M[nN][oO])
-_NEED_GNU_GETTEXT=	YES
+BUILDLINK_USE_BUILTIN.gettext=	NO
 .  else
 #
 # Consider the base system libintl to be gettext-lib-0.10.35nb1.
 #
 _GETTEXT_PKG=		gettext-lib-0.10.35nb1
 _GETTEXT_DEPENDS=	${BUILDLINK_DEPENDS.gettext}
-_NEED_GNU_GETTEXT!=	\
+BUILDLINK_USE_BUILTIN.gettext!=	\
 	if ${PKG_ADMIN} pmatch '${_GETTEXT_DEPENDS}' ${_GETTEXT_PKG}; then \
-		${ECHO} "NO";						\
-	else								\
 		${ECHO} "YES";						\
+	else								\
+		${ECHO} "NO";						\
 	fi
 #
 # The listed platforms have a broken (for the purposes of pkgsrc) version
@@ -46,11 +51,12 @@ _INCOMPAT_GETTEXT=	SunOS-*-*
 INCOMPAT_GETTEXT?=	# empty
 .    for _pattern_ in ${_INCOMPAT_GETTEXT} ${INCOMPAT_GETTEXT}
 .      if !empty(MACHINE_PLATFORM:M${_pattern_})
-_NEED_GNU_GETTEXT=	YES
+BUILDLINK_USE_BUILTIN.gettext=	NO
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=	_NEED_GNU_GETTEXT=${_NEED_GNU_GETTEXT}
+MAKEFLAGS+=	\
+	BUILDLINK_USE_BUILTIN.gettext="${BUILDLINK_USE_BUILTIN.gettext}"
 .endif
 
 .if !defined(_BLNK_LIBINTL_FOUND)
@@ -63,15 +69,14 @@ _BLNK_LIBINTL_FOUND!=	\
 MAKEFLAGS+=	_BLNK_LIBINTL_FOUND=${_BLNK_LIBINTL_FOUND}
 .endif
 
-.if ${_NEED_GNU_GETTEXT} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gettext
 .  endif
 .endif
 
 .if !empty(GETTEXT_BUILDLINK3_MK:M+)
-.  if ${_NEED_GNU_GETTEXT} == "YES"
-BUILDLINK_PACKAGES+=	gettext
+.  if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO])
 _BLNK_LIBINTL=		-lintl
 _GETTEXT_ICONV_DEPENDS=	gettext-lib>=0.11.5nb1
 .    if !defined(_GETTEXT_NEEDS_ICONV)
@@ -113,12 +118,12 @@ BUILDLINK_LDADD.gettext?=	${_BLNK_LIBINTL}
 .  if defined(GNU_CONFIGURE)
 LIBS+=			${BUILDLINK_LDADD.gettext}
 CONFIGURE_ENV+=		INTLLIBS="${BUILDLINK_LDADD.gettext}"
-.    if ${_NEED_GNU_GETTEXT} == "NO"
+.    if !empty(BUILDLINK_USE_BUILTIN.gettext:M[yY][eE][sS])
 .      if ${_BLNK_LIBINTL_FOUND} == "YES"
 CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl="yes"
 .      endif
 .    endif
-.    if ${_NEED_GNU_GETTEXT} == "YES"
+.    if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO])
 CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
 .    else
 CONFIGURE_ARGS+=	--without-libintl-prefix
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index 392c92ebfbf..ce63a76dcee 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETOPT_BUILDLINK3_MK:=	${GETOPT_BUILDLINK3_MK}+
 
 .if !empty(GETOPT_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		getopt
 BUILDLINK_DEPENDS.getopt?=	libgetopt>=1.3
 BUILDLINK_PKGSRCDIR.getopt?=	../../devel/libgetopt
 .endif	# GETOPT_BUILDLINK3_MK
@@ -18,37 +19,34 @@ BUILDLINK_IS_BUILTIN.getopt=	YES
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.getopt:M[yY][eE][sS])
-_NEED_GETOPT=	NO
+BUILDLINK_USE_BUILTIN.getopt=	YES
 .endif
 
-.if !defined(_NEED_GETOPT)
+.if !defined(BUILDLINK_USE_BUILTIN.getopt)
 .  if !empty(BUILDLINK_IS_BUILTIN.getopt:M[nN][oO])
-_NEED_GETOPT=	YES
+BUILDLINK_USE_BUILTIN.getopt=	NO
 .  else
-_NEED_GETOPT=	NO
+BUILDLINK_USE_BUILTIN.getopt=	YES
 .  endif
-MAKEFLAGS+=	_NEED_GETOPT="${_NEED_GETOPT}"
 .endif
 
-.if ${_NEED_GETOPT} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.getopt:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	getopt
 .  endif
 .endif
 
 .if !empty(GETOPT_BUILDLINK3_MK:M+)
-.  if ${_NEED_GETOPT} == "YES"
-BUILDLINK_PACKAGES+=		getopt
-LIBGETOPT=			-lgetopt
+.  if !empty(BUILDLINK_USE_BUILTIN.getopt:M[nN][oO])
+LIBGETOPT=	-lgetopt
 .  else
-BUILDLINK_PREFIX.getopt=	/usr
-LIBGETOPT=			# empty
+LIBGETOPT=	# empty
 .  endif
 
 BUILDLINK_LDADD.getopt?=	${LIBGETOPT}
 
-CONFIGURE_ENV+=			LIBGETOPT="${LIBGETOPT}"
-MAKE_ENV+=			LIBGETOPT="${LIBGETOPT}"
+CONFIGURE_ENV+=		LIBGETOPT="${LIBGETOPT}"
+MAKE_ENV+=		LIBGETOPT="${LIBGETOPT}"
 .endif	# GETOPT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index f65853605b6..181f32b7d3e 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,27 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
-#
-# Optionally define:
-#
-# USE_NCURSES		force use of ncurses
-# INCOMPAT_CURSES	specify MACHINE_PLATFORM versions that are missing
-#			some needed functions.
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
 
-.if !empty(NCURSES_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
+.if !empty(NCURSES_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		ncurses
 BUILDLINK_DEPENDS.ncurses?=	ncurses>=5.3nb1
 BUILDLINK_PKGSRCDIR.ncurses?=	../../devel/ncurses
 .endif	# NCURSES_BUILDLINK3_MK
 
 BUILDLINK_CHECK_BUILTIN.ncurses?=	NO
 
-.if !defined(BUILDLINK_IS_BUILTIN.ncurses)
-BUILDLINK_IS_BUILTIN.ncurses=	NO
-.endif
-
 .if !defined(_BLNK_LIBNCURSES_FOUND)
 _BLNK_LIBNCURSES_FOUND!=	\
 	if [ "`${ECHO} /usr/lib/libncurses.*`" = "/usr/lib/libncurses.*" ]; then \
@@ -32,17 +23,24 @@ _BLNK_LIBNCURSES_FOUND!=	\
 MAKEFLAGS+=	_BLNK_LIBNCURSES_FOUND=${_BLNK_LIBNCURSES_FOUND}
 .endif
 
-.if ${_BLNK_LIBNCURSES_FOUND} == "YES"
+.if !defined(BUILDLINK_IS_BUILTIN.ncurses)
+BUILDLINK_IS_BUILTIN.ncurses=	NO
+.  if ${_BLNK_LIBNCURSES_FOUND} == "YES"
 BUILDLINK_IS_BUILTIN.ncurses=	YES
+.  endif
+.endif
+
+.if defined(USE_NCURSES)
+BUILDLINK_USE_BUILTIN.ncurses=	NO
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS])
-_NEED_NCURSES=	NO
+BUILDLINK_USE_BUILTIN.ncurses=	YES
 .endif
 
-.if !defined(_NEED_NCURSES)
+.if !defined(BUILDLINK_USE_BUILTIN.ncurses)
 .  if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[nN][oO])
-_NEED_NCURSES=	NO
+BUILDLINK_USE_BUILTIN.ncurses=	YES
 .  else
 #
 # These versions of NetBSD didn't have a curses library that was capable of
@@ -61,24 +59,22 @@ _INCOMPAT_CURSES+=      Darwin-*-*
 INCOMPAT_CURSES?=	# empty
 .    for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
 .      if !empty(MACHINE_PLATFORM:M${_pattern_})
-_NEED_NCURSES=		YES
+BUILDLINK_USE_BUILTIN.ncurses=	NO
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=	_NEED_NCURSES="${_NEED_NCURSES}"
+MAKEFLAGS+=	\
+	BUILDLINK_USE_BUILTIN.ncurses="${BUILDLINK_USE_BUILTIN.ncurses}"
 .endif
 
-.if ${_NEED_NCURSES} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	ncurses
 .  endif
 .endif
 
 .if !empty(NCURSES_BUILDLINK3_MK:M+)
-.  if ${_NEED_NCURSES} == "YES"
-BUILDLINK_PACKAGES+=	ncurses
-.  else
-BUILDLINK_PREFIX.ncurses=	/usr
+.  if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[yY][eE][sS])
 .    if ${_BLNK_LIBNCURSES_FOUND} == "NO"
 BUILDLINK_TRANSFORM.ncurses+=	-e "s|/curses.h|/ncurses.h|g"
 BUILDLINK_TRANSFORM+=		l:ncurses:curses
@@ -94,9 +90,7 @@ BUILDLINK_TARGETS+=	buildlink-ncurses-extra-includes
 .PHONY: buildlink-ncurses-extra-includes
 buildlink-ncurses-extra-includes:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	extra_includes="						\
-		include/term.h						\
-	";								\
+	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}."; \
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 0db3114fbac..5017d389e26 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
 
-.if !empty(ZLIB_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
+.if !empty(ZLIB_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		zlib
 BUILDLINK_DEPENDS.zlib?=	zlib>=1.1.4nb1
 BUILDLINK_PKGSRCDIR.zlib?=	../../devel/zlib
 .endif	# ZLIB_BUILDLINK3_MK
@@ -19,15 +20,19 @@ BUILDLINK_IS_BUILTIN.zlib=	YES
 .  endif
 .endif
 
+.if defined(USE_ZLIB)
+BUILDLINK_USE_BUILTIN.zlib=	NO
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[yY][eE][sS])
-_NEED_ZLIB=	NO
+BUILDLINK_USE_BUILTIN.zlib=	YES
 .endif
 
-.if !defined(_NEED_ZLIB)
+.if !defined(BUILDLINK_USE_BUILTIN.zlib)
 .  if !empty(BUILDLINK_IS_BUILTIN.zlib:M[nN][oO])
-_NEED_ZLIB=	YES
+BUILDLINK_USE_BUILTIN.zlib=	NO
 .  else
-_NEED_ZLIB=	NO
+BUILDLINK_USE_BUILTIN.zlib=	YES
 #
 # The listed platforms have a broken (for the purposes of pkgsrc) version
 # of this package.
@@ -45,28 +50,17 @@ _INCOMPAT_ZLIB+=	NetBSD-1.3-* NetBSD-1.3.*-* NetBSD-1.3[A-H]-*
 INCOMPAT_ZLIB?=		# empty
 .    for _pattern_ in ${_INCOMPAT_ZLIB} ${INCOMPAT_ZLIB}
 .      if !empty(MACHINE_PLATFORM:M${_pattern_})
-_NEED_ZLIB=	YES
+BUILDLINK_USE_BUILTIN.zlib=	NO
 .      endif
 .    endfor
 .  endif
-.  if defined(USE_ZLIB)
-_NEED_ZLIB=	YES
-.  endif
-MAKEFLAGS+=	_NEED_ZLIB="${_NEED_ZLIB}"
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.zlib="${BUILDLINK_USE_BUILTIN.zlib}"
 .endif
 
-.if ${_NEED_ZLIB} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	zlib
 .  endif
 .endif
 
-.if !empty(ZLIB_BUILDLINK3_MK:M+)
-.  if ${_NEED_ZLIB} == "YES"
-BUILDLINK_PACKAGES+=	zlib
-.  else
-BUILDLINK_PREFIX.zlib=	/usr
-.  endif
-.endif	# ZLIB_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}