[28822] trunk/base

[source_changes at macosforge.org]

Revision: 28822
          http://trac.macosforge.org/projects/macports/changeset/28822
Author:   afb at macports.org
Date:     2007-09-09 08:48:40 -0700 (Sun, 09 Sep 2007)

Log Message:
-----------
portable sed regexp now. looks like snoopy swearing.

Modified Paths:
--------------
    trunk/base/configure
    trunk/base/configure.ac

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2007-09-09 15:43:30 UTC (rev 28821)
+++ trunk/base/configure	2007-09-09 15:48:40 UTC (rev 28822)
@@ -2038,7 +2038,8 @@
 # translate mp_version (1.600) to regular version (1.6.0)
 { echo "$as_me:$LINENO: checking MacPorts version" >&5
 echo $ECHO_N "checking MacPorts version... $ECHO_C" >&6; }
-VER=`cat config/mp_version | tr -d '\n' | sed -E 's/([0-9])\.([0-9])0?([0-9][1-9]?)0?/\1.\2.\3/'`
+MP_VERSION=`cat config/mp_version | tr -d '\n'`
+VER=`echo $MP_VERSION | sed -e 's/\([0-9]\)\.\([0-9]\)0\{0,1\}\([0-9][1-9]\{0,1\}\)0\{0,1\}/\1.\2.\3/'`
 { echo "$as_me:$LINENO: result: $VER" >&5
 echo "${ECHO_T}$VER" >&6; }
 

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2007-09-09 15:43:30 UTC (rev 28821)
+++ trunk/base/configure.ac	2007-09-09 15:48:40 UTC (rev 28822)
@@ -11,7 +11,8 @@
 
 # translate mp_version (1.600) to regular version (1.6.0)
 AC_MSG_CHECKING(MacPorts version)
-VER=`cat config/mp_version | tr -d '\n' | sed -E 's/([[0-9]])\.([[0-9]])0?([[0-9]][[1-9]]?)0?/\1.\2.\3/'`
+MP_VERSION=`cat config/mp_version | tr -d '\n'`
+VER=`echo $MP_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)0\{0,1\}\([[0-9]][[1-9]]\{0,1\}\)0\{0,1\}/\1.\2.\3/'`
 AC_MSG_RESULT([$VER])
 AC_SUBST(VER)
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070909/6ddd2650/attachment.html