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.

4 files changed, 18 insertions, 20 deletions

diff --git a/security/PAM/buildlink.mk b/security/PAM/buildlink.mk
index e6617e50543..a59b8503c54 100644
--- a/security/PAM/buildlink.mk
+++ b/security/PAM/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/11 01:59:38 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/06/23 19:26:59 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpam.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define PAM_REQD to the version of pam desired.
+# (1) Optionally define BUILDLINK_DEPENDS.pam to the dependency pattern
+#     for the version of pam 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(PAM_BUILDLINK_MK)
 PAM_BUILDLINK_MK=	# defined
 
-PAM_REQD?=		0.72
-DEPENDS+=		PAM>=${PAM_REQD}:../../security/PAM
+BUILDLINK_DEPENDS.pam?=	PAM>=0.72
+DEPENDS+=		${BUILDLINK_DEPENDS.pam}:../../security/PAM
 
 BUILDLINK_PREFIX.pam=	${LOCALBASE}
 BUILDLINK_FILES.pam=	include/security/*
diff --git a/security/libcrack/buildlink.mk b/security/libcrack/buildlink.mk
index 1afb57125cc..6f3fe1310f3 100644
--- a/security/libcrack/buildlink.mk
+++ b/security/libcrack/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/19 09:11:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:00 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libcrack.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define LIBCRACK_REQD to the version of libcrack desired.
+# (1) Optionally define BUILDLINK_DEPENDS.libcrack to the dependency pattern
+#     for the version of libcrack 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(LIBCRACK_BUILDLINK_MK)
 LIBCRACK_BUILDLINK_MK=	# defined
 
-LIBCRACK_REQD?=		2.7
-DEPENDS+=		libcrack>=${LIBCRACK_REQD}:../../security/libcrack
+BUILDLINK_DEPENDS.libcrack?=	libcrack>=2.7
+DEPENDS+=	${BUILDLINK_DEPENDS.libcrack}:../../security/libcrack
 
 BUILDLINK_PREFIX.libcrack=	${LOCALBASE}
 BUILDLINK_FILES.libcrack=	include/cracklib/*
diff --git a/security/openssl/buildlink.mk b/security/openssl/buildlink.mk
index 9f4fa25b8fd..ce8590468d9 100644
--- a/security/openssl/buildlink.mk
+++ b/security/openssl/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/18 05:30:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:00 jlam Exp $
 #
 # This Makefile fragment is included by packages that use OpenSSL.
 #
@@ -13,9 +13,7 @@
 .if !defined(OPENSSL_BUILDLINK_MK)
 OPENSSL_BUILDLINK_MK=	# defined
 
-.include "../../mk/bsd.prefs.mk"
-
-OPENSSL_REQD=		0.9.[56]*
+BUILDLINK_DEPENDS.openssl?=	openssl-0.9.[56]*
 
 .if exists(/usr/include/openssl/ssl.h)
 _NEED_OPENSSL=		NO
@@ -24,7 +22,7 @@ _NEED_OPENSSL=		YES
 .endif
 
 .if ${_NEED_OPENSSL} == "YES"
-DEPENDS+=			openssl-${OPENSSL_REQD}:../../security/openssl
+DEPENDS+=	${BUILDLINK_DEPENDS.openssl}:../../security/openssl
 BUILDLINK_PREFIX.openssl=	${LOCALBASE}
 SSLBASE=			${LOCALBASE}
 SSLCERTS=			${SSLBASE}/certs
diff --git a/security/tcp_wrappers/buildlink.mk b/security/tcp_wrappers/buildlink.mk
index 460baa4b73c..02229e6c4c8 100644
--- a/security/tcp_wrappers/buildlink.mk
+++ b/security/tcp_wrappers/buildlink.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:00 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tcp_wrappers.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define TCP_WRAPPERS_REQD to the version of tcp_wrappers
-#     desired.
+# (1) Optionally define BUILDLINK_DEPENDS.tcp_wrappers to the dependency
+#     pattern for the version of tcp_wrappers 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
@@ -15,9 +15,7 @@
 .if !defined(TCP_WRAPPERS_BUILDLINK_MK)
 TCP_WRAPPERS_BUILDLINK_MK=	# defined
 
-.include "../../mk/bsd.prefs.mk"
-
-TCP_WRAPPERS_REQD?=		7.6.1nb1
+BUILDLINK_DEPENDS.tcp_wrappers?=	tcp_wrappers>=7.6.1nb1
 
 .if exists(/usr/include/tcpd.h)
 _NEED_TCP_WRAPPERS=	NO
@@ -26,7 +24,7 @@ _NEED_TCP_WRAPPERS=	YES
 .endif
 
 .if ${_NEED_TCP_WRAPPERS} == "YES"
-DEPENDS+=	tcp_wrappers>=${TCP_WRAPPERS_REQD}:../../security/tcp_wrappers
+DEPENDS+=	${BUILDLINK_DEPENDS.tcp_wrappers}:../../security/tcp_wrappers
 BUILDLINK_PREFIX.tcp_wrappers=	${LOCALBASE}
 .else
 BUILDLINK_PREFIX.tcp_wrappers=	/usr