diff --git a/databases/sqlite-jdbc/Makefile b/databases/sqlite-jdbc/Makefile index 9feeeedcaacb..851806e67b04 100644 --- a/databases/sqlite-jdbc/Makefile +++ b/databases/sqlite-jdbc/Makefile @@ -1,39 +1,39 @@ PORTNAME= sqlite-jdbc -DISTVERSION= 3.53.0.0 +DISTVERSION= 3.53.1.0 CATEGORIES= databases java MASTER_SITES+= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${DISTVERSION}/:jar DISTFILES+= ${DISTJAR}:jar EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= michaelo@FreeBSD.org COMMENT= JDBC driver for SQLite WWW= https://github.com/xerial/sqlite-jdbc LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${JAVAJARDIR}/slf4j-api.jar:devel/slf4j LIB_DEPENDS= libsqlite3.so:databases/sqlite3 USES= gmake java:build USE_GITHUB= yes GH_ACCOUNT= xerial MAKE_ARGS+= SQLITE_OBJ="${LOCALBASE}/lib/libsqlite3.so" \ SQLITE_HEADER="${LOCALBASE}/include/sqlite3.h" \ JAVA_CLASSPATH="${JAVAJARDIR}/slf4j-api.jar" MAKE_ENV+= JAVA_HOME="${JAVA_HOME}" ALL_TARGET= native DISTJAR= ${PORTNAME}-${DISTVERSION}-without-natives.jar PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar lib/libsqlitejdbc.so do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${DISTDIR}/${DISTJAR} \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar ${FIND} ${WRKSRC}/target/classes -name libsqlitejdbc.so \ -exec ${INSTALL_LIB} {} ${STAGEDIR}${PREFIX}/lib/ \; .include diff --git a/databases/sqlite-jdbc/distinfo b/databases/sqlite-jdbc/distinfo index ab0449770ec8..b8294d2acf35 100644 --- a/databases/sqlite-jdbc/distinfo +++ b/databases/sqlite-jdbc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1777227359 -SHA256 (sqlite-jdbc-3.53.0.0-without-natives.jar) = 8098b34191dd832a112934e12087e0d430b7e9ae93aee7c155e06f82866b1b2b -SIZE (sqlite-jdbc-3.53.0.0-without-natives.jar) = 247330 -SHA256 (xerial-sqlite-jdbc-3.53.0.0_GH0.tar.gz) = 3bdb37d04ec817dc68e4911149d1b3ebe5b7ca419b550dc56b91d01a4f396952 -SIZE (xerial-sqlite-jdbc-3.53.0.0_GH0.tar.gz) = 18548916 +TIMESTAMP = 1778178527 +SHA256 (sqlite-jdbc-3.53.1.0-without-natives.jar) = 7b8d5d0d6f5c484e834e2577a8b5ecebeae8a499be1bd83ca8e2a429a4dfe777 +SIZE (sqlite-jdbc-3.53.1.0-without-natives.jar) = 247414 +SHA256 (xerial-sqlite-jdbc-3.53.1.0_GH0.tar.gz) = c73538bcfdd6aa79861ac1a712137da6f16b9be053b03f64030f4c6aa7c6c023 +SIZE (xerial-sqlite-jdbc-3.53.1.0_GH0.tar.gz) = 18551112 diff --git a/databases/sqlite-jdbc/files/patch-Makefile b/databases/sqlite-jdbc/files/patch-Makefile deleted file mode 100644 index b01a77e149e4..000000000000 --- a/databases/sqlite-jdbc/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2026-04-26 18:22:17 UTC -+++ Makefile -@@ -14,7 +14,7 @@ SRC:=src/main/java - MVN:=mvn - CODESIGN:=docker run $(DOCKER_RUN_OPTS) -v $$PWD:/workdir gotson/rcodesign sign - SRC:=src/main/java --JAVA_CLASSPATH:=$(TARGET)/classpath/slf4j-api.jar -+JAVA_CLASSPATH?=$(TARGET)/classpath/slf4j-api.jar - SQLITE_OUT:=$(TARGET)/$(sqlite)-$(OS_NAME)-$(OS_ARCH) - SQLITE_OBJ?=$(SQLITE_OUT)/sqlite3.o - SQLITE_SRC_ARCHIVE:=$(TARGET)/$(sqlite)-src.zip diff --git a/databases/sqlite-jdbc/files/patch-Makefile.common b/databases/sqlite-jdbc/files/patch-Makefile.common index 42d8f92a7abe..4d0cb873f032 100644 --- a/databases/sqlite-jdbc/files/patch-Makefile.common +++ b/databases/sqlite-jdbc/files/patch-Makefile.common @@ -1,47 +1,32 @@ --- Makefile.common.orig 2026-04-14 03:25:20 UTC +++ Makefile.common -@@ -12,13 +12,12 @@ OSINFO_PROG := lib/org/sqlite/util/OSInfo.class - SRC:=src/main/java - OSINFO_CLASS := org.sqlite.util.OSInfo - OSINFO_PROG := lib/org/sqlite/util/OSInfo.class --JAVA_CLASSPATH:=$(TARGET)/classpath/slf4j-api.jar -+JAVA_CLASSPATH?=$(TARGET)/classpath/slf4j-api.jar - - ## building OSInfo.java - ifeq ("$(wildcard $(OSINFO_PROG))","") - $(info Building OSInfo tool) - $(shell mkdir -p $(TARGET)/classpath) --$(shell curl -L -f -o$(JAVA_CLASSPATH) https://search.maven.org/remotecontent?filepath=org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar) - $(shell $(JAVAC) -cp $(JAVA_CLASSPATH) -sourcepath $(SRC) -d lib src/main/java/org/sqlite/util/OSInfo.java) - endif - @@ -155,23 +154,23 @@ DragonFly-x86_64_SQLITE_FLAGS := DragonFly-x86_64_LIBNAME := libsqlitejdbc.so DragonFly-x86_64_SQLITE_FLAGS := -FreeBSD-x86_CC := $(CROSS_PREFIX)gcc +FreeBSD-x86_CC := $(CROSS_PREFIX)cc FreeBSD-x86_STRIP := $(CROSS_PREFIX)strip -FreeBSD-x86_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -Os -fPIC -fvisibility=hidden +FreeBSD-x86_CCFLAGS := -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -Os -fPIC -fvisibility=hidden FreeBSD-x86_LINKFLAGS := -shared FreeBSD-x86_LIBNAME := libsqlitejdbc.so FreeBSD-x86_SQLITE_FLAGS := -FreeBSD-x86_64_CC := $(CROSS_PREFIX)gcc +FreeBSD-x86_64_CC := $(CROSS_PREFIX)cc FreeBSD-x86_64_STRIP := $(CROSS_PREFIX)strip -FreeBSD-x86_64_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -Os -fPIC -fvisibility=hidden +FreeBSD-x86_64_CCFLAGS := -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -Os -fPIC -fvisibility=hidden FreeBSD-x86_64_LINKFLAGS := -shared FreeBSD-x86_64_LIBNAME := libsqlitejdbc.so FreeBSD-x86_64_SQLITE_FLAGS := -FreeBSD-aarch64_CC := $(CROSS_PREFIX)clang +FreeBSD-aarch64_CC := $(CROSS_PREFIX)cc FreeBSD-aarch64_STRIP := $(CROSS_PREFIX)strip -FreeBSD-aarch64_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -Os -fPIC -fvisibility=hidden +FreeBSD-aarch64_CCFLAGS := -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -Os -fPIC -fvisibility=hidden FreeBSD-aarch64_LINKFLAGS := -shared FreeBSD-aarch64_LIBNAME := libsqlitejdbc.so FreeBSD-aarch64_SQLITE_FLAGS :=