Date: Fri, 7 Mar 2014 21:18:56 GMT From: Jonathan Chen <jonc@chen.org.nz> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/187356: Upgrade databases/squirrel-sql to 3.5.1 Message-ID: <201403072118.s27LIuwU007857@cgiserv.freebsd.org> Resent-Message-ID: <201403072120.s27LK0QP019932@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187356
>Category: ports
>Synopsis: Upgrade databases/squirrel-sql to 3.5.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 07 21:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Jonathan Chen
>Release: FreeBSD 10.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD osiris.chen.org.nz 10.0-STABLE FreeBSD 10.0-STABLE #0 r261220: Thu Jan 30 18:36:34 NZDT 2014 root@osiris.chen.org.nz:/usr/obj/usr/src/sys/OSIRIS amd64
>Description:
Update databases/squirrel-sql port from 3.5.0 to 3.5.1
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/databases/squirrel-sql/Makefile ./Makefile
--- /usr/ports/databases/squirrel-sql/Makefile 2013-09-23 18:54:58.920065843 +1200
+++ ./Makefile 2014-02-25 17:27:11.494540525 +1300
@@ -2,11 +2,10 @@
# $FreeBSD: head/databases/squirrel-sql/Makefile 327717 2013-09-20 16:13:47Z bapt $
PORTNAME= squirrel-sql
-PORTVERSION= 3.5.0
-PORTREVISION= 1
+PORTVERSION= 3.5.1
CATEGORIES= databases java
MASTER_SITES= SF/${PORTNAME}/1-stable/${PORTVERSION}-plainzip
-DISTNAME= ${PORTNAME}-${PORTVERSION}-optional
+DISTNAME= squirrelsql-plainzip-${PORTVERSION}-optional
MAINTAINER= jonc@chen.org.nz
COMMENT= Universal SQL Client
@@ -14,6 +13,7 @@
LICENSE= GPLv2
NO_BUILD= yes
+USE_ZIP= yes
USE_JAVA= yes
JAVA_VERSION= 1.6+
WRKSRC= ${WRKDIR}/${DISTNAME}
diff -ruN /usr/ports/databases/squirrel-sql/distinfo ./distinfo
--- /usr/ports/databases/squirrel-sql/distinfo 2013-07-15 14:47:19.452197768 +1200
+++ ./distinfo 2014-02-25 17:29:27.801360939 +1300
@@ -1,2 +1,2 @@
-SHA256 (squirrel-sql-3.5.0-optional.tar.gz) = b507f73ad765cc7d8db9215a7d8fa877bfd8d28da47bb63c8eb8108a4006d230
-SIZE (squirrel-sql-3.5.0-optional.tar.gz) = 46899188
+SHA256 (squirrelsql-plainzip-3.5.1-optional.zip) = 9e9cd3be87c81326d69ffe2bab17a992833dd58fa437c5880bcf4e09319020a7
+SIZE (squirrelsql-plainzip-3.5.1-optional.zip) = 58197729
diff -ruN /usr/ports/databases/squirrel-sql/files/squirrel-sql.in ./files/squirrel-sql.in
--- /usr/ports/databases/squirrel-sql/files/squirrel-sql.in 2014-02-01 18:15:28.059779083 +1300
+++ ./files/squirrel-sql.in 2014-02-25 17:30:14.237960438 +1300
@@ -14,4 +14,4 @@
# Now add the system classpath to the classpath.
TMP_CP=$TMP_CP:$CLASSPATH
-java -Xmx256m -cp $TMP_CP net.sourceforge.squirrel_sql.client.Main --log-config-file $SQUIRREL_SQL_HOME/log4j.properties --squirrel-home $SQUIRREL_SQL_HOME $1 $2 $3 $4 $5 $6 $7 $8 $9
+JAVA_VERSION=%%JAVA_VERSION%% java -Xmx256m -cp $TMP_CP net.sourceforge.squirrel_sql.client.Main --log-config-file $SQUIRREL_SQL_HOME/log4j.properties --squirrel-home $SQUIRREL_SQL_HOME $1 $2 $3 $4 $5 $6 $7 $8 $9
diff -ruN /usr/ports/databases/squirrel-sql/pkg-plist ./pkg-plist
--- /usr/ports/databases/squirrel-sql/pkg-plist 2013-07-15 14:47:19.451161333 +1200
+++ ./pkg-plist 2014-03-08 10:11:15.433586419 +1300
@@ -121,6 +121,7 @@
share/java/squirrel-sql/lib/commons-lang.jar
share/java/squirrel-sql/lib/commons-logging.jar
share/java/squirrel-sql/lib/core.jar
+share/java/squirrel-sql/lib/dom4j.jar
share/java/squirrel-sql/lib/forms.jar
share/java/squirrel-sql/lib/fw.jar
share/java/squirrel-sql/lib/hibernate-annotations.jar
@@ -133,11 +134,14 @@
share/java/squirrel-sql/lib/jfreechart.jar
share/java/squirrel-sql/lib/jide-oss.jar
share/java/squirrel-sql/lib/jmeld.jar
-share/java/squirrel-sql/lib/jxl.jar
share/java/squirrel-sql/lib/log4j.jar
share/java/squirrel-sql/lib/nanoxml.jar
share/java/squirrel-sql/lib/org.eclipse.equinox.common.jar
share/java/squirrel-sql/lib/osgi.jar
+share/java/squirrel-sql/lib/poi-ooxml-schemas.jar
+share/java/squirrel-sql/lib/poi-ooxml.jar
+share/java/squirrel-sql/lib/poi.jar
+share/java/squirrel-sql/lib/rstaui.jar
share/java/squirrel-sql/lib/rsyntaxtextarea.jar
share/java/squirrel-sql/lib/rtext.jar
share/java/squirrel-sql/lib/spring-beans.jar
@@ -162,6 +166,7 @@
share/java/squirrel-sql/lib/versioncheck.jar
share/java/squirrel-sql/lib/x86.jar
share/java/squirrel-sql/lib/xml-apis.jar
+share/java/squirrel-sql/lib/xmlbeans.jar
share/java/squirrel-sql/log4j.properties
share/java/squirrel-sql/plugins/codecompletion.jar
share/java/squirrel-sql/plugins/codecompletion/changes.txt
@@ -373,22 +378,41 @@
share/java/squirrel-sql/plugins/multisource.jar
share/java/squirrel-sql/plugins/multisource/changes.txt
share/java/squirrel-sql/plugins/multisource/img/add_alias_prompt.png
+share/java/squirrel-sql/plugins/multisource/img/add_mongo.png
+share/java/squirrel-sql/plugins/multisource/img/add_mongo_driver.png
share/java/squirrel-sql/plugins/multisource/img/add_mssql.png
+share/java/squirrel-sql/plugins/multisource/img/add_mssql_to_virtualization.png
+share/java/squirrel-sql/plugins/multisource/img/add_multisource_plugin_install.png
share/java/squirrel-sql/plugins/multisource/img/add_mysql.png
share/java/squirrel-sql/plugins/multisource/img/add_oracle.png
+share/java/squirrel-sql/plugins/multisource/img/add_oracle_virtualization.png
share/java/squirrel-sql/plugins/multisource/img/add_oracle_with_schema.png
share/java/squirrel-sql/plugins/multisource/img/add_postgres.png
share/java/squirrel-sql/plugins/multisource/img/after_add_mssql.png
+share/java/squirrel-sql/plugins/multisource/img/after_all_sources_added.png
share/java/squirrel-sql/plugins/multisource/img/before_add_mssql.png
+share/java/squirrel-sql/plugins/multisource/img/connect_virtual_source.png
share/java/squirrel-sql/plugins/multisource/img/create_unity.png
+share/java/squirrel-sql/plugins/multisource/img/create_virtual_source.png
+share/java/squirrel-sql/plugins/multisource/img/encryption_example.png
+share/java/squirrel-sql/plugins/multisource/img/example_five_source_query.png
share/java/squirrel-sql/plugins/multisource/img/example_four_sources.png
+share/java/squirrel-sql/plugins/multisource/img/export_source_example.png
+share/java/squirrel-sql/plugins/multisource/img/file_locations.png
share/java/squirrel-sql/plugins/multisource/img/install_after_unzip.png
share/java/squirrel-sql/plugins/multisource/img/install_before_unzip.png
+share/java/squirrel-sql/plugins/multisource/img/install_squirrel_lib.png
+share/java/squirrel-sql/plugins/multisource/img/install_unityjdbc_jar.png
+share/java/squirrel-sql/plugins/multisource/img/multisource_plugin_list.png
share/java/squirrel-sql/plugins/multisource/img/register_driver.png
+share/java/squirrel-sql/plugins/multisource/img/remove_source.png
+share/java/squirrel-sql/plugins/multisource/img/remove_table.png
+share/java/squirrel-sql/plugins/multisource/img/trim_example.png
share/java/squirrel-sql/plugins/multisource/img/trim_translation_example.png
share/java/squirrel-sql/plugins/multisource/img/two_source_join.png
share/java/squirrel-sql/plugins/multisource/licence.txt
share/java/squirrel-sql/plugins/multisource/multisource-sources.jar
+share/java/squirrel-sql/plugins/multisource/multisource-style.css
share/java/squirrel-sql/plugins/multisource/readme.html
share/java/squirrel-sql/plugins/multisource/readme.txt
share/java/squirrel-sql/plugins/multisource/unityjdbc.jar
@@ -557,6 +581,22 @@
share/java/squirrel-sql/plugins/syntax/standard-nbm-license.txt
share/java/squirrel-sql/plugins/syntax/syntax-sources.jar
share/java/squirrel-sql/plugins/syntax/toolspopup.jpg
+share/java/squirrel-sql/plugins/vertica.jar
+share/java/squirrel-sql/plugins/vertica/changes.txt
+share/java/squirrel-sql/plugins/vertica/images/1-db-objects.png
+share/java/squirrel-sql/plugins/vertica/images/1-sys-tables.png
+share/java/squirrel-sql/plugins/vertica/images/2-projections_tab.png
+share/java/squirrel-sql/plugins/vertica/images/3-source-seq.png
+share/java/squirrel-sql/plugins/vertica/images/3-source-tab.png
+share/java/squirrel-sql/plugins/vertica/images/3-source-udf.png
+share/java/squirrel-sql/plugins/vertica/images/3-source-view.png
+share/java/squirrel-sql/plugins/vertica/images/4-detail-UDF.png
+share/java/squirrel-sql/plugins/vertica/images/4-detail-proj.png
+share/java/squirrel-sql/plugins/vertica/images/4-detail-seq.png
+share/java/squirrel-sql/plugins/vertica/images/5-content+.png
+share/java/squirrel-sql/plugins/vertica/licence.txt
+share/java/squirrel-sql/plugins/vertica/readme.html
+share/java/squirrel-sql/plugins/vertica/vertica-sources.jar
share/java/squirrel-sql/plugins/wikiTableConfigurations.jar
share/java/squirrel-sql/plugins/wikiTableConfigurations/wikiTableConfigurations-sources.jar
share/java/squirrel-sql/squirrel-sql.jar
@@ -564,6 +604,8 @@
share/java/squirrel-sql/update/release.xml
@dirrm share/java/squirrel-sql/update
@dirrm share/java/squirrel-sql/plugins/wikiTableConfigurations
+@dirrm share/java/squirrel-sql/plugins/vertica/images
+@dirrm share/java/squirrel-sql/plugins/vertica
@dirrm share/java/squirrel-sql/plugins/syntax
@dirrm share/java/squirrel-sql/plugins/sybase
@dirrm share/java/squirrel-sql/plugins/swingViolations
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403072118.s27LIuwU007857>