Ticket #42114: maven-devel-fix-select.patch

Portfile

@@ -6 +6 @@
 
 name            maven-devel
 version         3.1.1
+revision        1
 
 categories      java devel
 license         Apache-2
@@ -33 +34 @@
 master_sites    apache:maven/maven-3/${version}/binaries 
 distname        apache-maven-${version}-bin
 worksrcdir      apache-maven-${version}
+checksums       md5     6342fdf6b0aabc1457c7f8cc218127ed \
+                sha1    630eea2107b0742acb315b214009ba08602dda5f \
+                sha256  077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b
 
-checksums           md5     6342fdf6b0aabc1457c7f8cc218127ed \
-                    sha1    630eea2107b0742acb315b214009ba08602dda5f \
-                    sha256  077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b
+depends_run     port:maven_select \
+                bin:java:kaffe
 
-depends_run     port:maven_select 
+use_configure   no
+universal_variant no
 
-use_configure     no
-# hmm?  
-universal_variant no 
-
 select.group    maven
-select.file     ${filespath}/maven3
+select.file     ${filespath}/${name}
 
 # Source builds of maven are not possible. So, the default build is a binary
 # install of the jars.
@@ -53 +53 @@
 }
 
 destroot {
-    set maven_dir    apache-maven-${version}
-    set maven_path   ${destroot}${prefix}/share/java/${maven_dir}
+    set mavendir ${destroot}${prefix}/share/java/${name}
 
     # Create the target java directory exists
-    xinstall -m 755 -d ${maven_path}
+    xinstall -m 755 -d ${mavendir}
 
     # Copy over the needed elements of our directory tree
     file copy \
@@ -65 +64 @@
         ${worksrcpath}/boot \
         ${worksrcpath}/conf \
         ${worksrcpath}/lib \
-        ${maven_path}
+        ${mavendir}
 
     # Remove extraneous bat files
-    foreach f [glob -directory ${maven_path}/bin *.bat] {
+    foreach f [glob -directory ${mavendir}/bin *.bat] {
         file delete $f
     }
 
     # Fix permissions on shell scripts
     foreach f { maven install_repo.sh } {
-        if [file exists ${maven_path}/bin/$f] {
-            file attributes ${maven_path}/bin/$f -permissions +x
+        if [file exists ${mavendir}/bin/$f] {
+            file attributes ${mavendir}/bin/$f -permissions +x
         }
     }
 
     # Reduce the permissions on the distribution files.
-    file attributes ${maven_path}/conf -permissions 0755
-    file attributes ${maven_path}/conf/settings.xml -permissions 0644
-    foreach f [glob -directory ${maven_path}/boot *.jar] {
+    file attributes ${mavendir}/conf -permissions 0755
+    file attributes ${mavendir}/conf/settings.xml -permissions 0644
+    foreach f [glob -directory ${mavendir}/boot *.jar] {
         file attributes $f -permissions 0644
     }
-    foreach f [glob -directory ${maven_path}/lib *.jar] {
+    foreach f [glob -directory ${mavendir}/lib *.jar] {
         file attributes $f -permissions 0644
     }
 
     # Symlink maven into the bin directory
-    ln -s ${prefix}/share/java/${maven_dir}/bin/mvn ${prefix}/bin/mvn3 
+    system "cd ${destroot}${prefix}/bin && ln -s ../share/java/${name}/bin/mvn mvn-devel"
 }
 
 notes \
@@ -99 +98 @@
 
 livecheck.type  regex
 livecheck.url   ${homepage}download.html
-livecheck.regex apache-maven-(3\\.\[0-9.\]+)-bin\\.tar
+livecheck.regex apache-maven-(3\\.1\\.\[0-9\]+)-bin\\.tar

files/maven-devel

@@ -1 @@
-bin/mvn3
+bin/mvn-devel

files/maven3

@@ -1 @@
-bin/mvn3