diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-11-25 03:09:57 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-11-25 03:09:57 +0000 |
| commit | 8d8a34b5033b08f23b6ce268a6c37930c50043a3 (patch) | |
| tree | b54fa92235e27133b2ebf9be130fa0adda062023 /editors/openoffice-3 | |
| parent | - unbreak on sparc64 [1] (diff) | |
* Remove RELEASE_NR. OOOVERSION is same as RELEASE_NR [1].
* Desktop Icons and menus are not installed as default as pkg-plist
is incomplete. [2]
* Remove openoffice.org symlink.
Submitted by: oliver[1] kris[2]
Notes
Notes:
svn path=/head/; revision=178011
Diffstat (limited to 'editors/openoffice-3')
| -rw-r--r-- | editors/openoffice-3/Makefile | 12 | ||||
| -rw-r--r-- | editors/openoffice-3/files/Makefile.knobs | 5 | ||||
| -rw-r--r-- | editors/openoffice-3/files/pkg-message.in | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index c72cbfa468a5..09bfa6ee705d 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -71,7 +71,6 @@ IGNORE= install lang/perl5.8 then try again .endif CODELINE= 680 -RELEASE_NR= 2.0 OOOTAG?= OOD680_m5 OOOSRC?= OOo_2.0.4_src.tar.gz INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION} @@ -235,13 +234,12 @@ post-install: @${ECHO_MSG} "===> Add wrapper scripts"; @${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice.org-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ ${PREFIX}/bin/${EXECBASE} - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw @@ -250,9 +248,8 @@ post-install: @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter - @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST} - @${REINPLACE_CMD} -e 's#${RELEASE_NR}#${OOOVERSION}#g' \ - -e '/^Exec/s/printeradmin/spadmin/' \ +.if defined(WITH_MENU) + @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ @@ -272,6 +269,7 @@ post-install: ${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \ done ; \ done +.endif @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} @@ -282,7 +280,7 @@ post-install: @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ ${PKGMESSAGE} @${ECHO_CMD} @${CAT} ${PKGMESSAGE} diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs index 87843d8a66bc..1474bd849ccf 100644 --- a/editors/openoffice-3/files/Makefile.knobs +++ b/editors/openoffice-3/files/Makefile.knobs @@ -132,6 +132,11 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif +.if !defined(WITH_MENU) + @${ECHO} + @${ECHO} "You can install OOo with menu items by" + @${ECHO} "make -DWITH_MENU" +.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice-3/files/pkg-message.in b/editors/openoffice-3/files/pkg-message.in index 48e87f301db7..4215af3b4049 100644 --- a/editors/openoffice-3/files/pkg-message.in +++ b/editors/openoffice-3/files/pkg-message.in @@ -1,9 +1,9 @@ -OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To +OpenOffice.org Build %%OOOVERSION%% Personal Install How-To Written by: Martin Blapp <mbr@freebsd.org> and Maho Nakata <maho@FreeBSD.org> -OpenOffice.org %%RELEASE_NR%% will soon been installed in +OpenOffice.org %%OOOVERSION%% will soon been installed in %%PREFIX%%/%%EXECBASE%% 1. User installation |