[126850] trunk/dports/java

easieste at macports.org easieste at macports.org
Thu Oct 16 01:51:27 PDT 2014


Revision: 126850
          https://trac.macports.org/changeset/126850
Author:   easieste at macports.org
Date:     2014-10-16 01:51:27 -0700 (Thu, 16 Oct 2014)
Log Message:
-----------
Obsolete 'java/maven-devel' in favor of 'java/maven3'.

Add 'java/maven31' for users that still need a maven-3.1.x version, as
maven-3.2.x still has problems with some older tools.

'maven31' unlike 'maven-devel' now works with maven_select correctly.

Modified Paths:
--------------
    trunk/dports/java/maven-devel/Portfile

Added Paths:
-----------
    trunk/dports/java/maven31/
    trunk/dports/java/maven31/Portfile
    trunk/dports/java/maven31/files/
    trunk/dports/java/maven31/files/maven31

Removed Paths:
-------------
    trunk/dports/java/maven-devel/files/maven3

Modified: trunk/dports/java/maven-devel/Portfile
===================================================================
--- trunk/dports/java/maven-devel/Portfile	2014-10-16 06:03:44 UTC (rev 126849)
+++ trunk/dports/java/maven-devel/Portfile	2014-10-16 08:51:27 UTC (rev 126850)
@@ -1,12 +1,14 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup select 1.0
+PortSystem       1.0
 
 name            maven-devel
 version         3.1.1
+revision        2
 
+replaced_by     maven3
+
 categories      java devel
 license         Apache-2
 maintainers     easieste openmaintainer
@@ -30,73 +32,12 @@
 
 homepage        http://maven.apache.org/
 
-master_sites    apache:maven/maven-3/${version}/binaries 
-distname        apache-maven-${version}-bin
-worksrcdir      apache-maven-${version}
+distfiles
 
-checksums           md5     6342fdf6b0aabc1457c7f8cc218127ed \
-                    sha1    630eea2107b0742acb315b214009ba08602dda5f \
-                    sha256  077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b
+livecheck.type  none
 
-depends_run     port:maven_select 
-
-use_configure     no
-# hmm?  
-universal_variant no 
-
-select.group    maven
-select.file     ${filespath}/maven3
-
-# Source builds of maven are not possible. So, the default build is a binary
-# install of the jars.
-build {
+pre-configure {
+    ui_error "Please do not install this port since it has been replaced by 'maven3'.\n
+If you wish to install a version of maven-3.1.1 please use the java/maven31 port."
+    return -code error
 }
-
-destroot {
-    set maven_dir    apache-maven-${version}
-    set maven_path   ${destroot}${prefix}/share/java/${maven_dir}
-
-    # Create the target java directory exists
-    xinstall -m 755 -d ${maven_path}
-
-    # Copy over the needed elements of our directory tree
-    file copy \
-        ${worksrcpath}/bin \
-        ${worksrcpath}/boot \
-        ${worksrcpath}/conf \
-        ${worksrcpath}/lib \
-        ${maven_path}
-
-    # Remove extraneous bat files
-    foreach f [glob -directory ${maven_path}/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
-        }
-    }
-
-    # 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 $f -permissions 0644
-    }
-    foreach f [glob -directory ${maven_path}/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 
-}
-
-notes \
-"To make maven $version the default, please run
-\tsudo port select --set ${select.group} $name"
-
-livecheck.type  regex
-livecheck.url   ${homepage}download.html
-livecheck.regex apache-maven-(3\\.\[0-9.\]+)-bin\\.tar

Deleted: trunk/dports/java/maven-devel/files/maven3
===================================================================
--- trunk/dports/java/maven-devel/files/maven3	2014-10-16 06:03:44 UTC (rev 126849)
+++ trunk/dports/java/maven-devel/files/maven3	2014-10-16 08:51:27 UTC (rev 126850)
@@ -1 +0,0 @@
-bin/mvn3

Added: trunk/dports/java/maven31/Portfile
===================================================================
--- trunk/dports/java/maven31/Portfile	                        (rev 0)
+++ trunk/dports/java/maven31/Portfile	2014-10-16 08:51:27 UTC (rev 126850)
@@ -0,0 +1,103 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+PortGroup select 1.0
+
+name            maven31
+version         3.1.1
+revision        0
+
+categories      java devel
+license         Apache-2
+maintainers     easieste openmaintainer
+platforms       darwin
+supported_archs noarch
+
+description     A java-based build and project management environment.
+long_description \
+                Maven is a Java project management and project \
+                comprehension tool.  Maven is based on the \
+                concept of a project object model (POM) in that \
+                all the artifacts produced by Maven are a result \
+                of consulting a well defined model for your \
+                project.Builds, documentation, source metrics, \
+                and source cross-references are all controlled by \
+                your POM.  Maven 3 aims to ensure backward \
+                compatibility with Maven 2, improve usability, \
+                increase performance, allow safe embedding, and \
+                pave the way to implement many highly demanded \
+                features.
+
+homepage        http://maven.apache.org/
+
+master_sites    apache:maven/maven-3/${version}/binaries 
+distname        apache-maven-${version}-bin
+worksrcdir      apache-maven-${version}
+
+checksums           md5     6342fdf6b0aabc1457c7f8cc218127ed \
+                    sha1    630eea2107b0742acb315b214009ba08602dda5f \
+                    sha256  077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b
+
+depends_run     port:maven_select 
+
+use_configure     no
+# hmm?  
+universal_variant no 
+
+select.group    maven
+select.file     ${filespath}/maven31
+
+# Source builds of maven are not possible. So, the default build is a binary
+# install of the jars.
+build {
+}
+
+destroot {
+    set maven_dir    apache-maven-${version}
+    set maven_path   ${destroot}${prefix}/share/java/${maven_dir}
+
+    # Create the target java directory exists
+    xinstall -m 755 -d ${maven_path}
+
+    # Copy over the needed elements of our directory tree
+    file copy \
+        ${worksrcpath}/bin \
+        ${worksrcpath}/boot \
+        ${worksrcpath}/conf \
+        ${worksrcpath}/lib \
+        ${maven_path}
+
+    # Remove extraneous bat files
+    foreach f [glob -directory ${maven_path}/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
+        }
+    }
+
+    # 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 $f -permissions 0644
+    }
+    foreach f [glob -directory ${maven_path}/lib *.jar] {
+        file attributes $f -permissions 0644
+    }
+
+    # Symlink maven into the bin directory
+    ln -s ${prefix}/share/java/${maven_dir}/bin/mvn ${prefix}/bin/mvn31
+}
+
+notes \
+"To make maven $version the default, please run
+\tsudo port select --set ${select.group} $name"
+
+livecheck.type  regex
+livecheck.url   ${homepage}download.html
+livecheck.regex apache-maven-(3\\.\[0-9.\]+)-bin\\.tar


Property changes on: trunk/dports/java/maven31/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/java/maven31/files/maven31
===================================================================
--- trunk/dports/java/maven31/files/maven31	                        (rev 0)
+++ trunk/dports/java/maven31/files/maven31	2014-10-16 08:51:27 UTC (rev 126850)
@@ -0,0 +1 @@
+bin/mvn31
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141016/ba6ad51d/attachment.html>


More information about the macports-changes mailing list