Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 01 Apr 2026 14:28:30 +0000
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Cc:        Jonathan Chen <jonc@chen.org.nz>
Subject:   git: 6f3a832da5c4 - main - databases/squirrel-sql: Update 4.8.0 => 5.1.0
Message-ID:  <69cd2b8e.30c9a.36288611@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6f3a832da5c47921ac50802fbc59d3c89a2ac291

commit 6f3a832da5c47921ac50802fbc59d3c89a2ac291
Author:     Jonathan Chen <jonc@chen.org.nz>
AuthorDate: 2026-04-01 14:17:28 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-04-01 14:28:13 +0000

    databases/squirrel-sql: Update 4.8.0 => 5.1.0
    
    Changelog:
    https://sourceforge.net/p/squirrel-sql/git/ci/27a32b4/tree/sql12/core/doc/changes.txt
    https://github.com/squirrel-sql-client/squirrel-sql-code/blob/27a32b4/sql12/core/doc/changes.txt
    
    - Replace "${RM}" in post-extract with "EXTRACT_BEFORE_ARGS=-x …".
    - Replace "${FIND} . | ${CPIO}" in do-install with "${COPYTREE_SHARE}".
    
    PR:             294173
    Sponsored by:   UNIS Labs
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
---
 databases/squirrel-sql/Makefile  | 17 ++++++++-------
 databases/squirrel-sql/distinfo  |  6 +++---
 databases/squirrel-sql/pkg-plist | 45 +++++++++++++++++++---------------------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index 1212fcc4ae6e..7f4cfd50b2af 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	squirrel-sql
-DISTVERSION=	4.8.0
-PORTREVISION=	1
+DISTVERSION=	5.1.0
 CATEGORIES=	databases java
 MASTER_SITES=	SF/${PORTNAME}/1-stable/${DISTVERSION}-plainzip
 DISTNAME=	squirrelsql-${DISTVERSION}-optional
@@ -12,7 +11,7 @@ WWW=		http://www.squirrelsql.org/
 LICENSE=	GPLv2
 
 USES=		java zip
-JAVA_VERSION=	11+
+JAVA_VERSION=	17+
 
 DATADIR=	${PREFIX}/share/java/${PKGBASE}
 
@@ -22,6 +21,13 @@ DESKTOP_ENTRIES="Squirrel-SQL Client" \
 		"squirrel-sql" \
 		"Development;Database;Java;" \
 		false
+EXTRACT_BEFORE_ARGS=	-qo \
+			-x '*.bat' \
+			-x '*.sh' \
+			-x '${DISTNAME}/icons/acorn.png.bak.png' \
+			-x '${DISTNAME}/mac' \
+			-x '${DISTNAME}/squirrelcli/*' \
+			-x '${DISTNAME}/squirrelcli'
 NO_ARCH=	yes
 NO_BUILD=	yes
 
@@ -29,12 +35,9 @@ SUB_FILES=	squirrel-sql
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-post-extract:
-	cd "${WRKSRC}" && ${RM} -r *.bat *.sh icons/acorn.png.bak.png mac squirrelcli
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	cd "${WRKSRC}" && ${FIND} . | ${CPIO} -pdum -R root:wheel ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${INSTALL_SCRIPT} ${WRKDIR}/squirrel-sql ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/databases/squirrel-sql/distinfo b/databases/squirrel-sql/distinfo
index 8f1aeae33675..6c37fe1fdd08 100644
--- a/databases/squirrel-sql/distinfo
+++ b/databases/squirrel-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746596022
-SHA256 (squirrelsql-4.8.0-optional.zip) = b707867f3b8b207c6317c8ce2a05d62c46f010a5f11d57398d99f5a1885bbde0
-SIZE (squirrelsql-4.8.0-optional.zip) = 54506667
+TIMESTAMP = 1775006468
+SHA256 (squirrelsql-5.1.0-optional.zip) = 19b1c404f7b43192dc0f222e172b46d8e3e7775db13e28a1c011f4cf636185d6
+SIZE (squirrelsql-5.1.0-optional.zip) = 61549384
diff --git a/databases/squirrel-sql/pkg-plist b/databases/squirrel-sql/pkg-plist
index 2aa24d85f43d..fcdbc2478a93 100644
--- a/databases/squirrel-sql/pkg-plist
+++ b/databases/squirrel-sql/pkg-plist
@@ -67,12 +67,14 @@ bin/squirrel-sql
 %%DATADIR%%/doc/images/update_summary.png
 %%DATADIR%%/doc/images/updates-menu.png
 %%DATADIR%%/doc/licences/Eclipse Distribution License - Version 1.0.txt
+%%DATADIR%%/doc/licences/RSyntaxTextArea.License.txt
 %%DATADIR%%/doc/licences/dean_jones_icons_licence.txt
 %%DATADIR%%/doc/licences/eclipse-icons-licence.html
 %%DATADIR%%/doc/licences/eclipse-icons-licence.txt
 %%DATADIR%%/doc/licences/log4j-licence.txt
 %%DATADIR%%/doc/licences/nano_xml_licence.txt
 %%DATADIR%%/doc/licences/squirrel_licence.txt
+%%DATADIR%%/doc/licences/standard-nbm-license.txt
 %%DATADIR%%/doc/licences/sun_icons_licence.txt
 %%DATADIR%%/doc/news.txt
 %%DATADIR%%/doc/plugins.html
@@ -91,8 +93,8 @@ bin/squirrel-sql
 %%DATADIR%%/lib/asm.jar
 %%DATADIR%%/lib/cglib.jar
 %%DATADIR%%/lib/commons-cli-1.4.jar
-%%DATADIR%%/lib/commons-codec-1.13.jar
-%%DATADIR%%/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/lib/commons-codec-1.17.0.jar
+%%DATADIR%%/lib/commons-collections4-4.4.jar
 %%DATADIR%%/lib/commons-discovery.jar
 %%DATADIR%%/lib/commons-httpclient.jar
 %%DATADIR%%/lib/commons-lang3-3.14.0.jar
@@ -107,12 +109,17 @@ bin/squirrel-sql
 %%DATADIR%%/lib/jfreechart-1.5.3.jar
 %%DATADIR%%/lib/jgit6.0.0.202111291000-r-with-dependencies.jar
 %%DATADIR%%/lib/jmeld-3.6.0-jar-with-some-dependencies.jar
-%%DATADIR%%/lib/jsqlparser-4.3.jar
+%%DATADIR%%/lib/jsqlparser-5.1.jar
 %%DATADIR%%/lib/markdowngeneratorJava1_6.jar
 %%DATADIR%%/lib/org.eclipse.equinox.common.jar
-%%DATADIR%%/lib/poi-ooxml-schemas.jar
-%%DATADIR%%/lib/poi-ooxml.jar
-%%DATADIR%%/lib/poi.jar
+%%DATADIR%%/lib/poi-dependency-SparseBitSet-1.3.jar
+%%DATADIR%%/lib/poi-dependency-commons-compress-1.26.2.jar
+%%DATADIR%%/lib/poi-dependency-commons-io-2.16.1.jar
+%%DATADIR%%/lib/poi-dependency-commons-math3-3.6.1.jar
+%%DATADIR%%/lib/poi-dependency-poi-5.3.0.jar
+%%DATADIR%%/lib/poi-dependency-poi-ooxml-5.3.0.jar
+%%DATADIR%%/lib/poi-dependency-poi-ooxml-lite-5.3.0.jar
+%%DATADIR%%/lib/poi-dependency-xmlbeans-5.2.1.jar
 %%DATADIR%%/lib/rsyntax_RText-6.0.2.jar
 %%DATADIR%%/lib/rsyntax_autocomplete-3.3.1.jar
 %%DATADIR%%/lib/rsyntax_rstaui-3.3.1.jar
@@ -129,7 +136,6 @@ bin/squirrel-sql
 %%DATADIR%%/lib/treetable.jar
 %%DATADIR%%/lib/versioncheck.jar
 %%DATADIR%%/lib/xml-apis.jar
-%%DATADIR%%/lib/xmlbeans.jar
 %%DATADIR%%/plugins/cache.jar
 %%DATADIR%%/plugins/cache/doc/changes.txt
 %%DATADIR%%/plugins/cache/doc/licence.txt
@@ -308,18 +314,18 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/laf/doc/skin_look_and_feel_licence.txt
 %%DATADIR%%/plugins/laf/doc/tinylaf-license.txt
 %%DATADIR%%/plugins/laf/doc/tonic-licence.txt
-%%DATADIR%%/plugins/laf/lafs/JTattoo-1.6.10.jar
-%%DATADIR%%/plugins/laf/lafs/flatlaf-3.4.1.jar
+%%DATADIR%%/plugins/laf/lafs/JTattoo-1.6.13.jar
+%%DATADIR%%/plugins/laf/lafs/flatlaf-3.5.4.jar
 %%DATADIR%%/plugins/laf/lafs/ilf-gpl.jar
 %%DATADIR%%/plugins/laf/lafs/jgoodies-common-1.8.1.jar
 %%DATADIR%%/plugins/laf/lafs/jgoodies-looks-2.5.3.jar
-%%DATADIR%%/plugins/laf/lafs/kunststoff.jar
+%%DATADIR%%/plugins/laf/lafs/kunstoff-laf-2.0.2.jar
 %%DATADIR%%/plugins/laf/lafs/napkinlaf-1.3-SNAPSHOT.jar
-%%DATADIR%%/plugins/laf/lafs/nimrod-laf.jar
-%%DATADIR%%/plugins/laf/lafs/radiance-animation-5.0.0.jar
-%%DATADIR%%/plugins/laf/lafs/radiance-common-5.0.0.jar
-%%DATADIR%%/plugins/laf/lafs/radiance-theming-5.0.0.jar
-%%DATADIR%%/plugins/laf/lafs/radiance-theming-extras-5.0.0.jar
+%%DATADIR%%/plugins/laf/lafs/nimrodlf-1.2d.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-animation-7.5.0.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-common-7.5.0.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-theming-7.5.0.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-theming-extras-7.5.0.jar
 %%DATADIR%%/plugins/laf/lafs/readme.txt
 %%DATADIR%%/plugins/laf/lafs/skinlf.jar
 %%DATADIR%%/plugins/laf/lafs/swingsetthemes.jar
@@ -518,15 +524,6 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/sybase/doc/changes.txt
 %%DATADIR%%/plugins/sybase/doc/licence.txt
 %%DATADIR%%/plugins/sybase/doc/readme.txt
-%%DATADIR%%/plugins/syntax.jar
-%%DATADIR%%/plugins/syntax/doc/RSyntaxTextArea.License.txt
-%%DATADIR%%/plugins/syntax/doc/changes.txt
-%%DATADIR%%/plugins/syntax/doc/configdlg.jpg
-%%DATADIR%%/plugins/syntax/doc/corrabrev.jpg
-%%DATADIR%%/plugins/syntax/doc/licence.txt
-%%DATADIR%%/plugins/syntax/doc/readme.html
-%%DATADIR%%/plugins/syntax/doc/standard-nbm-license.txt
-%%DATADIR%%/plugins/syntax/doc/toolspopup.jpg
 %%DATADIR%%/plugins/vertica.jar
 %%DATADIR%%/plugins/vertica/doc/changes.txt
 %%DATADIR%%/plugins/vertica/doc/images/1-db-objects.png


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69cd2b8e.30c9a.36288611>