Wed Jul 1 05:03:40 2020 UTC ()
Specify java source and target version as maven option to make this build with JDK 11.


(yyamano)
diff -r1.9 -r1.10 pkgsrc/devel/snappy-java10/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/snappy-java10/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/snappy-java10/patches/patch-pom.xml
cvs diff -r1.9 -r1.10 pkgsrc/devel/snappy-java10/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/snappy-java10/Makefile 2019/11/03 10:39:30 1.9
+++ pkgsrc/devel/snappy-java10/Makefile 2020/07/01 05:03:39 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2019/11/03 10:39:30 rillig Exp $ 1# $NetBSD: Makefile,v 1.10 2020/07/01 05:03:39 yyamano Exp $
2 2
3DISTNAME= snappy-java-${SNAPVER}${SNAPJVER} 3DISTNAME= snappy-java-${SNAPVER}${SNAPJVER}
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=xerial/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=xerial/}
6 6
7MAINTAINER= ryoon@NetBSD.org 7MAINTAINER= ryoon@NetBSD.org
8HOMEPAGE= https://github.com/xerial/snappy-java/ 8HOMEPAGE= https://github.com/xerial/snappy-java/
9COMMENT= Snappy compressor/decompressor for Java 9COMMENT= Snappy compressor/decompressor for Java
10LICENSE= apache-2.0 10LICENSE= apache-2.0
11 11
12GITHUB_PROJECT= snappy-java 12GITHUB_PROJECT= snappy-java
13SNAPVER= 1.0.5 13SNAPVER= 1.0.5
14SNAPJVER= .4 14SNAPJVER= .4
@@ -18,34 +18,43 @@ DISTFILES= ${DEFAULT_DISTFILES} @@ -18,34 +18,43 @@ DISTFILES= ${DEFAULT_DISTFILES}
18DISTFILES+= snappy-java-deps-${SNAPVER}${SNAPJVER}.tar.gz 18DISTFILES+= snappy-java-deps-${SNAPVER}${SNAPJVER}.tar.gz
19DISTFILES+= snappy-${SNAPVER}.tar.gz 19DISTFILES+= snappy-${SNAPVER}.tar.gz
20SITES.snappy-${SNAPVER}.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/ 20SITES.snappy-${SNAPVER}.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
21SITES.snappy-java-deps-${SNAPVER}${SNAPJVER}.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/ 21SITES.snappy-java-deps-${SNAPVER}${SNAPJVER}.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
22EXTRACT_DIR.snappy-${SNAPVER}.tar.gz= ${WRKSRC}/target 22EXTRACT_DIR.snappy-${SNAPVER}.tar.gz= ${WRKSRC}/target
23 23
24TOOL_DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven 24TOOL_DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven
25 25
26USE_LANGUAGES= c++ 26USE_LANGUAGES= c++
27USE_TOOLS+= gmake 27USE_TOOLS+= gmake
28USE_JAVA= yes 28USE_JAVA= yes
29USE_JAVA2= 6 29USE_JAVA2= 6
30 30
 31.include "../../mk/java-vm.mk"
 32
31MAVEN_FLAGS+= -Duser.home=${FAKEHOMEDIR} 33MAVEN_FLAGS+= -Duser.home=${FAKEHOMEDIR}
32MAVEN_FLAGS+= -Dmaven.repo.local=${WRKDIR}/deps 34MAVEN_FLAGS+= -Dmaven.repo.local=${WRKDIR}/deps
33MAVEN_FLAGS+= --offline 35MAVEN_FLAGS+= --offline
 36# Java 11 doesn't support Java 1.5 compatibility.
 37.if ${PKG_JVM} == "sun-jdk7" || ${PKG_JVM} == "oracle-jdk8" || ${PKG_JVM} == "openjdk8"
 38MAVEN_FLAGS+= -Dmaven.compiler.source=1.5
 39MAVEN_FLAGS+= -Dmaven.compiler.target=1.5
 40.else
 41MAVEN_FLAGS+= -Dmaven.compiler.source=1.6
 42MAVEN_FLAGS+= -Dmaven.compiler.target=1.6
 43.endif
34 44
35MAKE_FLAGS+= JAVA_HOME=${PKG_JAVA_HOME} 45MAKE_FLAGS+= JAVA_HOME=${PKG_JAVA_HOME}
36MAKE_FLAGS+= MVN="mvn ${MAVEN_FLAGS}" 46MAKE_FLAGS+= MVN="mvn ${MAVEN_FLAGS}"
37MAKE_JOBS_SAFE= no 47MAKE_JOBS_SAFE= no
38 48
39INSTALLATION_DIRS+= lib/java/snappy-java 49INSTALLATION_DIRS+= lib/java/snappy-java
40 50
41post-extract: 51post-extract:
42 ${TOUCH} ${WRKSRC}/target/snappy-extracted.log 52 ${TOUCH} ${WRKSRC}/target/snappy-extracted.log
43 ${RM} -rf ${WRKSRC}/src/main/resources/org/xerial/snappy/native/* 53 ${RM} -rf ${WRKSRC}/src/main/resources/org/xerial/snappy/native/*
44 54
45do-install: 55do-install:
46 ${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${SNAPVER}${SNAPJVER}.jar \ 56 ${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${SNAPVER}${SNAPJVER}.jar \
47 ${DESTDIR}${PREFIX}/lib/java/snappy-java/snappy-java.jar 57 ${DESTDIR}${PREFIX}/lib/java/snappy-java/snappy-java.jar
48 58
49.include "../../mk/java-env.mk" 59.include "../../mk/java-env.mk"
50.include "../../mk/java-vm.mk" 
51.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/devel/snappy-java10/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/snappy-java10/distinfo 2018/06/09 11:36:45 1.8
+++ pkgsrc/devel/snappy-java10/distinfo 2020/07/01 05:03:39 1.9
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.8 2018/06/09 11:36:45 fhajny Exp $ 1$NetBSD: distinfo,v 1.9 2020/07/01 05:03:39 yyamano Exp $
2 2
3SHA1 (snappy-java/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1 3SHA1 (snappy-java/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1
4RMD160 (snappy-java/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa 4RMD160 (snappy-java/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa
5SHA512 (snappy-java/snappy-1.0.5.tar.gz) = 4f772673dd1bf482f13db0f09299b46d0ee47b7052c43e69c2c5361d352031152f3132c25faf86ffcf1bfbe0e68625d7eef8fa669be873b568adfc160a82f25b 5SHA512 (snappy-java/snappy-1.0.5.tar.gz) = 4f772673dd1bf482f13db0f09299b46d0ee47b7052c43e69c2c5361d352031152f3132c25faf86ffcf1bfbe0e68625d7eef8fa669be873b568adfc160a82f25b
6Size (snappy-java/snappy-1.0.5.tar.gz) = 1731382 bytes 6Size (snappy-java/snappy-1.0.5.tar.gz) = 1731382 bytes
7SHA1 (snappy-java/snappy-java-1.0.5.4.tar.gz) = 2a67400be7e5967ee28c87f32ea4776f26494f2c 7SHA1 (snappy-java/snappy-java-1.0.5.4.tar.gz) = 2a67400be7e5967ee28c87f32ea4776f26494f2c
8RMD160 (snappy-java/snappy-java-1.0.5.4.tar.gz) = 30d12e9717b012bf5b214deecf59f3d02c36996b 8RMD160 (snappy-java/snappy-java-1.0.5.4.tar.gz) = 30d12e9717b012bf5b214deecf59f3d02c36996b
9SHA512 (snappy-java/snappy-java-1.0.5.4.tar.gz) = 4fce5c0c0ce294ba789fd33dd8aeed92b6c58e004ac8e569ee1840fe4fbeb47b1f3edff75619aee0ebbda65476ec56b15a4aeead360d98dbc3d45d295ab028bd 9SHA512 (snappy-java/snappy-java-1.0.5.4.tar.gz) = 4fce5c0c0ce294ba789fd33dd8aeed92b6c58e004ac8e569ee1840fe4fbeb47b1f3edff75619aee0ebbda65476ec56b15a4aeead360d98dbc3d45d295ab028bd
10Size (snappy-java/snappy-java-1.0.5.4.tar.gz) = 6041905 bytes 10Size (snappy-java/snappy-java-1.0.5.4.tar.gz) = 6041905 bytes
11SHA1 (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 3ff19882907aef93579b96e56e3d191c49e34e15 11SHA1 (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 3ff19882907aef93579b96e56e3d191c49e34e15
12RMD160 (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 48b28e2d091838b8e80dd16b46bd1ef603c4d5b9 12RMD160 (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 48b28e2d091838b8e80dd16b46bd1ef603c4d5b9
13SHA512 (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = f5148b0ded3b6beeb688b1b57dbc7fe64d40cd927140e9c4c35baf5f2fba25fb533dc38736736f153fd2e2cf76f0d0092cc676d9446f3baba102f2af64c56258 13SHA512 (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = f5148b0ded3b6beeb688b1b57dbc7fe64d40cd927140e9c4c35baf5f2fba25fb533dc38736736f153fd2e2cf76f0d0092cc676d9446f3baba102f2af64c56258
14Size (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 13148358 bytes 14Size (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 13148358 bytes
15SHA1 (patch-Makefile) = cb15c6016dab4670fce0ace6f1dd21e7c7bb1097 15SHA1 (patch-Makefile) = cb15c6016dab4670fce0ace6f1dd21e7c7bb1097
16SHA1 (patch-Makefile.common) = 83eeaf91c7dbd6ac3c4b3405d53acec9caa260aa 16SHA1 (patch-Makefile.common) = 83eeaf91c7dbd6ac3c4b3405d53acec9caa260aa
17SHA1 (patch-pom.xml) = 2dbf15f680aa570e8479fa81640d53d6fac12b15 17SHA1 (patch-pom.xml) = 833e19ef0b58d539b2ca2d6cd89361e9845b17cf
cvs diff -r1.1 -r1.2 pkgsrc/devel/snappy-java10/patches/patch-pom.xml (expand / switch to unified diff)

--- pkgsrc/devel/snappy-java10/patches/patch-pom.xml 2018/06/09 11:36:45 1.1
+++ pkgsrc/devel/snappy-java10/patches/patch-pom.xml 2020/07/01 05:03:39 1.2
@@ -1,20 +1,32 @@ @@ -1,20 +1,32 @@
1$NetBSD: patch-pom.xml,v 1.1 2018/06/09 11:36:45 fhajny Exp $ 1$NetBSD: patch-pom.xml,v 1.2 2020/07/01 05:03:39 yyamano Exp $
2 2
 3Specify java source and target version as maven option to make this build with JDK 11.
3Remove pre-built binaries for other platforms. 4Remove pre-built binaries for other platforms.
4 5
5--- pom.xml.orig 2014-07-04 05:20:00.000000000 +0000 6--- pom.xml.orig 2014-07-04 05:20:00.000000000 +0000
6+++ pom.xml 7+++ pom.xml
7@@ -182,13 +182,6 @@ 8@@ -102,10 +102,6 @@
 9 <groupId>org.apache.maven.plugins</groupId>
 10 <artifactId>maven-compiler-plugin</artifactId>
 11 <version>2.0.2</version>
 12- <configuration>
 13- <source>1.5</source>
 14- <target>1.5</target>
 15- </configuration>
 16 </plugin>
 17
 18 <plugin>
 19@@ -182,13 +178,6 @@
8 <Import-Package>org.osgi.framework;version="[1.5,2)"</Import-Package> 20 <Import-Package>org.osgi.framework;version="[1.5,2)"</Import-Package>
9 <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> 21 <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
10 <Bundle-NativeCode> 22 <Bundle-NativeCode>
11- org/xerial/snappy/native/Windows/amd64/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=win32))", 23- org/xerial/snappy/native/Windows/amd64/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=win32))",
12- org/xerial/snappy/native/Windows/x86/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=win32))", 24- org/xerial/snappy/native/Windows/x86/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=win32))",
13- org/xerial/snappy/native/Mac/i386/libsnappyjava.jnilib;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=macosx))", 25- org/xerial/snappy/native/Mac/i386/libsnappyjava.jnilib;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=macosx))",
14- org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx))", 26- org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx))",
15- org/xerial/snappy/native/Linux/amd64/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=linux))", 27- org/xerial/snappy/native/Linux/amd64/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=linux))",
16- org/xerial/snappy/native/Linux/i386/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=linux))", 28- org/xerial/snappy/native/Linux/i386/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=linux))",
17- org/xerial/snappy/native/Linux/arm/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=arm)(osgi.os=linux))" 29- org/xerial/snappy/native/Linux/arm/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=arm)(osgi.os=linux))"
18 </Bundle-NativeCode> 30 </Bundle-NativeCode>
19 <!-- TODO: unsure about ARMHF --> 31 <!-- TODO: unsure about ARMHF -->
20 </instructions> 32 </instructions>