- Update to version 3.5.1 [1]

- Add staging support

PR:		ports/187356 [1]
Submitted by:	maintainer

4 files changed, 52 insertions, 12 deletions

diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index c8edab70baa6..ca0f5e68eb38 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 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 @@ COMMENT=	Universal SQL Client
 LICENSE=	GPLv2
 
 NO_BUILD=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -29,14 +29,12 @@ DESKTOP_ENTRIES="Squirrel-SQL Client" \
 		"Development;Database;Java;" \
 		false
 
-NO_STAGE=	yes
 post-extract:
 	cd "${WRKSRC}" && ${RM} -rf Uninstaller *.bat *.sh .installationinformation
 
 do-install:
-	${MKDIR} ${DATADIR}
-	cd "${WRKSRC}" && ${FIND} . | ${CPIO} -pdum -R root:wheel ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/squirrel-sql ${PREFIX}/bin
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	cd "${WRKSRC}" && ${FIND} . | ${CPIO} -pdum -R root:wheel ${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 2343cd06cc1f..4532344d7ec8 100644
--- a/databases/squirrel-sql/distinfo
+++ b/databases/squirrel-sql/distinfo
@@ -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 --git a/databases/squirrel-sql/files/squirrel-sql.in b/databases/squirrel-sql/files/squirrel-sql.in
index 7a83dd69ea71..edf2f3dd4900 100644
--- a/databases/squirrel-sql/files/squirrel-sql.in
+++ b/databases/squirrel-sql/files/squirrel-sql.in
@@ -14,4 +14,4 @@ done
 # 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 --git a/databases/squirrel-sql/pkg-plist b/databases/squirrel-sql/pkg-plist
index df921d9c03b5..3c96a7b6210a 100644
--- a/databases/squirrel-sql/pkg-plist
+++ b/databases/squirrel-sql/pkg-plist
@@ -121,6 +121,7 @@ share/java/squirrel-sql/lib/commons-httpclient.jar
 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/jcommon.jar
 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/treetable.jar
 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/mssql/readme.html
 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/readme.html
 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-log4j.properties
 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