[151788] trunk/dports/devel

[blair at macports.org]

Revision: 151788
          https://trac.macports.org/changeset/151788
Author:   blair at macports.org
Date:     2016-08-21 19:11:28 -0700 (Sun, 21 Aug 2016)
Log Message:
-----------
protobuf3-{cpp,java}: upgrade to 3.0.0 GA release; closes #52072.

Modified Paths:
--------------
    trunk/dports/devel/protobuf3-cpp/Portfile
    trunk/dports/devel/protobuf3-java/Portfile

Modified: trunk/dports/devel/protobuf3-cpp/Portfile
===================================================================
--- trunk/dports/devel/protobuf3-cpp/Portfile	2016-08-22 00:55:26 UTC (rev 151787)
+++ trunk/dports/devel/protobuf3-cpp/Portfile	2016-08-22 02:11:28 UTC (rev 151788)
@@ -5,8 +5,7 @@
 PortGroup  github 1.0
 
 name            protobuf3-cpp
-version         0.0.0.2
-set real_version 3.0.0-alpha-3
+version         3.0.0
 categories      devel
 maintainers     blair
 license         BSD
@@ -30,14 +29,12 @@
                 logical record of information, containing a series of \
                 name-value pairs.
 
-github.setup    google protobuf-cpp ${real_version} v
+github.setup    google protobuf-cpp ${version} v
 github.tarball_from releases
-# REMOVE THE VERSION LINE WHEN THERE IS A GA RELEASE AND LEAVE THE ONE ABOVE
-version         0.0.0.2
 homepage        https://github.com/google/protobuf
-master_sites    https://github.com/google/protobuf/releases/download/v${real_version}
-distfiles       protobuf-cpp-${real_version}.tar.gz
-worksrcdir      protobuf-${real_version}
+master_sites    https://github.com/google/protobuf/releases/download/v${version}
+distfiles       protobuf-cpp-${version}.tar.gz
+worksrcdir      protobuf-${version}
 
 pre-fetch {
     if {${os.platform} eq "darwin" && ${os.major} < 11} {
@@ -46,8 +43,8 @@
     }
 }
 
-checksums       sha1   531094f573b9d711bebfe161aab424965d332ea6 \
-                sha256 a4144ae5e21c5ebf36baf823c6b23efa0d009d08ad1e6fec2fadb69499880fc0
+checksums       sha1   00140d255922bf33ef3842168954e3269fbba3af \
+                sha256 318e8f375fb4e5333975a40e0d1215e855b4a8c581d692eb0eb7df70db1a8d4e
 
 platforms       darwin
 
@@ -61,7 +58,7 @@
 
     xinstall -d -m 755 ${docdir}
 
-    foreach f {CHANGES.txt CONTRIBUTORS.txt INSTALL.txt LICENSE README.md editors examples} {
+    foreach f {CHANGES.txt CONTRIBUTORS.txt LICENSE README.md editors examples} {
         file copy ${worksrcpath}/${f} ${docdir}
     }
 }

Modified: trunk/dports/devel/protobuf3-java/Portfile
===================================================================
--- trunk/dports/devel/protobuf3-java/Portfile	2016-08-22 00:55:26 UTC (rev 151787)
+++ trunk/dports/devel/protobuf3-java/Portfile	2016-08-22 02:11:28 UTC (rev 151788)
@@ -4,8 +4,7 @@
 PortGroup	github 1.0
 
 name            protobuf3-java
-version         0.0.0.2
-set real_version 3.0.0-alpha-3
+version         3.0.0
 categories      devel
 maintainers     blair
 license         BSD
@@ -29,17 +28,15 @@
                 logical record of information, containing a series of \
                 name-value pairs.
 
-github.setup    google protobuf-java ${real_version} v
+github.setup    google protobuf-java ${version} v
 github.tarball_from releases
-# REMOVE THE VERSION LINE WHEN THERE IS A GA RELEASE AND LEAVE THE ONE ABOVE
-version         0.0.0.2
 homepage        https://github.com/google/protobuf
-master_sites    https://github.com/google/protobuf/releases/download/v${real_version}
-distfiles       protobuf-java-${real_version}.tar.gz
-worksrcdir      protobuf-${real_version}/java
+master_sites    https://github.com/google/protobuf/releases/download/v${version}
+distfiles       protobuf-java-${version}.tar.gz
+worksrcdir      protobuf-${version}/java
 
-checksums       sha1   9af47e30aaa218fa37ff9b0dff887fab30c4d898 \
-                sha256 479ecd501632c15b194de10879fe5a5000cd3cde2fa942fedf65b328bfd58d0e
+checksums       sha1   bbb5bbed9e0fde6dc72a0d55e359ad81030420a8 \
+                sha256 411eb52ee294386cf04e0fcc5a68a93280c90d90908915f0ce2a28a695d42702
 
 platforms       darwin
 
@@ -47,30 +44,33 @@
 depends_build   port:maven3
 
 patch {
-    reinplace "s#../src/protoc#${prefix}/bin/protoc#g" ${worksrcpath}/pom.xml
+    reinplace "s#\$\{protobuf.source.dir\}/protoc#${prefix}/bin/protoc#g" ${worksrcpath}/pom.xml
 }
 
 use_configure   no
 
 build.cmd       mvn3
-build.target    install ## javadoc:javadoc
+build.target    install javadoc:javadoc -DskipTests
 build.env       MAVEN_OPTS=-Duser.home=${workpath}/.home
 
-post-build {
-    ## This command exists with a non-zero status but does build some
-    ## docs, so ignore the error.
-    system -W ${worksrcpath} "${build.env} mvn3 javadoc:javadoc || :"
-}
-
 destroot {
     set javadir ${destroot}${prefix}/share/java
     set docdir ${destroot}${prefix}/share/doc/${name}
 
     xinstall -d -m 755 ${javadir}
     xinstall -d -m 755 ${docdir}
+    xinstall -d -m 755 ${docdir}/core
+    xinstall -d -m 755 ${docdir}/util
 
-    file copy ${worksrcpath}/target/protobuf-java-${real_version}.jar ${javadir}/protobuf.jar
-    file copy ${worksrcpath}/target/site/apidocs ${docdir}/api
+    file copy ${worksrcpath}/core/target/protobuf-java-${version}.jar ${javadir}/protobuf.jar
+    file copy ${worksrcpath}/util/target/protobuf-java-util-${version}.jar ${javadir}/protobuf-util.jar
+
+    file copy ${worksrcpath}/README.md ${docdir}/README-java.md
+    foreach f {CHANGES.txt CONTRIBUTORS.txt LICENSE README.md} {
+        file copy ${worksrcpath}/../${f} ${docdir}
+    }
+    file copy ${worksrcpath}/core/target/site/apidocs ${docdir}/core/api
+    file copy ${worksrcpath}/util/target/site/apidocs ${docdir}/util/api
 }
 
 test.run    yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160821/d8748537/attachment.html>