From owner-freebsd-eclipse@FreeBSD.ORG  Thu Sep 30 19:35:20 2010
Return-Path: <owner-freebsd-eclipse@FreeBSD.ORG>
Delivered-To: freebsd-eclipse@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50DA31065672
	for <freebsd-eclipse@FreeBSD.org>; Thu, 30 Sep 2010 19:35:20 +0000 (UTC)
	(envelope-from Thomas.Gellekum@gmx.de)
Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22])
	by mx1.freebsd.org (Postfix) with SMTP id AFDB58FC22
	for <freebsd-eclipse@FreeBSD.org>; Thu, 30 Sep 2010 19:35:19 +0000 (UTC)
Received: (qmail invoked by alias); 30 Sep 2010 19:08:38 -0000
Received: from xdsl-84-44-251-34.netcologne.de (EHLO siegel.tg.intern)
	[84.44.251.34]
	by mail.gmx.net (mp018) with SMTP; 30 Sep 2010 21:08:38 +0200
X-Authenticated: #18235045
X-Provags-ID: V01U2FsdGVkX1+cIoJkDVacZvgq/4tgjUKDZ7kyahvthgTaC2r+To
	2qrEFTjKIoxDH1
From: Thomas Gellekum <Thomas.Gellekum@gmx.de>
To: freebsd-eclipse@FreeBSD.org
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix)
Date: Thu, 30 Sep 2010 21:08:37 +0200
Message-ID: <86k4m3m4lm.fsf@siegel.tg.intern>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Y-GMX-Trusted: 0
Cc: 
Subject: JUnit4 jar overwritten by JUnit3 jar during installation of
	java/eclipse
X-BeenThere: freebsd-eclipse@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps &amp;
	ports." <freebsd-eclipse.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-eclipse>, 
	<mailto:freebsd-eclipse-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-eclipse>
List-Post: <mailto:freebsd-eclipse@freebsd.org>
List-Help: <mailto:freebsd-eclipse-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-eclipse>,
	<mailto:freebsd-eclipse-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Sep 2010 19:35:20 -0000

--=-=-=

Moin,

I noticed that JUnit4 doesn't work out of the box with the eclipse port.
The reason seems to be the loop in the do-install target, which installs
jars from ${BUILD_WRKSRC} to the final installation directory. I've
removed that loop and instead added "-L" to the "cp -R" command in
build.xml. Please test the attached patch, I could easily be missing
something here.

I guess eclipse-devel will need a similar change.

tg


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=eclipse-port.diff

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/eclipse/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- Makefile	7 Sep 2010 08:40:13 -0000	1.71
+++ Makefile	30 Sep 2010 18:51:49 -0000
@@ -183,6 +183,7 @@
 .endfor
 	@${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit.jar+" ${BUILD_WRKSRC}/nonosgidependencies.properties
 	@${REINPLACE_CMD} -e "s+=/usr/share/java/junit4.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/nonosgidependencies.properties
+	@${REINPLACE_CMD} -e "s+/usr/share/java/junit4.jar+${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/build.xml
 .if defined(WITH_TESTS)
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches)
 .endif
@@ -208,16 +209,6 @@
 	  ${BUILD_WRKSRC}/eclipse.tmp
 .endif
 	@${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${PORTNAME}
-	@for f in `ls ${BUILD_WRKSRC}/bundles/*.jar`; do \
-		BASE=`basename $$f`; \
-		FILES=`find ${PORTDESTDIR}/plugins/ -name "$$BASE"`; \
-		if [ ! -z "$$FILES" ]; then \
-			for s in $$FILES; do \
-				${RM} "$$s"; \
-				${INSTALL_DATA} "$$f" "$$s"; \
-			done; \
-		fi; \
-	done
 	@${PREFIX}/bin/${PORTNAME} -initialize -consolelog
 	-@update-desktop-database
 	@(cd ${PREFIX}; ${FIND} -s lib/${PORTNAME} -not -type d) >> ${TMPPLIST}
Index: files/patch-eclipse-build
===================================================================
RCS file: /home/ncvs/ports/java/eclipse/files/patch-eclipse-build,v
retrieving revision 1.1
diff -u -r1.1 patch-eclipse-build
--- files/patch-eclipse-build	10 Jul 2010 19:34:26 -0000	1.1
+++ files/patch-eclipse-build	30 Sep 2010 18:52:39 -0000
@@ -122,7 +122,7 @@
 -			<arg value="--no-target-directory" />
 -			<arg value="${buildDirectory}/installation" />
 -			<arg value="${destDir}${prefix}/${libDir}/eclipse" />
-+			<arg value="-R" />
++			<arg value="-RL" />
 +			<arg value="${buildDirectory}/installation/" />
 +			<arg value="${destDir}${prefix}/${libDir}/%%PORTNAME%%" />
  		</exec>

--=-=-=--