[134113] trunk/dports/java

[blair at macports.org]

Revision: 134113
          https://trac.macports.org/changeset/134113
Author:   blair at macports.org
Date:     2015-03-18 09:40:18 -0700 (Wed, 18 Mar 2015)
Log Message:
-----------
maven{3,31}: restore pre-activate that was deleted in r134074.

See https://lists.macosforge.org/pipermail/macports-dev/2015-March/030048.html.

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

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-18 16:32:07 UTC (rev 134112)
+++ trunk/dports/java/maven3/Portfile	2015-03-18 16:40:18 UTC (rev 134113)
@@ -6,6 +6,7 @@
 
 name            maven3
 version         3.3.1
+revision        1
 
 categories      java devel
 license         Apache-2
@@ -78,6 +79,19 @@
     ln -s ../share/java/${name}/bin/mvn ${destroot}${prefix}/bin/mvn3
 }
 
+# Delete this pre-activate section after 2016-03-18, after which it
+# will have existed for a year to clean up cruft on people's systems.
+pre-activate {
+    # Remove stray files due to a destroot bug that has since been
+    # fixed.
+    foreach file {bin/mvn3} {
+        set filepath ${prefix}/${file}
+        if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
+            delete ${filepath}
+        }
+    }
+}
+
 notes \
 "To make maven $version the default, please run
 \tsudo port select --set ${select.group} $name"

Modified: trunk/dports/java/maven31/Portfile
===================================================================
--- trunk/dports/java/maven31/Portfile	2015-03-18 16:32:07 UTC (rev 134112)
+++ trunk/dports/java/maven31/Portfile	2015-03-18 16:40:18 UTC (rev 134113)
@@ -6,7 +6,7 @@
 
 name            maven31
 version         3.1.1
-revision        1
+revision        2
 
 categories      java devel
 license         Apache-2
@@ -94,6 +94,19 @@
     ln -s ../share/java/${maven_dir}/bin/mvn ${destroot}${prefix}/bin/mvn31
 }
 
+# Delete this pre-activate section after 2016-03-18, after which it
+# will have existed for a year to clean up cruft on people's systems.
+pre-activate {
+    # Remove stray files due to a destroot bug that has since been
+    # fixed.
+    foreach file {bin/mvn31} {
+        set filepath ${prefix}/${file}
+        if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
+            delete ${filepath}
+        }
+    }
+}
+
 notes \
 "To make maven $version the default, please run
 \tsudo port select --set ${select.group} $name"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150318/36761c95/attachment-0001.html>