Mon Apr 30 13:59:39 2012 UTC ()

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.


(gdt)

diff -r1.32 -r1.33 pkgsrc/pkgtools/pkg_rolling-replace/Makefile
diff -r1.31 -r1.32 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh

--- pkgsrc/pkgtools/pkg_rolling-replace/Makefile 2011/03/22 04:04:58 1.32
+++ pkgsrc/pkgtools/pkg_rolling-replace/Makefile 2012/04/30 13:59:38 1.33

@@ -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

--- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh 2011/03/22 04:04:58 1.31
+++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh 2012/04/30 13:59:39 1.32

@@ -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..."