From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 10 22:10:04 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D802C106566C for ; Mon, 10 May 2010 22:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id A09368FC21 for ; Mon, 10 May 2010 22:10:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o4AMA4JS060625 for ; Mon, 10 May 2010 22:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o4AMA4EH060624; Mon, 10 May 2010 22:10:04 GMT (envelope-from gnats) Resent-Date: Mon, 10 May 2010 22:10:04 GMT Resent-Message-Id: <201005102210.o4AMA4EH060624@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jonathan Chen Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9BA96106564A for ; Mon, 10 May 2010 22:08:58 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: from chen.org.nz (ip-58-28-152-174.static-xdsl.xnet.co.nz [58.28.152.174]) by mx1.freebsd.org (Postfix) with ESMTP id DE9008FC17 for ; Mon, 10 May 2010 22:08:57 +0000 (UTC) Received: by chen.org.nz (Postfix, from userid 1000) id F1F56E043A; Tue, 11 May 2010 10:08:55 +1200 (NZST) Message-Id: <20100510220855.F1F56E043A@chen.org.nz> Date: Tue, 11 May 2010 10:08:55 +1200 (NZST) From: Jonathan Chen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/146475: update databases/squirrel-sql to 3.1.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jonathan Chen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 May 2010 22:10:04 -0000 >Number: 146475 >Category: ports >Synopsis: update databases/squirrel-sql to 3.1.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 10 22:10:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Jonathan Chen >Release: FreeBSD 8.0-STABLE amd64 >Organization: >Environment: System: FreeBSD osiris.chen.org.nz 8.0-STABLE FreeBSD 8.0-STABLE #0: Sun Apr 4 20:19:24 NZST 2010 root@osiris.chen.org.nz:/usr/obj/usr/src/sys/OSIRIS amd64 >Description: Update databases/squirrel-sql from 3.0.2 to 3.1.1 >How-To-Repeat: >Fix: This patch removes: files/squirrel-sql.sh diff -ruN /usr/ports/databases/squirrel-sql/Makefile ./Makefile --- /usr/ports/databases/squirrel-sql/Makefile 2009-11-04 08:55:37.000000000 +1300 +++ ./Makefile 2010-05-11 10:01:02.000000000 +1200 @@ -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 diff -ruN /usr/ports/databases/squirrel-sql/distinfo ./distinfo --- /usr/ports/databases/squirrel-sql/distinfo 2009-11-04 08:55:37.000000000 +1300 +++ ./distinfo 2010-05-11 09:51:15.000000000 +1200 @@ -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 -ruN /usr/ports/databases/squirrel-sql/files/squirrel-sql.in ./files/squirrel-sql.in --- /usr/ports/databases/squirrel-sql/files/squirrel-sql.in 2006-12-04 09:45:21.000000000 +1300 +++ ./files/squirrel-sql.in 2010-05-11 10:03:10.000000000 +1200 @@ -14,4 +14,4 @@ # 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 -ruN /usr/ports/databases/squirrel-sql/files/squirrel-sql.sh ./files/squirrel-sql.sh --- /usr/ports/databases/squirrel-sql/files/squirrel-sql.sh 2006-12-04 09:45:21.000000000 +1300 +++ ./files/squirrel-sql.sh 1970-01-01 12:00:00.000000000 +1200 @@ -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: 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: -Duser.language= 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 - >Release-Note: >Audit-Trail: >Unformatted: