Changeset 10879 for trunk/dports/java/tomcat5

Timestamp:

Feb 8, 2005, 11:35:19 PM (15 years ago)

Author:

jberry

Message:

Better ant version parsing.

File:

• trunk/dports/java/tomcat5/Portfile (modified) (2 diffs)

trunk/dports/java/tomcat5/Portfile

@@ -1 @@
-# $Id: Portfile,v 1.12 2005/02/08 23:27:36 jberry Exp $
+# $Id: Portfile,v 1.13 2005/02/08 23:35:19 jberry Exp $
 
 PortSystem 1.0
@@ -55 +55 @@
 set tomcatgroup         www
 
+#
 # Tomcat in this version requires ant 1.6.2.
 # If the current version of ant is not at least 1.6.2 then add an
 # explicit dependency onto our ant port.
+#
 if { [string length [auto_execok ant]] } {
         set verOutput [exec ant -version]
-        regexp {version (\d*(\.\d*(\.\d*)?)?)} $verOutput -> antVersion
+        regexp {version (\d+(\.\d+)*)} $verOutput -> antVersion
         if { [rpm-vercomp $antVersion "1.6.2"] < 0 } {
                 depends_build-append bin:XXX:apache-ant