summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2012-04-30 13:59:38 +0000
committergdt <gdt@pkgsrc.org>2012-04-30 13:59:38 +0000
commit99245398e160236f6a5968c6df9678f7b2142ae9 (patch)
tree6c4bf6a04bad97f7ffb30e317ccf9f4073212543 /pkgtools
parente9f2f38ee4953b3bb27282a8ae3bbae128f0ad98 (diff)
downloadpkgsrc-99245398e160236f6a5968c6df9678f7b2142ae9.tar.gz
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 (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_rolling-replace/Makefile4
-rwxr-xr-xpkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile
index e1b389dcdaf..1ea10f6f4b8 100644
--- a/pkgtools/pkg_rolling-replace/Makefile
+++ b/pkgtools/pkg_rolling-replace/Makefile
@@ -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 --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
index 996059db250..7ea0b97df07 100755
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
@@ -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 @@ while [ -n "$REPLACE_TODO" ]; do
# 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..."