mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-09 06:51:44 +00:00
Code Issues Releases Activity

. Fix overwriting of JUnit 4 during installation.

Browse Source 
Submitted by:	tg@
This commit is contained in:
Greg Lewis 2010-10-03 06:23:58 +00:00
parent 3e5a1b8c1c
commit 839a7edf3e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=262335
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java/eclipse/Makefile
View File

@ -183,6 +183,7 @@ post-patch:
.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 @@ do-install:
${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}

2
java/eclipse/files/patch-eclipse-build
View File

@ -122,7 +122,7 @@ $FreeBSD$
- <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>