diff options
| author | mbr <mbr@FreeBSD.org> | 2003-04-27 11:58:20 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2003-04-27 11:58:20 +0000 |
| commit | f480b4f9c5010a4302df633837dbc12c60550403 (patch) | |
| tree | 44e0004a693f34cadc23cee445c4cf7fcacbb289 /editors/openoffice-1.0 | |
| parent | 9ba2460cfa096803b3bb0f5fba59a1ffa015ee8b (diff) | |
| download | FreeBSD-ports-f480b4f9c5010a4302df633837dbc12c60550403.zip FreeBSD-ports-f480b4f9c5010a4302df633837dbc12c60550403.tar.gz | |
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.
Diffstat (limited to 'editors/openoffice-1.0')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 1543d18..9247b92 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -375,6 +375,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}" ; \ @@ -395,7 +397,6 @@ post-patch: ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \ fi .endif - .if defined(WITH_DEBUG) @if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \ ${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \ @@ -427,6 +428,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-|' \ + ${WRKSRC}/../sysui/oounix/office/kde2/kdeint + +fix-gnomewrappers: + @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice-|' \ + ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint + extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" @@ -538,9 +547,6 @@ do-build: pre-install: @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ > ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - # 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-|' do-install: .if !defined(DISPLAY) |
