Update to 3.1.1.

PR:		ports/86830
Submitted by:	Mark Hobden <mark@mclgm.net>
Committed at:	CBUG Meeting XCAST6 Festival feature with cjh@

3 files changed, 11 insertions, 81 deletions

diff --git a/java/eclipse-gef/Makefile b/java/eclipse-gef/Makefile
index 0a11068..fd173f6 100644
--- a/java/eclipse-gef/Makefile
+++ b/java/eclipse-gef/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gef
-PORTVERSION=	3.0.1
-PORTREVISION=	2
+PORTVERSION=	3.1.1
+PORTREVISION=	0
 CATEGORIES=	java devel
-MASTER_SITES=	http://download.eclipse.org/tools/gef/downloads/drops/R-3.0.1-200408311615/
+MASTER_SITES=	http://download.eclipse.org/tools/gef/downloads/drops/R-${PORTVERSION}-200509301327/
 PKGNAMEPREFIX=	eclipse-
 DISTNAME=	GEF-SDK-${PORTVERSION}
 DIST_SUBDIR=	eclipse
@@ -17,7 +17,8 @@ DIST_SUBDIR=	eclipse
 MAINTAINER=	freebsd-eclipse@FreeBSD.org
 COMMENT=	Graphical Editing Framework for the Eclipse IDE
 
-RUN_DEPENDS=    ${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
+RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse \
+		${LOCALBASE}/eclipse/features/org.eclipse.emf_2.1.1/feature.xml:${PORTSDIR}/java/eclipse-emf
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -25,11 +26,14 @@ USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_OS=	native
-PLIST_SUB=	RELEASEVERSION=${PORTVERSION}
 
 do-install:
 		@${MKDIR} ${PREFIX}/eclipse
 		@${CP} -r ${WRKSRC}/eclipse/plugins ${PREFIX}/eclipse
 		@${CP} -r ${WRKSRC}/eclipse/features ${PREFIX}/eclipse
+		@(cd ${WRKSRC}; ${FIND} -s eclipse/features eclipse/plugins -not -type d) >> ${TMPPLIST}
+		@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d) \
+			| ${GREP} -vE 'eclipse/plugins$$|eclipse/features$$' \
+			| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-gef/distinfo b/java/eclipse-gef/distinfo
index 3595777..bf75a4e 100644
--- a/java/eclipse-gef/distinfo
+++ b/java/eclipse-gef/distinfo
@@ -1,2 +1,2 @@
-MD5 (eclipse/GEF-SDK-3.0.1.zip) = 6e04327e3b9e6326477fc6bc9f8e3930
-SIZE (eclipse/GEF-SDK-3.0.1.zip) = 5983670
+MD5 (eclipse/GEF-SDK-3.1.1.zip) = 70a6de96c4edbc8903f6bd964039ddc8
+SIZE (eclipse/GEF-SDK-3.1.1.zip) = 6070341
diff --git a/java/eclipse-gef/pkg-plist b/java/eclipse-gef/pkg-plist
deleted file mode 100644
index 7412b05..0000000
--- a/java/eclipse-gef/pkg-plist
+++ /dev/null
@@ -1,74 +0,0 @@
-eclipse/features/org.eclipse.gef.sdk_%%RELEASEVERSION%%/cpl-v10.html
-eclipse/features/org.eclipse.gef.sdk_%%RELEASEVERSION%%/eclipse_update_120.jpg
-eclipse/features/org.eclipse.gef.sdk_%%RELEASEVERSION%%/feature.properties
-eclipse/features/org.eclipse.gef.sdk_%%RELEASEVERSION%%/feature.xml
-eclipse/features/org.eclipse.gef.sdk_%%RELEASEVERSION%%/license.html
-eclipse/features/org.eclipse.gef.source_%%RELEASEVERSION%%/cpl-v10.html
-eclipse/features/org.eclipse.gef.source_%%RELEASEVERSION%%/eclipse_update_120.jpg
-eclipse/features/org.eclipse.gef.source_%%RELEASEVERSION%%/feature.properties
-eclipse/features/org.eclipse.gef.source_%%RELEASEVERSION%%/feature.xml
-eclipse/features/org.eclipse.gef.source_%%RELEASEVERSION%%/license.html
-eclipse/features/org.eclipse.gef_%%RELEASEVERSION%%/cpl-v10.html
-eclipse/features/org.eclipse.gef_%%RELEASEVERSION%%/eclipse_update_120.jpg
-eclipse/features/org.eclipse.gef_%%RELEASEVERSION%%/feature.properties
-eclipse/features/org.eclipse.gef_%%RELEASEVERSION%%/feature.xml
-eclipse/features/org.eclipse.gef_%%RELEASEVERSION%%/license.html
-eclipse/plugins/org.eclipse.draw2d.doc.isv_%%RELEASEVERSION%%/about.html
-eclipse/plugins/org.eclipse.draw2d.doc.isv_%%RELEASEVERSION%%/doc.properties
-eclipse/plugins/org.eclipse.draw2d.doc.isv_%%RELEASEVERSION%%/doc.zip
-eclipse/plugins/org.eclipse.draw2d.doc.isv_%%RELEASEVERSION%%/plugin.properties
-eclipse/plugins/org.eclipse.draw2d.doc.isv_%%RELEASEVERSION%%/plugin.xml
-eclipse/plugins/org.eclipse.draw2d.doc.isv_%%RELEASEVERSION%%/toc.xml
-eclipse/plugins/org.eclipse.draw2d.doc.isv_%%RELEASEVERSION%%/topics_Guide.xml
-eclipse/plugins/org.eclipse.draw2d.doc.isv_%%RELEASEVERSION%%/topics_Reference.xml
-eclipse/plugins/org.eclipse.draw2d_%%RELEASEVERSION%%/about.html
-eclipse/plugins/org.eclipse.draw2d_%%RELEASEVERSION%%/draw2d.jar
-eclipse/plugins/org.eclipse.draw2d_%%RELEASEVERSION%%/icons/debugGEF.gif
-eclipse/plugins/org.eclipse.draw2d_%%RELEASEVERSION%%/plugin.properties
-eclipse/plugins/org.eclipse.draw2d_%%RELEASEVERSION%%/plugin.xml
-eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/about.html
-eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/doc.properties
-eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/doc.zip
-eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/icons/debugGEF.gif
-eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/plugin.properties
-eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/plugin.xml
-eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/toc.xml
-eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/topics_Guide.xml
-eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/topics_Reference.xml
-eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/about.html
-eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/about.ini
-eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/about.mappings
-eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/about.properties
-eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/eclipse32.gif
-eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/plugin.properties
-eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/plugin.xml
-eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/src/org.eclipse.draw2d_%%RELEASEVERSION%%/draw2dsrc.zip
-eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/src/org.eclipse.gef_%%RELEASEVERSION%%/gefsrc.zip
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/about.html
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/about.ini
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/about.mappings
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/about.properties
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/eclipse32.gif
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/gef.jar
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/icons/debugGEF.gif
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/icons/palette_view.gif
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/plugin.properties
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/plugin.xml
-eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/readme/readme_gef.html
-share/nls/POSIX
-share/nls/en_US.US-ASCII
-@dirrm eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/readme
-@dirrm eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%/icons
-@dirrm eclipse/plugins/org.eclipse.gef_%%RELEASEVERSION%%
-@dirrm eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/src/org.eclipse.gef_%%RELEASEVERSION%%
-@dirrm eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/src/org.eclipse.draw2d_%%RELEASEVERSION%%
-@dirrm eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%/src
-@dirrm eclipse/plugins/org.eclipse.gef.source_%%RELEASEVERSION%%
-@dirrm eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%/icons
-@dirrm eclipse/plugins/org.eclipse.gef.doc.isv_%%RELEASEVERSION%%
-@dirrm eclipse/plugins/org.eclipse.draw2d_%%RELEASEVERSION%%/icons
-@dirrm eclipse/plugins/org.eclipse.draw2d_%%RELEASEVERSION%%
-@dirrm eclipse/plugins/org.eclipse.draw2d.doc.isv_%%RELEASEVERSION%%
-@dirrm eclipse/features/org.eclipse.gef_%%RELEASEVERSION%%
-@dirrm eclipse/features/org.eclipse.gef.source_%%RELEASEVERSION%%
-@dirrm eclipse/features/org.eclipse.gef.sdk_%%RELEASEVERSION%%