summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2011-09-13 06:19:01 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2011-09-13 06:19:01 +0000
commitf7853001e118310e9a9ab6183e82acc96cf430d2 (patch)
tree289deeda70eb21f1165b97210d022615709166b0
parent- Remove USE_RUBY_AMSTD support, since it is no longer used (diff)
Fix bad usage of sed
Fix typo This should fix the plist problems Reported by: kwm, pointyhat (pav)
Notes
Notes: svn path=/head/; revision=281713
-rw-r--r--editors/libreoffice/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index bb1b1d9ab4b2..2f3b96ae6a3d 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -421,13 +421,14 @@ post-install:
.for subdir in application-registry applications icons mime mime-info mimelnk
@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s share/${subdir} \( -type f -o -type l \) -print >> ${PLISTF}
@cd ${LODESTDIR}/${PREFIX}/ && ${FIND} -d share/${subdir} -type d \
- -exec ${ECHO_CMD} "@exec ${RMDIR} %D/{} 2>/dev/null || ${TRUE}" \; >> ${PLISTD}
+ -exec ${ECHO_CMD} "@unexec ${RMDIR} %D/{} 2>/dev/null || ${TRUE}" \; >> ${PLISTD}
.endfor
@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s bin \( -type f -o -type l \) -print >> ${PLISTF}
#Fix .desktop files
- @${FIND} ${LODESTDIR}/${PREFIX} -name *.desktop -type f -exec ${SED} -i"" -e 's|office34|office|g; s|office3.4|office|g' {} \;
+ @${FIND} ${LODESTDIR}/${PREFIX} -name *.desktop -type f -exec ${SED} -i .bak -e 's|office34|office|g; s|office3.4|office|g' {} \;
+ @${FIND} ${LODESTDIR}/${PREFIX} -name *.desktop.bak -delete
.if defined(WITH_GTK) || defined(WITH_GNOME)
@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${TMPPLIST}