diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2007-06-26 01:17:48 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2007-06-26 01:17:48 +0000 |
| commit | 3c477c58545e5180d2d81d9e38e7fe48a3ff11db (patch) | |
| tree | 27573637fd03d0861739d3e651ccfbca0dcd2047 /editors/openoffice.org-3-RC | |
| parent | - Update to 0.75 (diff) | |
Make OpenOffice.org/freedesktop.org integration more robust.
- Rename icon files to have unique file names per each port.
- Patch *.desktop files to reflect the change.
- Prefer install(1) to cp(1) for installing the desktops, icons and mime types.
- Run update-desktop-database after installing these files.
- Add GNOME desktopfileutils component for the update-desktop-database.
- While I am here, micro-optimize use of find(1) in the plist build.
Approved by: maho (maintainer)
Notes
Notes:
svn path=/head/; revision=194263
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index f5bdf8332e5c..92ce79706ddd 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -36,7 +36,7 @@ DISTFILES+= ${CWSARCHIVE}:cws CWSARCHIVE= ${WITH_CWS}.tar.gz NO_LATEST_LINK= yes -USE_GNOME= gtk20 +USE_GNOME= desktopfileutils gtk20 MOZILLA_VERSION= 1.7.5 MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) @@ -289,6 +289,7 @@ post-install: ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @for app in base calc draw impress math printeradmin writer; do \ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \ + -e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/$${app}.desktop ; \ done @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak @@ -301,23 +302,23 @@ post-install: @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ for app in base calc draw impress math printeradmin writer; do \ if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ - ${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ - ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg22-$${app}.png ; \ - ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/openofficeorg22-$${app}.png" >> ${TMPPLIST} ; \ + ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ + ${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \ + ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ - ${CP} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \ + ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \ ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \ done ; \ done - @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp - @${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} + @${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE} + @${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST} + @cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} + @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} + @cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ + ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ |