diff options
| author | tnn <tnn> | 2007-06-29 17:00:44 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2007-06-29 17:00:44 +0000 |
| commit | bf210ec57d97dd43699e2f0246ad6e4952f4f075 (patch) | |
| tree | 852503cd89a22e4195b2928d4f776770d0e97ef3 /pkgtools/pkg_rolling-replace | |
| parent | 40a65b97a6f605c8968ce0a4949249b959fc6377 (diff) | |
| download | pkgsrc-bf210ec57d97dd43699e2f0246ad6e4952f4f075.tar.gz | |
Convert extended RE into basic RE equivalent, making us portable again.
Noted by Mehul N. Sanghvi on pkgsrc-users@
Diffstat (limited to 'pkgtools/pkg_rolling-replace')
| -rw-r--r-- | pkgtools/pkg_rolling-replace/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile index 4c89bb5b3d4..ae0d7512cf2 100644 --- a/pkgtools/pkg_rolling-replace/Makefile +++ b/pkgtools/pkg_rolling-replace/Makefile @@ -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 --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh index 4cfed9427b6..873adc20435 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.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 @@ while [ -n "$REPLACE_TODO" ]; do 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" |