summaryrefslogtreecommitdiff
path: root/databases
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 /databases
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 'databases')
-rw-r--r--databases/db/buildlink.mk9
-rw-r--r--databases/freetds/buildlink.mk9
-rw-r--r--databases/gdbm/buildlink.mk9
-rw-r--r--databases/postgresql-client/Makefile15
-rw-r--r--databases/postgresql-lib/buildlink.mk13
-rw-r--r--databases/postgresql-plperl/Makefile8
-rw-r--r--databases/postgresql-pltcl/Makefile11
-rw-r--r--databases/postgresql-server/Makefile11
-rw-r--r--databases/py-postgresql/Makefile9
-rw-r--r--databases/tcl-postgresql/Makefile11
-rw-r--r--databases/tcl-postgresql/buildlink.mk10
-rw-r--r--databases/tk-postgresql/Makefile15
12 files changed, 61 insertions, 69 deletions
diff --git a/databases/db/buildlink.mk b/databases/db/buildlink.mk
index e6c476fb9ad..703ac4a3d1f 100644
--- a/databases/db/buildlink.mk
+++ b/databases/db/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/19 07:37:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:50 jlam Exp $
#
# This Makefile fragment is included by packages that use db.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define DB_REQD to the version of db desired.
+# (1) Optionally define BUILDLINK_DEPENDS.db to the dependency pattern
+# for the version of db 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(DB_BUILDLINK_MK)
DB_BUILDLINK_MK= # defined
-DB_REQD?= 2.7.3
-DEPENDS+= db>=${DB_REQD}:../../databases/db
+BUILDLINK_DEPENDS.db?= db>=2.7.3
+DEPENDS+= ${BUILDLINK_DEPENDS.db}:../../databases/db
BUILDLINK_PREFIX.db= ${LOCALBASE}
BUILDLINK_FILES.db= include/db2/*
diff --git a/databases/freetds/buildlink.mk b/databases/freetds/buildlink.mk
index 6473823f62e..4c9dab5e77a 100644
--- a/databases/freetds/buildlink.mk
+++ b/databases/freetds/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/20 23:48:49 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:50 jlam Exp $
#
# This Makefile fragment is included by packages that use freetds.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define FREETDS_REQD to the version of freetds desired.
+# (1) Optionally define BUILDLINK_DEPENDS.freetds to the dependency pattern
+# for the version of freetds 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(FREETDS_BUILDLINK_MK)
FREETDS_BUILDLINK_MK= # defined
-FREETDS_REQD?= 0.50
-DEPENDS+= freetds>=${FREETDS_REQD}:../../databases/freetds
+BUILDLINK_DEPENDS.freetds?= freetds>=0.50
+DEPENDS+= ${BUILDLINK_DEPENDS.freetds}:../../databases/freetds
BUILDLINK_PREFIX.freetds= ${LOCALBASE}
BUILDLINK_FILES.freetds= freetds/include/*
diff --git a/databases/gdbm/buildlink.mk b/databases/gdbm/buildlink.mk
index 5d8c027659a..bd11d55b5c7 100644
--- a/databases/gdbm/buildlink.mk
+++ b/databases/gdbm/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/20 23:46:23 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:51 jlam Exp $
#
# This Makefile fragment is included by packages that use gdbm.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define GDBM_REQD to the version of gdbm desired.
+# (1) Optionally define BUILDLINK_DEPENDS.gdbm to the dependency pattern
+# for the version of gdbm 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(GDBM_BUILDLINK_MK)
GDBM_BUILDLINK_MK= # defined
-GDBM_REQD?= 1.7.3
-DEPENDS+= gdbm>=${GDBM_REQD}:../../databases/gdbm
+BUILDLINK_DEPENDS.gdbm?= gdbm>=1.7.3
+DEPENDS+= ${BUILDLINK_DEPENDS.gdbm}:../../databases/gdbm
BUILDLINK_PREFIX.gdbm= ${LOCALBASE}
BUILDLINK_FILES.gdbm= include/gdbm.h
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 01a1abb19ab..ec77578b43c 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/21 21:40:08 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/23 19:26:51 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
@@ -7,13 +7,8 @@ PKGNAME= postgresql-client-${PG_VERS}
PG_PKG_VERS= # empty
COMMENT= PostgreSQL database client programs
-USE_BUILDLINK_ONLY= # defined
-POSTGRESQL_LIB_REQD= ${PG_BASE_VERS}
-
-.include "../../devel/libgetopt/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../devel/zlib/buildlink.mk"
-.include "../../databases/postgresql-lib/buildlink.mk"
+USE_BUILDLINK_ONLY= # defined
+BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS}
CONFIGURE_ARGS+= --enable-readline
MAKE_ENV+= INSTALLED_LIBPQ=1
@@ -41,4 +36,8 @@ post-install:
${SED} -e "s|^#.*||" ${FILESDIR}/exclude \
| ${GTAR} zxCXf ${PREFIX}/man - ${WRKSRC}/doc/man.tar.gz
+.include "../../devel/libgetopt/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
+.include "../../devel/zlib/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-lib/buildlink.mk b/databases/postgresql-lib/buildlink.mk
index 1441d2a69ac..2e736463e22 100644
--- a/databases/postgresql-lib/buildlink.mk
+++ b/databases/postgresql-lib/buildlink.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/21 21:41:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:51 jlam Exp $
#
# This Makefile fragment is included by packages that use postgresql-lib.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define POSTGRESQL_LIB_REQD to the version of postgresql-lib
-# desired.
+# (1) Optionally define BUILDLINK_DEPENDS.postgresql-lib to the dependency
+# pattern for the version of postgresql-lib 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,11 +15,8 @@
.if !defined(POSTGRESQL_LIB_BUILDLINK_MK)
POSTGRESQL_LIB_BUILDLINK_MK= # defined
-.if defined(POSTGRESQL_LIB_REQD)
-DEPENDS+= postgresql-lib>=${POSTGRESQL_LIB_REQD}:../../databases/postgresql-lib
-.else
-DEPENDS+= postgresql-{6.5.3*,7.0*,lib-*}:../../databases/postgresql-lib
-.endif
+BUILDLINK_DEPENDS.postgresql-lib?= postgresql-{6.5.3*,7.0*,lib-*}
+DEPENDS+= ${BUILDLINK_DEPENDS.postgresql-lib}:../../databases/postgresql-lib
BUILDLINK_PREFIX.postgresql-lib= ${LOCALBASE}
BUILDLINK_FILES.postgresql-lib= include/pgsql/*/*.h
diff --git a/databases/postgresql-plperl/Makefile b/databases/postgresql-plperl/Makefile
index 06d4810c6f3..58b493ad297 100644
--- a/databases/postgresql-plperl/Makefile
+++ b/databases/postgresql-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/21 21:40:08 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/23 19:26:51 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
@@ -7,10 +7,7 @@ PKGNAME= postgresql-plperl-${PG_VERS}
PG_PKG_VERS= # empty
COMMENT= PL/Perl procedural language for the PostgreSQL backend
-POSTGRESQL_LIB_REQD= ${PG_BASE_VERS}
-
-.include "../../databases/postgresql-lib/buildlink.mk"
-
+BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS}
DEPENDS+= postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server
DEPENDS+= libperl>=${LIBPERL5_REQD}:../../lang/libperl
@@ -40,4 +37,5 @@ do-install:
${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
.endfor
+.include "../../databases/postgresql-lib/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index 49c05d37807..b7643bdb969 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/21 21:40:08 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/23 19:26:51 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
@@ -7,11 +7,8 @@ PKGNAME= postgresql-pltcl-${PG_VERS}
PG_PKG_VERS= # empty
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
-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}
DEPENDS+= postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server
@@ -34,4 +31,6 @@ do-install:
${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
.endfor
+.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../lang/tcl/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index b42eca2a5ab..fd9f6d4a00a 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/21 21:40:08 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/23 19:26:52 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
@@ -7,11 +7,8 @@ PKGNAME= postgresql-server-${PG_VERS}
PG_PKG_VERS= # empty
COMMENT= PostgreSQL database server programs
-USE_BUILDLINK_ONLY= # defined
-POSTGRESQL_LIB_REQD= ${PG_BASE_VERS}
-
-.include "../../devel/libgetopt/buildlink.mk"
-.include "../../databases/postgresql-lib/buildlink.mk"
+USE_BUILDLINK_ONLY= # defined
+BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS}
DEPENDS+= postgresql-client>=${PG_BASE_VERS}:../../databases/postgresql-client
@@ -101,4 +98,6 @@ post-install:
${INSTALL_SCRIPT} ${WRKDIR}/pgsql.sh ${PREFIX}/etc/rc.d/pgsql
PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+.include "../../devel/libgetopt/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index 616d7abf0d3..67db56a0411 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/06/21 21:40:09 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/06/23 19:26:52 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
@@ -11,10 +11,8 @@ MAINTAINER= darcy@netbsd.org
DEPENDS+= python>=2.0:../../lang/python
DEPENDS+= py-mxDateTime-[0-9]*:../../time/py-mxDateTime
-USE_BUILDLINK_ONLY= # defined
-POSTGRESQL_LIB_REQD= ${PG_BASE_VERS}
-
-.include "../../databases/postgresql-lib/buildlink.mk"
+USE_BUILDLINK_ONLY= # defined
+BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS}
PYTHON= ${LOCALBASE}/bin/python
@@ -56,4 +54,5 @@ post-install:
${INSTALL_DATA} $${file} ${DOCDIR}/tutorial; \
done
+.include "../../databases/postgresql-lib/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
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
diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile
index a7a52ddcf52..71ab7c8cce9 100644
--- a/databases/tk-postgresql/Makefile
+++ b/databases/tk-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/21 21:40:09 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/23 19:26:52 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
@@ -7,13 +7,9 @@ PKGNAME= tk-postgresql-${PG_VERS}
PG_PKG_VERS= # empty
COMMENT= Tk interface to PostgreSQL
-USE_BUILDLINK_ONLY= # defined
-POSTGRESQL_LIB_REQD= ${PG_BASE_VERS}
-TCL_POSTGRESQL_REQD= ${PG_BASE_VERS}
-
-.include "../../databases/postgresql-lib/buildlink.mk"
-.include "../../databases/tcl-postgresql/buildlink.mk"
-.include "../../x11/tk/buildlink.mk"
+USE_BUILDLINK_ONLY= # defined
+BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS}
+BUILDLINK_DEPENDS.tcl-postgresql= tcl-postgresql>=${PG_BASE_VERS}
USE_X11= # defined
MAKE_ENV+= INSTALLED_LIBPQ=1 INSTALLED_LIBPGTCL=1
@@ -45,4 +41,7 @@ post-install:
${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \
`${SED} -e "s|#.*||" ${FILESDIR}/man.tk`
+.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../databases/tcl-postgresql/buildlink.mk"
+.include "../../x11/tk/buildlink.mk"
.include "../../mk/bsd.pkg.mk"