diff options
Diffstat (limited to '')
| -rw-r--r-- | archivers/snappy-java/Makefile | 26 | ||||
| -rw-r--r-- | archivers/snappy-java/distinfo | 18 | ||||
| -rw-r--r-- | archivers/snappy-java/files/patch-Makefile | 16 | ||||
| -rw-r--r-- | archivers/snappy-java/files/patch-Makefile.common | 12 |
4 files changed, 30 insertions, 42 deletions
diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile index 1d8f2705f900..fcbc54e5c28c 100644 --- a/archivers/snappy-java/Makefile +++ b/archivers/snappy-java/Makefile @@ -4,15 +4,14 @@ PORTNAME= snappy DISTVERSIONPREFIX= v -DISTVERSION= 1.1.10.5 -PORTREVISION= 1 +DISTVERSION= 1.1.10.8 CATEGORIES= archivers java -MASTER_SITES= LOCAL/otis:repo +MASTER_SITES= LOCAL/otis:deps \ + LOCAL/vvd:deps PKGNAMESUFFIX= java -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo +DISTFILES= ${PORTNAME}-${PKGNAMESUFFIX}-repository-${DISTVERSION}.tar.xz:deps EXTRACT_ONLY= ${DISTFILE_DEFAULT} \ - ${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}-${PKGNAMESUFFIX}-repository-${DISTVERSION}.tar.xz \ ${DISTFILE_google_benchmark} \ ${DISTFILE_google_googletest} @@ -22,18 +21,16 @@ WWW= https://github.com/xerial/snappy-java LICENSE= APACHE20 -BUILD_DEPENDS= cmake:devel/cmake-core \ - sbt:devel/sbt +BUILD_DEPENDS= sbt:devel/sbt -USES= gmake java:build +USES= cmake:indirect gmake java:build 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 \ + google:benchmark:v1.7.1:google_benchmark/google_benchmark \ + google:googletest:v1.13.0:google_googletest/google_googletest \ kiyo-masui:bitshuffle:${BITSHUFFLE_V}:masui USE_LDCONFIG= yes @@ -62,7 +59,8 @@ post-extract: do-build: 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 + ${MAKE_CMD} ${MAKE_ARGS} SBT_IVY_HOME=${WRKDIR}/repository \ + SBT_BOOT_DIR=${WRKDIR}/sbt_boot SBT_GLOBAL_DIR=${WRKDIR}/sbt_global do-test: cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \ @@ -93,7 +91,7 @@ PLATFORM_DIR_SUFFIX= Default 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 \ + ${INSTALL_LIB} ${WRKSRC}/target/snappy-${DISTVERSION:R}-${PLATFORM_DIR_SUFFIX}/libsnappyjava.so \ ${STAGEDIR}${LOCALBASE}/lib .include <bsd.port.post.mk> diff --git a/archivers/snappy-java/distinfo b/archivers/snappy-java/distinfo index 92165b8a2cf1..f0062b74e9b9 100644 --- a/archivers/snappy-java/distinfo +++ b/archivers/snappy-java/distinfo @@ -1,13 +1,13 @@ -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 +TIMESTAMP = 1754425555 +SHA256 (snappy-java-repository-1.1.10.8.tar.xz) = 29c44a31058c6c094532fe70d28da852c64c5d58c2ad2590599961f2db53a6d8 +SIZE (snappy-java-repository-1.1.10.8.tar.xz) = 150547564 +SHA256 (xerial-snappy-java-v1.1.10.8_GH0.tar.gz) = 8bd5072fd984983a5709a8ea4b2e8a4457c4f16a134d3d912789d3007f7f1649 +SIZE (xerial-snappy-java-v1.1.10.8_GH0.tar.gz) = 4063792 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 (google-benchmark-v1.7.1_GH0.tar.gz) = 6430e4092653380d9dc4ccb45a1e2dc9259d581f4866dc0759713126056bc1d7 +SIZE (google-benchmark-v1.7.1_GH0.tar.gz) = 196575 +SHA256 (google-googletest-v1.13.0_GH0.tar.gz) = ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363 +SIZE (google-googletest-v1.13.0_GH0.tar.gz) = 862871 SHA256 (kiyo-masui-bitshuffle-0.3.4_GH0.tar.gz) = 275a5f329b9eba2e4e7a540e8a4211f01a919a59f2b428299da680c7f0a15c3e SIZE (kiyo-masui-bitshuffle-0.3.4_GH0.tar.gz) = 110150 diff --git a/archivers/snappy-java/files/patch-Makefile b/archivers/snappy-java/files/patch-Makefile index ae6ab7e4591e..3be3eec93eac 100644 --- a/archivers/snappy-java/files/patch-Makefile +++ b/archivers/snappy-java/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2023-09-27 02:22:20 UTC +--- Makefile.orig 2025-07-19 20:40:49 UTC +++ Makefile @@ -4,7 +4,7 @@ MVN:=mvn $(info OS_NAME:$(OS_NAME), OS_ARCH:$(OS_ARCH)) @@ -17,7 +17,7 @@ SNAPPY_CMAKE_CACHE=$(SNAPPY_OUT)/CMakeCache.txt BITSHUFFLE_ARCHIVE:=$(TARGET)/bitshuffle-$(BITSHUFFLE_VERSION).tar.gz -@@ -74,37 +73,28 @@ $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE) +@@ -74,21 +73,12 @@ $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE) $(TAR) xvfz $< -C $(TARGET) touch $@ @@ -41,17 +41,7 @@ snappy-header: $(SNAPPY_CMAKE_CACHE) - $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class: $(SRC)/org/xerial/snappy/SnappyNative.java - @mkdir -p $(TARGET)/jni-classes -- $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< -+ $(JAVAC) -source 8 -target 8 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< - - $(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class - - $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xerial/snappy/BitShuffleNative.java - @mkdir -p $(TARGET)/jni-classes -- $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< -+ $(JAVAC) -source 8 -target 8 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< +@@ -104,7 +94,7 @@ $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET) $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class diff --git a/archivers/snappy-java/files/patch-Makefile.common b/archivers/snappy-java/files/patch-Makefile.common index f348fa250244..fd7ec71b1d0b 100644 --- a/archivers/snappy-java/files/patch-Makefile.common +++ b/archivers/snappy-java/files/patch-Makefile.common @@ -1,6 +1,6 @@ ---- Makefile.common.orig 2023-09-27 02:22:20 UTC +--- Makefile.common.orig 2025-07-19 20:40:49 UTC +++ Makefile.common -@@ -29,8 +29,13 @@ else +@@ -28,8 +28,13 @@ else ifeq ($(OS_NAME),Mac) ENDIANESS:="Little Endian" else @@ -15,16 +15,16 @@ # Windows uses different path separators ifeq ($(OS_NAME),Windows) -@@ -51,7 +56,7 @@ endif +@@ -50,7 +55,7 @@ endif # os=Default is meant to be generic unix/linux # To support new CPU architecture, add a new target name here --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 -+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-arm FreeBSD-aarch64 FreeBSD-ppc 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 +-known_os_archs := Linux-x86_64-musl 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 Linux-loongarch Linux-loongarch64 ++known_os_archs := Linux-x86_64-musl 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-arm FreeBSD-aarch64 FreeBSD-ppc 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 Linux-loongarch Linux-loongarch64 os_arch := $(OS_NAME)-$(OS_ARCH) IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7")) -@@ -262,6 +267,48 @@ Mac-x86_64_SNAPPY_FLAGS := +@@ -272,6 +277,48 @@ Mac-x86_64_SNAPPY_FLAGS := Mac-x86_64_LINKFLAGS := -dynamiclib Mac-x86_64_LIBNAME := libsnappyjava.dylib Mac-x86_64_SNAPPY_FLAGS := |