summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/bzip2/buildlink.mk11
-rw-r--r--audio/esound/buildlink.mk9
-rw-r--r--audio/libaudiofile/buildlink.mk9
-rw-r--r--audio/libmikmod/buildlink.mk9
-rw-r--r--chat/bitchx/Makefile6
-rw-r--r--comms/jpilot/buildlink.mk9
-rw-r--r--comms/pilot-link/buildlink.mk9
-rw-r--r--converters/libiconv/buildlink.mk9
-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
-rw-r--r--devel/gettext-lib/buildlink.mk18
-rw-r--r--devel/glib/buildlink.mk9
-rw-r--r--devel/gmp/buildlink.mk9
-rw-r--r--devel/libgetopt/buildlink.mk6
-rw-r--r--devel/libtool/buildlink.mk5
-rw-r--r--devel/lwp/buildlink.mk9
-rw-r--r--devel/ncurses/buildlink.mk9
-rw-r--r--devel/pth/buildlink.mk9
-rw-r--r--devel/readline/buildlink.mk9
-rw-r--r--devel/rpc2/buildlink.mk9
-rw-r--r--devel/rvm/buildlink.mk9
-rw-r--r--devel/zlib/buildlink.mk9
-rw-r--r--graphics/freetype-lib/buildlink.mk9
-rw-r--r--graphics/freetype-utils/Makefile5
-rw-r--r--graphics/gdk-pixbuf-gnome/Makefile10
-rw-r--r--graphics/gdk-pixbuf/buildlink.mk9
-rw-r--r--graphics/gqview/Makefile4
-rw-r--r--graphics/imlib/buildlink.mk9
-rw-r--r--graphics/jpeg/buildlink.mk9
-rw-r--r--graphics/lcms/buildlink.mk9
-rw-r--r--graphics/libungif/buildlink.mk9
-rw-r--r--graphics/mng/buildlink.mk9
-rw-r--r--graphics/netpbm/buildlink.mk9
-rw-r--r--graphics/png/buildlink.mk9
-rw-r--r--graphics/tiff/buildlink.mk9
-rw-r--r--japanese/vflib-lib/buildlink.mk9
-rw-r--r--lang/librep/Makefile5
-rw-r--r--lang/tcl/buildlink.mk9
-rw-r--r--mail/imap-uw/buildlink.mk9
-rw-r--r--misc/rpm/buildlink.mk9
-rw-r--r--net/ORBit/buildlink.mk9
-rw-r--r--print/cups/buildlink.mk9
-rw-r--r--security/PAM/buildlink.mk9
-rw-r--r--security/libcrack/buildlink.mk9
-rw-r--r--security/openssl/buildlink.mk8
-rw-r--r--security/tcp_wrappers/buildlink.mk12
-rw-r--r--textproc/libxml/buildlink.mk9
-rw-r--r--x11/Xaw3d/buildlink.mk9
-rw-r--r--x11/fltk/buildlink.mk9
-rw-r--r--x11/gnome-libs/buildlink.mk9
-rw-r--r--x11/gtk/buildlink.mk9
-rw-r--r--x11/tk/buildlink.mk9
62 files changed, 299 insertions, 272 deletions
diff --git a/archivers/bzip2/buildlink.mk b/archivers/bzip2/buildlink.mk
index dc20ebe6b44..b98aa7e02ef 100644
--- a/archivers/bzip2/buildlink.mk
+++ b/archivers/bzip2/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/21 22:36:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:48 jlam Exp $
#
# This Makefile fragment is included by packages that use bzip2.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define BZIP2_REQD to the version of bzip2 desired.
+# (1) Optionally define BUILDLINK_DEPENDS.bzip2 to the dependency pattern
+# for the version of bzip2 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,9 +15,9 @@
.if !defined(BZIP2_BUILDLINK_MK)
BZIP2_BUILDLINK_MK= # defined
-.include "../../mk/bsd.prefs.mk"
+BUILDLINK_DEPENDS.bzip2?= bzip2>=1.0.1
-BZIP2_REQD?= 1.0.1
+.include "../../mk/bsd.prefs.mk"
.if exists(/usr/include/bzlib.h)
#
@@ -34,7 +35,7 @@ _NEED_BZIP2= NO
.endif
.if ${_NEED_BZIP2} == "YES"
-DEPENDS+= bzip2>=${BZIP2_REQD}:../../archivers/bzip2
+DEPENDS+= ${BUILDLINK_DEPENDS.bzip2}:../../archivers/bzip2
BUILDLINK_PREFIX.bzip2= ${LOCALBASE}
.else
BUILDLINK_PREFIX.bzip2= /usr
diff --git a/audio/esound/buildlink.mk b/audio/esound/buildlink.mk
index 5753a939c64..9ff9cb45750 100644
--- a/audio/esound/buildlink.mk
+++ b/audio/esound/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:49 jlam Exp $
#
# This Makefile fragment is included by packages that use esound.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define ESOUND_REQD to the version of esound desired.
+# (1) Optionally define BUILDLINK_DEPENDS.esound to the dependency pattern
+# for the version of esound 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(ESOUND_BUILDLINK_MK)
ESOUND_BUILDLINK_MK= # defined
-ESOUND_REQD?= 0.2.18
-DEPENDS+= esound>=${ESOUND_REQD}:../../audio/esound
+BUILDLINK_DEPENDS.esound?= esound>=0.2.18
+DEPENDS+= ${BUILDLINK_DEPENDS.esound}:../../audio/esound
BUILDLINK_PREFIX.esound= ${LOCALBASE}
BUILDLINK_FILES.esound= include/esd.h
diff --git a/audio/libaudiofile/buildlink.mk b/audio/libaudiofile/buildlink.mk
index cb2b058c4a9..f85a27f6159 100644
--- a/audio/libaudiofile/buildlink.mk
+++ b/audio/libaudiofile/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/19 03:59:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:49 jlam Exp $
#
# This Makefile fragment is included by packages that use libaudiofile.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define AUDIOFILE_REQD to the version of libaudiofile desired.
+# (1) Optionally define BUILDLINK_DEPENDS.audiofile to the dependency pattern
+# for the version of libaudiofile 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(AUDIOFILE_BUILDLINK_MK)
AUDIOFILE_BUILDLINK_MK= # defined
-AUDIOFILE_REQD?= 0.2.1
-DEPENDS+= libaudiofile>=${AUDIOFILE_REQD}:../../audio/libaudiofile
+BUILDLINK_DEPENDS.audiofile?= libaudiofile>=0.2.1
+DEPENDS+= ${BUILDLINK_DEPENDS.audiofile}:../../audio/libaudiofile
BUILDLINK_PREFIX.audiofile= ${LOCALBASE}
BUILDLINK_FILES.audiofile= include/af_vfs.h
diff --git a/audio/libmikmod/buildlink.mk b/audio/libmikmod/buildlink.mk
index 69551e0bf88..d158c6a725e 100644
--- a/audio/libmikmod/buildlink.mk
+++ b/audio/libmikmod/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/19 15:59:27 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:49 jlam Exp $
#
# This Makefile fragment is included by packages that use libmikmod.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define LIBMIKMOD_REQD to the version of libmikmod desired.
+# (1) Optionally define BUILDLINK_DEPENDS.libmikmod to the dependency pattern
+# for the version of libmikmod 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(LIBMIKMOD_BUILDLINK_MK)
LIBMIKMOD_BUILDLINK_MK= # defined
-LIBMIKMOD_REQD?= 3.1.9
-DEPENDS+= libmikmod>=${LIBMIKMOD_REQD}:../../audio/libmikmod
+BUILDLINK_DEPENDS.libmikmod?= libmikmod>=3.1.9
+DEPENDS+= ${BUILDLINK_DEPENDS.libmikmod}:../../audio/libmikmod
BUILDLINK_PREFIX.libmikmod= ${LOCALBASE}
BUILDLINK_FILES.libmikmod= include/mikmod.h
diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index 64f77068320..c9f6abdb7cd 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/20 02:54:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/23 19:26:49 jlam Exp $
DISTNAME= ircii-pana-1.0c18
PKGNAME= bitchx-1.0.3.18
@@ -15,8 +15,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ssl
# We need ncurses since BitchX dumps core on startup when using curses.
-USE_NCURSES= yes
-NCURSES_REQD= 5.2
+USE_NCURSES= yes
+BUILDLINK_DEPENDS.ncurses= ncurses>=5.2
# Files are installed using a .bz2 extension, and BitchX assumes it can
# find bunzip2 in the PATH.
diff --git a/comms/jpilot/buildlink.mk b/comms/jpilot/buildlink.mk
index 1f2bab7c868..980e1a6c953 100644
--- a/comms/jpilot/buildlink.mk
+++ b/comms/jpilot/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/22 06:06:26 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:49 jlam Exp $
#
# This Makefile fragment is included by packages that use jpilot.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define JPILOT_REQD to the version of jpilot desired.
+# (1) Optionally define BUILDLINK_DEPENDS.jpilot to the dependency pattern
+# for the version of jpilot 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(JPILOT_BUILDLINK_MK)
JPILOT_BUILDLINK_MK= # defined
-JPILOT_REQD?= 0.99
-BUILD_DEPENDS+= jpilot>=${JPILOT_REQD}:../../comms/jpilot
+BUILDLINK_DEPENDS.jpilot?= jpilot>=0.99
+BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.jpilot}:../../comms/jpilot
BUILDLINK_PREFIX.jpilot= ${LOCALBASE}
BUILDLINK_FILES.jpilot= include/jpilot/*
diff --git a/comms/pilot-link/buildlink.mk b/comms/pilot-link/buildlink.mk
index ccca3651816..57184fd657d 100644
--- a/comms/pilot-link/buildlink.mk
+++ b/comms/pilot-link/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/22 05:49:42 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 pilot-link.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define PILOT_LINK_REQD to the version of pilot-link desired.
+# (1) Optionally define BUILDLINK_DEPENDS.pilot-link to the dependency pattern
+# for the version of pilot-link 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(PILOT_LINK_BUILDLINK_MK)
PILOT_LINK_BUILDLINK_MK= # defined
-PILOT_LINK_REQD?= 0.9.3
-DEPENDS+= pilot-link>=${PILOT_LINK_REQD}:../../comms/pilot-link
+BUILDLINK_DEPENDS.pilot-link?= pilot-link>=0.9.3
+DEPENDS+= ${BUILDLINK_DEPENDS.pilot-link}:../../comms/pilot-link
BUILDLINK_PREFIX.pilot-link= ${LOCALBASE}
BUILDLINK_FILES.pilot-link= include/pi-*.*
diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk
index 6f41bb4ac58..e9df357329d 100644
--- a/converters/libiconv/buildlink.mk
+++ b/converters/libiconv/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/11 01:59:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:50 jlam Exp $
#
# This Makefile fragment is included by packages that use libiconv.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define ICONV_REQD to the version of libiconv desired.
+# (1) Optionally define BUILDLINK_DEPENDS.iconv to the dependency pattern
+# for the version of libiconv 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(ICONV_BUILDLINK_MK)
ICONV_BUILDLINK_MK= # defined
-ICONV_REQD?= 1.5
-DEPENDS+= libiconv>=${ICONV_REQD}:../../converters/libiconv
+BUILDLINK_DEPENDS.iconv?= libiconv>=1.5
+DEPENDS+= ${BUILDLINK_DEPENDS.iconv}:../../converters/libiconv
BUILDLINK_PREFIX.iconv= ${LOCALBASE}
BUILDLINK_FILES.iconv= include/iconv.h
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"
diff --git a/devel/gettext-lib/buildlink.mk b/devel/gettext-lib/buildlink.mk
index 074b4aeffee..14fc8ad8d4a 100644
--- a/devel/gettext-lib/buildlink.mk
+++ b/devel/gettext-lib/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/11 01:59:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/06/23 19:26:52 jlam Exp $
#
# This Makefile fragment is included by packages that use gettext.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define GETTEXT_REQD to the version of gettext desired.
+# (1) Optionally define BUILDLINK_DEPENDS.gettext to the dependency pattern
+# for the version of gettext 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,7 +15,7 @@
.if !defined(GETTEXT_BUILDLINK_MK)
GETTEXT_BUILDLINK_MK= # defined
-GETTEXT_REQD?= 0.10.35nb1
+BUILDLINK_DEPENDS.gettext?= gettext-lib>=0.10.35nb1
.if defined(USE_GNU_GETTEXT)
_NEED_GNU_GETTEXT= YES
@@ -25,7 +26,7 @@ _NEED_GNU_GETTEXT= YES
.endif
.if ${_NEED_GNU_GETTEXT} == "YES"
-DEPENDS+= gettext-lib>=${GETTEXT_REQD}:../../devel/gettext-lib
+DEPENDS+= ${BUILDLINK_DEPENDS.gettext}:../../devel/gettext-lib
BUILDLINK_PREFIX.gettext= ${LOCALBASE}
.else
BUILDLINK_PREFIX.gettext= /usr
@@ -37,6 +38,9 @@ BUILDLINK_FILES.gettext+= lib/libintl.*
BUILDLINK_TARGETS.gettext= gettext-buildlink
BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gettext}
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Linux"
.if defined(GNU_CONFIGURE)
#
# Add -lintl to LIBS in CONFIGURE_ENV to work around broken gettext.m4:
@@ -44,13 +48,9 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gettext}
# configure script fails to detect if libintl.a is the genuine GNU gettext
# or not.
#
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+= LIBS="${LIBS}"
-CFLAGS+= -I${BUILDLINK_DIR}/include
-CPPFLAGS+= -I${BUILDLINK_DIR}/include
-LDFLAGS+= -L${BUILDLINK_DIR}/lib
LIBS+= -lintl
.endif
+.endif
pre-configure: ${BUILDLINK_TARGETS.gettext}
gettext-buildlink: _BUILDLINK_USE
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index 912bf920140..e56efe5460f 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:53 jlam Exp $
#
# This Makefile fragment is included by packages that use glib.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define GLIB_REQD to the version of glib desired.
+# (1) Optionally define BUILDLINK_DEPENDS.glib to the dependency pattern
+# for the version of glib 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(GLIB_BUILDLINK_MK)
GLIB_BUILDLINK_MK= # defined
-GLIB_REQD?= 1.2.8
-DEPENDS+= glib>=${GLIB_REQD}:../../devel/glib
+BUILDLINK_DEPENDS.glib?= glib>=1.2.8
+DEPENDS+= ${BUILDLINK_DEPENDS.glib}:../../devel/glib
BUILDLINK_PREFIX.glib= ${LOCALBASE}
BUILDLINK_FILES.glib= include/glib/*/*
diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk
index 71e03068801..21d38e3c4c1 100644
--- a/devel/gmp/buildlink.mk
+++ b/devel/gmp/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/11 01:59:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:53 jlam Exp $
#
# This Makefile fragment is included by packages that use gmp.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define GMP_REQD to the version of gmp desired.
+# (1) Optionally define BUILDLINK_DEPENDS.gmp to the dependency pattern
+# for the version of gmp 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(GMP_BUILDLINK_MK)
GMP_BUILDLINK_MK= # defined
-GMP_REQD?= 3.0
-DEPENDS+= gmp>=${GMP_REQD}:../../devel/gmp
+BUILDLINK_DEPENDS.gmp?= gmp>=3.0
+DEPENDS+= ${BUILDLINK_DEPENDS.gmp}:../../devel/gmp
BUILDLINK_PREFIX.gmp= ${LOCALBASE}
BUILDLINK_FILES.gmp= include/gmp.h
diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk
index 00198343ace..c4f466a75ad 100644
--- a/devel/libgetopt/buildlink.mk
+++ b/devel/libgetopt/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/06/18 10:53:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/06/23 19:26:53 jlam Exp $
#
# This Makefile fragment is included by packages that use getopt_long().
#
@@ -14,11 +14,13 @@
.if !defined(GETOPT_BUILDLINK_MK)
GETOPT_BUILDLINK_MK= # defined
+BUILDLINK_DEPENDS.getopt?= libgetopt>=1.3
+
.if exists(/usr/include/getopt.h)
BUILDLINK_PREFIX.getopt= /usr
BUILDLINK_FILES.getopt= include/getopt.h
.else
-DEPENDS+= libgetopt>=1.3:../../devel/libgetopt
+DEPENDS+= ${BUILDLINK_DEPENDS.getopt}:../../devel/libgetopt
BUILDLINK_PREFIX.getopt= ${LOCALBASE}
BUILDLINK_FILES.getopt= include/getopt.h
BUILDLINK_FILES.getopt+= lib/libgetopt.*
diff --git a/devel/libtool/buildlink.mk b/devel/libtool/buildlink.mk
index 9de2093e3c0..f9f61a408a3 100644
--- a/devel/libtool/buildlink.mk
+++ b/devel/libtool/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/20 21:33:01 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:53 jlam Exp $
#
# This Makefile fragment is included by packages that use ltdl.
#
@@ -13,7 +13,8 @@
.if !defined(LTDL_BUILDLINK_MK)
LTDL_BUILDLINK_MK= # defined
-DEPENDS+= libtool>=${LIBTOOL_REQD}:../../devel/libtool
+BUILDLINK_DEPENDS.ltdl?= libtool>=${LIBTOOL_REQD}
+DEPENDS+= ${BUILDLINK_DEPENDS.ltdl}:../../devel/libtool
BUILDLINK_PREFIX.ltdl= ${LOCALBASE}
BUILDLINK_FILES.ltdl= include/ltdl.h
diff --git a/devel/lwp/buildlink.mk b/devel/lwp/buildlink.mk
index 7253624659a..0bae73af493 100644
--- a/devel/lwp/buildlink.mk
+++ b/devel/lwp/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:53 jlam Exp $
#
# This Makefile fragment is included by packages that use lwp.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define LWP_REQD to the version of lwp desired.
+# (1) Optionally define BUILDLINK_DEPENDS.lwp to the dependency pattern
+# for the version of lwp 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(LWP_BUILDLINK_MK)
LWP_BUILDLINK_MK= # defined
-LWP_REQD?= 1.6
-DEPENDS+= lwp>=${LWP_REQD}:../../devel/lwp
+BUILDLINK_DEPENDS.lwp?= lwp>=1.6
+DEPENDS+= ${BUILDLINK_DEPENDS.lwp}:../../devel/lwp
BUILDLINK_PREFIX.lwp= ${LOCALBASE}
BUILDLINK_FILES.lwp= include/lwp/*
diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk
index bb26f4b114a..7c9a637a4bc 100644
--- a/devel/ncurses/buildlink.mk
+++ b/devel/ncurses/buildlink.mk
@@ -1,17 +1,18 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/19 16:18:15 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:54 jlam Exp $
#
# This Makefile fragment is included by packages that use ncurses.
#
# To use this Makefile fragment, simply:
#
# (1) Optionally define USE_NCURSES to force use of ncurses.
-# (2) Optionally define NCURSES_REQD to the version of ncurses desired.
+# (2) Optionally define BUILDLINK_DEPENDS.ncurses to the dependency pattern
+# for the version of ncurses desired.
# (3) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
# search path, and
# (4) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
# path.
-NCURSES_REQD?= 5.0
+BUILDLINK_DEPENDS.ncurses?= ncurses>=5.0
.if defined(USE_NCURSES)
_NEED_NCURSES= YES
@@ -52,7 +53,7 @@ BUILDLINK_FILES.ncurses+= lib/libmenu.*
BUILDLINK_FILES.ncurses+= lib/libncurses++.*
BUILDLINK_FILES.ncurses+= lib/libncurses.*
BUILDLINK_FILES.ncurses+= lib/libpanel.*
-DEPENDS+= ncurses>=${NCURSES_REQD}:../../devel/ncurses
+DEPENDS+= ${BUILDLINK_DEPENDS.ncurses}:../../devel/ncurses
.else
BUILDLINK_PREFIX.ncurses= /usr
BUILDLINK_FILES.ncurses= include/curses.h
diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk
index 237af486593..33174d125f5 100644
--- a/devel/pth/buildlink.mk
+++ b/devel/pth/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/18 20:30:48 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:54 jlam Exp $
#
# This Makefile fragment is included by packages that use pth.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define PTH_REQD to the version of pth desired.
+# (1) Optionally define BUILDLINK_DEPENDS.pth to the dependency pattern
+# for the version of pth 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(PTH_BUILDLINK_MK)
PTH_BUILDLINK_MK= # defined
-PTH_REQD?= 1.3.2
-DEPENDS+= pth>=${PTH_REQD}:../../devel/pth
+BUILDLINK_DEPENDS.pth?= pth>=1.3.2
+DEPENDS+= ${BUILDLINK_DEPENDS.pth}:../../devel/pth
BUILDLINK_PREFIX.pth= ${LOCALBASE}
BUILDLINK_FILES.pth= include/pth.h
diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk
index a5b6cb7583b..5c473266630 100644
--- a/devel/readline/buildlink.mk
+++ b/devel/readline/buildlink.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink.mk,v 1.11 2001/06/20 23:24:39 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.12 2001/06/23 19:26:54 jlam Exp $
#
# This Makefile fragment is included by packages that use readline().
#
# To use this Makefile fragment, simply:
#
# (1) Optionally define USE_GNU_READLINE to force use of GNU readline.
-# (2) Optionally define READLINE_REQD to the version of GNU readline desired.
+# (2) Optionally define BUILDLINK_DEPENDS.readline to the dependency pattern
+# for the version of GNU readline desired.
# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
# search path, and
# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
@@ -17,7 +18,7 @@
.if !defined(READLINE_BUILDLINK_MK)
READLINE_BUILDLINK_MK= # defined
-READLINE_REQD?= 2.2
+BUILDLINK_DEPENDS.readline?= readline>=2.2
.if defined(USE_GNU_READLINE)
_NEED_GNU_READLINE= YES
@@ -29,7 +30,7 @@ _NEED_GNU_READLINE= YES
.endif
.if ${_NEED_GNU_READLINE} == "YES"
-DEPENDS+= readline>=${READLINE_REQD}:../../devel/readline
+DEPENDS+= ${BUILDLINK_DEPENDS.readline}:../../devel/readline
BUILDLINK_PREFIX.readline= ${LOCALBASE}
BUILDLINK_FILES.readline= include/readline/*
BUILDLINK_FILES.readline+= lib/libreadline.*
diff --git a/devel/rpc2/buildlink.mk b/devel/rpc2/buildlink.mk
index 9de17fc246f..ad513f59b73 100644
--- a/devel/rpc2/buildlink.mk
+++ b/devel/rpc2/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:54 jlam Exp $
#
# This Makefile fragment is included by packages that use rpc2.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define RPC2_REQD to the version of rpc2 desired.
+# (1) Optionally define BUILDLINK_DEPENDS.rpc2 to the dependency pattern
+# for the version of rpc2 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(RPC2_BUILDLINK_MK)
RPC2_BUILDLINK_MK= # defined
-RPC2_REQD?= 1.10
-DEPENDS+= rpc2>=${RPC2_REQD}:../../devel/rpc2
+BUILDLINK_DEPENDS.rpc2?= rpc2>=1.10
+DEPENDS+= ${BUILDLINK_DEPENDS.rpc2}:../../devel/rpc2
BUILDLINK_PREFIX.rpc2= ${LOCALBASE}
BUILDLINK_FILES.rpc2= include/rpc2/*
diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk
index 7a776b9f281..2d08c6c3dbc 100644
--- a/devel/rvm/buildlink.mk
+++ b/devel/rvm/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:54 jlam Exp $
#
# This Makefile fragment is included by packages that use rvm.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define RVM_REQD to the version of rvm desired.
+# (1) Optionally define BUILDLINK_DEPENDS.rvm to the dependency pattern
+# for the version of rvm 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(RVM_BUILDLINK_MK)
RVM_BUILDLINK_MK= # defined
-RVM_REQD?= 1.3
-DEPENDS+= rvm>=${RVM_REQD}:../../devel/rvm
+BUILDLINK_DEPENDS.rvm?= rvm>=1.3
+DEPENDS+= ${BUILDLINK_DEPENDS.rvm}:../../devel/rvm
BUILDLINK_PREFIX.rvm= ${LOCALBASE}
BUILDLINK_FILES.rvm= include/rvm/*
diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk
index 3cca7764de8..6dadc4a7cfd 100644
--- a/devel/zlib/buildlink.mk
+++ b/devel/zlib/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/11 01:59:36 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:55 jlam Exp $
#
# This Makefile fragment is included by packages that use zlib.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define ZLIB_REQD to the version of zlib desired.
+# (1) Optionally define BUILDLINK_DEPENDS.zlib to the dependency pattern
+# for the version of zlib 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,7 +15,7 @@
.if !defined(ZLIB_BUILDLINK_MK)
ZLIB_BUILDLINK_MK= # defined
-ZLIB_REQD?= 1.1.3
+BUILDLINK_DEPENDS.zlib?= zlib>=1.1.3
.if exists(/usr/include/zlib.h)
_NEED_ZLIB= NO
@@ -23,7 +24,7 @@ _NEED_ZLIB= YES
.endif
.if ${_NEED_ZLIB} == "YES"
-DEPENDS+= zlib>=${ZLIB_REQD}:../../devel/zlib
+DEPENDS+= ${BUILDLINK_DEPENDS.zlib}:../../devel/zlib
BUILDLINK_PREFIX.zlib= ${LOCALBASE}
.else
BUILDLINK_PREFIX.zlib= /usr
diff --git a/graphics/freetype-lib/buildlink.mk b/graphics/freetype-lib/buildlink.mk
index b419cf82d20..49990046fc1 100644
--- a/graphics/freetype-lib/buildlink.mk
+++ b/graphics/freetype-lib/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:55 jlam Exp $
#
# This Makefile fragment is included by packages that use freetype.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define FREETYPE_REQD to the version of freetype desired.
+# (1) Optionally define BUILDLINK_DEPENDS.freetype to the dependency pattern
+# for the version of freetype 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(FREETYPE_BUILDLINK_MK)
FREETYPE_BUILDLINK_MK= # defined
-FREETYPE_REQD?= 1.3.1
-DEPENDS+= freetype-lib>=${FREETYPE_REQD}:../../graphics/freetype-lib
+BUILDLINK_DEPENDS.freetype?= freetype-lib>=1.3.1
+DEPENDS+= ${BUILDLINK_DEPENDS.freetype}:../../graphics/freetype-lib
BUILDLINK_PREFIX.freetype= ${LOCALBASE}
BUILDLINK_FILES.freetype= include/freetype/*
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index b7b45bf05d6..75958625e64 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/05/28 03:16:44 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/23 19:26:55 jlam Exp $
PKGNAME= freetype-utils-${FT_VERS}
-
COMMENT= Utilities for manipulating TrueType fonts
-FREETYPE_REQD= ${FT_VERS}
+BUILDLINK_DEPENDS.freetype= freetype>=${FT_VERS}
USE_X11= # defined
CONFIGURE_ARGS+= --with-x
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 20142f3c424..55a66c2c7c6 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2001/06/18 20:49:01 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/23 19:26:55 jlam Exp $
.include "../gdk-pixbuf/Makefile.common"
PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
-
COMMENT= the GNOME image loading library GNOME canvas support add-on
CONFLICTS+= gdk-pixbuf<0.10.1
-GDK_PIXBUF_REQD= 0.10.1
-
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../x11/gnome-libs/buildlink.mk"
+BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.10.1
# Fix config scripts by removing buildlink directory references.
post-build:
@@ -38,4 +34,6 @@ do-install:
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \
${INSTALL_TARGET}
+.include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../x11/gnome-libs/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index 4f4361ab0e4..24d307c53db 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/16 19:53:09 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:55 jlam Exp $
#
# This Makefile fragment is included by packages that use gdk-pixbuf.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define GDK_PIXBUF_REQD to the version of gdk-pixbuf desired.
+# (1) Optionally define BUILDLINK_DEPENDS.gkd-pixbuf to the dependency version
+# for the version of gdk-pixbuf 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(GDK_PIXBUF_BUILDLINK_MK)
GDK_PIXBUF_BUILDLINK_MK= # defined
-GDK_PIXBUF_REQD?= 0.8.0nb1
-DEPENDS+= gdk-pixbuf>=${GDK_PIXBUF_REQD}:../../graphics/gdk-pixbuf
+BUILDLINK_DEPENDS.gkd-pixbuf?= gdk-pixbuf>=0.8.0nb1
+DEPENDS+= ${BUILDLINK_DEPENDS.gkd-pixbuf}:../../graphics/gdk-pixbuf
BUILDLINK_PREFIX.gdk-pixbuf= ${X11PREFIX}
BUILDLINK_FILES.gdk-pixbuf= include/gdk-pixbuf/*
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 6f4fda8109e..53ac6fc75a1 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/06/18 21:48:52 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/06/23 19:26:56 jlam Exp $
#
DISTNAME= gqview-0.10.1
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=no
CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
-GDK_PIXBUF_REQD= 0.9.0
+BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.9.0
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../graphics/gdk-pixbuf/buildlink.mk"
diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk
index fd33045f373..165ce4fabfe 100644
--- a/graphics/imlib/buildlink.mk
+++ b/graphics/imlib/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $
#
# This Makefile fragment is included by packages that use imlib.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define IMLIB_REQD to the version of imlib desired.
+# (1) Optionally define BUILDLINK_DEPENDS.imlib to the dependency pattern
+# for the version of imlib 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(IMLIB_BUILDLINK_MK)
IMLIB_BUILDLINK_MK= # defined
-IMLIB_REQD?= 1.9.8
-DEPENDS+= imlib>=${IMLIB_REQD}:../../graphics/imlib
+BUILDLINK_DEPENDS.imlib?= imlib>=1.9.8
+DEPENDS+= ${BUILDLINK_DEPENDS.imlib}:../../graphics/imlib
BUILDLINK_PREFIX.imlib= ${X11PREFIX}
BUILDLINK_FILES.imlib= include/gdk_imlib.h
diff --git a/graphics/jpeg/buildlink.mk b/graphics/jpeg/buildlink.mk
index 31c665a77ac..c8d59f0f976 100644
--- a/graphics/jpeg/buildlink.mk
+++ b/graphics/jpeg/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:56 jlam Exp $
#
# This Makefile fragment is included by packages that use libjpeg.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define JPEG_REQD to the version of libjpeg desired.
+# (1) Optionally define BUILDLINK_DEPENDS.jpeg to the dependency pattern
+# for the version of libjpeg 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(JPEG_BUILDLINK_MK)
JPEG_BUILDLINK_MK= # defined
-JPEG_REQD?= 6
-DEPENDS+= jpeg>=${JPEG_REQD}:../../graphics/jpeg
+BUILDLINK_DEPENDS.jpeg?= jpeg-6b
+DEPENDS+= ${BUILDLINK_DEPENDS.jpeg}:../../graphics/jpeg
BUILDLINK_PREFIX.jpeg= ${LOCALBASE}
BUILDLINK_FILES.jpeg= include/jconfig.h
diff --git a/graphics/lcms/buildlink.mk b/graphics/lcms/buildlink.mk
index 4bbccfecd0d..01e06f60be8 100644
--- a/graphics/lcms/buildlink.mk
+++ b/graphics/lcms/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/22 16:39:00 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $
#
# This Makefile fragment is included by packages that use lcms.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define LCMS_REQD to the version of lcms desired.
+# (1) Optionally define BUILDLINK_DEPENDS.lcms to the dependency pattern
+# for the version of lcms 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(LCMS_BUILDLINK_MK)
LCMS_BUILDLINK_MK= # defined
-LCMS_REQD?= 1.06
-DEPENDS+= lcms>=${LCMS_REQD}:../../graphics/lcms
+BUILDLINK_DEPENDS.lcms?= lcms>=1.06
+DEPENDS+= ${BUILDLINK_DEPENDS.lcms}:../../graphics/lcms
BUILDLINK_PREFIX.lcms= ${LOCALBASE}
BUILDLINK_FILES.lcms= include/lcms/*
diff --git a/graphics/libungif/buildlink.mk b/graphics/libungif/buildlink.mk
index e36adb3673e..6f2b9e011dd 100644
--- a/graphics/libungif/buildlink.mk
+++ b/graphics/libungif/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $
#
# This Makefile fragment is included by packages that use libungif.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define LIBUNGIF_REQD to the version of libungif desired.
+# (1) Optionally define BUILDLINK_DEPENDS.libungif to the dependency pattern
+# for the version of libungif 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(LIBUNGIF_BUILDLINK_MK)
LIBUNGIF_BUILDLINK_MK= # defined
-LIBUNGIF_REQD?= 4.1.0
-DEPENDS+= libungif>=${LIBUNGIF_REQD}:../../graphics/libungif
+BUILDLINK_DEPENDS.libungif?= libungif>=4.1.0
+DEPENDS+= ${BUILDLINK_DEPENDS.libungif}:../../graphics/libungif
BUILDLINK_PREFIX.libungif= ${LOCALBASE}
BUILDLINK_FILES.libungif= include/gif_lib.h
diff --git a/graphics/mng/buildlink.mk b/graphics/mng/buildlink.mk
index 10cf7e52192..ba0dd7b3488 100644
--- a/graphics/mng/buildlink.mk
+++ b/graphics/mng/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/22 16:46:51 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:57 jlam Exp $
#
# This Makefile fragment is included by packages that use mng.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define MNG_REQD to the version of mng desired.
+# (1) Optionally define BUILDLINK_DEPENDS.mng to the dependency pattern
+# for the version of mng 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(MNG_BUILDLINK_MK)
MNG_BUILDLINK_MK= # defined
-MNG_REQD?= 1.0.0
-DEPENDS+= mng>=${MNG_REQD}:../../graphics/mng
+BUILDLINK_DEPENDS.mng?= mng>=1.0.0
+DEPENDS+= ${BUILDLINK_DEPENDS.mng}:../../graphics/mng
BUILDLINK_PREFIX.mng= ${LOCALBASE}
BUILDLINK_FILES.mng= include/libmng.h
diff --git a/graphics/netpbm/buildlink.mk b/graphics/netpbm/buildlink.mk
index 2752a67b496..27de7b8f594 100644
--- a/graphics/netpbm/buildlink.mk
+++ b/graphics/netpbm/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:57 jlam Exp $
#
# This Makefile fragment is included by packages that use netpbm.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define NETPBM_REQD to the version of netpbm desired.
+# (1) Optionally define BUILDLINK_DEPENDS.netpbm to the dependency pattern
+# for the version of netpbm 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(NETPBM_BUILDLINK_MK)
NETPBM_BUILDLINK_MK= # defined
-NETPBM_REQD?= 9.7
-DEPENDS+= netpbm>=${NETPBM_REQD}:../../graphics/netpbm
+BUILDLINK_DEPENDS.netpbm?= netpbm>=9.7
+DEPENDS+= ${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm
BUILDLINK_PREFIX.netpbm= ${LOCALBASE}
BUILDLINK_FILES.netpbm= include/pbm.h
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk
index b36119507b4..266fff55ecb 100644
--- a/graphics/png/buildlink.mk
+++ b/graphics/png/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:36 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:26:57 jlam Exp $
#
# This Makefile fragment is included by packages that use libpng.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define PNG_REQD to the version of libpng desired.
+# (1) Optionally define BUILDLINK_DEPENDS.png to the dependency pattern
+# for the version of libpng 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(PNG_BUILDLINK_MK)
PNG_BUILDLINK_MK= # defined
-PNG_REQD?= 1.0.11
-DEPENDS+= png>=${PNG_REQD}:../../graphics/png
+BUILDLINK_DEPENDS.png?= png>=1.0.11
+DEPENDS+= ${BUILDLINK_DEPENDS.png}:../../graphics/png
BUILDLINK_PREFIX.png= ${LOCALBASE}
BUILDLINK_FILES.png= include/png.h
diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk
index a428e8be831..27c7a916105 100644
--- a/graphics/tiff/buildlink.mk
+++ b/graphics/tiff/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:26:57 jlam Exp $
#
# This Makefile fragment is included by packages that use libtiff.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define TIFF_REQD to the version of libtiff desired.
+# (1) Optionally define BUILDLINK_DEPENDS.tiff to the dependency pattern
+# for the version of libtiff 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(TIFF_BUILDLINK_MK)
TIFF_BUILDLINK_MK= # defined
-TIFF_REQD?= 3.5.4
-DEPENDS+= tiff>=${TIFF_REQD}:../../graphics/tiff
+BUILDLINK_DEPENDS.tiff?= tiff>=3.5.4
+DEPENDS+= ${BUILDLINK_DEPENDS.tiff}:../../graphics/tiff
BUILDLINK_PREFIX.tiff= ${LOCALBASE}
BUILDLINK_FILES.tiff= include/tiff.h
diff --git a/japanese/vflib-lib/buildlink.mk b/japanese/vflib-lib/buildlink.mk
index dcfeabe0c90..522e7c34cba 100644
--- a/japanese/vflib-lib/buildlink.mk
+++ b/japanese/vflib-lib/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:57 jlam Exp $
#
# This Makefile fragment is included by packages that use VFlib.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define VFLIB_REQD to the version of VFlib desired.
+# (1) Optionally define BUILDLINK_DEPENDS.vflib to the dependency pattern
+# for the version of VFlib 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(VFLIB_BUILDLINK_MK)
VFLIB_BUILDLINK_MK= # defined
-VFLIB_REQD?= 2.24.2
-DEPENDS+= ja-vflib-lib>=${VFLIB_REQD}:../../japanese/vflib-lib
+BUILDLINK_DEPENDS.vflib?= ja-vflib-lib>=2.24.2
+DEPENDS+= ${BUILDLINK_DEPENDS.vflib}:../../japanese/vflib-lib
BUILDLINK_PREFIX.vflib= ${LOCALBASE}
BUILDLINK_FILES.vflib= include/VF.h
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 61ae1c9c985..07a6a3f3c0b 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/06/21 03:03:20 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/23 19:26:58 jlam Exp $
#
DISTNAME= librep-${REP_VERS}
@@ -10,7 +10,7 @@ MAINTAINER= danw@netbsd.org
HOMEPAGE= http://librep.sourceforge.net/
COMMENT= Emacs Lisp-like runtime library, interpreter, compiler and VM
-GDBM_REQD= 1.8.0
+BUILDLINK_DEPENDS.gdbm= gdbm>=1.8.0
USE_GNU_READLINE= # uses rl_basic_quote_characters
USE_BUILDLINK_ONLY= # defined
@@ -28,5 +28,4 @@ PLIST_SUBST+= REP_VERS=${REP_VERS}
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../devel/gmp/buildlink.mk"
.include "../../devel/readline/buildlink.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl/buildlink.mk b/lang/tcl/buildlink.mk
index a7fe9fa87dc..e162bf06de1 100644
--- a/lang/tcl/buildlink.mk
+++ b/lang/tcl/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/21 18:54:37 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 tcl.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define TCL_REQD to the version of tcl desired.
+# (1) Optionally define BUILDLINK_DEPENDS.tcl to the dependency pattern
+# for the version of tcl 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(TCL_BUILDLINK_MK)
TCL_BUILDLINK_MK= # defined
-TCL_REQD?= 8.3.2
-DEPENDS+= tcl>=${TCL_REQD}:../../lang/tcl
+BUILDLINK_DEPENDS.tcl?= tcl>=8.3.2
+DEPENDS+= ${BUILDLINK_DEPENDS.tcl}:../../lang/tcl
BUILDLINK_PREFIX.tcl= ${LOCALBASE}
BUILDLINK_FILES.tcl= include/tcl.h
diff --git a/mail/imap-uw/buildlink.mk b/mail/imap-uw/buildlink.mk
index 846e5c4af50..d9fd416d1d6 100644
--- a/mail/imap-uw/buildlink.mk
+++ b/mail/imap-uw/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/22 05:46:26 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 imap-uw.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define IMAP_UW_REQD to the version of imap-uw desired.
+# (1) Optionally define BUILDLINK_DEPENDS.imap-uw to the dependency pattern
+# for the version of imap-uw 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(IMAP_UW_BUILDLINK_MK)
IMAP_UW_BUILDLINK_MK= # defined
-IMAP_UW_REQD?= 2000.0.3nb1
-DEPENDS+= imap-uw>=${IMAP_UW_REQD}:../../mail/imap-uw
+BUILDLINK_DEPENDS.imap-uw?= imap-uw>=2000.0.3nb1
+DEPENDS+= ${BUILDLINK_DEPENDS.imap-uw}:../../mail/imap-uw
BUILDLINK_PREFIX.imap-uw= ${LOCALBASE}
BUILDLINK_FILES.imap-uw= include/c-client/*
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/*
diff --git a/net/ORBit/buildlink.mk b/net/ORBit/buildlink.mk
index 8fa67ed357e..508d6b90991 100644
--- a/net/ORBit/buildlink.mk
+++ b/net/ORBit/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:59 jlam Exp $
#
# This Makefile fragment is included by packages that use ORBit.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define ORBIT_REQD to the version of ORBit desired.
+# (1) Optionally define BUILDLINK_DEPENDS.ORBit to the dependency pattern
+# for the version of ORBit 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(ORBIT_BUILDLINK_MK)
ORBIT_BUILDLINK_MK= # defined
-ORBIT_REQD?= 0.5.1
-DEPENDS+= ORBit>=${ORBIT_REQD}:../../net/ORBit
+BUILDLINK_DEPENDS.ORBit?= ORBit>=0.5.1
+DEPENDS+= ${BUILDLINK_DEPENDS.ORBit}:../../net/ORBit
BUILDLINK_PREFIX.ORBit= ${LOCALBASE}
BUILDLINK_FILES.ORBit= include/IIOP/*
diff --git a/print/cups/buildlink.mk b/print/cups/buildlink.mk
index 7d61f33c494..8311126d6c7 100644
--- a/print/cups/buildlink.mk
+++ b/print/cups/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/11 01:59:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/06/23 19:26:59 jlam Exp $
#
# This Makefile fragment is included by packages that use libcups.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define CUPS_REQD to the version of cups desired.
+# (1) Optionally define BUILDLINK_DEPENDS.cups to the dependency pattern
+# for the version of cups 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(CUPS_BUILDLINK_MK)
CUPS_BUILDLINK_MK= # defined
-CUPS_REQD?= 1.1.1
-DEPENDS+= cups>=${CUPS_REQD}:../../print/cups
+BUILDLINK_DEPENDS.cups?= cups>=1.1.1
+DEPENDS+= ${BUILDLINK_DEPENDS.cups}:../../print/cups
BUILDLINK_PREFIX.cups= ${LOCALBASE}
BUILDLINK_FILES.cups= include/cups/*
diff --git a/security/PAM/buildlink.mk b/security/PAM/buildlink.mk
index e6617e50543..a59b8503c54 100644
--- a/security/PAM/buildlink.mk
+++ b/security/PAM/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/11 01:59:38 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/06/23 19:26:59 jlam Exp $
#
# This Makefile fragment is included by packages that use libpam.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define PAM_REQD to the version of pam desired.
+# (1) Optionally define BUILDLINK_DEPENDS.pam to the dependency pattern
+# for the version of pam 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(PAM_BUILDLINK_MK)
PAM_BUILDLINK_MK= # defined
-PAM_REQD?= 0.72
-DEPENDS+= PAM>=${PAM_REQD}:../../security/PAM
+BUILDLINK_DEPENDS.pam?= PAM>=0.72
+DEPENDS+= ${BUILDLINK_DEPENDS.pam}:../../security/PAM
BUILDLINK_PREFIX.pam= ${LOCALBASE}
BUILDLINK_FILES.pam= include/security/*
diff --git a/security/libcrack/buildlink.mk b/security/libcrack/buildlink.mk
index 1afb57125cc..6f3fe1310f3 100644
--- a/security/libcrack/buildlink.mk
+++ b/security/libcrack/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/19 09:11:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:00 jlam Exp $
#
# This Makefile fragment is included by packages that use libcrack.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define LIBCRACK_REQD to the version of libcrack desired.
+# (1) Optionally define BUILDLINK_DEPENDS.libcrack to the dependency pattern
+# for the version of libcrack 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(LIBCRACK_BUILDLINK_MK)
LIBCRACK_BUILDLINK_MK= # defined
-LIBCRACK_REQD?= 2.7
-DEPENDS+= libcrack>=${LIBCRACK_REQD}:../../security/libcrack
+BUILDLINK_DEPENDS.libcrack?= libcrack>=2.7
+DEPENDS+= ${BUILDLINK_DEPENDS.libcrack}:../../security/libcrack
BUILDLINK_PREFIX.libcrack= ${LOCALBASE}
BUILDLINK_FILES.libcrack= include/cracklib/*
diff --git a/security/openssl/buildlink.mk b/security/openssl/buildlink.mk
index 9f4fa25b8fd..ce8590468d9 100644
--- a/security/openssl/buildlink.mk
+++ b/security/openssl/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/18 05:30:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:00 jlam Exp $
#
# This Makefile fragment is included by packages that use OpenSSL.
#
@@ -13,9 +13,7 @@
.if !defined(OPENSSL_BUILDLINK_MK)
OPENSSL_BUILDLINK_MK= # defined
-.include "../../mk/bsd.prefs.mk"
-
-OPENSSL_REQD= 0.9.[56]*
+BUILDLINK_DEPENDS.openssl?= openssl-0.9.[56]*
.if exists(/usr/include/openssl/ssl.h)
_NEED_OPENSSL= NO
@@ -24,7 +22,7 @@ _NEED_OPENSSL= YES
.endif
.if ${_NEED_OPENSSL} == "YES"
-DEPENDS+= openssl-${OPENSSL_REQD}:../../security/openssl
+DEPENDS+= ${BUILDLINK_DEPENDS.openssl}:../../security/openssl
BUILDLINK_PREFIX.openssl= ${LOCALBASE}
SSLBASE= ${LOCALBASE}
SSLCERTS= ${SSLBASE}/certs
diff --git a/security/tcp_wrappers/buildlink.mk b/security/tcp_wrappers/buildlink.mk
index 460baa4b73c..02229e6c4c8 100644
--- a/security/tcp_wrappers/buildlink.mk
+++ b/security/tcp_wrappers/buildlink.mk
@@ -1,11 +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:00 jlam Exp $
#
# This Makefile fragment is included by packages that use tcp_wrappers.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define TCP_WRAPPERS_REQD to the version of tcp_wrappers
-# desired.
+# (1) Optionally define BUILDLINK_DEPENDS.tcp_wrappers to the dependency
+# pattern for the version of tcp_wrappers 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,9 +15,7 @@
.if !defined(TCP_WRAPPERS_BUILDLINK_MK)
TCP_WRAPPERS_BUILDLINK_MK= # defined
-.include "../../mk/bsd.prefs.mk"
-
-TCP_WRAPPERS_REQD?= 7.6.1nb1
+BUILDLINK_DEPENDS.tcp_wrappers?= tcp_wrappers>=7.6.1nb1
.if exists(/usr/include/tcpd.h)
_NEED_TCP_WRAPPERS= NO
@@ -26,7 +24,7 @@ _NEED_TCP_WRAPPERS= YES
.endif
.if ${_NEED_TCP_WRAPPERS} == "YES"
-DEPENDS+= tcp_wrappers>=${TCP_WRAPPERS_REQD}:../../security/tcp_wrappers
+DEPENDS+= ${BUILDLINK_DEPENDS.tcp_wrappers}:../../security/tcp_wrappers
BUILDLINK_PREFIX.tcp_wrappers= ${LOCALBASE}
.else
BUILDLINK_PREFIX.tcp_wrappers= /usr
diff --git a/textproc/libxml/buildlink.mk b/textproc/libxml/buildlink.mk
index 6add6bc6b04..5ac01cf7f5b 100644
--- a/textproc/libxml/buildlink.mk
+++ b/textproc/libxml/buildlink.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/19 04:51:25 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:00 jlam Exp $
#
# This Makefile fragment is included by packages that use libxml.
#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define LIBXML_REQD to the version of libxml desired.
+# (1) Optionally define BUILDLINK_DEPENDS.libxml to the dependency patthern
+# for the version of libxml 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(LIBXML_BUILDLINK_MK)
LIBXML_BUILDLINK_MK= # defined
-LIBXML_REQD?= 1.8.11
-DEPENDS+= libxml>=${LIBXML_REQD}:../../textproc/libxml
+BUILDLINK_DEPENDS.libxml?= libxml>=1.8.11
+DEPENDS+= ${BUILDLINK_DEPENDS.libxml}:../../textproc/libxml
BUILDLINK_PREFIX.libxml= ${LOCALBASE}
BUILDLINK_FILES.libxml= include/gnome-xml/*
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