pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Require xpkgwedge>=1.13 when used as a build depend...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/95b8fe0cde20
branches:  trunk
changeset: 495567:95b8fe0cde20
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jun 14 07:25:24 2005 +0000

description:
Require xpkgwedge>=1.13 when used as a build dependency so that the
correct make(1) program is invoked by pkgxmkmf.

diffstat:

 mk/bsd.pkg.use.mk |  4 ++--
 mk/bsd.prefs.mk   |  3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r f5305e3f829b -r 95b8fe0cde20 mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Tue Jun 14 07:23:56 2005 +0000
+++ b/mk/bsd.pkg.use.mk Tue Jun 14 07:25:24 2005 +0000
@@ -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 @@
 ### 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 -r f5305e3f829b -r 95b8fe0cde20 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Tue Jun 14 07:23:56 2005 +0000
+++ b/mk/bsd.prefs.mk   Tue Jun 14 07:25:24 2005 +0000
@@ -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 @@
 
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 USE_XPKGWEDGE=         yes
-_XPKGWEDGE_REQD=       1.9
 .endif
 
 # Set X11PREFIX to reflect the install directory of X11 packages.



Home | Main Index | Thread Index | Old Index