Attachment #245705 for bug #268558




# and distributed so build is repeatable and cluster-safe.

PORTNAME=	snappy
DISTVERSIONPREFIX=	v
DISTVERSION=	1.1.10.5
CATEGORIES=	archivers java
MASTER_SITES=	LOCAL/otis:repo
PKGNAMESUFFIX=	java
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
		${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo
EXTRACT_ONLY=	${DISTFILE_DEFAULT} \
		${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX} \
		${DISTFILE_google_benchmark} \
		${DISTFILE_google_googletest}

MAINTAINER=	language.devel@gmail.com
COMMENT=	Fast compressor/decompressor library


LICENSE=	APACHE20

BROKEN_armv6=	fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
BROKEN_armv7=	fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes

BUILD_DEPENDS=	cmake:devel/cmake-core \
		sbt:devel/sbt

USES=		gmake

USE_GITHUB=	yes
GH_ACCOUNT=	xerial
GH_PROJECT=	snappy-java
GH_TAGNAME=	${DISTVERSIONFULL}
GH_TUPLE=	google:snappy:${DISTVERSION:R}:google \
		google:benchmark:d572f47:google_benchmark/google_benchmark \
		google:googletest:b796f7d:google_googletest/google_googletest \
		kiyo-masui:bitshuffle:${BITSHUFFLE_V}:masui

USE_JAVA=	yes
USE_LDCONFIG=	yes
MAKE_ARGS+=	CXX="${CXX}"
TEST_TARGET=	test
BITSHUFFLE_V=	0.3.4

PLIST_FILES=	${JAVAJARDIR}/snappy-java.jar \
		lib/libsnappyjava.so

.include <bsd.port.pre.mk>
GH_PROJECT=	snappy-java \
		snappy:google \
		bitshuffle:masui
GH_TAGNAME=	${PORTVERSION} \
		${PORTVERSION:R}:google \
		${BITSHUFFLE_V}:masui

PLIST_FILES=	${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so

post-extract:
	${MKDIR} ${WRKSRC}/target
	${RM} ${WRKSRC}/sbt
	${CP} ${DISTDIR}/${DISTFILE_google} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX}
	${CP} ${DISTDIR}/${DISTFILE_masui} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX}
	(cd ${WRKSRC}/google_benchmark && \
		${COPYTREE_SHARE} . ${WRKSRC}/target/snappy-${PORTVERSION:R}/third_party/benchmark)
	(cd ${WRKSRC}/google_googletest && \
		${COPYTREE_SHARE} . ${WRKSRC}/target/snappy-${PORTVERSION:R}/third_party/googletest)

do-build:
	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \

	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \
		${MAKE_CMD} ${MAKE_ARGS} SBT_IVY_HOME=${WRKDIR}/repository SBT_BOOT_DIR=${WRKDIR}/sbt_boot SBT_GLOBAL_DIR=${WRKDIR}/sbt_global test

.include <bsd.port.pre.mk>

.if ${OPSYS} == FreeBSD
. if ${ARCH} == amd64
PLATFORM_DIR_SUFFIX=	FreeBSD-x86_64
. elif ${ARCH} == i386
PLATFORM_DIR_SUFFIX=	FreeBSD-x86
. elif ${ARCH} == aarch64
PLATFORM_DIR_SUFFIX=	FreeBSD-aarch64
. elif ${ARCH} == powerpc64
PLATFORM_DIR_SUFFIX=	FreeBSD-ppc64
. elif ${ARCH} == powerpc64le
PLATFORM_DIR_SUFFIX=	FreeBSD-ppc64le
.	else
PLATFORM_DIR_SUFFIX=	Default
. endif
.else
PLATFORM_DIR_SUFFIX=	Default
.endif

do-install:
	${INSTALL_DATA} ${WRKSRC}/target/snappy-java-*.jar \
		${STAGEDIR}${JAVAJARDIR}/snappy-java.jar
	${INSTALL_LIB} ${WRKSRC}/target/snappy-${PORTVERSION:R}-${PLATFORM_DIR_SUFFIX}/libsnappyjava.so \
		${STAGEDIR}${LOCALBASE}/lib




TIMESTAMP = 1696787613
SHA256 (xerial-snappy-java-v1.1.10.5_GH0.tar.gz) = dcec78c80eab4cd2841cb70f924cb1b9344d94481e84c45adbb5cb8cfc1c372f
SIZE (xerial-snappy-java-v1.1.10.5_GH0.tar.gz) = 3917442
SHA256 (snappy-java-repository-1.1.10.5.tar.gz) = 45fc41e1109d1b6bb6727808b6aed04d4bfb589012fb955906e82da9283156c7
SIZE (snappy-java-repository-1.1.10.5.tar.gz) = 235195392
SHA256 (google-snappy-1.1.10_GH0.tar.gz) = 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
SIZE (google-snappy-1.1.10_GH0.tar.gz) = 1105312
SHA256 (google-benchmark-d572f47_GH0.tar.gz) = 3ed2c88e1067c347031f77d5ea8b40e95a1cd4562badac361418160c23d6f000
SIZE (google-benchmark-d572f47_GH0.tar.gz) = 196565
SHA256 (google-googletest-b796f7d_GH0.tar.gz) = 00fda32f69c4b9f980f1a3166626e9ba74a2e92ff42dc15242e05be369364708
SIZE (google-googletest-b796f7d_GH0.tar.gz) = 862944
SHA256 (kiyo-masui-bitshuffle-0.3.4_GH0.tar.gz) = 275a5f329b9eba2e4e7a540e8a4211f01a919a59f2b428299da680c7f0a15c3e
SIZE (kiyo-masui-bitshuffle-0.3.4_GH0.tar.gz) = 110150




--- Makefile.orig	2023-10-08 13:55:19 UTC
+++ Makefile
@@ -4,7 +4,7 @@ include Makefile.common
 $(info OS_NAME:$(OS_NAME), OS_ARCH:$(OS_ARCH))
 
 MVN:=mvn
-SBT:=./sbt

 
 all: snappy
 
@@ -17,7 +17,6 @@ SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
 # Change this variable to use a specific git commit
 SNAPPY_GIT_REV:=$(SNAPPY_VERSION)
 SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log
-SNAPPY_GIT_UNPACKED:=$(TARGET)/snappy-git-extracted.log
 SNAPPY_CMAKE_CACHE=$(SNAPPY_OUT)/CMakeCache.txt
 
 BITSHUFFLE_ARCHIVE:=$(TARGET)/bitshuffle-$(BITSHUFFLE_VERSION).tar.gz
@@ -74,21 +73,12 @@ $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
-	curl -L -o$@ https://github.com/kiyo-masui/bitshuffle/archive/$(BITSHUFFLE_VERSION).tar.gz
 
 $(BITSHUFFLE_UNPACKED): $(BITSHUFFLE_ARCHIVE)
 	$(TAR) xvfz $< -C $(TARGET)
@@ -65,26 +64,25 @@ endif
 
 $(SNAPPY_ARCHIVE):
 	@mkdir -p $(@D)
-	curl -L -o$@ https://github.com/google/snappy/releases/download/$(SNAPPY_VERSION)/snappy-$(SNAPPY_VERSION).tar.gz
 
 $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
 	$(TAR) xvfz $< -C $(TARGET)
 	touch $@
 
-$(SNAPPY_GIT_UNPACKED):
+$(SNAPPY_CMAKE_CACHE): $(SNAPPY_UNPACKED)
 	@mkdir -p $(SNAPPY_OUT)
-	rm -rf $(SNAPPY_SRC_DIR)
-	@mkdir -p $(SNAPPY_SRC_DIR)
-	git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR)
-	git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)
-	cd $(SNAPPY_SRC_DIR) && git submodule update --init
-	touch $@
-
+#	@mkdir -p $(SNAPPY_OUT)
+#	rm -rf $(SNAPPY_SRC_DIR)
+#	@mkdir -p $(SNAPPY_SRC_DIR)
+#	git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR)
+#	git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)
+#	touch $@
 
-$(SNAPPY_CMAKE_CACHE): $(SNAPPY_GIT_UNPACKED)
-	@mkdir -p $(SNAPPY_OUT)
 	@mkdir -p $(SNAPPY_OUT)
 	cd $(SNAPPY_OUT) && cmake $(SNAPPY_CMAKE_OPTS) ../../$(SNAPPY_SRC_DIR)
 	touch $@
 

 
 snappy-header: $(SNAPPY_CMAKE_CACHE)
 
@@ -104,7 +94,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNati
 
 $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
 

Lines 1-17 Link Here

(-)b/archivers/snappy-java/files/patch-Makefile.common (-8 / +23 lines)
1	--- Makefile.common.orig 2020-05-06 17:26:51 UTC	1	--- Makefile.common.orig 2023-09-27 02:22:20 UTC
2	+++ Makefile.common	2	+++ Makefile.common
3	@@ -45,7 +45,7 @@ endif	3	@@ -29,8 +29,13 @@ IBM_JDK_LIB := lib/inc_ibm
		4	ifeq ($(OS_NAME),Mac)
		5	ENDIANESS:="Little Endian"
		6	else
		7	-ENDIANESS:=$(shell lscpu \| grep "Byte Order" \|cut -d ":" -f2)
		8	+_btord:=$(shell sysctl -n hw.byteorder)
		9	+ifeq ($(_btord),1234)
		10	+ENDIANESS:="Little Endian"
		11	+else
		12	+ENDIANESS:="Big Endian"
		13	endif
		14	+endif
4		15
		16	# Windows uses different path separators
		17	ifeq ($(OS_NAME),Windows)
		18	@@ -51,7 +56,7 @@ endif
5	# os=Default is meant to be generic unix/linux	19	# os=Default is meant to be generic unix/linux
6		20
7	-known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64	21	# To support new CPU architecture, add a new target name here
8	+known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-aarch64 FreeBSD-ppc64 FreeBSD-ppc64le FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64	22	-known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64
		23	+known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-aarch64 FreeBSD-ppc64 FreeBSD-ppc64le FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64
9	os_arch := $(OS_NAME)-$(OS_ARCH)	24	os_arch := $(OS_NAME)-$(OS_ARCH)
10	IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 \| grep IBM \| grep "JRE 1.7"))	25	IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 \| grep IBM \| grep "JRE 1.7"))
11		26
12	@@ -249,6 +249,34 @@ Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/i	27	@@ -262,6 +267,34 @@ Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/i
13	Mac-x86_64_LINKFLAGS := -dynamiclib	28	Mac-x86_64_LINKFLAGS := -dynamiclib
14	Mac-x86_64_LIBNAME := libsnappyjava.jnilib	29	Mac-x86_64_LIBNAME := libsnappyjava.dylib
15	Mac-x86_64_SNAPPY_FLAGS :=	30	Mac-x86_64_SNAPPY_FLAGS :=
16	+	31	+
17	+FreeBSD-aarch64_CXX := $(CROSS_PREFIX)g++	32	+FreeBSD-aarch64_CXX := $(CROSS_PREFIX)g++
Lines 42-46 Link Here
42	+FreeBSD-x86_LIBNAME := libsnappyjava.so	57	+FreeBSD-x86_LIBNAME := libsnappyjava.so
43	+FreeBSD-x86_SNAPPY_FLAGS :=	58	+FreeBSD-x86_SNAPPY_FLAGS :=
44		59
45	FreeBSD-x86_64_CXX := $(CROSS_PREFIX)g++	60	Mac-aarch64_CXX := c++ -arch arm64
46	FreeBSD-x86_64_STRIP := $(CROSS_PREFIX)strip	61	Mac-aarch64_STRIP := strip -x

Removed Link Here

(-)a/archivers/snappy-java/files/patch-project_plugins.sbt (-9 lines)
1	--- project/plugins.sbt.orig 2020-05-09 18:44:59 UTC
2	+++ project/plugins.sbt
3	@@ -4,5 +4,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2
4	addSbtPlugin("com.github.sbt" % "sbt-findbugs" % "2.0.0")
5	addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.1.0")
6	addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
7	-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M7")
8	addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1")
9	-

Return to bug 268558

Lines 3-15 Link Here

(-)b/archivers/snappy-java/Makefile (-32 / +40 lines)
3	# and distributed so build is repeatable and cluster-safe.	3	# and distributed so build is repeatable and cluster-safe.
4		4
5	PORTNAME= snappy	5	PORTNAME= snappy
6	PORTVERSION= 1.1.7.5	6	DISTVERSIONPREFIX= v
		7	DISTVERSION= 1.1.10.5
7	CATEGORIES= archivers java	8	CATEGORIES= archivers java
8	MASTER_SITES= LOCAL/pi:repo	9	MASTER_SITES= LOCAL/otis:repo
9	PKGNAMESUFFIX= java	10	PKGNAMESUFFIX= java
10	DISTFILES+= ${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo	11	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
		12	${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo
11	EXTRACT_ONLY= ${DISTFILE_DEFAULT} \	13	EXTRACT_ONLY= ${DISTFILE_DEFAULT} \
12	${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}	14	${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX} \
		15	${DISTFILE_google_benchmark} \
		16	${DISTFILE_google_googletest}
13		17
14	MAINTAINER= language.devel@gmail.com	18	MAINTAINER= language.devel@gmail.com
15	COMMENT= Fast compressor/decompressor library	19	COMMENT= Fast compressor/decompressor library
Lines 17-53 WWW= https://github.com/xerial/snappy-java Link Here
17		21
18	LICENSE= APACHE20	22	LICENSE= APACHE20
19		23
20	BROKEN_armv6= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes	24	BROKEN_armv6= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
21	BROKEN_armv7= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes	25	BROKEN_armv7= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
22		26
23	BUILD_DEPENDS= cmake:devel/cmake-core \	27	BUILD_DEPENDS= cmake:devel/cmake-core \
24	sbt:devel/sbt	28	sbt:devel/sbt
25		29
26	USES= gmake	30	USES= gmake
		31
		32	USE_GITHUB= yes
		33	GH_ACCOUNT= xerial
		34	GH_PROJECT= snappy-java
		35	GH_TAGNAME= ${DISTVERSIONFULL}
		36	GH_TUPLE= google:snappy:${DISTVERSION:R}:google \
		37	google:benchmark:d572f47:google_benchmark/google_benchmark \
		38	google:googletest:b796f7d:google_googletest/google_googletest \
		39	kiyo-masui:bitshuffle:${BITSHUFFLE_V}:masui
		40
27	USE_JAVA= yes	41	USE_JAVA= yes
28	USE_LDCONFIG= yes	42	USE_LDCONFIG= yes
29	MAKE_ARGS+= CXX="${CXX}"	43	MAKE_ARGS+= CXX="${CXX}"
30	TEST_TARGET= test	44	TEST_TARGET= test
31	BITSHUFFLE_V= 0.3.2	45	BITSHUFFLE_V= 0.3.4
32		46
33	USE_GITHUB= yes	47	PLIST_FILES= ${JAVAJARDIR}/snappy-java.jar \
34	GH_ACCOUNT= xerial \	48	lib/libsnappyjava.so
35	google:google \	49
36	kiyo-masui:masui	50	.include <bsd.port.pre.mk>
37	GH_PROJECT= snappy-java \
38	snappy:google \
39	bitshuffle:masui
40	GH_TAGNAME= ${PORTVERSION} \
41	${PORTVERSION:R}:google \
42	${BITSHUFFLE_V}:masui
43
44	PLIST_FILES= ${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so
45		51
46	post-extract:	52	post-extract:
47	@${MKDIR} ${WRKSRC}/target	53	${MKDIR} ${WRKSRC}/target
48	@${RM} ${WRKSRC}/sbt	54	${RM} ${WRKSRC}/sbt
49	@${CP} ${DISTDIR}/${DISTFILE_google} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX}	55	${CP} ${DISTDIR}/${DISTFILE_google} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX}
50	@${CP} ${DISTDIR}/${DISTFILE_masui} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX}	56	${CP} ${DISTDIR}/${DISTFILE_masui} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX}
		57	(cd ${WRKSRC}/google_benchmark && \
		58	${COPYTREE_SHARE} . ${WRKSRC}/target/snappy-${PORTVERSION:R}/third_party/benchmark)
		59	(cd ${WRKSRC}/google_googletest && \
		60	${COPYTREE_SHARE} . ${WRKSRC}/target/snappy-${PORTVERSION:R}/third_party/googletest)
51		61
52	do-build:	62	do-build:
53	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \	63	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \
Lines 57-84 do-test: Link Here
57	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \	67	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \
58	${MAKE_CMD} ${MAKE_ARGS} SBT_IVY_HOME=${WRKDIR}/repository SBT_BOOT_DIR=${WRKDIR}/sbt_boot SBT_GLOBAL_DIR=${WRKDIR}/sbt_global test	68	${MAKE_CMD} ${MAKE_ARGS} SBT_IVY_HOME=${WRKDIR}/repository SBT_BOOT_DIR=${WRKDIR}/sbt_boot SBT_GLOBAL_DIR=${WRKDIR}/sbt_global test
59		69
60	.include <bsd.port.pre.mk>
61
62	.if ${OPSYS} == FreeBSD	70	.if ${OPSYS} == FreeBSD
63	. if ${ARCH} == amd64	71	. if ${ARCH} == amd64
64	PLATFORM_DIR_SUFFIX= FreeBSD-x86_64	72	PLATFORM_DIR_SUFFIX= FreeBSD-x86_64
65	. elif ${ARCH} == i386	73	. elif ${ARCH} == i386
66	PLATFORM_DIR_SUFFIX= FreeBSD-x86	74	PLATFORM_DIR_SUFFIX= FreeBSD-x86
67	. elif ${ARCH} == aarch64	75	. elif ${ARCH} == aarch64
68	PLATFORM_DIR_SUFFIX= FreeBSD-aarch64	76	PLATFORM_DIR_SUFFIX= FreeBSD-aarch64
69	. elif ${ARCH} == powerpc64	77	. elif ${ARCH} == powerpc64
70	PLATFORM_DIR_SUFFIX= FreeBSD-ppc64	78	PLATFORM_DIR_SUFFIX= FreeBSD-ppc64
71	. elif ${ARCH} == powerpc64le	79	. elif ${ARCH} == powerpc64le
72	PLATFORM_DIR_SUFFIX= FreeBSD-ppc64le	80	PLATFORM_DIR_SUFFIX= FreeBSD-ppc64le
73	. else	81	. else
74	PLATFORM_DIR_SUFFIX= Default	82	PLATFORM_DIR_SUFFIX= Default
75	. endif	83	. endif
76	.else	84	.else
77	PLATFORM_DIR_SUFFIX= Default	85	PLATFORM_DIR_SUFFIX= Default
78	.endif	86	.endif
79		87
80	do-install:	88	do-install:
81	${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${PORTVERSION}.jar \	89	${INSTALL_DATA} ${WRKSRC}/target/snappy-java-*.jar \
82	${STAGEDIR}${JAVAJARDIR}/snappy-java.jar	90	${STAGEDIR}${JAVAJARDIR}/snappy-java.jar
83	${INSTALL_LIB} ${WRKSRC}/target/snappy-${PORTVERSION:R}-${PLATFORM_DIR_SUFFIX}/libsnappyjava.so \	91	${INSTALL_LIB} ${WRKSRC}/target/snappy-${PORTVERSION:R}-${PLATFORM_DIR_SUFFIX}/libsnappyjava.so \
84	${STAGEDIR}${LOCALBASE}/lib	92	${STAGEDIR}${LOCALBASE}/lib

Lines 1-9 Link Here

(-)b/archivers/snappy-java/distinfo (-9 / +13 lines)
1	TIMESTAMP = 1589051057	1	TIMESTAMP = 1696787613
2	SHA256 (snappy-java-repository-1.1.7.5.tar.gz) = 8025714a5ab5bcd91cf5f0da77465948247b5b2b1b5ebd02a14f4a1bec19e067	2	SHA256 (xerial-snappy-java-v1.1.10.5_GH0.tar.gz) = dcec78c80eab4cd2841cb70f924cb1b9344d94481e84c45adbb5cb8cfc1c372f
3	SIZE (snappy-java-repository-1.1.7.5.tar.gz) = 222476258	3	SIZE (xerial-snappy-java-v1.1.10.5_GH0.tar.gz) = 3917442
4	SHA256 (xerial-snappy-java-1.1.7.5_GH0.tar.gz) = af428168ae017944eb775e46ddc8e459365610fdde813e4542b9337aed479d93	4	SHA256 (snappy-java-repository-1.1.10.5.tar.gz) = 45fc41e1109d1b6bb6727808b6aed04d4bfb589012fb955906e82da9283156c7
5	SIZE (xerial-snappy-java-1.1.7.5_GH0.tar.gz) = 3547828	5	SIZE (snappy-java-repository-1.1.10.5.tar.gz) = 235195392
6	SHA256 (google-snappy-1.1.7_GH0.tar.gz) = 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4	6	SHA256 (google-snappy-1.1.10_GH0.tar.gz) = 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
7	SIZE (google-snappy-1.1.7_GH0.tar.gz) = 1090550	7	SIZE (google-snappy-1.1.10_GH0.tar.gz) = 1105312
8	SHA256 (kiyo-masui-bitshuffle-0.3.2_GH0.tar.gz) = c0b97632fdcf26c67db2634fda70ac05c1679b5f4d4bc3674c5961bd515672e4	8	SHA256 (google-benchmark-d572f47_GH0.tar.gz) = 3ed2c88e1067c347031f77d5ea8b40e95a1cd4562badac361418160c23d6f000
9	SIZE (kiyo-masui-bitshuffle-0.3.2_GH0.tar.gz) = 109279	9	SIZE (google-benchmark-d572f47_GH0.tar.gz) = 196565
		10	SHA256 (google-googletest-b796f7d_GH0.tar.gz) = 00fda32f69c4b9f980f1a3166626e9ba74a2e92ff42dc15242e05be369364708
		11	SIZE (google-googletest-b796f7d_GH0.tar.gz) = 862944
		12	SHA256 (kiyo-masui-bitshuffle-0.3.4_GH0.tar.gz) = 275a5f329b9eba2e4e7a540e8a4211f01a919a59f2b428299da680c7f0a15c3e
		13	SIZE (kiyo-masui-bitshuffle-0.3.4_GH0.tar.gz) = 110150

Lines 1-7 Link Here

(-)b/archivers/snappy-java/files/patch-Makefile (-29 / +17 lines)
1	--- Makefile.orig 2020-05-06 17:26:51 UTC	1	--- Makefile.orig 2023-10-08 13:55:19 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -2,7 +2,7 @@	3	@@ -4,7 +4,7 @@ include Makefile.common
4	include Makefile.common	4	$(info OS_NAME:$(OS_NAME), OS_ARCH:$(OS_ARCH))
5		5
6	MVN:=mvn	6	MVN:=mvn
7	-SBT:=./sbt	7	-SBT:=./sbt
Lines 9-50 Link Here
9		9
10	all: snappy	10	all: snappy
11		11
12	@@ -25,7 +25,6 @@ BITSHUFFLE_UNPACKED:=$(TARGET)/bitshuffle-extracted.lo	12	@@ -17,7 +17,6 @@ SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
		13	# Change this variable to use a specific git commit
		14	SNAPPY_GIT_REV:=$(SNAPPY_VERSION)
		15	SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log
		16	-SNAPPY_GIT_UNPACKED:=$(TARGET)/snappy-git-extracted.log
		17	SNAPPY_CMAKE_CACHE=$(SNAPPY_OUT)/CMakeCache.txt
13		18
14	$(BITSHUFFLE_ARCHIVE):	19	BITSHUFFLE_ARCHIVE:=$(TARGET)/bitshuffle-$(BITSHUFFLE_VERSION).tar.gz
15	@mkdir -p $(@D)	20	@@ -74,21 +73,12 @@ $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
16	- curl -L -o$@ https://github.com/kiyo-masui/bitshuffle/archive/$(BITSHUFFLE_VERSION).tar.gz
17
18	$(BITSHUFFLE_UNPACKED): $(BITSHUFFLE_ARCHIVE)
19	$(TAR) xvfz $< -C $(TARGET)
20	@@ -65,26 +64,25 @@ endif
21
22	$(SNAPPY_ARCHIVE):
23	@mkdir -p $(@D)
24	- curl -L -o$@ https://github.com/google/snappy/releases/download/$(SNAPPY_VERSION)/snappy-$(SNAPPY_VERSION).tar.gz
25
26	$(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
27	$(TAR) xvfz $< -C $(TARGET)	21	$(TAR) xvfz $< -C $(TARGET)
28	touch $@	22	touch $@
29		23
30	-$(SNAPPY_GIT_UNPACKED):	24	-$(SNAPPY_GIT_UNPACKED):
31	- @mkdir -p $(SNAPPY_OUT)	25	+$(SNAPPY_CMAKE_CACHE): $(SNAPPY_UNPACKED)
		26	@mkdir -p $(SNAPPY_OUT)
32	- rm -rf $(SNAPPY_SRC_DIR)	27	- rm -rf $(SNAPPY_SRC_DIR)
33	- @mkdir -p $(SNAPPY_SRC_DIR)	28	- @mkdir -p $(SNAPPY_SRC_DIR)
34	- git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR)	29	- git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR)
35	- git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)	30	- git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)
		31	- cd $(SNAPPY_SRC_DIR) && git submodule update --init
36	- touch $@	32	- touch $@
37	+#$(SNAPPY_GIT_UNPACKED):	33	-
38	+# @mkdir -p $(SNAPPY_OUT)
39	+# rm -rf $(SNAPPY_SRC_DIR)
40	+# @mkdir -p $(SNAPPY_SRC_DIR)
41	+# git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR)
42	+# git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)
43	+# touch $@
44
45	-$(SNAPPY_CMAKE_CACHE): $(SNAPPY_GIT_UNPACKED)	34	-$(SNAPPY_CMAKE_CACHE): $(SNAPPY_GIT_UNPACKED)
46	+$(SNAPPY_CMAKE_CACHE): $(SNAPPY_UNPACKED)	35	- @mkdir -p $(SNAPPY_OUT)
47	@mkdir -p $(SNAPPY_OUT)
48	cd $(SNAPPY_OUT) && cmake $(SNAPPY_CMAKE_OPTS) ../../$(SNAPPY_SRC_DIR)	36	cd $(SNAPPY_OUT) && cmake $(SNAPPY_CMAKE_OPTS) ../../$(SNAPPY_SRC_DIR)
49	touch $@	37	touch $@
50		38
Lines 53-59 Link Here
53		41
54	snappy-header: $(SNAPPY_CMAKE_CACHE)	42	snappy-header: $(SNAPPY_CMAKE_CACHE)
55		43
56	@@ -100,7 +98,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNati	44	@@ -104,7 +94,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNati
57		45
58	$(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class	46	$(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
59		47