pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_rolling-replace Use " for PKGNAME_REQUIRE...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a539be24f35
branches:  trunk
changeset: 603213:4a539be24f35
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Mon Apr 30 13:59:38 2012 +0000

description:
Use " for PKGNAME_REQUIRED, so that ${pkg} is expanded.

Resolves at least some issues with finding the right pyNN-foo, when
replacing packages that don't match PYTHON_VERSION_DEFAULT.

(This was a stray change in my tree not committed for a while, but
it's been working ok.)

Now 0.24.1.

diffstat:

 pkgtools/pkg_rolling-replace/Makefile                     |  4 ++--
 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r cb59d7571837 -r 4a539be24f35 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Mon Apr 30 13:57:02 2012 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Mon Apr 30 13:59:38 2012 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2011/03/22 04:04:58 obache Exp $
+# $NetBSD: Makefile,v 1.33 2012/04/30 13:59:38 gdt Exp $
 
-DISTNAME=      pkg_rolling-replace-0.24
+DISTNAME=      pkg_rolling-replace-0.24.1
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r cb59d7571837 -r 4a539be24f35 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Mon Apr 30 13:57:02 2012 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Mon Apr 30 13:59:38 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.31 2011/03/22 04:04:58 obache Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.32 2012/04/30 13:59:39 gdt Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -453,7 +453,7 @@
     # the appropriate version of Python can be derived from the
     # package name (so, when building py25-foo, use python-2.5,
     # not python-2.6).
-    MAKE_SET_VARS='PKGNAME_REQD=${pkg}-*'
+    MAKE_SET_VARS="PKGNAME_REQD=${pkg}-*"
 
     if ! is_member $pkg $DEPENDS_CHECKED; then
        echo "${OPI} Checking if $pkg has new depends..."



Home | Main Index | Thread Index | Old Index