From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 24 17:20:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A596862A for ; Sat, 24 Aug 2013 17:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8535F29A5 for ; Sat, 24 Aug 2013 17:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7OHK08w030626 for ; Sat, 24 Aug 2013 17:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7OHK0dQ030625; Sat, 24 Aug 2013 17:20:00 GMT (envelope-from gnats) Resent-Date: Sat, 24 Aug 2013 17:20:00 GMT Resent-Message-Id: <201308241720.r7OHK0dQ030625@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dominic Fandrey Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F1DCC45F for ; Sat, 24 Aug 2013 17:10:00 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D03CD293D for ; Sat, 24 Aug 2013 17:10:00 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7OHA0G1081375 for ; Sat, 24 Aug 2013 17:10:00 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7OHA02R081371; Sat, 24 Aug 2013 17:10:00 GMT (envelope-from nobody) Message-Id: <201308241710.r7OHA02R081371@oldred.freebsd.org> Date: Sat, 24 Aug 2013 17:10:00 GMT From: Dominic Fandrey To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/181506: [maintainer-update] devel/eclipse-eclemma 2.2.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Aug 2013 17:20:00 -0000 >Number: 181506 >Category: ports >Synopsis: [maintainer-update] devel/eclipse-eclemma 2.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Aug 24 17:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Dominic Fandrey >Release: stable/9 >Organization: private >Environment: FreeBSD mobileKamikaze.norad 9.2-PRERELEASE FreeBSD 9.2-PRERELEASE #0 r254557: Tue Aug 20 14:02:38 CEST 2013 root@mobileKamikaze.norad:/usr/obj/HP6510b-91/amd64/usr/src/sys/HP6510b-91 amd64 >Description: - Update to the latest release 2.2.1 - New style Makefile header - Use eclipse plugin dropin directory - Tested with openjdk-7.25.15 and eclipse-3.7.1_4 >How-To-Repeat: >Fix: Patch attached with submission follows: Index: devel/eclipse-eclemma/Makefile =================================================================== --- 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 Index: devel/eclipse-eclemma/distinfo =================================================================== --- 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 Index: devel/eclipse-eclemma/pkg-plist =================================================================== --- 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%% >Release-Note: >Audit-Trail: >Unformatted: