Tue Oct 20 12:13:33 2015 UTC ()
Simplify maven call and make sure maven runs offline. Prepare offline
deps repository to use. Update home page and description. PKGREVISION+


(fhajny)
diff -r1.4 -r1.5 pkgsrc/devel/snappy-java10/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/snappy-java10/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/snappy-java10/patches/patch-Makefile
cvs diff -r1.4 -r1.5 pkgsrc/devel/snappy-java10/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/snappy-java10/Makefile 2014/12/15 13:24:21 1.4
+++ pkgsrc/devel/snappy-java10/Makefile 2015/10/20 12:13:33 1.5
@@ -1,42 +1,51 @@ @@ -1,42 +1,51 @@
1# $NetBSD: Makefile,v 1.4 2014/12/15 13:24:21 fhajny Exp $ 1# $NetBSD: Makefile,v 1.5 2015/10/20 12:13:33 fhajny Exp $
2 2
3SNAPPYVER= 1.0.5 3DISTNAME= snappy-java-${SNAPPYVER}
4PKGNAME= snappy-java10-${SNAPPYVER} 4PKGNAME= ${DISTNAME:S/java/java10/}
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
 7MASTER_SITES= ${MASTER_SITE_GITHUB:=xerial/}
6 8
7MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
8HOMEPAGE= https://code.google.com/p/snappy-java/ 10HOMEPAGE= http://github.com/xerial/snappy-java/
9COMMENT= Snappy for Java, a fast compressor/decompressor library 11COMMENT= Snappy compressor/decompressor for Java
10LICENSE= apache-2.0 12LICENSE= apache-2.0
11 13
12DISTFILES+= snappy-java-${SNAPPYVER}.tar.gz snappy-${SNAPPYVER}.tar.gz 14GITHUB_PROJECT= snappy-java
13SITES.snappy-${SNAPPYVER}.tar.gz= https://snappy.googlecode.com/files/ 15SNAPPYVER= 1.0.5
14SITES.snappy-java-${SNAPPYVER}.tar.gz= http://snappy-java.googlecode.com/files/ 
15 
16TOOL_DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven 
17 16
18DIST_SUBDIR= snappy-java10 17DIST_SUBDIR= ${PKGBASE}
 18DISTFILES= ${DEFAULT_DISTFILES}
 19DISTFILES+= snappy-java-${SNAPPYVER}-deps.tar.gz
 20DISTFILES+= snappy-${SNAPPYVER}.tar.gz
 21SITES.snappy-${SNAPPYVER}.tar.gz= https://snappy.googlecode.com/files/
 22SITES.snappy-java-${SNAPPYVER}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
 23EXTRACT_DIR.snappy-${SNAPPYVER}.tar.gz= ${WRKSRC}/target
19 24
20WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/snappy-java10/snappy-java/} 25TOOL_DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven
21 26
22USE_LANGUAGES= c++ 27USE_LANGUAGES= c++
23USE_TOOLS+= gmake 28USE_TOOLS+= gmake
24USE_JAVA= yes 29USE_JAVA= yes
25USE_JAVA2= 6 30USE_JAVA2= 6
26 31
27INSTALLATION_DIRS+= lib/java/snappy-java 32MAVEN_FLAGS+= -Duser.home=${FAKEHOMEDIR}
 33MAVEN_FLAGS+= -Dmaven.repo.local=${WRKDIR}/deps
 34MAVEN_FLAGS+= --offline
28 35
29MAKE_FLAGS+= JAVA_HOME=${PKG_JAVA_HOME} 36MAKE_FLAGS+= JAVA_HOME=${PKG_JAVA_HOME}
 37MAKE_FLAGS+= MVN="mvn ${MAVEN_FLAGS}"
30MAKE_JOBS_SAFE= no 38MAKE_JOBS_SAFE= no
31 39
32pre-build: 40INSTALLATION_DIRS+= lib/java/snappy-java
33 ${MKDIR} ${WRKSRC}/target 41
34 ${CP} -f ${DISTDIR}/${DIST_SUBDIR}/snappy-${SNAPPYVER}.tar.gz ${WRKSRC}/target 42post-extract:
 43 ${TOUCH} ${WRKSRC}/target/snappy-extracted.log
35 44
36do-install: 45do-install:
37 ${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${SNAPPYVER}.jar \ 46 ${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${SNAPPYVER}.jar \
38 ${DESTDIR}${PREFIX}/lib/java/snappy-java 47 ${DESTDIR}${PREFIX}/lib/java/snappy-java
39 48
40.include "../../mk/java-env.mk" 49.include "../../mk/java-env.mk"
41.include "../../mk/java-vm.mk" 50.include "../../mk/java-vm.mk"
42.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/snappy-java10/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/snappy-java10/distinfo 2014/12/23 18:51:37 1.3
+++ pkgsrc/devel/snappy-java10/distinfo 2015/10/20 12:13:33 1.4
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1$NetBSD: distinfo,v 1.3 2014/12/23 18:51:37 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2015/10/20 12:13:33 fhajny Exp $
2 2
3SHA1 (snappy-java10/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1 3SHA1 (snappy-java10/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1
4RMD160 (snappy-java10/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa 4RMD160 (snappy-java10/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa
 5SHA512 (snappy-java10/snappy-1.0.5.tar.gz) = 4f772673dd1bf482f13db0f09299b46d0ee47b7052c43e69c2c5361d352031152f3132c25faf86ffcf1bfbe0e68625d7eef8fa669be873b568adfc160a82f25b
5Size (snappy-java10/snappy-1.0.5.tar.gz) = 1731382 bytes 6Size (snappy-java10/snappy-1.0.5.tar.gz) = 1731382 bytes
6SHA1 (snappy-java10/snappy-java-1.0.5.jar) = f6fdc26b034b2a6a62f74b0a678ae6679ed6c201 7SHA1 (snappy-java10/snappy-java-1.0.5-deps.tar.gz) = 0792db245c10cd995cf28b0fb8352c12441a43a2
7RMD160 (snappy-java10/snappy-java-1.0.5.jar) = 53140b9a4b33c66bbf24b601b0aee5931a8a7c2d 8RMD160 (snappy-java10/snappy-java-1.0.5-deps.tar.gz) = 8ca8c99eaed520b2f7b9c3cf068f2557b4b8e702
8Size (snappy-java10/snappy-java-1.0.5.jar) = 1272779 bytes 9SHA512 (snappy-java10/snappy-java-1.0.5-deps.tar.gz) = ee8e287817530f3b85313037629e5beeacad997c897b1cfc009bf1ad076499b1b63fdefb46322f018be605150ee12a758c296d451be8ceada034cc86e522114b
 10Size (snappy-java10/snappy-java-1.0.5-deps.tar.gz) = 9874187 bytes
9SHA1 (snappy-java10/snappy-java-1.0.5.tar.gz) = 61c9585aa64eba6cec77f9af61f0f5ea6fd418fb 11SHA1 (snappy-java10/snappy-java-1.0.5.tar.gz) = 61c9585aa64eba6cec77f9af61f0f5ea6fd418fb
10RMD160 (snappy-java10/snappy-java-1.0.5.tar.gz) = 65cf54742b55f4797dcc560215cca5cae1a11973 12RMD160 (snappy-java10/snappy-java-1.0.5.tar.gz) = 65cf54742b55f4797dcc560215cca5cae1a11973
 13SHA512 (snappy-java10/snappy-java-1.0.5.tar.gz) = 7ab443fbbe5a9caebc65720427bc6a11c5fec1f155928b268dde109f2996d3093a7600aaae0c5ef8c7e050c839e5a63ce037c6a4c42fccd682b976405bc7f581
11Size (snappy-java10/snappy-java-1.0.5.tar.gz) = 5739368 bytes 14Size (snappy-java10/snappy-java-1.0.5.tar.gz) = 5739368 bytes
12SHA1 (patch-Makefile) = b236636dc99d4e316398baaf321dab00b54765ab 15SHA1 (patch-Makefile) = cb15c6016dab4670fce0ace6f1dd21e7c7bb1097
13SHA1 (patch-Makefile.common) = 83eeaf91c7dbd6ac3c4b3405d53acec9caa260aa 16SHA1 (patch-Makefile.common) = 83eeaf91c7dbd6ac3c4b3405d53acec9caa260aa
cvs diff -r1.3 -r1.4 pkgsrc/devel/snappy-java10/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/snappy-java10/patches/patch-Makefile 2014/12/23 18:51:37 1.3
+++ pkgsrc/devel/snappy-java10/patches/patch-Makefile 2015/10/20 12:13:33 1.4
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1$NetBSD: patch-Makefile,v 1.3 2014/12/23 18:51:37 joerg Exp $ 1$NetBSD: patch-Makefile,v 1.4 2015/10/20 12:13:33 fhajny Exp $
2 2
3Add explicit NetBSD 64-bit target. 3Add explicit NetBSD 64-bit target.
4--- Makefile.orig 2013-05-17 01:29:31.000000000 +0000 4Skip unpacking, handled by pkgsrc.
 5
 6--- Makefile.orig 2014-07-04 05:20:00.000000000 +0000
5+++ Makefile 7+++ Makefile
6@@ -76,7 +76,7 @@ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)  8@@ -20,7 +20,7 @@ $(SNAPPY_ARCHIVE):
7  9 @mkdir -p $(@D)
 10 curl -o$@ http://snappy.googlecode.com/files/snappy-$(VERSION).tar.gz
8  11
9 $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL) 12-$(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
10- $(MVN) package -Dmaven.test.skip=true 13+$(SNAPPY_UNPACKED):
11+ $(MVN) package -Dmaven.test.skip=true -Duser.home=${HOME} 14 tar xvfz $< -C $(TARGET)
 15 touch $@
12  16
13 test: $(NATIVE_DLL) 
14 $(MVN) test 
15@@ -97,6 +97,9 @@ linux32: 17@@ -97,6 +97,9 @@ linux32:
16 freebsd64: 18 freebsd64:
17 $(MAKE) native OS_NAME=FreeBSD OS_ARCH=amd64 19 $(MAKE) native OS_NAME=FreeBSD OS_ARCH=amd64
18  20
19+netbsd64: 21+netbsd64:
20+ $(MAKE) native OS_NAME=NetBSD OS_ARCH=amd64 22+ $(MAKE) native OS_NAME=NetBSD OS_ARCH=amd64
21+ 23+
22 # for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabi package 24 # for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabi package
23 linux-arm: 25 linux-arm:
24 $(MAKE) native CROSS_PREFIX=arm-linux-gnueabi- OS_NAME=Linux OS_ARCH=arm 26 $(MAKE) native CROSS_PREFIX=arm-linux-gnueabi- OS_NAME=Linux OS_ARCH=arm