diff options
| author | tnn <tnn@pkgsrc.org> | 2009-06-17 08:12:18 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-06-17 08:12:18 +0000 |
| commit | 90f3085579e2683294fc4c8fd525482324553566 (patch) | |
| tree | a6425f8233963a4fbabed3860cda5c0efdd1af9f /pkgtools | |
| parent | e7f7c5cf1f5cb8cd9e40c2d61cb2a5a876b98d4c (diff) | |
| download | pkgsrc-90f3085579e2683294fc4c8fd525482324553566.tar.gz | |
pkg_rolling-replace-0.17:
Use "pkg_info -Q" to extract PKGPATH from installed packages instead of
"pkg_info -B" coupled with awk magic. The previous regexp didn't account
for packages that have PREV_PKGPATH set, and blew up while replacing
for example mail/sylpheed and multimedia/ffmpeg.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_rolling-replace/Makefile | 5 | ||||
| -rwxr-xr-x | pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile index 9582a62d44e..bb34c70ff7f 100644 --- a/pkgtools/pkg_rolling-replace/Makefile +++ b/pkgtools/pkg_rolling-replace/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.23 2009/04/09 00:48:13 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2009/06/17 08:12:18 tnn Exp $ -DISTNAME= pkg_rolling-replace-0.16 -PKGREVISION= 2 +DISTNAME= pkg_rolling-replace-0.17 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 0e9bb8a0dff..407d157eb06 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.20 2009/05/13 10:47:35 wiz Exp $ +# $NetBSD: pkg_rolling-replace.sh,v 1.21 2009/06/17 08:12:18 tnn Exp $ #<license> # Copyright (c) 2006 BBN Technologies Corp. All rights reserved. # @@ -355,7 +355,7 @@ while [ -n "$REPLACE_TODO" ]; do break; fi done - pkgdir=$(${PKG_INFO} -Bq $pkg | ${AWK} -F= '/PKGPATH=/{print $2}' | sed -e 's/^ //') + pkgdir=$(${PKG_INFO} -Q PKGPATH $pkg) echo "${OPI} Selecting $pkg ($pkgdir) as next package to replace" sleep 1 |