Generalize how the dependency pattern may be specified. Instead of just

FOO_REQD=1.0 being converted to foo>=1.0, one can now directly specify
the dependency pattern as FOO_DEPENDS=foo>=1.0.  This allows things like
JPEG_DEPENDS=jpeg-6b, or fancier expressions like for postgresql-lib.
Change existing FOO_REQD definitions in Makefiles to FOO_DEPENDS.

12 files changed, 61 insertions, 49 deletions

diff --git a/devel/gettext-lib/buildlink.mk b/devel/gettext-lib/buildlink.mk
index 074b4aeffee..14fc8ad8d4a 100644
--- a/devel/gettext-lib/buildlink.mk
+++ b/devel/gettext-lib/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/11 01:59:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/06/23 19:26:52 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gettext.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define GETTEXT_REQD to the version of gettext desired.
+# (1) Optionally define BUILDLINK_DEPENDS.gettext to the dependency pattern
+#     for the version of gettext desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
@@ -14,7 +15,7 @@
 .if !defined(GETTEXT_BUILDLINK_MK)
 GETTEXT_BUILDLINK_MK=	# defined
 
-GETTEXT_REQD?=		0.10.35nb1
+BUILDLINK_DEPENDS.gettext?=	gettext-lib>=0.10.35nb1
 
 .if defined(USE_GNU_GETTEXT)
 _NEED_GNU_GETTEXT=	YES
@@ -25,7 +26,7 @@ _NEED_GNU_GETTEXT=	YES
 .endif
 
 .if ${_NEED_GNU_GETTEXT} == "YES"
-DEPENDS+=		gettext-lib>=${GETTEXT_REQD}:../../devel/gettext-lib
+DEPENDS+=	${BUILDLINK_DEPENDS.gettext}:../../devel/gettext-lib
 BUILDLINK_PREFIX.gettext=	${LOCALBASE}
 .else
 BUILDLINK_PREFIX.gettext=	/usr
@@ -37,6 +38,9 @@ BUILDLINK_FILES.gettext+=	lib/libintl.*
 BUILDLINK_TARGETS.gettext=	gettext-buildlink
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gettext}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Linux"
 .if defined(GNU_CONFIGURE)
 #
 # Add -lintl to LIBS in CONFIGURE_ENV to work around broken gettext.m4:
@@ -44,13 +48,9 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gettext}
 # configure script fails to detect if libintl.a is the genuine GNU gettext
 # or not.
 #
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+=		LIBS="${LIBS}"
-CFLAGS+=		-I${BUILDLINK_DIR}/include
-CPPFLAGS+=		-I${BUILDLINK_DIR}/include
-LDFLAGS+=		-L${BUILDLINK_DIR}/lib
 LIBS+=			-lintl
 .endif
+.endif
 
 pre-configure: ${BUILDLINK_TARGETS.gettext}
 gettext-buildlink: _BUILDLINK_USE
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index 912bf920140..e56efe5460f 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define GLIB_REQD to the version of glib desired.
+# (1) Optionally define BUILDLINK_DEPENDS.glib to the dependency pattern
+#     for the version of glib desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
@@ -14,8 +15,8 @@
 .if !defined(GLIB_BUILDLINK_MK)
 GLIB_BUILDLINK_MK=	# defined
 
-GLIB_REQD?=		1.2.8
-DEPENDS+=		glib>=${GLIB_REQD}:../../devel/glib
+BUILDLINK_DEPENDS.glib?=	glib>=1.2.8
+DEPENDS+=	${BUILDLINK_DEPENDS.glib}:../../devel/glib
 
 BUILDLINK_PREFIX.glib=	${LOCALBASE}
 BUILDLINK_FILES.glib=	include/glib/*/*
diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk
index 71e03068801..21d38e3c4c1 100644
--- a/devel/gmp/buildlink.mk
+++ b/devel/gmp/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/11 01:59:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gmp.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define GMP_REQD to the version of gmp desired.
+# (1) Optionally define BUILDLINK_DEPENDS.gmp to the dependency pattern
+#     for the version of gmp desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
@@ -14,8 +15,8 @@
 .if !defined(GMP_BUILDLINK_MK)
 GMP_BUILDLINK_MK=	# defined
 
-GMP_REQD?=		3.0
-DEPENDS+=		gmp>=${GMP_REQD}:../../devel/gmp
+BUILDLINK_DEPENDS.gmp?=	gmp>=3.0
+DEPENDS+=		${BUILDLINK_DEPENDS.gmp}:../../devel/gmp
 
 BUILDLINK_PREFIX.gmp=	${LOCALBASE}
 BUILDLINK_FILES.gmp=	include/gmp.h
diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk
index 00198343ace..c4f466a75ad 100644
--- a/devel/libgetopt/buildlink.mk
+++ b/devel/libgetopt/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/06/18 10:53:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/06/23 19:26:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use getopt_long().
 #
@@ -14,11 +14,13 @@
 .if !defined(GETOPT_BUILDLINK_MK)
 GETOPT_BUILDLINK_MK=	# defined
 
+BUILDLINK_DEPENDS.getopt?=	libgetopt>=1.3
+
 .if exists(/usr/include/getopt.h)
 BUILDLINK_PREFIX.getopt=	/usr
 BUILDLINK_FILES.getopt=		include/getopt.h
 .else
-DEPENDS+=			libgetopt>=1.3:../../devel/libgetopt
+DEPENDS+=	${BUILDLINK_DEPENDS.getopt}:../../devel/libgetopt
 BUILDLINK_PREFIX.getopt=	${LOCALBASE}
 BUILDLINK_FILES.getopt=		include/getopt.h
 BUILDLINK_FILES.getopt+=	lib/libgetopt.*
diff --git a/devel/libtool/buildlink.mk b/devel/libtool/buildlink.mk
index 9de2093e3c0..f9f61a408a3 100644
--- a/devel/libtool/buildlink.mk
+++ b/devel/libtool/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/20 21:33:01 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ltdl.
 #
@@ -13,7 +13,8 @@
 .if !defined(LTDL_BUILDLINK_MK)
 LTDL_BUILDLINK_MK=	# defined
 
-DEPENDS+=		libtool>=${LIBTOOL_REQD}:../../devel/libtool
+BUILDLINK_DEPENDS.ltdl?=	libtool>=${LIBTOOL_REQD}
+DEPENDS+=	${BUILDLINK_DEPENDS.ltdl}:../../devel/libtool
 
 BUILDLINK_PREFIX.ltdl=	${LOCALBASE}
 BUILDLINK_FILES.ltdl=	include/ltdl.h
diff --git a/devel/lwp/buildlink.mk b/devel/lwp/buildlink.mk
index 7253624659a..0bae73af493 100644
--- a/devel/lwp/buildlink.mk
+++ b/devel/lwp/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lwp.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define LWP_REQD to the version of lwp desired.
+# (1) Optionally define BUILDLINK_DEPENDS.lwp to the dependency pattern
+#     for the version of lwp desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
@@ -14,8 +15,8 @@
 .if !defined(LWP_BUILDLINK_MK)
 LWP_BUILDLINK_MK=	# defined
 
-LWP_REQD?=		1.6
-DEPENDS+=		lwp>=${LWP_REQD}:../../devel/lwp
+BUILDLINK_DEPENDS.lwp?=	lwp>=1.6
+DEPENDS+=		${BUILDLINK_DEPENDS.lwp}:../../devel/lwp
 
 BUILDLINK_PREFIX.lwp=	${LOCALBASE}
 BUILDLINK_FILES.lwp=	include/lwp/*
diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk
index bb26f4b114a..7c9a637a4bc 100644
--- a/devel/ncurses/buildlink.mk
+++ b/devel/ncurses/buildlink.mk
@@ -1,17 +1,18 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/19 16:18:15 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ncurses.
 #
 # To use this Makefile fragment, simply:
 #
 # (1) Optionally define USE_NCURSES to force use of ncurses.
-# (2) Optionally define NCURSES_REQD to the version of ncurses desired.
+# (2) Optionally define BUILDLINK_DEPENDS.ncurses to the dependency pattern
+#     for the version of ncurses desired.
 # (3) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
 # (4) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
-NCURSES_REQD?=		5.0
+BUILDLINK_DEPENDS.ncurses?=	ncurses>=5.0
 
 .if defined(USE_NCURSES)
 _NEED_NCURSES=		YES
@@ -52,7 +53,7 @@ BUILDLINK_FILES.ncurses+=	lib/libmenu.*
 BUILDLINK_FILES.ncurses+=	lib/libncurses++.*
 BUILDLINK_FILES.ncurses+=	lib/libncurses.*
 BUILDLINK_FILES.ncurses+=	lib/libpanel.*
-DEPENDS+=			ncurses>=${NCURSES_REQD}:../../devel/ncurses
+DEPENDS+=			${BUILDLINK_DEPENDS.ncurses}:../../devel/ncurses
 .else
 BUILDLINK_PREFIX.ncurses=	/usr
 BUILDLINK_FILES.ncurses=	include/curses.h
diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk
index 237af486593..33174d125f5 100644
--- a/devel/pth/buildlink.mk
+++ b/devel/pth/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/18 20:30:48 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pth.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define PTH_REQD to the version of pth desired.
+# (1) Optionally define BUILDLINK_DEPENDS.pth to the dependency pattern
+#     for the version of pth desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
@@ -14,8 +15,8 @@
 .if !defined(PTH_BUILDLINK_MK)
 PTH_BUILDLINK_MK=	# defined
 
-PTH_REQD?=		1.3.2
-DEPENDS+=		pth>=${PTH_REQD}:../../devel/pth
+BUILDLINK_DEPENDS.pth?=	pth>=1.3.2
+DEPENDS+=		${BUILDLINK_DEPENDS.pth}:../../devel/pth
 
 BUILDLINK_PREFIX.pth=	${LOCALBASE}
 BUILDLINK_FILES.pth=	include/pth.h
diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk
index a5b6cb7583b..5c473266630 100644
--- a/devel/readline/buildlink.mk
+++ b/devel/readline/buildlink.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink.mk,v 1.11 2001/06/20 23:24:39 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.12 2001/06/23 19:26:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use readline().
 #
 # To use this Makefile fragment, simply:
 #
 # (1) Optionally define USE_GNU_READLINE to force use of GNU readline.
-# (2) Optionally define READLINE_REQD to the version of GNU readline desired.
+# (2) Optionally define BUILDLINK_DEPENDS.readline to the dependency pattern
+#     for the version of GNU readline desired.
 # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
 # (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
@@ -17,7 +18,7 @@
 .if !defined(READLINE_BUILDLINK_MK)
 READLINE_BUILDLINK_MK=	# defined
 
-READLINE_REQD?=		2.2
+BUILDLINK_DEPENDS.readline?=	readline>=2.2
 
 .if defined(USE_GNU_READLINE)
 _NEED_GNU_READLINE=	YES
@@ -29,7 +30,7 @@ _NEED_GNU_READLINE=	YES
 .endif
 
 .if ${_NEED_GNU_READLINE} == "YES"
-DEPENDS+=			readline>=${READLINE_REQD}:../../devel/readline
+DEPENDS+=			${BUILDLINK_DEPENDS.readline}:../../devel/readline
 BUILDLINK_PREFIX.readline=	${LOCALBASE}
 BUILDLINK_FILES.readline=	include/readline/*
 BUILDLINK_FILES.readline+=	lib/libreadline.*
diff --git a/devel/rpc2/buildlink.mk b/devel/rpc2/buildlink.mk
index 9de17fc246f..ad513f59b73 100644
--- a/devel/rpc2/buildlink.mk
+++ b/devel/rpc2/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rpc2.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define RPC2_REQD to the version of rpc2 desired.
+# (1) Optionally define BUILDLINK_DEPENDS.rpc2 to the dependency pattern
+#     for the version of rpc2 desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
@@ -14,8 +15,8 @@
 .if !defined(RPC2_BUILDLINK_MK)
 RPC2_BUILDLINK_MK=	# defined
 
-RPC2_REQD?=		1.10
-DEPENDS+=		rpc2>=${RPC2_REQD}:../../devel/rpc2
+BUILDLINK_DEPENDS.rpc2?=	rpc2>=1.10
+DEPENDS+=			${BUILDLINK_DEPENDS.rpc2}:../../devel/rpc2
 
 BUILDLINK_PREFIX.rpc2=	${LOCALBASE}
 BUILDLINK_FILES.rpc2=	include/rpc2/*
diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk
index 7a776b9f281..2d08c6c3dbc 100644
--- a/devel/rvm/buildlink.mk
+++ b/devel/rvm/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rvm.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define RVM_REQD to the version of rvm desired.
+# (1) Optionally define BUILDLINK_DEPENDS.rvm to the dependency pattern
+#     for the version of rvm desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
@@ -14,8 +15,8 @@
 .if !defined(RVM_BUILDLINK_MK)
 RVM_BUILDLINK_MK=	# defined
 
-RVM_REQD?=		1.3
-DEPENDS+=		rvm>=${RVM_REQD}:../../devel/rvm
+BUILDLINK_DEPENDS.rvm?=	rvm>=1.3
+DEPENDS+=		${BUILDLINK_DEPENDS.rvm}:../../devel/rvm
 
 BUILDLINK_PREFIX.rvm=	${LOCALBASE}
 BUILDLINK_FILES.rvm=	include/rvm/*
diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk
index 3cca7764de8..6dadc4a7cfd 100644
--- a/devel/zlib/buildlink.mk
+++ b/devel/zlib/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/11 01:59:36 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use zlib. 
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define ZLIB_REQD to the version of zlib desired.
+# (1) Optionally define BUILDLINK_DEPENDS.zlib to the dependency pattern
+#     for the version of zlib desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
@@ -14,7 +15,7 @@
 .if !defined(ZLIB_BUILDLINK_MK)
 ZLIB_BUILDLINK_MK=	# defined
 
-ZLIB_REQD?=		1.1.3
+BUILDLINK_DEPENDS.zlib?=	zlib>=1.1.3
 
 .if exists(/usr/include/zlib.h)
 _NEED_ZLIB=		NO
@@ -23,7 +24,7 @@ _NEED_ZLIB=		YES
 .endif
 
 .if ${_NEED_ZLIB} == "YES"
-DEPENDS+=		zlib>=${ZLIB_REQD}:../../devel/zlib
+DEPENDS+=		${BUILDLINK_DEPENDS.zlib}:../../devel/zlib
 BUILDLINK_PREFIX.zlib=	${LOCALBASE}
 .else
 BUILDLINK_PREFIX.zlib=	/usr