--- devel/eclipse-eclemma/Makefile	(revision 325249)
+++ devel/eclipse-eclemma/Makefile	(working copy)
@@ -1,14 +1,12 @@ 
-# New ports collection makefile for:	eclemma
-# Date created:				18 Mar 2010
-# Whom:					kamikaze@bsdforen.de
-#
+# Created by: Dominic Fandrey
 # $FreeBSD$
-#
 
 PORTNAME=	eclemma
-PORTVERSION=	1.5.3
+PORTVERSION=	2.2.1
 CATEGORIES=	devel java editors
-MASTER_SITES=	SF/${PORTNAME}/01_EclEmma_Releases/${PORTVERSION}
+MASTER_SITES=	http://download.eclipselab.org/${PORTNAME}/release/
+EXTRACT_SUFX=	.zip
+EXTRACT_ONLY=
 
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Java code coverage tool for Eclipse
@@ -17,36 +15,34 @@ 
 
 PLUGIN_PATHS=	features plugins
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}
-ECLIPSE=	lib/eclipse
+EVER=		${PORTVERSION}.201306092145
+JVER=		0.6.3.201306030806
+DROPIN=		lib/eclipse/dropins/${PORTNAME}-${PORTVERSION}
+PLIST_SUB=	EVER=${EVER} \
+		JVER=${JVER} \
+		DROPIN=${DROPIN}
 
-PLIST_SUB=	VER=${PORTVERSION} \
-		ECLIPSE=${ECLIPSE}
-
 do-install:
-.for _path in ${PLUGIN_PATHS}
-	@${MKDIR} ${PREFIX}/${ECLIPSE}/${_path}
-	@${CP} -r ${WRKSRC}/${_path}/* ${PREFIX}/${ECLIPSE}/${_path}/
-.endfor
+	@${MKDIR} ${PREFIX}/${DROPIN}
+	@(cd ${PREFIX}/${DROPIN} \
+	  && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+	     ${DISTDIR}/${DISTFILES} ${EXTRACT_AFTER_ARGS})
 
-plist: build
+plist:
 	@${ECHO} "===>  Rebuilding PLIST."
 	@${TOUCH} ${PLIST}
 	@${RM} ${PLIST}
-.for _path in ${PLUGIN_PATHS}
-	@${FIND} -ds ${WRKSRC}/${_path}/ -not -type d \
-		| ${SED} "s|${WRKSRC}|%%ECLIPSE%%|1" \
-		| ${SED} "s|${PORTVERSION}|%%VER%%|g" \
-		>> ${PLIST}
-	@${FIND} -ds ${WRKSRC}/${_path}/ -mindepth 1 -type d \
-		| ${SED} "s|${WRKSRC}|@dirrm %%ECLIPSE%%|1" \
-		| ${SED} "s|${PORTVERSION}|%%VER%%|g" \
-		>> ${PLIST}
-	@${ECHO} "@dirrmtry %%ECLIPSE%%/${_path}" >> ${PLIST}
-.endfor
-	@${ECHO} "@dirrmtry %%ECLIPSE%%" >> ${PLIST}
+	@${TAR} -tf ${DISTDIR}/${DISTFILES} \
+	        | ${SED} -e '/\/$$/d' \
+	                 -e 's|^|%%DROPIN%%/|' \
+	                 -e 's|${EVER}|%%EVER%%|g' \
+	                 -e 's|${JVER}|%%JVER%%|g' \
+	        | ${SORT} > ${PLIST}
+	@${TAR} -tf ${DISTDIR}/${DISTFILES} \
+	        | ${SED} 's|^|@dirrm %%DROPIN%%/|' \
+		| ${AWK} '{while(/\//){sub(/\/[^\/]*$$/,"");print}}' \
+	        | ${SORT} -ur >> ${PLIST}
 
 .include <bsd.port.mk>
--- devel/eclipse-eclemma/distinfo	(revision 325249)
+++ devel/eclipse-eclemma/distinfo	(working copy)
@@ -1,2 +1,2 @@ 
-SHA256 (eclemma-1.5.3.zip) = c8f3a650159847aa64315c9f5d96f0aee9b8397c8351ed10f63d0a83b0b4c734
-SIZE (eclemma-1.5.3.zip) = 778970
+SHA256 (eclemma-2.2.1.zip) = cdbdb7d1a68f04b7d4f804b277b24d3ad69aaa58b6ed759b39002e47d3c7113a
+SIZE (eclemma-2.2.1.zip) = 1175211
--- devel/eclipse-eclemma/pkg-plist	(revision 325249)
+++ devel/eclipse-eclemma/pkg-plist	(working copy)
@@ -1,14 +1,18 @@ 
-%%ECLIPSE%%/features/com.mountainminds.eclemma.feature_%%VER%%/META-INF/MANIFEST.MF
-%%ECLIPSE%%/features/com.mountainminds.eclemma.feature_%%VER%%/META-INF/MTNMINDS.RSA
-%%ECLIPSE%%/features/com.mountainminds.eclemma.feature_%%VER%%/META-INF/MTNMINDS.SF
-%%ECLIPSE%%/features/com.mountainminds.eclemma.feature_%%VER%%/about.html
-%%ECLIPSE%%/features/com.mountainminds.eclemma.feature_%%VER%%/feature.properties
-%%ECLIPSE%%/features/com.mountainminds.eclemma.feature_%%VER%%/feature.xml
-@dirrm %%ECLIPSE%%/features/com.mountainminds.eclemma.feature_%%VER%%/META-INF
-@dirrm %%ECLIPSE%%/features/com.mountainminds.eclemma.feature_%%VER%%
-@dirrmtry %%ECLIPSE%%/features
-%%ECLIPSE%%/plugins/com.mountainminds.eclemma.core_%%VER%%.jar
-%%ECLIPSE%%/plugins/com.mountainminds.eclemma.doc_%%VER%%.jar
-%%ECLIPSE%%/plugins/com.mountainminds.eclemma.ui_%%VER%%.jar
-@dirrmtry %%ECLIPSE%%/plugins
-@dirrmtry %%ECLIPSE%%
+%%DROPIN%%/META-INF/MANIFEST.MF
+%%DROPIN%%/META-INF/MTNMINDS.RSA
+%%DROPIN%%/META-INF/MTNMINDS.SF
+%%DROPIN%%/artifacts.jar
+%%DROPIN%%/content.jar
+%%DROPIN%%/features/com.mountainminds.eclemma.feature_%%EVER%%.jar
+%%DROPIN%%/plugins/com.mountainminds.eclemma.asm_%%EVER%%.jar
+%%DROPIN%%/plugins/com.mountainminds.eclemma.core_%%EVER%%.jar
+%%DROPIN%%/plugins/com.mountainminds.eclemma.debug.ui.compatibility_%%EVER%%.jar
+%%DROPIN%%/plugins/com.mountainminds.eclemma.doc_%%EVER%%.jar
+%%DROPIN%%/plugins/com.mountainminds.eclemma.ui_%%EVER%%.jar
+%%DROPIN%%/plugins/org.jacoco.agent_%%JVER%%.jar
+%%DROPIN%%/plugins/org.jacoco.core_%%JVER%%.jar
+%%DROPIN%%/plugins/org.jacoco.report_%%JVER%%.jar
+@dirrm %%DROPIN%%/plugins
+@dirrm %%DROPIN%%/features
+@dirrm %%DROPIN%%/META-INF
+@dirrm %%DROPIN%%