Update to 3.0.

Submitted by:	SUGIMURA Takashi <sugimura@jp.FreeBSD.org>
Approved by:	maintainer timeout (1week)

6 files changed, 124 insertions, 113 deletions

diff --git a/java/eclipse-gef-examples/Makefile b/java/eclipse-gef-examples/Makefile
index 222ca404d2d7..fcaf11b65dbd 100644
--- a/java/eclipse-gef-examples/Makefile
+++ b/java/eclipse-gef-examples/Makefile
@@ -5,23 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	eclipse-gef-examples
-PORTVERSION=	2.1.2
+PORTNAME=	gef
+PORTVERSION=	3.0
 CATEGORIES=	java devel
-MASTER_SITES=	http://download.eclipse.org/tools/gef/downloads/drops/R-2.1.2-200310151343/
-DISTNAME=	GEF-examples-I20031015
+MASTER_SITES=	http://download.eclipse.org/tools/gef/downloads/drops/R-3.0-200406251257/
+PKGNAMEPREFIX=	eclipse-
+PKGNAMESUFFIX=	-examples
+DISTNAME=	GEF-examples-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
 MAINTAINER=	java@FreeBSD.ORG
 COMMENT=	Graphical Editing Framework for the Eclipse IDE (examples)
 
+RUN_DEPENDS=    ${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 
 do-install:
 		@${MKDIR} ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/plugins ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/features ${PREFIX}/eclipse
+		@${CP} -r ${WRKSRC}/eclipse/plugins ${PREFIX}/eclipse
+		@${CP} -r ${WRKSRC}/eclipse/features ${PREFIX}/eclipse
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-gef-examples/distinfo b/java/eclipse-gef-examples/distinfo
index a5d30a1970e2..a3bcb10f1762 100644
--- a/java/eclipse-gef-examples/distinfo
+++ b/java/eclipse-gef-examples/distinfo
@@ -1,2 +1,2 @@
-MD5 (eclipse/GEF-examples-I20031015.zip) = 5b5c787ac58e36c008c6ef1e0ca5aea1
-SIZE (eclipse/GEF-examples-I20031015.zip) = 449198
+MD5 (eclipse/GEF-examples-3.0.zip) = 03dfa9e725ecb1154cdff9e4ffb0cd80
+SIZE (eclipse/GEF-examples-3.0.zip) = 536038
diff --git a/java/eclipse-gef-examples/pkg-plist b/java/eclipse-gef-examples/pkg-plist
index 83674781cc94..d64ab654f2eb 100644
--- a/java/eclipse-gef-examples/pkg-plist
+++ b/java/eclipse-gef-examples/pkg-plist
@@ -1,28 +1,32 @@
-eclipse/features/org.eclipse.gef.examples_2.1.2/cpl-v10.html
-eclipse/features/org.eclipse.gef.examples_2.1.2/eclipse_update_120.jpg
-eclipse/features/org.eclipse.gef.examples_2.1.2/feature.properties
-eclipse/features/org.eclipse.gef.examples_2.1.2/feature.xml
-eclipse/features/org.eclipse.gef.examples_2.1.2/license.html
-eclipse/plugins/org.eclipse.gef.examples.flow_2.1.2/flow.jar
-eclipse/plugins/org.eclipse.gef.examples.flow_2.1.2/plugin.xml
-eclipse/plugins/org.eclipse.gef.examples.flow_2.1.2/view.gif
-eclipse/plugins/org.eclipse.gef.examples.logic_2.1.2/about.html
-eclipse/plugins/org.eclipse.gef.examples.logic_2.1.2/logic.gif
-eclipse/plugins/org.eclipse.gef.examples.logic_2.1.2/logic.jar
-eclipse/plugins/org.eclipse.gef.examples.logic_2.1.2/plugin.properties
-eclipse/plugins/org.eclipse.gef.examples.logic_2.1.2/plugin.xml
-eclipse/plugins/org.eclipse.gef.examples.source_2.1.2/eclipse32.gif
-eclipse/plugins/org.eclipse.gef.examples.source_2.1.2/plugin.properties
-eclipse/plugins/org.eclipse.gef.examples.source_2.1.2/plugin.xml
-eclipse/plugins/org.eclipse.gef.examples.source_2.1.2/src/org.eclipse.gef.examples.flow_2.1.2/flowsrc.zip
-eclipse/plugins/org.eclipse.gef.examples.source_2.1.2/src/org.eclipse.gef.examples.logic_2.1.2/logicsrc.zip
-@dirrm eclipse/plugins/org.eclipse.gef.examples.source_2.1.2/src/org.eclipse.gef.examples.logic_2.1.2
-@dirrm eclipse/plugins/org.eclipse.gef.examples.source_2.1.2/src/org.eclipse.gef.examples.flow_2.1.2
-@dirrm eclipse/plugins/org.eclipse.gef.examples.source_2.1.2/src
-@dirrm eclipse/plugins/org.eclipse.gef.examples.source_2.1.2
-@dirrm eclipse/plugins/org.eclipse.gef.examples.logic_2.1.2
-@dirrm eclipse/plugins/org.eclipse.gef.examples.flow_2.1.2
-@dirrm eclipse/features/org.eclipse.gef.examples_2.1.2
+eclipse/plugins/org.eclipse.gef.examples.flow_3.0.0/flow.jar
+eclipse/plugins/org.eclipse.gef.examples.flow_3.0.0/view.gif
+eclipse/plugins/org.eclipse.gef.examples.flow_3.0.0/plugin.xml
+eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/plugin.xml
+eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/src/org.eclipse.gef.examples.flow_3.0.0/flowsrc.zip
+eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/src/org.eclipse.gef.examples.logic_3.0.0/logicsrc.zip
+eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/about.html
+eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/plugin.properties
+eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/about.ini
+eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/about.mappings
+eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/eclipse32.gif
+eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/about.properties
+eclipse/plugins/org.eclipse.gef.examples.logic_3.0.0/logic.jar
+eclipse/plugins/org.eclipse.gef.examples.logic_3.0.0/plugin.properties
+eclipse/plugins/org.eclipse.gef.examples.logic_3.0.0/logic.gif
+eclipse/plugins/org.eclipse.gef.examples.logic_3.0.0/about.html
+eclipse/plugins/org.eclipse.gef.examples.logic_3.0.0/plugin.xml
+eclipse/features/org.eclipse.gef.examples_3.0.0/license.html
+eclipse/features/org.eclipse.gef.examples_3.0.0/feature.xml
+eclipse/features/org.eclipse.gef.examples_3.0.0/eclipse_update_120.jpg
+eclipse/features/org.eclipse.gef.examples_3.0.0/cpl-v10.html
+eclipse/features/org.eclipse.gef.examples_3.0.0/feature.properties
+@dirrm eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/src/org.eclipse.gef.examples.logic_3.0.0
+@dirrm eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/src/org.eclipse.gef.examples.flow_3.0.0
+@dirrm eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/src
+@dirrm eclipse/plugins/org.eclipse.gef.examples.source_3.0.0
+@dirrm eclipse/plugins/org.eclipse.gef.examples.logic_3.0.0
+@dirrm eclipse/plugins/org.eclipse.gef.examples.flow_3.0.0
+@dirrm eclipse/features/org.eclipse.gef.examples_3.0.0
 @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
diff --git a/java/eclipse-gef/Makefile b/java/eclipse-gef/Makefile
index 1cf21e70a6be..7520352e1c24 100644
--- a/java/eclipse-gef/Makefile
+++ b/java/eclipse-gef/Makefile
@@ -5,24 +5,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=	eclipse-gef
-PORTVERSION=	2.1.2
+PORTNAME=	gef
+PORTVERSION=	3.0
 CATEGORIES=	java devel
-MASTER_SITES=	http://download.eclipse.org/tools/gef/downloads/drops/R-2.1.2-200310151343/
-DISTNAME=	GEF-SDK-I20031015
+MASTER_SITES=	http://download.eclipse.org/tools/gef/downloads/drops/R-3.0-200406251257/
+PKGNAMEPREFIX=	eclipse-
+DISTNAME=	GEF-SDK-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
-
 MAINTAINER=	java@FreeBSD.ORG
 COMMENT=	Graphical Editing Framework for the Eclipse IDE
 
+RUN_DEPENDS=    ${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 
 do-install:
 		@${MKDIR} ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/plugins ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/features ${PREFIX}/eclipse
+		@${CP} -r ${WRKSRC}/eclipse/plugins ${PREFIX}/eclipse
+		@${CP} -r ${WRKSRC}/eclipse/features ${PREFIX}/eclipse
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-gef/distinfo b/java/eclipse-gef/distinfo
index d30f35710ac8..0cc9d424bd86 100644
--- a/java/eclipse-gef/distinfo
+++ b/java/eclipse-gef/distinfo
@@ -1,2 +1,2 @@
-MD5 (eclipse/GEF-SDK-I20031015.zip) = 5e497da17b9f5eb3db3293cca74ebfc2
-SIZE (eclipse/GEF-SDK-I20031015.zip) = 5180564
+MD5 (eclipse/GEF-SDK-3.0.zip) = e5c52283c002a851d72ee14b79653775
+SIZE (eclipse/GEF-SDK-3.0.zip) = 5908165
diff --git a/java/eclipse-gef/pkg-plist b/java/eclipse-gef/pkg-plist
index c73ed967b692..bb4eb1d3fd9b 100644
--- a/java/eclipse-gef/pkg-plist
+++ b/java/eclipse-gef/pkg-plist
@@ -1,74 +1,75 @@
-eclipse/features/org.eclipse.gef.sdk_2.1.2/cpl-v10.html
-eclipse/features/org.eclipse.gef.sdk_2.1.2/eclipse_update_120.jpg
-eclipse/features/org.eclipse.gef.sdk_2.1.2/feature.properties
-eclipse/features/org.eclipse.gef.sdk_2.1.2/feature.xml
-eclipse/features/org.eclipse.gef.sdk_2.1.2/license.html
-eclipse/features/org.eclipse.gef.source_2.1.2/cpl-v10.html
-eclipse/features/org.eclipse.gef.source_2.1.2/eclipse_update_120.jpg
-eclipse/features/org.eclipse.gef.source_2.1.2/feature.properties
-eclipse/features/org.eclipse.gef.source_2.1.2/feature.xml
-eclipse/features/org.eclipse.gef.source_2.1.2/license.html
-eclipse/features/org.eclipse.gef_2.1.2/cpl-v10.html
-eclipse/features/org.eclipse.gef_2.1.2/eclipse_update_120.jpg
-eclipse/features/org.eclipse.gef_2.1.2/feature.properties
-eclipse/features/org.eclipse.gef_2.1.2/feature.xml
-eclipse/features/org.eclipse.gef_2.1.2/license.html
-eclipse/plugins/org.eclipse.draw2d.doc.isv_2.1.2/about.html
-eclipse/plugins/org.eclipse.draw2d.doc.isv_2.1.2/doc.properties
-eclipse/plugins/org.eclipse.draw2d.doc.isv_2.1.2/doc.zip
-eclipse/plugins/org.eclipse.draw2d.doc.isv_2.1.2/plugin.properties
-eclipse/plugins/org.eclipse.draw2d.doc.isv_2.1.2/plugin.xml
-eclipse/plugins/org.eclipse.draw2d.doc.isv_2.1.2/toc.xml
-eclipse/plugins/org.eclipse.draw2d.doc.isv_2.1.2/topics_Guide.xml
-eclipse/plugins/org.eclipse.draw2d.doc.isv_2.1.2/topics_Reference.xml
-eclipse/plugins/org.eclipse.draw2d_2.1.2/about.html
-eclipse/plugins/org.eclipse.draw2d_2.1.2/draw2d.jar
-eclipse/plugins/org.eclipse.draw2d_2.1.2/icons/debugGEF.gif
-eclipse/plugins/org.eclipse.draw2d_2.1.2/plugin.properties
-eclipse/plugins/org.eclipse.draw2d_2.1.2/plugin.xml
-eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/about.html
-eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/doc.properties
-eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/doc.zip
-eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/icons/debugGEF.gif
-eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/plugin.properties
-eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/plugin.xml
-eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/toc.xml
-eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/topics_Guide.xml
-eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/topics_Reference.xml
-eclipse/plugins/org.eclipse.gef.source_2.1.2/about.html
-eclipse/plugins/org.eclipse.gef.source_2.1.2/about.ini
-eclipse/plugins/org.eclipse.gef.source_2.1.2/about.mappings
-eclipse/plugins/org.eclipse.gef.source_2.1.2/about.properties
-eclipse/plugins/org.eclipse.gef.source_2.1.2/eclipse32.gif
-eclipse/plugins/org.eclipse.gef.source_2.1.2/plugin.properties
-eclipse/plugins/org.eclipse.gef.source_2.1.2/plugin.xml
-eclipse/plugins/org.eclipse.gef.source_2.1.2/src/org.eclipse.draw2d_2.1.2/draw2dsrc.zip
-eclipse/plugins/org.eclipse.gef.source_2.1.2/src/org.eclipse.gef_2.1.2/gefsrc.zip
-eclipse/plugins/org.eclipse.gef_2.1.2/about.html
-eclipse/plugins/org.eclipse.gef_2.1.2/about.ini
-eclipse/plugins/org.eclipse.gef_2.1.2/about.mappings
-eclipse/plugins/org.eclipse.gef_2.1.2/about.properties
-eclipse/plugins/org.eclipse.gef_2.1.2/eclipse32.gif
-eclipse/plugins/org.eclipse.gef_2.1.2/gef.jar
-eclipse/plugins/org.eclipse.gef_2.1.2/icons/debugGEF.gif
-eclipse/plugins/org.eclipse.gef_2.1.2/plugin.properties
-eclipse/plugins/org.eclipse.gef_2.1.2/plugin.xml
-eclipse/plugins/org.eclipse.gef_2.1.2/readme/readme_gef.html
-@dirrm eclipse/plugins/org.eclipse.gef_2.1.2/readme
-@dirrm eclipse/plugins/org.eclipse.gef_2.1.2/icons
-@dirrm eclipse/plugins/org.eclipse.gef_2.1.2
-@dirrm eclipse/plugins/org.eclipse.gef.source_2.1.2/src/org.eclipse.gef_2.1.2
-@dirrm eclipse/plugins/org.eclipse.gef.source_2.1.2/src/org.eclipse.draw2d_2.1.2
-@dirrm eclipse/plugins/org.eclipse.gef.source_2.1.2/src
-@dirrm eclipse/plugins/org.eclipse.gef.source_2.1.2
-@dirrm eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2/icons
-@dirrm eclipse/plugins/org.eclipse.gef.doc.isv_2.1.2
-@dirrm eclipse/plugins/org.eclipse.draw2d_2.1.2/icons
-@dirrm eclipse/plugins/org.eclipse.draw2d_2.1.2
-@dirrm eclipse/plugins/org.eclipse.draw2d.doc.isv_2.1.2
-@dirrm eclipse/features/org.eclipse.gef_2.1.2
-@dirrm eclipse/features/org.eclipse.gef.source_2.1.2
-@dirrm eclipse/features/org.eclipse.gef.sdk_2.1.2
+eclipse/plugins/org.eclipse.draw2d.doc.isv_3.0.0/doc.zip
+eclipse/plugins/org.eclipse.draw2d.doc.isv_3.0.0/plugin.xml
+eclipse/plugins/org.eclipse.draw2d.doc.isv_3.0.0/plugin.properties
+eclipse/plugins/org.eclipse.draw2d.doc.isv_3.0.0/about.html
+eclipse/plugins/org.eclipse.draw2d.doc.isv_3.0.0/topics_Reference.xml
+eclipse/plugins/org.eclipse.draw2d.doc.isv_3.0.0/topics_Guide.xml
+eclipse/plugins/org.eclipse.draw2d.doc.isv_3.0.0/toc.xml
+eclipse/plugins/org.eclipse.draw2d.doc.isv_3.0.0/doc.properties
+eclipse/plugins/org.eclipse.gef_3.0.0/gef.jar
+eclipse/plugins/org.eclipse.gef_3.0.0/about.mappings
+eclipse/plugins/org.eclipse.gef_3.0.0/eclipse32.gif
+eclipse/plugins/org.eclipse.gef_3.0.0/plugin.xml
+eclipse/plugins/org.eclipse.gef_3.0.0/icons/debugGEF.gif
+eclipse/plugins/org.eclipse.gef_3.0.0/icons/palette_view.gif
+eclipse/plugins/org.eclipse.gef_3.0.0/about.ini
+eclipse/plugins/org.eclipse.gef_3.0.0/readme/readme_gef.html
+eclipse/plugins/org.eclipse.gef_3.0.0/about.html
+eclipse/plugins/org.eclipse.gef_3.0.0/plugin.properties
+eclipse/plugins/org.eclipse.gef_3.0.0/about.properties
+eclipse/plugins/org.eclipse.draw2d_3.0.0/draw2d.jar
+eclipse/plugins/org.eclipse.draw2d_3.0.0/about.html
+eclipse/plugins/org.eclipse.draw2d_3.0.0/plugin.properties
+eclipse/plugins/org.eclipse.draw2d_3.0.0/icons/debugGEF.gif
+eclipse/plugins/org.eclipse.draw2d_3.0.0/plugin.xml
+eclipse/plugins/org.eclipse.gef.source_3.0.0/src/org.eclipse.gef_3.0.0/gefsrc.zip
+eclipse/plugins/org.eclipse.gef.source_3.0.0/src/org.eclipse.draw2d_3.0.0/draw2dsrc.zip
+eclipse/plugins/org.eclipse.gef.source_3.0.0/plugin.properties
+eclipse/plugins/org.eclipse.gef.source_3.0.0/about.mappings
+eclipse/plugins/org.eclipse.gef.source_3.0.0/eclipse32.gif
+eclipse/plugins/org.eclipse.gef.source_3.0.0/about.ini
+eclipse/plugins/org.eclipse.gef.source_3.0.0/plugin.xml
+eclipse/plugins/org.eclipse.gef.source_3.0.0/about.html
+eclipse/plugins/org.eclipse.gef.source_3.0.0/about.properties
+eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/doc.zip
+eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/plugin.xml
+eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/about.html
+eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/plugin.properties
+eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/doc.properties
+eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/toc.xml
+eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/topics_Guide.xml
+eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/icons/debugGEF.gif
+eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/topics_Reference.xml
+eclipse/features/org.eclipse.gef.sdk_3.0.0/feature.properties
+eclipse/features/org.eclipse.gef.sdk_3.0.0/license.html
+eclipse/features/org.eclipse.gef.sdk_3.0.0/eclipse_update_120.jpg
+eclipse/features/org.eclipse.gef.sdk_3.0.0/feature.xml
+eclipse/features/org.eclipse.gef.sdk_3.0.0/cpl-v10.html
+eclipse/features/org.eclipse.gef_3.0.0/license.html
+eclipse/features/org.eclipse.gef_3.0.0/cpl-v10.html
+eclipse/features/org.eclipse.gef_3.0.0/feature.properties
+eclipse/features/org.eclipse.gef_3.0.0/feature.xml
+eclipse/features/org.eclipse.gef_3.0.0/eclipse_update_120.jpg
+eclipse/features/org.eclipse.gef.source_3.0.0/license.html
+eclipse/features/org.eclipse.gef.source_3.0.0/feature.xml
+eclipse/features/org.eclipse.gef.source_3.0.0/eclipse_update_120.jpg
+eclipse/features/org.eclipse.gef.source_3.0.0/feature.properties
+eclipse/features/org.eclipse.gef.source_3.0.0/cpl-v10.html
+@dirrm eclipse/plugins/org.eclipse.gef_3.0.0/readme
+@dirrm eclipse/plugins/org.eclipse.gef_3.0.0/icons
+@dirrm eclipse/plugins/org.eclipse.gef_3.0.0
+@dirrm eclipse/plugins/org.eclipse.gef.source_3.0.0/src/org.eclipse.gef_3.0.0
+@dirrm eclipse/plugins/org.eclipse.gef.source_3.0.0/src/org.eclipse.draw2d_3.0.0
+@dirrm eclipse/plugins/org.eclipse.gef.source_3.0.0/src
+@dirrm eclipse/plugins/org.eclipse.gef.source_3.0.0
+@dirrm eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0/icons
+@dirrm eclipse/plugins/org.eclipse.gef.doc.isv_3.0.0
+@dirrm eclipse/plugins/org.eclipse.draw2d_3.0.0/icons
+@dirrm eclipse/plugins/org.eclipse.draw2d_3.0.0
+@dirrm eclipse/plugins/org.eclipse.draw2d.doc.isv_3.0.0
+@dirrm eclipse/features/org.eclipse.gef_3.0.0
+@dirrm eclipse/features/org.eclipse.gef.source_3.0.0
+@dirrm eclipse/features/org.eclipse.gef.sdk_3.0.0
 @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