From 58ac91985ef2e25c6f659c6addbc2086a135e8a6 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Thu, 10 Jun 2010 06:20:29 +0000 Subject: . Fix the copying of bundles into the plugin directory during install to ensure that the bundles are put into the correct location, which is sometimes a subdirectory of the plugin directory. The previous fix missed those and left dangling symlinks. Problem reported by: Andriy Gapon --- java/eclipse-devel/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'java/eclipse-devel') diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile index 71d63c5e5ef5..9686618db21d 100644 --- a/java/eclipse-devel/Makefile +++ b/java/eclipse-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= eclipse-devel PORTVERSION= 3.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/:1 \ http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/:2 \ @@ -208,8 +208,16 @@ do-install: ${BUILD_WRKSRC}/eclipse.tmp .endif @${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${PORTNAME} - @cd ${BUILD_WRKSRC}/bundles && \ - ${COPYTREE_SHARE} . ${PORTDESTDIR}/plugins/ + @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} -- cgit v1.2.3