3 files changed, 24 insertions, 15 deletions

diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index ae56dd41cbd6..dc1e6311b248 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	squirrel
-PORTVERSION=	2.5
+PORTVERSION=	2.6.4
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 PKGNAMESUFFIX=	-sql
-DISTNAME=	squirrel-sql-2.5-standard
+DISTNAME=	squirrel-sql-2.6-standard
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A universal SQL Client
 
 NO_BUILD=	yes
diff --git a/databases/squirrel-sql/distinfo b/databases/squirrel-sql/distinfo
index ba98db2daec8..747ae7f1b2e0 100644
--- a/databases/squirrel-sql/distinfo
+++ b/databases/squirrel-sql/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrel-sql-2.5-standard.tar.gz) = 299832f8e480e1a0068f8b92310707f6
-SHA256 (squirrel-sql-2.5-standard.tar.gz) = 6fcc0a8ba67126904ea77b2d10fcc65bba02ea6c876324dd7da9da5b22dac89e
-SIZE (squirrel-sql-2.5-standard.tar.gz) = 12681977
+MD5 (squirrel-sql-2.6-standard.tar.gz) = 47355086defaaa90c5664f8cab182ba1
+SHA256 (squirrel-sql-2.6-standard.tar.gz) = e69ced3b67c9cf221d82ca9f64d2144a6593d7f4be134633dabd5e1b1f61b434
+SIZE (squirrel-sql-2.6-standard.tar.gz) = 15892069
diff --git a/databases/squirrel-sql/pkg-plist b/databases/squirrel-sql/pkg-plist
index 2f46c3ffde25..16d97e20bb36 100644
--- a/databases/squirrel-sql/pkg-plist
+++ b/databases/squirrel-sql/pkg-plist
@@ -1,4 +1,5 @@
 bin/squirrel-sql
+share/applications/squirrel-sql.desktop
 share/java/squirrel-sql/doc/changes.txt
 share/java/squirrel-sql/doc/faq.html
 share/java/squirrel-sql/doc/images/add_alias_1.png
@@ -61,14 +62,28 @@ share/java/squirrel-sql/icons/acorn.ico
 share/java/squirrel-sql/icons/acorn.png
 share/java/squirrel-sql/icons/acorn.xpm
 share/java/squirrel-sql/lib/antlr-2.7.5H3.jar
+share/java/squirrel-sql/lib/cglib-2.1.3.jar
 share/java/squirrel-sql/lib/commons-cli.jar
+share/java/squirrel-sql/lib/commons-collections-2.1.1.jar
 share/java/squirrel-sql/lib/commons-logging-1.0.4.jar
+share/java/squirrel-sql/lib/dom4j-1.6.1.jar
+share/java/squirrel-sql/lib/ejb3-persistence.jar
 share/java/squirrel-sql/lib/forms.jar
 share/java/squirrel-sql/lib/fw.jar
-share/java/squirrel-sql/lib/hibernate3.jar
+share/java/squirrel-sql/lib/hibernate-annotations-3.3.0.jar
+share/java/squirrel-sql/lib/hibernate-commons-annotations-3.3.0.jar
+share/java/squirrel-sql/lib/hibernate-entitymanager-3.3.1.jar
+share/java/squirrel-sql/lib/hibernate3.2.4.sp1.jar
 share/java/squirrel-sql/lib/jxl.jar
 share/java/squirrel-sql/lib/log4j.jar
 share/java/squirrel-sql/lib/nanoxml-2.1.jar
+share/java/squirrel-sql/lib/openide-loaders.jar
+share/java/squirrel-sql/lib/openide.jar
+share/java/squirrel-sql/lib/org-netbeans-modules-editor-fold.jar
+share/java/squirrel-sql/lib/org-netbeans-modules-editor-lib.jar
+share/java/squirrel-sql/lib/org-netbeans-modules-editor-util.jar
+share/java/squirrel-sql/lib/org-netbeans-modules-editor.jar
+share/java/squirrel-sql/lib/syntax.jar
 share/java/squirrel-sql/log4j.properties
 share/java/squirrel-sql/plugins/codecompletion.jar
 share/java/squirrel-sql/plugins/codecompletion/changes.txt
@@ -109,6 +124,7 @@ share/java/squirrel-sql/plugins/laf/lafs/nimrodlf.jar
 share/java/squirrel-sql/plugins/laf/lafs/oalnf.jar
 share/java/squirrel-sql/plugins/laf/lafs/readme.txt
 share/java/squirrel-sql/plugins/laf/lafs/skinlf.jar
+share/java/squirrel-sql/plugins/laf/lafs/substance.jar
 share/java/squirrel-sql/plugins/laf/lafs/swingsetthemes.jar
 share/java/squirrel-sql/plugins/laf/lafs/tinylaf.jar
 share/java/squirrel-sql/plugins/laf/lafs/toniclf.jar
@@ -156,13 +172,6 @@ share/java/squirrel-sql/plugins/syntax.jar
 share/java/squirrel-sql/plugins/syntax/changes.txt
 share/java/squirrel-sql/plugins/syntax/configdlg.jpg
 share/java/squirrel-sql/plugins/syntax/corrabrev.jpg
-share/java/squirrel-sql/plugins/syntax/lib/openide-loaders.jar
-share/java/squirrel-sql/plugins/syntax/lib/openide.jar
-share/java/squirrel-sql/plugins/syntax/lib/org-netbeans-modules-editor-fold.jar
-share/java/squirrel-sql/plugins/syntax/lib/org-netbeans-modules-editor-lib.jar
-share/java/squirrel-sql/plugins/syntax/lib/org-netbeans-modules-editor-util.jar
-share/java/squirrel-sql/plugins/syntax/lib/org-netbeans-modules-editor.jar
-share/java/squirrel-sql/plugins/syntax/lib/syntax.jar
 share/java/squirrel-sql/plugins/syntax/licence.txt
 share/java/squirrel-sql/plugins/syntax/readme.html
 share/java/squirrel-sql/plugins/syntax/src.jar