[37501] trunk/base

[afb at macports.org]

Revision: 37501
          http://trac.macosforge.org/projects/macports/changeset/37501
Author:   afb at macports.org
Date:     2008-06-10 02:31:54 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
make missing sed extended regexp into a run-time error instead of configure-time

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2008-06-10 09:09:56 UTC (rev 37500)
+++ trunk/base/aclocal.m4	2008-06-10 09:31:54 UTC (rev 37501)
@@ -912,8 +912,8 @@
 		AC_MSG_RESULT([-r (GNU)])
 		SED_EXT=-r
 	else
-		AC_MSG_RESULT([no idea])
-		AC_MSG_ERROR([cannot determine flag to use for $SED])
+		AC_MSG_RESULT([not available])
+		SED_EXT='N/A'
 	fi
 	AC_SUBST(SED_EXT)
 ])

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2008-06-10 09:09:56 UTC (rev 37500)
+++ trunk/base/configure	2008-06-10 09:31:54 UTC (rev 37501)
@@ -4205,11 +4205,9 @@
 echo "${ECHO_T}-r (GNU)" >&6; }
 		SED_EXT=-r
 	else
-		{ echo "$as_me:$LINENO: result: no idea" >&5
-echo "${ECHO_T}no idea" >&6; }
-		{ { echo "$as_me:$LINENO: error: cannot determine flag to use for $SED" >&5
-echo "$as_me: error: cannot determine flag to use for $SED" >&2;}
-   { (exit 1); exit 1; }; }
+		{ echo "$as_me:$LINENO: result: not available" >&5
+echo "${ECHO_T}not available" >&6; }
+		SED_EXT='N/A'
 	fi
 
 

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2008-06-10 09:09:56 UTC (rev 37500)
+++ trunk/base/src/port1.0/portutil.tcl	2008-06-10 09:31:54 UTC (rev 37501)
@@ -758,6 +758,10 @@
     
         set cmdline $portutil::autoconf::sed_command
         if {$extended} {
+            if {$portutil::autoconf::sed_ext_flag == "N/A"} {
+                ui_debug "sed extended regexp not available"
+                return -code error "reinplace sed(1) too old"
+            }
             lappend cmdline $portutil::autoconf::sed_ext_flag
         }
         set cmdline [concat $cmdline [list $pattern < $file >@ $tmpfd]]

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080610/f17ebfb8/attachment.htm