4 files changed, 14 insertions, 41 deletions

diff --git a/java/eclipse-sysdeo-tomcat/Makefile b/java/eclipse-sysdeo-tomcat/Makefile
index ffd180cb7ccc..b0f70760e6e7 100644
--- a/java/eclipse-sysdeo-tomcat/Makefile
+++ b/java/eclipse-sysdeo-tomcat/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	sysdeo
-PORTVERSION=	3
-PORTREVISION=	2
+PORTVERSION=	3.1.0
 CATEGORIES=	java
-MASTER_SITES=	http://www.sysdeo.com/eclipse/
+MASTER_SITES=	http://www.sysdeo.com/sysdeo/content/download/393/4930/file/
 PKGNAMEPREFIX=	eclipse-
 PKGNAMESUFFIX=	-tomcat
-DISTNAME=	tomcatPluginV${PORTVERSION}
+DISTNAME=	tomcatPluginV31
 DIST_SUBDIR=	eclipse
 
 MAINTAINER=	sugimura@jp.FreeBSD.ORG
@@ -25,7 +24,11 @@ NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 
 do-install:
-		@${MKDIR} ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/com.sysdeo.eclipse.tomcat_3.0.0 ${PREFIX}/eclipse/plugins
+		@${MKDIR} -p ${PREFIX}/eclipse
+		@${CP} -r ${WRKSRC}/com.sysdeo.eclipse.tomcat_${PORTVERSION} ${PREFIX}/eclipse/plugins
+		@(cd ${WRKSRC}; ${FIND} -s com.sysdeo.eclipse.tomcat_${PORTVERSION} -not -type d) \
+			| ${SED} -ne 's,^,eclipse/plugins/,p' >> ${TMPPLIST}
+		@(cd ${WRKSRC}; ${FIND} -s -d com.sysdeo.eclipse.tomcat_${PORTVERSION} -type d) \
+			| ${SED} -ne 's,^,@dirrm eclipse/plugins/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-sysdeo-tomcat/distinfo b/java/eclipse-sysdeo-tomcat/distinfo
index 1c1eec99842e..c11cd400846d 100644
--- a/java/eclipse-sysdeo-tomcat/distinfo
+++ b/java/eclipse-sysdeo-tomcat/distinfo
@@ -1,2 +1,3 @@
-MD5 (eclipse/tomcatPluginV3.zip) = da6bc55c5dacfd04e29a51189ab42514
-SIZE (eclipse/tomcatPluginV3.zip) = 280121
+MD5 (eclipse/tomcatPluginV31.zip) = f981aeda4b5694c675417fd17c4c0295
+SHA256 (eclipse/tomcatPluginV31.zip) = fea51a522f58c6c4d70c921ffd259250e774cce6615992313fec396abfc3c593
+SIZE (eclipse/tomcatPluginV31.zip) = 271850
diff --git a/java/eclipse-sysdeo-tomcat/pkg-descr b/java/eclipse-sysdeo-tomcat/pkg-descr
index 855e4fe85cf6..436cee974b31 100644
--- a/java/eclipse-sysdeo-tomcat/pkg-descr
+++ b/java/eclipse-sysdeo-tomcat/pkg-descr
@@ -1,6 +1,6 @@
 Sysdeo Eclipse Tomcat Launcher plugin, its features are:
 
-    * Starting, stopping and restarting Tomcat 4.x, 5.0.x, 3.3
+    * Starting, stopping and restarting Tomcat 4.x, 5.x, 3.3
     * Registering Tomcat process to Eclipse debugger
     * Creating a WAR project (wizard can update server.xml file)
     * Adding Java Projects to Tomcat classpath
@@ -11,4 +11,4 @@ Sysdeo Eclipse Tomcat Launcher plugin, its features are:
       several java projects loaded at the same classloader level than classes
       in a Tomcat project
 
-WWW: http://www.sysdeo.com/eclipse/tomcatPlugin.html
+WWW: http://www.sysdeo.com/eclipse/
diff --git a/java/eclipse-sysdeo-tomcat/pkg-plist b/java/eclipse-sysdeo-tomcat/pkg-plist
deleted file mode 100644
index c77dc3b47b67..000000000000
--- a/java/eclipse-sysdeo-tomcat/pkg-plist
+++ /dev/null
@@ -1,31 +0,0 @@
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/DevLoader.zip
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/icons/newjprj_wiz.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/icons/newjprj_wiz2.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/icons/newwar_wiz.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/icons/restart.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/icons/start.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/icons/stop.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/img/bleu.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/img/jaune.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/img/jaune_transparent.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/img/logoSysdeo137_53.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/img/rouge.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/img/vert.gif
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/license.txt
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/plugin.properties
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/plugin.xml
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/plugin_bg.properties
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/plugin_de.properties
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/plugin_fr.properties
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/plugin_it.properties
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/plugin_ja.properties
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/readme.html
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/readmeDevLoader.html
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/releaseNotesV3.txt
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/tomcat.jar
-eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/tomcatsrc.zip
-@dirrm eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/img
-@dirrm eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0/icons
-@dirrm eclipse/plugins/com.sysdeo.eclipse.tomcat_3.0.0
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true