Update to 3.1RC2.

o Fix install dependency problems.

PR:		ports/87469
Submitted by:	Mark Hobden <mark@mclgm.net>
Approved by:	maintainer no response

java/eclipse-lomboz/Makefile

@@ -6,27 +6,40 @@
 #
 
 PORTNAME=	lomboz
-PORTVERSION=	3.0.1
-PORTREVISION=	2
-CATEGORIES=	java
+PORTVERSION=	3.1.r2
+PORTREVISION=	0
+CATEGORIES=	java devel
 MASTER_SITES=	http://download.fr2.forge.objectweb.org/lomboz/ \
 		http://download.us.forge.objectweb.org/lomboz/ \
 		http://download.forge.objectweb.org/lomboz/
 PKGNAMEPREFIX=	eclipse-
-DISTNAME=	lomboz.301
+DISTNAME=	lomboz-${PORTVERSION:S/.r/RC/}
 DIST_SUBDIR=	eclipse
 
 MAINTAINER=	sugimura@jp.FreeBSD.ORG
 COMMENT=	A J2EE developer tool build as a plugin for the eclipse platform
 
-RUN_DEPENDS+=	${LOCALBASE}/eclipse/features/org.eclipse.emf_2.0.1/feature.xml:${PORTSDIR}/java/eclipse-emf
+RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse \
+		${LOCALBASE}/eclipse/features/org.eclipse.emf_2.1.1/feature.xml:${PORTSDIR}/java/eclipse-emf \
+		${LOCALBASE}/eclipse/features/org.eclipse.gef_3.1.1/feature.xml:${PORTSDIR}/java/eclipse-gef \
+		${LOCALBASE}/eclipse/features/org.eclipse.jem_1.1.0.1/feature.xml:${PORTSDIR}/java/eclipse-vep
+
+CONFLICTS=	eclipse-webtools-0.7*
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
+JAVA_OS=	native
 
 do-install:
 		@${MKDIR} ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/plugins ${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>

java/eclipse-lomboz/distinfo

@@ -1,2 +1,2 @@
-MD5 (eclipse/lomboz.301.zip) = 462f736745448d4b83617b6a560693f5
-SIZE (eclipse/lomboz.301.zip) = 6643444
+MD5 (eclipse/lomboz-3.1RC2.zip) = d91f3185e6e026a1ecea0815f91cf7d8
+SIZE (eclipse/lomboz-3.1RC2.zip) = 25069977