- Update to 2.2.4

- Use sourceforge mastersite
- Added dependency on eclipse-gef
- Automatically generate pkg-plist

PR:		88649
Submitted by:	SUGIMURA Takashi <sugimura@jp.FreeBSD.org> (maintainer)
Approved by:	clement (mentor)

4 files changed, 22 insertions, 93 deletions

diff --git a/java/eclipse-sqlexplorer/Makefile b/java/eclipse-sqlexplorer/Makefile
index 683963977d60..aab823a9cce4 100644
--- a/java/eclipse-sqlexplorer/Makefile
+++ b/java/eclipse-sqlexplorer/Makefile
@@ -6,42 +6,33 @@
 #
 
 PORTNAME=	sqlexplorer
-PORTVERSION=	2.2.2
-PORTREVISION=	2
+PORTVERSION=	2.2.4
+PORTREVISION=	1
 CATEGORIES=	java
-MASTER_SITES=	#
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= eclipsesql
 PKGNAMEPREFIX=	eclipse-
-DISTNAME=	net.java.${PORTNAME}_${PORTVERSION}
+DISTNAME=	net.sourceforge.${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	eclipse
 
 MAINTAINER=	sugimura@jp.FreeBSD.ORG
 COMMENT=	A visual database query tool for Eclipse
 
-RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
+RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse \
+		${LOCALBASE}/eclipse/features/org.eclipse.gef_3.1.1/feature.xml:${PORTSDIR}/java/eclipse-gef
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
-DOWNLOAD_URL=	https://sqlexplorer.dev.java.net/servlets/ProjectDocumentList
 
 do-install:
-		@${MKDIR} ${PREFIX}/eclipse
+		@${MKDIR} -p ${PREFIX}/eclipse
 		@${CP} -r ${WRKSRC}/plugins ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/features ${PREFIX}/eclipse
+		@(cd ${WRKSRC}; ${FIND} -s plugins -not -type d) \
+			| ${SED} -ne 's,^,eclipse/,p' >> ${TMPPLIST}
+		@(cd ${WRKSRC}; ${FIND} -s -d plugins -type d) \
+			| ${GREP} -vE '^plugins$$' \
+			| ${SED} -ne 's,^,@dirrm eclipse/,p' >> ${TMPPLIST}
 
-.include <bsd.port.pre.mk>
-
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=	${PRINTF}
-IGNORE=	:\n\
-Because of a specific structure of dev.java.net, you must fetch the\n\
-distribution manually. Please acccess\n\
-\n\
-  ${DOWNLOAD_URL}\n\
-\n\
-with a web browser and click its filename.\n\
-Please place the downloaded ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}/${DIST_SUBDIR}.\n
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/java/eclipse-sqlexplorer/distinfo b/java/eclipse-sqlexplorer/distinfo
index 22b48fcbf73b..d2f591167bde 100644
--- a/java/eclipse-sqlexplorer/distinfo
+++ b/java/eclipse-sqlexplorer/distinfo
@@ -1,2 +1,3 @@
-MD5 (eclipse/net.java.sqlexplorer_2.2.2.zip) = c4f4748b31ac04f5b49691140dd90954
-SIZE (eclipse/net.java.sqlexplorer_2.2.2.zip) = 1980806
+MD5 (eclipse/net.sourceforge.sqlexplorer_2.2.4.zip) = 3f470a0fb8a8a2b645bd67336d83073a
+SHA256 (eclipse/net.sourceforge.sqlexplorer_2.2.4.zip) = 517a3b6c9e5d49be67f88faf023e220c82b1d71e5c4c526a6a631a45fddde992
+SIZE (eclipse/net.sourceforge.sqlexplorer_2.2.4.zip) = 3263370
diff --git a/java/eclipse-sqlexplorer/pkg-descr b/java/eclipse-sqlexplorer/pkg-descr
index 5b9600d33314..59577c592c6e 100644
--- a/java/eclipse-sqlexplorer/pkg-descr
+++ b/java/eclipse-sqlexplorer/pkg-descr
@@ -1,6 +1,7 @@
-SQLExplorer Eclipse Database Plugin
+Eclipse IDE plugin for database query/schema viewer for nearly any kind of
+JDBC database. It supports plugins for specialized functionality for
+individual databases (Oracle and data tools ( like Hibernate, Oracle
+or Sybase )
 
-SQLExplorer is a visual database design/query tool implemented as a plugin
-for Eclipse.
+WWW: http://sourceforge.net/projects/eclipsesql/
 
-WWW: https://sqlexplorer.dev.java.net/
diff --git a/java/eclipse-sqlexplorer/pkg-plist b/java/eclipse-sqlexplorer/pkg-plist
index 428df94cdfed..e69de29bb2d1 100644
--- a/java/eclipse-sqlexplorer/pkg-plist
+++ b/java/eclipse-sqlexplorer/pkg-plist
@@ -1,64 +0,0 @@
-eclipse/features/net.java.sqlexplorer_2.2.2/feature.xml
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/3.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/alpha_mode.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/app_obj.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/backward_nav.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/claytable_new.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/clear.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/col_obj.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/commit.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/configs.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/copy_edit.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/defaultview_misc.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/delete_edit.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/edittsk_tsk.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/element_obj.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/elements_obj.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/error_log.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/error_st_obj.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/feature_obj.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/forward_nav.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/history_list.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/key.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/logo.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/new_page.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/new_wiz.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/next.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/nextall.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/nullkey.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/ok_st_obj.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/open.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/outline.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/overview.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/perspective_icon.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/removeAll_co.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/remove_co.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/replace_persp.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/replace_persp2.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/replace_persp3.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/rollback.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/run_exc.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/save.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/showparents_mode.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/update.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/sort_asc.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/sort_desc.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/template_obj.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/tree_mode.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/icons/view.gif
-eclipse/plugins/net.java.sqlexplorer_2.2.2/lib/commons-logging.jar
-eclipse/plugins/net.java.sqlexplorer_2.2.2/lib/gef.jar
-eclipse/plugins/net.java.sqlexplorer_2.2.2/lib/log4j.jar
-eclipse/plugins/net.java.sqlexplorer_2.2.2/lib/nanoxml.jar
-eclipse/plugins/net.java.sqlexplorer_2.2.2/lib/rowset.jar
-eclipse/plugins/net.java.sqlexplorer_2.2.2/lib/squirrel.jar
-eclipse/plugins/net.java.sqlexplorer_2.2.2/default_drivers.xml
-eclipse/plugins/net.java.sqlexplorer_2.2.2/plugin.xml
-eclipse/plugins/net.java.sqlexplorer_2.2.2/sqlexplorer.jar
-@dirrm eclipse/features/net.java.sqlexplorer_2.2.2
-@dirrm eclipse/plugins/net.java.sqlexplorer_2.2.2/lib
-@dirrm eclipse/plugins/net.java.sqlexplorer_2.2.2/icons
-@dirrm eclipse/plugins/net.java.sqlexplorer_2.2.2
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true