CVS commit: pkgsrc/devel/snappy-java10

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Sat Jun  9 11:36:45 UTC 2018

Modified Files:
        pkgsrc/devel/snappy-java10: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/snappy-java10/patches: patch-pom.xml

Log Message:
devel/snappy-java10: Update to the latest 1.0.5.4 (no code changes). Change PKGBASE to just snappy-java. Remove precompiled binaries. Fix fetching, simplifiy installation.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/snappy-java10/Makefile \
    pkgsrc/devel/snappy-java10/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/snappy-java10/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/snappy-java10/patches/patch-pom.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/snappy-java10/Makefile
diff -u pkgsrc/devel/snappy-java10/Makefile:1.7 pkgsrc/devel/snappy-java10/Makefile:1.8
--- pkgsrc/devel/snappy-java10/Makefile:1.7     Thu Jun  7 16:34:45 2018
+++ pkgsrc/devel/snappy-java10/Makefile Sat Jun  9 11:36:45 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2018/06/07 16:34:45 fhajny Exp $
+# $NetBSD: Makefile,v 1.8 2018/06/09 11:36:45 fhajny Exp $
 
-DISTNAME=      snappy-java-${SNAPPYVER}
-PKGNAME=       ${DISTNAME:S/java/java10/}
-PKGREVISION=   2
+DISTNAME=      snappy-java-${SNAPVER}${SNAPJVER}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=xerial/}
 
@@ -12,15 +10,16 @@ COMMENT=    Snappy compressor/decompressor 
 LICENSE=       apache-2.0
 
 GITHUB_PROJECT=        snappy-java
-SNAPPYVER=     1.0.5
+SNAPVER=       1.0.5
+SNAPJVER=      .4
 
 DIST_SUBDIR=   ${PKGBASE}
 DISTFILES=     ${DEFAULT_DISTFILES}
-DISTFILES+=    snappy-java-deps-${SNAPPYVER}nb1.tar.gz
-DISTFILES+=    snappy-${SNAPPYVER}.tar.gz
-SITES.snappy-${SNAPPYVER}.tar.gz=              https://snappy.googlecode.com/files/
-SITES.snappy-java-deps-${SNAPPYVER}nb1.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
-EXTRACT_DIR.snappy-${SNAPPYVER}.tar.gz=                ${WRKSRC}/target
+DISTFILES+=    snappy-java-deps-${SNAPVER}${SNAPJVER}.tar.gz
+DISTFILES+=    snappy-${SNAPVER}.tar.gz
+SITES.snappy-${SNAPVER}.tar.gz=                ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
+SITES.snappy-java-deps-${SNAPVER}${SNAPJVER}.tar.gz=   ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
+EXTRACT_DIR.snappy-${SNAPVER}.tar.gz=          ${WRKSRC}/target
 
 TOOL_DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven
 
@@ -41,10 +40,11 @@ INSTALLATION_DIRS+= lib/java/snappy-java
 
 post-extract:
        ${TOUCH} ${WRKSRC}/target/snappy-extracted.log
+       ${RM} -rf ${WRKSRC}/src/main/resources/org/xerial/snappy/native/*
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${SNAPPYVER}.jar \
-               ${DESTDIR}${PREFIX}/lib/java/snappy-java
+       ${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${SNAPVER}${SNAPJVER}.jar \
+               ${DESTDIR}${PREFIX}/lib/java/snappy-java/snappy-java.jar
 
 .include "../../mk/java-env.mk"
 .include "../../mk/java-vm.mk"
Index: pkgsrc/devel/snappy-java10/distinfo
diff -u pkgsrc/devel/snappy-java10/distinfo:1.7 pkgsrc/devel/snappy-java10/distinfo:1.8
--- pkgsrc/devel/snappy-java10/distinfo:1.7     Thu Jun  7 16:34:45 2018
+++ pkgsrc/devel/snappy-java10/distinfo Sat Jun  9 11:36:45 2018
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.7 2018/06/07 16:34:45 fhajny Exp $
+$NetBSD: distinfo,v 1.8 2018/06/09 11:36:45 fhajny Exp $
 
-SHA1 (snappy-java10/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1
-RMD160 (snappy-java10/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa
-SHA512 (snappy-java10/snappy-1.0.5.tar.gz) = 4f772673dd1bf482f13db0f09299b46d0ee47b7052c43e69c2c5361d352031152f3132c25faf86ffcf1bfbe0e68625d7eef8fa669be873b568adfc160a82f25b
-Size (snappy-java10/snappy-1.0.5.tar.gz) = 1731382 bytes
-SHA1 (snappy-java10/snappy-java-1.0.5.tar.gz) = 61c9585aa64eba6cec77f9af61f0f5ea6fd418fb
-RMD160 (snappy-java10/snappy-java-1.0.5.tar.gz) = 65cf54742b55f4797dcc560215cca5cae1a11973
-SHA512 (snappy-java10/snappy-java-1.0.5.tar.gz) = 7ab443fbbe5a9caebc65720427bc6a11c5fec1f155928b268dde109f2996d3093a7600aaae0c5ef8c7e050c839e5a63ce037c6a4c42fccd682b976405bc7f581
-Size (snappy-java10/snappy-java-1.0.5.tar.gz) = 5739368 bytes
-SHA1 (snappy-java10/snappy-java-deps-1.0.5nb1.tar.gz) = 3ff19882907aef93579b96e56e3d191c49e34e15
-RMD160 (snappy-java10/snappy-java-deps-1.0.5nb1.tar.gz) = 48b28e2d091838b8e80dd16b46bd1ef603c4d5b9
-SHA512 (snappy-java10/snappy-java-deps-1.0.5nb1.tar.gz) = f5148b0ded3b6beeb688b1b57dbc7fe64d40cd927140e9c4c35baf5f2fba25fb533dc38736736f153fd2e2cf76f0d0092cc676d9446f3baba102f2af64c56258
-Size (snappy-java10/snappy-java-deps-1.0.5nb1.tar.gz) = 13148358 bytes
+SHA1 (snappy-java/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1
+RMD160 (snappy-java/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa
+SHA512 (snappy-java/snappy-1.0.5.tar.gz) = 4f772673dd1bf482f13db0f09299b46d0ee47b7052c43e69c2c5361d352031152f3132c25faf86ffcf1bfbe0e68625d7eef8fa669be873b568adfc160a82f25b
+Size (snappy-java/snappy-1.0.5.tar.gz) = 1731382 bytes
+SHA1 (snappy-java/snappy-java-1.0.5.4.tar.gz) = 2a67400be7e5967ee28c87f32ea4776f26494f2c
+RMD160 (snappy-java/snappy-java-1.0.5.4.tar.gz) = 30d12e9717b012bf5b214deecf59f3d02c36996b
+SHA512 (snappy-java/snappy-java-1.0.5.4.tar.gz) = 4fce5c0c0ce294ba789fd33dd8aeed92b6c58e004ac8e569ee1840fe4fbeb47b1f3edff75619aee0ebbda65476ec56b15a4aeead360d98dbc3d45d295ab028bd
+Size (snappy-java/snappy-java-1.0.5.4.tar.gz) = 6041905 bytes
+SHA1 (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 3ff19882907aef93579b96e56e3d191c49e34e15
+RMD160 (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 48b28e2d091838b8e80dd16b46bd1ef603c4d5b9
+SHA512 (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = f5148b0ded3b6beeb688b1b57dbc7fe64d40cd927140e9c4c35baf5f2fba25fb533dc38736736f153fd2e2cf76f0d0092cc676d9446f3baba102f2af64c56258
+Size (snappy-java/snappy-java-deps-1.0.5.4.tar.gz) = 13148358 bytes
 SHA1 (patch-Makefile) = cb15c6016dab4670fce0ace6f1dd21e7c7bb1097
 SHA1 (patch-Makefile.common) = 83eeaf91c7dbd6ac3c4b3405d53acec9caa260aa
+SHA1 (patch-pom.xml) = 2dbf15f680aa570e8479fa81640d53d6fac12b15

Index: pkgsrc/devel/snappy-java10/PLIST
diff -u pkgsrc/devel/snappy-java10/PLIST:1.1 pkgsrc/devel/snappy-java10/PLIST:1.2
--- pkgsrc/devel/snappy-java10/PLIST:1.1        Thu Apr 24 16:15:43 2014
+++ pkgsrc/devel/snappy-java10/PLIST    Sat Jun  9 11:36:45 2018
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2014/04/24 16:15:43 ryoon Exp $
-lib/java/snappy-java/snappy-java-${PKGVERSION}.jar
+@comment $NetBSD: PLIST,v 1.2 2018/06/09 11:36:45 fhajny Exp $
+lib/java/snappy-java/snappy-java.jar

Added files:

Index: pkgsrc/devel/snappy-java10/patches/patch-pom.xml
diff -u /dev/null pkgsrc/devel/snappy-java10/patches/patch-pom.xml:1.1
--- /dev/null   Sat Jun  9 11:36:45 2018
+++ pkgsrc/devel/snappy-java10/patches/patch-pom.xml    Sat Jun  9 11:36:45 2018
@@ -0,0 +1,20 @@
+$NetBSD: patch-pom.xml,v 1.1 2018/06/09 11:36:45 fhajny Exp $
+
+Remove pre-built binaries for other platforms.
+
+--- pom.xml.orig       2014-07-04 05:20:00.000000000 +0000
++++ pom.xml
+@@ -182,13 +182,6 @@
+                         <Import-Package>org.osgi.framework;version="[1.5,2)"</Import-Package>
+                         <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+                         <Bundle-NativeCode>
+-                              org/xerial/snappy/native/Windows/amd64/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=win32))",
+-                              org/xerial/snappy/native/Windows/x86/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=win32))",
+-                              org/xerial/snappy/native/Mac/i386/libsnappyjava.jnilib;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=macosx))",
+-                              org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx))",
+-                              org/xerial/snappy/native/Linux/amd64/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=linux))",
+-                              org/xerial/snappy/native/Linux/i386/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=linux))",
+-                              org/xerial/snappy/native/Linux/arm/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=arm)(osgi.os=linux))"
+                         </Bundle-NativeCode>
+                         <!-- TODO: unsure about ARMHF -->
+                     </instructions>