diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-04-27 11:58:20 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-04-27 11:58:20 +0000 |
| commit | 59a1dc1968c31140b47fccba60a45008f5a36145 (patch) | |
| tree | 79855ffc2cdb22660409d02d0e295bbc2ce47817 /editors/openoffice.org-3-RC | |
| parent | palm/prc-tools-binutils and palm/prc-tools-gcc are migrated into (diff) | |
Move the KDE wrapper replacement a bit, and only substitute in
the perl script which creates the wrapper bits. Remove a newline
in the post-patch target in the openoffice port.
Add fix for gnome wrappers too.
Notes
Notes:
svn path=/head/; revision=79737
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 5c8daf1fae2d..3792b35c715c 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -359,6 +359,8 @@ post-extract: post-patch: @${MAKE} patch-mozilla + @${MAKE} fix-kdewrappers + @${MAKE} fix-gnomewrappers .if defined(WITH_TTF_BYTECODE_ENABLED) @if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \ ${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \ @@ -410,6 +412,14 @@ post-patch: @${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g" +fix-kdewrappers: + @${PERL} -pi -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \ + ${WRKSRC}/../sysui/oounix/office/kde2/kdeint + +fix-gnomewrappers: + @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \ + ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint + extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" @@ -524,9 +534,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - # fix KDE-files to use our wrapper skrips. - @${FIND} ${WRKSRC}/../sysui/unxfbsd.pro | ${EGREP} "\.desktop$$" | ${XARGS} \ - ${PERL} -pi -e 's|Exec="\<progpath\>/program/|Exec="${PREFIX}/bin/openoffice_${RELEASE_NR}-|' do-install: .if !defined(DISPLAY) |