diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-11-14 11:30:42 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-11-14 11:30:42 +0000 |
| commit | 4f04fe3206857546e93019da80e9f07fc851afc3 (patch) | |
| tree | bcab0f981d7841f070997f3f3ad99d0aaf3dc4f4 /java/eclipse | |
| parent | Cleanup plist (diff) | |
Cleanup plist
Diffstat (limited to 'java/eclipse')
| -rw-r--r-- | java/eclipse/Makefile | 11 | ||||
| -rw-r--r-- | java/eclipse/Makefile.plugins | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 58bdb775f340..9193fb1081c1 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -112,16 +112,11 @@ do-install: ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/eclipse.tmp ${STAGEDIR}${PREFIX}/bin/eclipse @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s lib/eclipse -not -type d) >> ${TMPPLIST} @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s bin/eclipse -not -type d) >> ${TMPPLIST} - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d lib/eclipse -type d) | ${SED} -ne "s,^,@dirrm ,p" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${MKDIR} %D/lib/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${MKDIR} %D/share/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST} + @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d lib/eclipse -type d -empty) | ${SED} -ne "s,^,@dir ,p" >> ${TMPPLIST} @${ECHO_CMD} "@exec echo '-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%D/share/eclipse/dropins' >> %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${SED} -i '' '/^-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/d' %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST} - @${ECHO_CMD} "@dirrm share/eclipse/dropins" >> ${TMPPLIST} - @${ECHO_CMD} "@dirrm share/eclipse" >> ${TMPPLIST} - -post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins + ${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins + @${ECHO_CMD} "@dir share/eclipse/dropins" >> ${TMPPLIST} distclean: ${RM} -rf ${DISTDIR}/eclipse diff --git a/java/eclipse/Makefile.plugins b/java/eclipse/Makefile.plugins index f23fa3467081..44ec89eaaa1b 100644 --- a/java/eclipse/Makefile.plugins +++ b/java/eclipse/Makefile.plugins @@ -10,5 +10,5 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse @(cd ${WRKSRC}; ${COPYTREE_SHARE} "${REPO_DIRS}" ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse/) @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s share/eclipse/dropins/${PORTNAME} -not -type d) >> ${TMPPLIST} - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d) \ - | ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST} + @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d -empty) \ + | ${SED} -ne 's,^,@dir ,p' >> ${TMPPLIST} |