From nobody Thu Jul 07 12:32:07 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8003A10FD86B; Thu, 7 Jul 2022 12:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LdwlW34qBz3gPm; Thu, 7 Jul 2022 12:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657197127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwpuoAUwL8wD6+okLWYBA8Xv29de84zlNq+2lNUqlNM=; b=Uu31RjMagvmSvn0sQcvqSXatL/CfwE1HFP6tLysEqKkqIStQzNlKSu/mEI1dRFg3G79JGA Bp3qXYKb9AUt4ERc0VDIHln8R/qHVxQ74yr6yCO9z04PVHVkEHXxyfdlOQba0ihXoFY6rO 782mlrOV5cdeIE9ZcFP4adQuGk0uGfhIpPEm1DZmIe0vYQqE74aWs6vlsZ7456disaMSnh guFD6pfXEPvt1be3dGW9WjRYO1d/rx4zWi0hd0GonEMWxQixdJ2/p68UJ+js27pQ7dMNmZ H1HJLIHewIqkWTPTELnnIOHnQBy2TCh6R/TxcueYb3y5oCeN8IbIWD9so1MFPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LdwlW282XzjWX; Thu, 7 Jul 2022 12:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 267CW7hv072777; Thu, 7 Jul 2022 12:32:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 267CW7Gw072776; Thu, 7 Jul 2022 12:32:07 GMT (envelope-from git) Date: Thu, 7 Jul 2022 12:32:07 GMT Message-Id: <202207071232.267CW7Gw072776@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 0276f6d332dc - main - java/sqlitejdbc: this old port requires specific (8th) version of JDK List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0276f6d332dc6cea04c3e1da35f71297fdb453b5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657197127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwpuoAUwL8wD6+okLWYBA8Xv29de84zlNq+2lNUqlNM=; b=NIUqeKdYRhwJJUDf5tBZ9sdKGC2v2zz3uffJwvYElcLmiiF4JNM/5ixFqDemZ+JEzEm0Se gXttaKk19fNqYpPcCIXPzWZB+ZUQNhRy2wTSXZd/gau6uKcuo5Vs+LGpKPUJQ8uwqFD5jT l9Oovhh0iw+3TkHnHtqoBHkRo4/mFEQIyAKHlXT8wbgm9qjV8L0HsQPMzUVVL2dSBqtGgg OhbhsovHAgQwqz9UaKsfN48bdSC1slMDsrXy4PIfJNeMBTjAbKwE0XjAbFrB/nRoEc6n6h YwSbc91FvdeFmU06f6lF7yDUL5YVUu8VGo0lj4qYFkLf7nlOKTluW9qvK3f2Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657197127; a=rsa-sha256; cv=none; b=EQnqdFIlrsUatMXuk5aJaaRywNYY5fOIim3HvlU259B+EEti3UiX0jmsW9zCZax4Q7k3Dx 15OIvludeOj8pgXAFaAz40D4b1VRG4R9Tmy2Hmpv/g5lN/AdAUBG2/YVH1XAEG5NXek2lH Gr7GbyTd+qlzN8bub5RelNkZVAwYq5ekbaJOdLCeh5X0YaUoXVdQjFTbSKg/mOh1Cc9jP9 Q0HXkMqLvpU1L6aF4FeF6E94A3eB8U/YBEPuSPYlcDKqhUvqzI8+Te0AlPtk2iOW6YwxPE JGzS1QPDCh82Xo0Ip46XX+A6ZmHeRUa1f6RKCnylczxljBI62Qz277WsqpiEeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=0276f6d332dc6cea04c3e1da35f71297fdb453b5 commit 0276f6d332dc6cea04c3e1da35f71297fdb453b5 Author: Alexey Dokuchaev AuthorDate: 2022-07-07 12:30:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-07-07 12:30:52 +0000 java/sqlitejdbc: this old port requires specific (8th) version of JDK It should be fairly easy to make it compatible against Java 8~11, but that's the task for another day. While here, bump the source/target version to 1.6 and get rid of bogus `post-patch' target: LOCALBASE is already passed on the MAKE_ENV. PR: 264748 --- java/sqlitejdbc/Makefile | 7 ++----- java/sqlitejdbc/files/patch-Makefile | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/java/sqlitejdbc/Makefile b/java/sqlitejdbc/Makefile index 20624d73e393..894e06c792d5 100644 --- a/java/sqlitejdbc/Makefile +++ b/java/sqlitejdbc/Makefile @@ -14,15 +14,12 @@ COMMENT= Java JDBC driver for SQLite LIB_DEPENDS= libsqlite3.so:databases/sqlite3 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION} -USE_JAVA= yes +USE_JAVA= 8 USES= gmake tar:tgz MAKE_ENV= JAVA_HOME="${JAVA_HOME}" ALL_TARGET= native -PLIST_FILES= %%JAVAJARDIR%%/sqlitejdbc-native.jar lib/libsqlitejdbc.so - -post-patch: - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile +PLIST_FILES= ${JAVAJARDIR}/sqlitejdbc-native.jar lib/libsqlitejdbc.so do-install: ${INSTALL_DATA} ${WRKSRC}/build/sqlitejdbc-v${PORTVERSION}-native.jar \ diff --git a/java/sqlitejdbc/files/patch-Makefile b/java/sqlitejdbc/files/patch-Makefile index 52e98ff6f0de..bc48bff6209f 100644 --- a/java/sqlitejdbc/files/patch-Makefile +++ b/java/sqlitejdbc/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2008-06-18 01:39:02.000000000 +0200 -+++ Makefile 2008-06-23 16:12:40.000000000 +0200 -@@ -16,6 +16,7 @@ +--- Makefile.orig 2009-06-09 10:54:22 UTC ++++ Makefile +@@ -16,6 +16,7 @@ include Makefile.common # include Makefile.common @@ -8,7 +8,7 @@ default: test -@@ -29,13 +30,15 @@ +@@ -29,13 +30,15 @@ build/$(sqlitejdbc)-native.jar: $(native_classes) build/$(sqlitejdbc)-native.jar: $(native_classes) cd build && jar cf $(sqlitejdbc)-native.jar $(java_classlist) @@ -17,12 +17,21 @@ @mkdir -p build/$(target) $(JAVAH) -classpath build -jni -o build/NativeDB.h org.sqlite.NativeDB $(CC) $(CFLAGS) -c -o build/$(target)/NativeDB.o \ -+ -I%%LOCALBASE%%/include \ ++ -I$(LOCALBASE)/include \ src/org/sqlite/NativeDB.c $(CC) $(CFLAGS) $(LINKFLAGS) -o build/$(target)/$(LIBNAME) \ - build/$(target)/NativeDB.o build/$(sqlite)-$(target)/*.o + build/$(target)/NativeDB.o \ -+ -L%%LOCALBASE%%/lib -lsqlite3 ++ -L$(LOCALBASE)/lib -lsqlite3 $(STRIP) build/$(target)/$(LIBNAME) build/$(sqlite)-%/sqlite3.o: dl/$(sqlite)-amal.zip +@@ -51,7 +54,7 @@ build/org/%.class: src/org/%.java + + build/org/%.class: src/org/%.java + @mkdir -p build +- $(JAVAC) -source 1.2 -target 1.2 -sourcepath src -d build $< ++ $(JAVAC) -source 1.6 -target 1.6 -sourcepath src -d build $< + + build/test/%.class: src/test/%.java + @mkdir -p build