Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Feb 2010 08:32:30 GMT
From:      Martin Birgmeier <martin.birgmeier@aon.at>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/143628: eclipse-3.4.2_2 Makefile broken
Message-ID:  <201002070832.o178WU8L003924@www.freebsd.org>
Resent-Message-ID: <201002070840.o178e1wR010637@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         143628
>Category:       ports
>Synopsis:       eclipse-3.4.2_2 Makefile broken
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 07 08:40:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Martin Birgmeier
>Release:        7,2, 8.0
>Organization:
MBi at home
>Environment:
FreeBSD campanula.xyzzy 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Thu Dec 31 13:33:35 CET 2009     root@campanula.xyzzy:/usr/VOL/OBJ/FreeBSD/RELENG_8_0_0_RELEASE/src/sys/XYZZY_SMP_NA  i386
>Description:
The last commit broke java/eclipse.
>How-To-Repeat:
Try to make the port.
>Fix:
See attached patch.



Patch attached with submission follows:

--- ./java/eclipse/Makefile.ORIG	2010-02-07 09:15:49.000000000 +0100
+++ ./java/eclipse/Makefile	2010-02-07 09:25:58.000000000 +0100
@@ -54,8 +54,7 @@
 NO_WRKSUBDIR=	yes
 
 ECLIPSE_RELEASE=3.4.2.M20090211-1700
-#ECLIPSE_VERSION=${ECLIPSE_RELEASE}-${PORTREVISION}
-ECLIPSE_VERSION=	1
+ECLIPSE_VERSION=${ECLIPSE_RELEASE}-${PORTREVISION}
 ECLIPSE_BUILDID=${ECLIPSE_VERSION:C/.*\.([MIS][0-9]{8}-[0-9]{4}-[0-9]+)/\1/}
 ECLIPSE_BUILDTYPE=${ECLIPSE_BUILDID:C/(.).*/\1/}
 ECLIPSE_TIMESTAMP=${ECLIPSE_BUILDID:C/.([0-9]{8})-([0-9]{4})-[0-9]+/\1\2/}
@@ -131,12 +130,8 @@
 	  -e "s/%%ECLIPSE_TIMESTAMP%%/${ECLIPSE_TIMESTAMP}/g" \
 	  ${FILESDIR}/packager-packager.properties.in > ${WRKSRC}/packager/packager.properties
 	@${REINPLACE_CMD} -E \
-#	  -e "/buildId/ s/(.*)/\1-${PORTREVISION}/" \
 	  -e "/buildId/ s/(.*)/\1-${PORTREVISION}/" \
-1
-#	  -e "/buildLabel/ s/(.*)/\1-${PORTREVISION}/" \
 	  -e "/buildLabel/ s/(.*)/\1-${PORTREVISION}/" \
-1
 	  ${WRKSRC}/label.properties
 	@${SED} \
 	  -e "s/%%ECLIPSE_ARCH%%/${ECLIPSE_ARCH}/g" \


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002070832.o178WU8L003924>