summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-06-23 19:26:48 +0000
committerjlam <jlam@pkgsrc.org>2001-06-23 19:26:48 +0000
commit34d11d8a0f59e1c62bc5b1cc1046d3275e061062 (patch)
treeca311365ad4be7fa955c6e626140f094e60c3647 /misc
parent8ca42bcf7c09eef6cbb13b534ad4d0a51c780fb1 (diff)
downloadpkgsrc-34d11d8a0f59e1c62bc5b1cc1046d3275e061062.tar.gz
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.
Diffstat (limited to 'misc')
-rw-r--r--misc/rpm/buildlink.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/misc/rpm/buildlink.mk b/misc/rpm/buildlink.mk
index bf8adcff517..4b3a82f5a00 100644
--- a/misc/rpm/buildlink.mk
+++ b/misc/rpm/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/18 10:24:49 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:58 jlam Exp $
#
# This Makefile fragment is included by packages that use rpm.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define RPM_REQD to the version of rpm desired.
+# (1) Optionally define BUILDLINK_DEPENDS.rpm to the dependency pattern
+# for the version of rpm 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,8 +16,8 @@
RPM_BUILDLINK_MK= # defined
# This adds a build-dependency as rpm only has a static library.
-RPM_REQD?= 2.4.3
-BUILD_DEPENDS+= rpm>=${RPM_REQD}:../../misc/rpm
+BUILDLINK_DEPENDS.rpm?= rpm>=2.4.3
+BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.rpm}:../../misc/rpm
BUILDLINK_PREFIX.rpm= ${LOCALBASE}
BUILDLINK_FILES.rpm= include/rpm/*