- Update to 3.1.1

PR:		ports/146475
Submitted by:	Jonathan Chen <jonc@chen.org.nz>

4 files changed, 9 insertions, 55 deletions

diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index 82d06c928ad..25e764b89b4 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	squirrel-sql
-PORTVERSION=	3.0.2
+PORTVERSION=	3.1.1
 CATEGORIES=	databases java
 MASTER_SITES=	SF/${PORTNAME}/1-stable/${PORTVERSION}%20(plain%20zip)
-DISTNAME=	${PORTNAME}-${PORTVERSION}-standard
+DISTNAME=	${PORTNAME}-${PORTVERSION}-optional
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A universal SQL Client
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
-WRKSRC=		${WRKDIR}/SQuirreL SQL Client
+JAVA_VERSION=	1.6+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 SUB_FILES=	squirrel-sql
 PKGMESSAGE=	pkg-messages
@@ -39,6 +39,6 @@ do-install:
 	${MKDIR} ${DATADIR}
 	cd "${WRKSRC}" && ${FIND} . | ${CPIO} -pdum -R root:wheel ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/squirrel-sql ${PREFIX}/bin
-	@${CAT} ${PKGMESSAGE} 
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/databases/squirrel-sql/distinfo b/databases/squirrel-sql/distinfo
index 47ff22912d1..fa49b33113f 100644
--- a/databases/squirrel-sql/distinfo
+++ b/databases/squirrel-sql/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrel-sql-3.0.2-standard.tar.gz) = 5ef5972b9a92dd6bca4913a5df81b653
-SHA256 (squirrel-sql-3.0.2-standard.tar.gz) = 470cb73b32b72fe1bd153ffd80e704d7a2a48764f5d17ded28fc848d35ce7e5a
-SIZE (squirrel-sql-3.0.2-standard.tar.gz) = 18860192
+MD5 (squirrel-sql-3.1.1-optional.tar.gz) = 027aa60d3bafa1f358d62a972a1178b4
+SHA256 (squirrel-sql-3.1.1-optional.tar.gz) = d401ceb2e8bcc3bf249e8141b8262ebf1793f6c8fda9f4cf5a7feec61108b6b9
+SIZE (squirrel-sql-3.1.1-optional.tar.gz) = 27035658
diff --git a/databases/squirrel-sql/files/squirrel-sql.in b/databases/squirrel-sql/files/squirrel-sql.in
index 938540aa805..7a83dd69ea7 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 -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 -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/files/squirrel-sql.sh b/databases/squirrel-sql/files/squirrel-sql.sh
deleted file mode 100644
index 9fe2784b4f2..00000000000
--- a/databases/squirrel-sql/files/squirrel-sql.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-[ ${JAVA_HOME} ] && JAVA=${JAVA_HOME}/bin/java || JAVA=java
-
-# Are we running within Cygwin on some version of Windows?
-cygwin=false;
-case "`uname -s`" in
-	CYGWIN*) cygwin=true ;;
-esac
-
-# Squirrel home.
-SQUIRREL_SQL_HOME=`dirname "$0"`
-
-# SQuirreL home in Unix format.
-if $cygwin ; then
-	UNIX_STYLE_HOME=`cygpath "$SQUIRREL_SQL_HOME"`
-else
-	UNIX_STYLE_HOME=$SQUIRREL_SQL_HOME
-fi
-
-# First entry in classpath is the Squirrel application.
-TMP_CP=$UNIX_STYLE_HOME/squirrel-sql.jar
-
-# Then add all library jars to the classpath.
-IFS=""
-for a in $UNIX_STYLE_HOME/lib/*; do
-	TMP_CP="$TMP_CP":"$a";
-done
-
-# Now add the system classpath to the classpath. If running
-# Cygwin we also need to change the classpath to Windows format.
-if $cygwin ; then
-	TMP_CP=`cygpath -w -p $TMP_CP`
-	TMP_CP=$TMP_CP';'$CLASSPATH
-else
-	TMP_CP=$TMP_CP:$CLASSPATH
-fi
-
-#To add translation working directories to your classpath edit and uncomment this line:
-#$JAVA -Xmx256m -cp $TMP_CP:<your working dir here> 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
-
-#To change the language edit and uncomment this line:
-#$JAVA -Xmx256m -cp $TMP_CP:<your working dir here> -Duser.language=<your language here> 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 -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
-