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 Convert extended RE into ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c130e22052c9
branches:  trunk
changeset: 530394:c130e22052c9
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Jun 29 17:00:44 2007 +0000

description:
Convert extended RE into basic RE equivalent, making us portable again.
Noted by Mehul N. Sanghvi on pkgsrc-users@

diffstat:

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

diffs (35 lines):

diff -r 5ae45fdc7ab2 -r c130e22052c9 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Thu Jun 28 23:19:17 2007 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Fri Jun 29 17:00:44 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2007/05/23 18:11:05 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2007/06/29 17:00:44 tnn Exp $
 
 DISTNAME=      pkg_rolling-replace-0.04
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 5ae45fdc7ab2 -r c130e22052c9 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Thu Jun 28 23:19:17 2007 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Fri Jun 29 17:00:44 2007 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.8 2007/06/05 08:22:32 tnn Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.9 2007/06/29 17:00:44 tnn Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -334,8 +334,8 @@
        bdeps=$(${MAKE} show-depends VARNAME=BUILD_DEPENDS)
        rdeps=$(${MAKE} show-depends)
        for depver in $bdeps $rdeps; do
-           dep=$(echo $depver | sed -E -e 's/[:[].*$/0/' \
-               -e 's/(>=|<=|-)[0-9][^-]*$//')
+           dep=$(echo $depver | sed -e 's/[:[].*$/0/' -e 's/>=[0-9][^-]*$//' \
+               -e 's/<=[0-9][^-]*$//' -e 's/-[0-9][^-]*$//')
            if ! is_member $dep $OLD_DEPENDS $NEW_DEPENDS; then
                NEW_DEPENDS="$NEW_DEPENDS $dep"
                DEPGRAPH_SRC="$DEPGRAPH_SRC $dep $pkg"



Home | Main Index | Thread Index | Old Index