diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-14 07:25:24 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-14 07:25:24 +0000 |
| commit | 33a4d9397c0200aebebfb6402f5c25261bd79132 (patch) | |
| tree | 4cc04608bfbb51425c4a908c7253801355d271be /mk | |
| parent | 8be3e662e0e6a5f0590cf1a9eadc877fc3bc7902 (diff) | |
| download | pkgsrc-33a4d9397c0200aebebfb6402f5c25261bd79132.tar.gz | |
Require xpkgwedge>=1.13 when used as a build dependency so that the
correct make(1) program is invoked by pkgxmkmf.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 4 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index f8420d3ae03..2019838f1db 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.17 2005/06/14 02:09:38 jlam Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.18 2005/06/14 07:25:24 jlam Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -125,5 +125,5 @@ RMAN?= ${X11BASE}/bin/rman ### USE_XPKGWEDGE .if defined(USE_X11BASE) && !empty(USE_XPKGWEDGE:M[yY][eE][sS]) -BUILD_DEPENDS+= xpkgwedge>=${_XPKGWEDGE_REQD:U1.5}:../../pkgtools/xpkgwedge +BUILD_DEPENDS+= xpkgwedge>=${_XPKGWEDGE_REQD:U1.13}:../../pkgtools/xpkgwedge .endif diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 54cf66d5a32..c5392bee06b 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.194 2005/06/01 17:05:19 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.195 2005/06/14 07:25:24 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -385,7 +385,6 @@ USE_XPKGWEDGE= yes .if ${PKG_INSTALLATION_TYPE} == "pkgviews" USE_XPKGWEDGE= yes -_XPKGWEDGE_REQD= 1.9 .endif # Set X11PREFIX to reflect the install directory of X11 packages. |