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.

20 files changed, 200 insertions, 63 deletions

diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 1543d18768e..9247b92a714 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)
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/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)
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/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)
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/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)
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/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)
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/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)
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/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)
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 1543d18768e..9247b92a714 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-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)
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/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)
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/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)
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-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)
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/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)
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/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)
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/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)
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/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)
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 5c8daf1fae2..3792b35c715 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)
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/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)
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/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)
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 5c8daf1fae2..3792b35c715 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/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)
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 1543d18768e..9247b92a714 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/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)