[134171] trunk/dports/java

[blair at macports.org]

Revision: 134171
          https://trac.macports.org/changeset/134171
Author:   blair at macports.org
Date:     2015-03-19 09:52:03 -0700 (Thu, 19 Mar 2015)
Log Message:
-----------
maven{3,31}: follow up to r134113, properly handle symlinks.

'file exists ${filepath}' resolves symlinks, so switch to
'![catch {file type ${filepath}}]'

Suggested by Joshua Root.

Revision Links:
--------------
    https://trac.macports.org/changeset/134113

Modified Paths:
--------------
    trunk/dports/java/maven3/Portfile
    trunk/dports/java/maven31/Portfile

Modified: trunk/dports/java/maven3/Portfile
===================================================================
--- trunk/dports/java/maven3/Portfile	2015-03-19 16:44:55 UTC (rev 134170)
+++ trunk/dports/java/maven3/Portfile	2015-03-19 16:52:03 UTC (rev 134171)
@@ -6,7 +6,7 @@
 
 name            maven3
 version         3.3.1
-revision        1
+revision        2
 
 categories      java devel
 license         Apache-2
@@ -86,7 +86,7 @@
     # fixed.
     foreach file {bin/mvn3} {
         set filepath ${prefix}/${file}
-        if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
+        if {![catch {file type ${filepath}}] && [registry_file_registered ${filepath}] == "0"} {
             delete ${filepath}
         }
     }

Modified: trunk/dports/java/maven31/Portfile
===================================================================
--- trunk/dports/java/maven31/Portfile	2015-03-19 16:44:55 UTC (rev 134170)
+++ trunk/dports/java/maven31/Portfile	2015-03-19 16:52:03 UTC (rev 134171)
@@ -6,7 +6,7 @@
 
 name            maven31
 version         3.1.1
-revision        2
+revision        3
 
 categories      java devel
 license         Apache-2
@@ -101,7 +101,7 @@
     # fixed.
     foreach file {bin/mvn31} {
         set filepath ${prefix}/${file}
-        if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
+        if {![catch {file type ${filepath}}] && [registry_file_registered ${filepath}] == "0"} {
             delete ${filepath}
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150319/1c4c0a8d/attachment-0001.html>