Simplify maven call and make sure maven runs offline. Prepare offline

deps repository to use. Update home page and description. PKGREVISION+

3 files changed, 44 insertions, 30 deletions

diff --git a/devel/snappy-java10/Makefile b/devel/snappy-java10/Makefile
index d88c94944f7..a3544ecc13e 100644
--- a/devel/snappy-java10/Makefile
+++ b/devel/snappy-java10/Makefile
@@ -1,37 +1,46 @@
-# $NetBSD: Makefile,v 1.4 2014/12/15 13:24:21 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2015/10/20 12:13:33 fhajny Exp $
 
-SNAPPYVER=	1.0.5
-PKGNAME=	snappy-java10-${SNAPPYVER}
+DISTNAME=	snappy-java-${SNAPPYVER}
+PKGNAME=	${DISTNAME:S/java/java10/}
+PKGREVISION=	1
 CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=xerial/}
 
 MAINTAINER=	ryoon@NetBSD.org
-HOMEPAGE=	https://code.google.com/p/snappy-java/
-COMMENT=	Snappy for Java, a fast compressor/decompressor library
+HOMEPAGE=	http://github.com/xerial/snappy-java/
+COMMENT=	Snappy compressor/decompressor for Java
 LICENSE=	apache-2.0
 
-DISTFILES+=	snappy-java-${SNAPPYVER}.tar.gz snappy-${SNAPPYVER}.tar.gz
-SITES.snappy-${SNAPPYVER}.tar.gz=	https://snappy.googlecode.com/files/
-SITES.snappy-java-${SNAPPYVER}.tar.gz=	http://snappy-java.googlecode.com/files/
-
-TOOL_DEPENDS+=	apache-maven-[0-9]*:../../devel/apache-maven
+GITHUB_PROJECT=	snappy-java
+SNAPPYVER=	1.0.5
 
-DIST_SUBDIR=	snappy-java10
+DIST_SUBDIR=	${PKGBASE}
+DISTFILES=	${DEFAULT_DISTFILES}
+DISTFILES+=	snappy-java-${SNAPPYVER}-deps.tar.gz
+DISTFILES+=	snappy-${SNAPPYVER}.tar.gz
+SITES.snappy-${SNAPPYVER}.tar.gz=		https://snappy.googlecode.com/files/
+SITES.snappy-java-${SNAPPYVER}-deps.tar.gz=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
+EXTRACT_DIR.snappy-${SNAPPYVER}.tar.gz=		${WRKSRC}/target
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/snappy-java10/snappy-java/}
+TOOL_DEPENDS+=	apache-maven-[0-9]*:../../devel/apache-maven
 
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 USE_JAVA=	yes
 USE_JAVA2=	6
 
-INSTALLATION_DIRS+=	lib/java/snappy-java
+MAVEN_FLAGS+=	-Duser.home=${FAKEHOMEDIR}
+MAVEN_FLAGS+=	-Dmaven.repo.local=${WRKDIR}/deps
+MAVEN_FLAGS+=	--offline
 
 MAKE_FLAGS+=	JAVA_HOME=${PKG_JAVA_HOME}
+MAKE_FLAGS+=	MVN="mvn ${MAVEN_FLAGS}"
 MAKE_JOBS_SAFE=	no
 
-pre-build:
-	${MKDIR} ${WRKSRC}/target
-	${CP} -f ${DISTDIR}/${DIST_SUBDIR}/snappy-${SNAPPYVER}.tar.gz ${WRKSRC}/target
+INSTALLATION_DIRS+=	lib/java/snappy-java
+
+post-extract:
+	${TOUCH} ${WRKSRC}/target/snappy-extracted.log
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${SNAPPYVER}.jar \
diff --git a/devel/snappy-java10/distinfo b/devel/snappy-java10/distinfo
index 57ee946e791..24a8164aeb9 100644
--- a/devel/snappy-java10/distinfo
+++ b/devel/snappy-java10/distinfo
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.3 2014/12/23 18:51:37 joerg Exp $
+$NetBSD: distinfo,v 1.4 2015/10/20 12:13:33 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.jar) = f6fdc26b034b2a6a62f74b0a678ae6679ed6c201
-RMD160 (snappy-java10/snappy-java-1.0.5.jar) = 53140b9a4b33c66bbf24b601b0aee5931a8a7c2d
-Size (snappy-java10/snappy-java-1.0.5.jar) = 1272779 bytes
+SHA1 (snappy-java10/snappy-java-1.0.5-deps.tar.gz) = 0792db245c10cd995cf28b0fb8352c12441a43a2
+RMD160 (snappy-java10/snappy-java-1.0.5-deps.tar.gz) = 8ca8c99eaed520b2f7b9c3cf068f2557b4b8e702
+SHA512 (snappy-java10/snappy-java-1.0.5-deps.tar.gz) = ee8e287817530f3b85313037629e5beeacad997c897b1cfc009bf1ad076499b1b63fdefb46322f018be605150ee12a758c296d451be8ceada034cc86e522114b
+Size (snappy-java10/snappy-java-1.0.5-deps.tar.gz) = 9874187 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 (patch-Makefile) = b236636dc99d4e316398baaf321dab00b54765ab
+SHA1 (patch-Makefile) = cb15c6016dab4670fce0ace6f1dd21e7c7bb1097
 SHA1 (patch-Makefile.common) = 83eeaf91c7dbd6ac3c4b3405d53acec9caa260aa
diff --git a/devel/snappy-java10/patches/patch-Makefile b/devel/snappy-java10/patches/patch-Makefile
index 517ac966db0..f1df0685117 100644
--- a/devel/snappy-java10/patches/patch-Makefile
+++ b/devel/snappy-java10/patches/patch-Makefile
@@ -1,17 +1,19 @@
-$NetBSD: patch-Makefile,v 1.3 2014/12/23 18:51:37 joerg Exp $
+$NetBSD: patch-Makefile,v 1.4 2015/10/20 12:13:33 fhajny Exp $
 
 Add explicit NetBSD 64-bit target.
---- Makefile.orig	2013-05-17 01:29:31.000000000 +0000
+Skip unpacking, handled by pkgsrc.
+
+--- Makefile.orig	2014-07-04 05:20:00.000000000 +0000
 +++ Makefile
-@@ -76,7 +76,7 @@ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) 
- 
+@@ -20,7 +20,7 @@ $(SNAPPY_ARCHIVE):
+ 	@mkdir -p $(@D)
+ 	curl -o$@ http://snappy.googlecode.com/files/snappy-$(VERSION).tar.gz
  
- $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)
--	$(MVN) package -Dmaven.test.skip=true
-+	$(MVN) package -Dmaven.test.skip=true -Duser.home=${HOME}
+-$(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
++$(SNAPPY_UNPACKED):
+ 	tar xvfz $< -C $(TARGET)	
+ 	touch $@
  
- test: $(NATIVE_DLL)
- 	$(MVN) test
 @@ -97,6 +97,9 @@ linux32:
  freebsd64:
  	$(MAKE) native OS_NAME=FreeBSD OS_ARCH=amd64