From 34d11d8a0f59e1c62bc5b1cc1046d3275e061062 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 23 Jun 2001 19:26:48 +0000 Subject: 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. --- databases/tk-postgresql/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'databases/tk-postgresql') 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" -- cgit v1.2.3