summaryrefslogtreecommitdiff
path: root/databases/tcl-postgresql
diff options
context:
space:
mode:
authorjlam <jlam>2001-06-23 19:26:48 +0000
committerjlam <jlam>2001-06-23 19:26:48 +0000
commit511662a5766e71adec2e6c0bd094eadfeb3e07b3 (patch)
treeca311365ad4be7fa955c6e626140f094e60c3647 /databases/tcl-postgresql
parent6ec0f65d350df34c002f72b07be7f4d4adf95c31 (diff)
downloadpkgsrc-511662a5766e71adec2e6c0bd094eadfeb3e07b3.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 'databases/tcl-postgresql')
-rw-r--r--databases/tcl-postgresql/Makefile11
-rw-r--r--databases/tcl-postgresql/buildlink.mk10
2 files changed, 10 insertions, 11 deletions
diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile
index b4e955a4e7f..2153be4acbf 100644
--- a/databases/tcl-postgresql/Makefile
+++ b/databases/tcl-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/21 21:40:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/23 19:26:52 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
@@ -7,11 +7,8 @@ PKGNAME= tcl-postgresql-${PG_VERS}
PG_PKG_VERS= # empty
COMMENT= Tcl interface to PostgreSQL
-USE_BUILDLINK_ONLY= # defined
-POSTGRESQL_LIB_REQD= ${PG_BASE_VERS}
-
-.include "../../databases/postgresql-lib/buildlink.mk"
-.include "../../lang/tcl/buildlink.mk"
+USE_BUILDLINK_ONLY= # defined
+BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS}
MAKE_ENV+= INSTALLED_LIBPQ=1
@@ -38,4 +35,6 @@ post-install:
${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \
`${SED} -e "s|#.*||" ${FILESDIR}/man.tcl`
+.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../lang/tcl/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/tcl-postgresql/buildlink.mk b/databases/tcl-postgresql/buildlink.mk
index 991804aebe5..cb23f6b78b7 100644
--- a/databases/tcl-postgresql/buildlink.mk
+++ b/databases/tcl-postgresql/buildlink.mk
@@ -1,11 +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:26:52 jlam Exp $
#
# This Makefile fragment is included by packages that use tcl-postgresql.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define TCL_POSTGRESQL_REQD to the version of tcl-postgresql
-# desired.
+# (1) Optionally define BUILDLINK_DEPENDS.tcl-postgresql to the dependency
+# pattern for the version of tcl-postgresql 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 +15,8 @@
.if !defined(TCL_POSTGRESQL_BUILDLINK_MK)
TCL_POSTGRESQL_BUILDLINK_MK= # defined
-TCL_POSTGRESQL_REQD= 7.0
-DEPENDS+= tcl-postgresql>=${TCL_POSTGRESQL_REQD}:../../databases/tcl-postgresql
+BUILDLINK_DEPENDS.tcl-postgresql?= tcl-postgresql>=7.0
+DEPENDS+= ${BUILDLINK_DEPENDS.tcl-postgresql}:../../databases/tcl-postgresql
BUILDLINK_PREFIX.tcl-postgresql= ${LOCALBASE}
BUILDLINK_FILES.tcl-postgresql= include/pgsql/libpgtcl.h