Ticket #52072: protobuf3-java.patch

Portfile

@@ -4 +4 @@
 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 +28 @@
                 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 +44 @@
 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}
-
+    set utildocdir ${destroot}${prefix}/share/doc/${name}-util
+    
     xinstall -d -m 755 ${javadir}
     xinstall -d -m 755 ${docdir}
+    xinstall -d -m 755 ${utildocdir}
 
-    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}/core/target/site/apidocs ${docdir}/api
+    file copy ${worksrcpath}/util/target/site/apidocs ${utildocdir}/api
 }
 
 test.run    yes