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.

5 files changed, 25 insertions, 20 deletions

diff --git a/x11/Xaw3d/buildlink.mk b/x11/Xaw3d/buildlink.mk
index c286ea85e2b..a44ef84ee3f 100644
--- a/x11/Xaw3d/buildlink.mk
+++ b/x11/Xaw3d/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/20 19:57:40 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:01 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Xaw3d.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define XAW3D_REQD to the version of Xaw3d desired.
+# (1) Optionally define BUILDLINK_DEPENDS.Xaw3d to the dependency pattern
+#     for the version of Xaw3d 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(XAW3D_BUILDLINK_MK)
 XAW3D_BUILDLINK_MK=	# defined
 
-XAW3D_REQD?=		1.5
-DEPENDS+=		Xaw3d>=${XAW3D_REQD}:../../x11/Xaw3d
+BUILDLINK_DEPENDS.Xaw3d?=	Xaw3d-1.5
+DEPENDS+=	${BUILDLINK_DEPENDS.Xaw3d}:../../x11/Xaw3d
 
 BUILDLINK_PREFIX.Xaw3d=		${X11PREFIX}
 BUILDLINK_FILES.Xaw3d=		include/X11/X11/Xaw3d/*	# for OpenWindows
diff --git a/x11/fltk/buildlink.mk b/x11/fltk/buildlink.mk
index eec267d2e38..691eb0770a8 100644
--- a/x11/fltk/buildlink.mk
+++ b/x11/fltk/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:38 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:27:01 jlam Exp $
 #
 # This Makefile fragment is included by packages that use FLTK.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define FLTK_REQD to the version of FLTK desired.
+# (1) Optionally define BUILDLINK_DEPENDS.fltk to the dependency pattern
+#     for the version of FLTK 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(FLTK_BUILDLINK_MK)
 FLTK_BUILDLINK_MK=	# defined
 
-FLTK_REQD?=		1.0.9
-DEPENDS+=		fltk>=${FLTK_REQD}:../../x11/fltk
+BUILDLINK_DEPENDS.fltk?=	fltk>=1.0.9
+DEPENDS+=	${BUILDLINK_DEPENDS.fltk}:../../x11/fltk
 
 BUILDLINK_PREFIX.fltk=	${X11PREFIX}
 BUILDLINK_FILES.fltk=	include/FL/*
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index 868acdd453d..18de82ab941 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,10 +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:01 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define GNOME_LIBS_REQD to the version of gnome-libs desired.
+# (1) Optionally define BUILDLINK_DEPENDS.gnome-libs to the dependency pattern
+#     for the version of gnome-libs 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(GNOME_LIBS_BUILDLINK_MK)
 GNOME_LIBS_BUILDLINK_MK=	# defined
 
-GNOME_LIBS_REQD?=	1.0.53
-DEPENDS+=		gnome-libs>=${GNOME_LIBS_REQD}:../../x11/gnome-libs
+BUILDLINK_DEPENDS.gnome-libs?=	gnome-libs>=1.0.53
+DEPENDS+=	${BUILDLINK_DEPENDS.gnome-libs}:../../x11/gnome-libs
 
 BUILDLINK_PREFIX.gnome-libs=	${X11PREFIX}
 BUILDLINK_FILES.gnome-libs=	include/gnome.h
diff --git a/x11/gtk/buildlink.mk b/x11/gtk/buildlink.mk
index 5008ddccb3c..27aad4dc93e 100644
--- a/x11/gtk/buildlink.mk
+++ b/x11/gtk/buildlink.mk
@@ -1,10 +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:01 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gtk.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define GTK_REQD to the version of gtk desired.
+# (1) Optionally define BUILDLINK_DEPENDS.gtk to the dependency pattern
+#     for the version of gtk 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(GTK_BUILDLINK_MK)
 GTK_BUILDLINK_MK=	# defined
 
-GTK_REQD?=		1.2.8
-DEPENDS+=		gtk+>=${GTK_REQD}:../../x11/gtk
+BUILDLINK_DEPENDS.gtk?=	gtk+>=1.2.8
+DEPENDS+=		${BUILDLINK_DEPENDS.gtk}:../../x11/gtk
 
 BUILDLINK_PREFIX.gtk=	${X11PREFIX}
 BUILDLINK_FILES.gtk=	include/gtk-*/*/*
diff --git a/x11/tk/buildlink.mk b/x11/tk/buildlink.mk
index f73975f817c..8aa851d1329 100644
--- a/x11/tk/buildlink.mk
+++ b/x11/tk/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/21 21:41:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:02 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tk.
 #
 # To use this Makefile fragment, simply:
 #
-# (1) Optionally define TK_REQD to the version of tk desired.
+# (1) Optionally define BUILDLINK_DEPENDS.tk to the dependency pattern
+#     for the version of tk 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(TK_BUILDLINK_MK)
 TK_BUILDLINK_MK=	# defined
 
-TK_REQD?=		8.3.2
-DEPENDS+=		tk>=${TK_REQD}:../../x11/tk
+BUILDLINK_DEPENDS.tk?=	tk>=8.3.2
+DEPENDS+=		${BUILDLINK_DEPENDS.tk}:../../x11/tk
 
 BUILDLINK_PREFIX.tk=	${LOCALBASE}
 BUILDLINK_FILES.tk=	include/tk.h