[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_rolling-replace pkg_rolling-replace-0.17:

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a51c08037480
branches:  trunk
changeset: 394859:a51c08037480
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Jun 17 08:12:18 2009 +0000

description:
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:

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

diffs (33 lines):

diff -r 9a907786a07e -r a51c08037480 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Wed Jun 17 08:07:54 2009 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Wed Jun 17 08:12:18 2009 +0000
@@ -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 -r 9a907786a07e -r a51c08037480 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Wed Jun 17 08:07:54 2009 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Wed Jun 17 08:12:18 2009 +0000
@@ -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 @@
             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