- Install hicolor and locolor icons.

 - Install gnome icons (with gnome option only).
 - Install MIME info files.
 - Fix name of .dekstop files.
 - Use startup scripts in OOo (don't generate these in Makefile).

Bump PKGREVISION.

7 files changed, 487 insertions, 32 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index dd7735c4531..e0d981a118d 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.59 2008/11/19 01:54:25 hira Exp $
+# $NetBSD: Makefile,v 1.60 2008/11/24 11:58:44 hira Exp $
 #
 
 OO_VER=			2.4.2
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=		${DISTNAME}
@@ -62,6 +62,13 @@ REPLACE_PERL+=		sd/res/webview/editpic.pl	\
 			sd/res/webview/webview.pl
 REPLACE_PYTHON+=	scripting/source/pyprov/mailmerge.py
 
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	post-patch
+SUBST_MESSAGE.prefix=	Fixing prefix
+SUBST_FILES.prefix=	sysui/desktop/share/openoffice.sh
+SUBST_FILES.prefix+=	sysui/desktop/share/printeradmin.sh
+SUBST_SED.prefix=	-e 's|@OO_PREFIX@|${OO_PREFIX}|g'
+
 SUBST_CLASSES+=		lib
 SUBST_STAGE.lib=	post-patch
 SUBST_MESSAGE.lib=	Adding library paths
@@ -124,6 +131,7 @@ OO_RELEASE=		OpenOffice.org${OO_VER}
 PLIST_SRC=		${PKGDIR}/PLIST
 PLIST_SRC+=		${WRKDIR}/PLIST
 PLIST_SUBST+=		OO_UNXNAME=${OO_UNXNAME}
+PLIST_SUBST+=		OO_ICON_PREFIX=openofficeorg24
 MESSAGE_SUBST+=		OO_PREFIX=${OO_PREFIX}
 INSTALLATION_DIRS=	bin lib/${OO_RELEASE} share/applications
 
@@ -142,14 +150,6 @@ post-extract:
 do-build:
 	${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && cd instsetoo_native && build.pl --checkmodules && build.pl -P${MAKE_JOBS:U1} --all product=full && cd util && dmake openoffice_${OO_BASELANG} && dmake ooolanguagepack"
 
-post-build:
-	${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}
-	${ECHO} "exec ${OO_PREFIX}/program/soffice \"\$$@\""	\
-		>> ${WRKDIR}/${OO_UNXNAME}
-	${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}-printeradmin
-	${ECHO} "exec ${OO_PREFIX}/program/spadmin"		\
-		>> ${WRKDIR}/${OO_UNXNAME}-printeradmin
-
 do-install:
 	cd ${DESTDIR}${OO_PREFIX} &&				\
 	for f in ${OO_PKGPATH:Q}/${OO_BASELANG}/*/*.sw; do	\
@@ -160,18 +160,16 @@ do-install:
 			tar xpf $$f;				\
 		done;						\
 	done
-	for d in ${DESTDIR}${OO_PREFIX}/share/xdg/*; do			\
-		ln -s $$d ${DESTDIR}${PREFIX}/share/applications;	\
-	done
 	cd ${DESTDIR}${OO_PREFIX}/program &&			\
 	chmod ${SHAREMODE} hid.lst testtoolrc
 	for f in ${OO_PROGRAMS}; do				\
 		ln -sf ${DESTDIR}${OO_PREFIX}/program/$$f	\
 			${DESTDIR}${PREFIX}/bin/$$f;		\
 	done
-	${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin	\
-		${DESTDIR}${PREFIX}/bin
+	cd ${WRKSRC}/sysui/${OPENOFFICE_OUTPATH}.pro/misc/openoffice.org && \
+	${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} _PREFIX=${PREFIX}	\
+		GNOME=${PKG_OPTIONS:Mgnome} KDE=${PKG_OPTIONS:Mkde}	\
+		OO_PREFIX=${OO_PREFIX} ${SH} create_tree.sh
 
 post-install:
 	cd ${DESTDIR}${PREFIX} &&				\
@@ -187,15 +185,16 @@ post-install:
 
 .include "../../mk/compiler.mk"
 
-.include "../../lang/python/application.mk"
-
 .include "../../databases/db4/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
diff --git a/misc/openoffice2/PLIST b/misc/openoffice2/PLIST
index 4f9cc614a10..f6e72f57784 100644
--- a/misc/openoffice2/PLIST
+++ b/misc/openoffice2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/10/31 11:02:55 hira Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/11/24 11:58:44 hira Exp $
 bin/scalc
 bin/sdraw
 bin/simpress
@@ -7,12 +7,341 @@ bin/swriter
 bin/unopkg
 bin/${OO_UNXNAME}
 bin/${OO_UNXNAME}-printeradmin
-share/applications/base.desktop
-share/applications/calc.desktop
-share/applications/draw.desktop
-share/applications/extension.desktop
-share/applications/impress.desktop
-share/applications/math.desktop
-share/applications/printeradmin.desktop
-${PLIST.gtk2}share/applications/qstart.desktop
-share/applications/writer.desktop
+share/applications/${OO_UNXNAME}-base.desktop
+share/applications/${OO_UNXNAME}-calc.desktop
+share/applications/${OO_UNXNAME}-draw.desktop
+share/applications/${OO_UNXNAME}-extension.desktop
+share/applications/${OO_UNXNAME}-impress.desktop
+share/applications/${OO_UNXNAME}-math.desktop
+share/applications/${OO_UNXNAME}-printeradmin.desktop
+share/applications/${OO_UNXNAME}-writer.desktop
+share/application-registry/${OO_UNXNAME}.applications
+share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-base.png
+share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-calc.png
+share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-draw.png
+share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-extension.png
+share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-impress.png
+share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-math.png
+share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
+share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-writer.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
+share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
+share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-base.png
+share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-calc.png
+share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-draw.png
+share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-extension.png
+share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-impress.png
+share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-math.png
+share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
+share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-writer.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
+share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-text.png
+share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-base.png
+share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-calc.png
+share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-draw.png
+share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-extension.png
+share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-impress.png
+share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-math.png
+share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-printeradmin.png
+share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-writer.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-database.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-drawing.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-extension.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-formula.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-master-document.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-presentation.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-text-template.png
+share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-text.png
+share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-base.png
+share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-calc.png
+share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-draw.png
+share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-extension.png
+share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-impress.png
+share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-math.png
+share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
+share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-writer.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
+share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
+share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-base.png
+share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-calc.png
+share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-draw.png
+share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-extension.png
+share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-impress.png
+share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-math.png
+share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
+share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-writer.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
+share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-text.png
+${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-base.png
+${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-calc.png
+${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-draw.png
+${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-extension.png
+${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-impress.png
+${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-math.png
+${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
+${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-writer.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
+${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
+${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-base.png
+${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-calc.png
+${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-draw.png
+${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-extension.png
+${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-impress.png
+${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-math.png
+${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
+${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-writer.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
+${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-text.png
+${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-base.png
+${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-calc.png
+${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-draw.png
+${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-extension.png
+${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-impress.png
+${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-math.png
+${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-printeradmin.png
+${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-writer.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-database.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-drawing.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-extension.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-formula.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-master-document.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-presentation.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-text-template.png
+${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-text.png
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-drawing-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-drawing.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-extension.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-formula.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-master-document.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-excel-sheet-12.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-excel-sheet-binary-12.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-excel-sheet.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-excel-template-12.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-powerpoint-presentation-12.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-powerpoint-presentation.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-powerpoint-template-12.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-word-document-12.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-word-document.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-word-document2.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-ms-word-template-12.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-database.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-drawing-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-drawing.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-formula.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-master-document.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-presentation-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-presentation.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-spreadsheet-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-spreadsheet.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-text-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-text.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-web-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-presentationml-presentation.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-presentationml-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-spreadsheetml-sheet.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-spreadsheetml-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-wordprocessingml-document.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-openxmlformats-officedocument-wordprocessingml-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-presentation-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-presentation.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text-template.desktop
+${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text.desktop
+share/mime/application/vnd.oasis.opendocument.formula.xml
+share/mime/application/vnd.oasis.opendocument.graphics-template.xml
+share/mime/application/vnd.oasis.opendocument.graphics.xml
+share/mime/application/vnd.oasis.opendocument.presentation-template.xml
+share/mime/application/vnd.oasis.opendocument.presentation.xml
+share/mime/application/vnd.oasis.opendocument.spreadsheet-template.xml
+share/mime/application/vnd.oasis.opendocument.spreadsheet.xml
+share/mime/application/vnd.oasis.opendocument.text-master.xml
+share/mime/application/vnd.oasis.opendocument.text-template.xml
+share/mime/application/vnd.oasis.opendocument.text-web.xml
+share/mime/application/vnd.oasis.opendocument.text.xml
+share/mime/application/vnd.openofficeorg.extension.xml
+share/mime/application/vnd.sun.xml.base.xml
+share/mime/application/vnd.sun.xml.calc.template.xml
+share/mime/application/vnd.sun.xml.calc.xml
+share/mime/application/vnd.sun.xml.draw.template.xml
+share/mime/application/vnd.sun.xml.draw.xml
+share/mime/application/vnd.sun.xml.impress.template.xml
+share/mime/application/vnd.sun.xml.impress.xml
+share/mime/application/vnd.sun.xml.math.xml
+share/mime/application/vnd.sun.xml.writer.global.xml
+share/mime/application/vnd.sun.xml.writer.template.xml
+share/mime/application/vnd.sun.xml.writer.xml
+share/mime/packages/openoffice.org.xml
+share/mime-info/${OO_UNXNAME}.mime
+share/mime-info/${OO_UNXNAME}.keys
+@dirrm share/icons/locolor/32x32/mimetypes
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/mimetypes
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index ab0582105d6..a45e6be6ff8 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2008/10/31 11:02:55 hira Exp $
+$NetBSD: distinfo,v 1.49 2008/11/24 11:58:44 hira Exp $
 
 SHA1 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 1c7f652c71ad3364a98d79d4f6751db00c7daa99
 RMD160 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 09662444f359f86bb7eeec0c035ae29360e989e5
@@ -70,3 +70,6 @@ SHA1 (patch-du) = 6aac97b36a36c2200ed56429e7a03b88481c4858
 SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
 SHA1 (patch-ec) = 05f45563ab1f27984e81945a4ea2ddd9e40b16ac
 SHA1 (patch-ed) = 37a3a9527c74500dbcd047f90f218f57d059548f
+SHA1 (patch-ef) = 57fa71f4b68bde84b95256b364f2fc418219db9e
+SHA1 (patch-eg) = 2b3d35e13e059e37996efc651dcca0a4a44a30e8
+SHA1 (patch-eh) = 9635ab017d28c6606126ccd1c5194685ef1828aa
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index f494a062428..15a72ac2bd0 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2008/11/19 01:54:25 hira Exp $
+# $NetBSD: options.mk,v 1.23 2008/11/24 11:58:44 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde nas ooo-external-libwpd
@@ -74,7 +74,9 @@ CONFIGURE_ARGS+=	--enable-cups
 CONFIGURE_ARGS+=	--disable-cups
 .endif
 
+PLIST_VARS+=		gnome
 .if !empty(PKG_OPTIONS:Mgnome)
+PLIST.gnome=		yes
 CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-evolution2
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
@@ -83,16 +85,16 @@ CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-evolution2
 CONFIGURE_ARGS+=	--disable-gnome-vfs --disable-evolution2
 .endif
 
-PLIST_VARS+=		gtk2
 .if !empty(PKG_OPTIONS:Mgtk2)
-PLIST.gtk2=		yes
 CONFIGURE_ARGS+=	--enable-gtk
 .include "../../x11/gtk2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-gtk
 .endif
 
+PLIST_VARS+=		kde
 .if !empty(PKG_OPTIONS:Mkde)
+PLIST.kde=		yes
 CONFIGURE_ENV+=		KDEDIR=${BUILDLINK_PREFIX.kdelibs:Q}
 CONFIGURE_ARGS+=	--enable-kde --enable-kdeab
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/misc/openoffice2/patches/patch-ef b/misc/openoffice2/patches/patch-ef
new file mode 100644
index 00000000000..87ec9cf5459
--- /dev/null
+++ b/misc/openoffice2/patches/patch-ef
@@ -0,0 +1,105 @@
+$NetBSD: patch-ef,v 1.1 2008/11/24 11:58:44 hira Exp $
+
+--- sysui/desktop/share/create_tree.sh.orig	2008-11-24 16:07:39.000000000 +0900
++++ sysui/desktop/share/create_tree.sh	2008-11-24 16:14:06.000000000 +0900
+@@ -1,46 +1,38 @@
+ umask 022
+ 
+-if [ "${KDEMAINDIR}" ]
+-then
+   echo Copying icons .. 
+   for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"`
+   do
+-    targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i`
+-    mkdir -p $targetdir
++    targetdir=${DESTDIR}${_PREFIX}/share/icons/`dirname $i`
++    ${BSD_INSTALL_DATA_DIR} $targetdir
+     destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename $i`
+-    cp ${ICON_SOURCE_DIR}/$i $destfile
+-    chmod 0644 $destfile
++    ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/$i $destfile
+   done
+-  
+-  mkdir -p ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application
++
++if [ "${KDE}" ]
++then
+   for i in `cat mimelnklist`; do
+-    cp $i ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/${PREFIX}-$i
++    ${BSD_INSTALL_DATA} $i ${DESTDIR}${_PREFIX}/share/mimelnk/application/${PREFIX}-$i
+   done
+-  chmod 0644 ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/*  
+ fi
+ 
+-if [ "${GNOMEDIR}" ]
++if [ "${GNOME}" ]
+ then
+   echo Copying GNOME icons ..
+   for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? -name "*.png"`
+   do
+-    targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname $i`
+-    mkdir -p $targetdir
++    targetdir=${DESTDIR}${_PREFIX}/share/icons/gnome/`dirname $i`
+     destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename $i`
+-    cp ${ICON_SOURCE_DIR}/hicolor/$i $destfile
+-    chmod 0644 $destfile
++    ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/hicolor/$i $destfile
+   done
++fi
+   
+-  mkdir -p ${DESTDIR}/${GNOMEDIR}/share/mime-info
+-  cp openoffice.mime ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.mime
+-  cp openoffice.keys ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.keys
+-  chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.*
+-
+-  mkdir -p ${DESTDIR}/${GNOMEDIR}/share/application-registry
+-  cp openoffice.applications ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.applications
+-  chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.*
++  ${BSD_INSTALL_DATA} openoffice.mime ${DESTDIR}${_PREFIX}/share/mime-info/${PREFIX}.mime
++  ${BSD_INSTALL_DATA} openoffice.keys ${DESTDIR}${_PREFIX}/share/mime-info/${PREFIX}.keys
+ 
+-  if [ "${GNOME_MIME_THEME}" ]
++  ${BSD_INSTALL_DATA} openoffice.applications ${DESTDIR}${_PREFIX}/share/application-registry/${PREFIX}.applications
++
++  if [ ]
+   then 
+     echo "Creating legacy mimetype symlinks for GNOME .."
+     # add symlinks so that nautilus can identify the mime-icons 
+@@ -88,29 +80,22 @@
+       ln -sf $link_target_dir${ICON_PREFIX:-}${ICON_PREFIX:+-}extension.png                   ${link_dir}/gnome-mime-application-vnd.openofficeorg.extension.png
+     done
+   fi
+-fi
+-
+-mkdir -p ${DESTDIR}/usr/bin
+ 
+ # reference symbolic link in /etc for relocatable packages
+-office_root=/etc/${PREFIX}
++office_root=${DESTDIR}${OO_PREFIX}
+ if [ ! -e "${DESTDIR}/$office_root" -a ! -h "${DESTDIR}/$office_root" ]; then
+   office_root=/opt/${PREFIX}
+ fi
+ 
+-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice
+-ln -sf ${office_root}/program/unopkg ${DESTDIR}/usr/bin/unopkg
++#ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice
++#ln -sf ${office_root}/program/unopkg ${DESTDIR}/usr/bin/unopkg
++
++${BSD_INSTALL_SCRIPT} openoffice.sh ${DESTDIR}${_PREFIX}/bin/${PREFIX}
++${BSD_INSTALL_SCRIPT} printeradmin.sh ${DESTDIR}${_PREFIX}/bin/${PREFIX}-printeradmin
+ 
+-cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
+-cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
+-chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
+-
+-mkdir -p ${DESTDIR}/usr/share/mime/packages
+-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/
+-chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml
++${BSD_INSTALL_DATA} openoffice.org.xml ${DESTDIR}${_PREFIX}/share/mime/packages/
+ 
+-mkdir -p ${DESTDIR}/usr/share/applications
+ for i in `cat launcherlist`; do
+-  ln -sf ${office_root}/share/xdg/$i ${DESTDIR}/usr/share/applications/${PREFIX}-$i
++  ln -sf ${office_root}/share/xdg/$i ${DESTDIR}${_PREFIX}/share/applications/${PREFIX}-$i
+ done
+ 
diff --git a/misc/openoffice2/patches/patch-eg b/misc/openoffice2/patches/patch-eg
new file mode 100644
index 00000000000..cf130cdce42
--- /dev/null
+++ b/misc/openoffice2/patches/patch-eg
@@ -0,0 +1,8 @@
+$NetBSD: patch-eg,v 1.1 2008/11/24 11:58:44 hira Exp $
+
+--- sysui/desktop/share/openoffice.sh.orig	2008-11-24 16:06:47.000000000 +0900
++++ sysui/desktop/share/openoffice.sh	2008-11-24 16:07:17.000000000 +0900
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-exec /etc/%PREFIX/program/soffice "$@"
++exec @OO_PREFIX@/%PREFIX/program/soffice "$@"
diff --git a/misc/openoffice2/patches/patch-eh b/misc/openoffice2/patches/patch-eh
new file mode 100644
index 00000000000..c3f0d2dfaab
--- /dev/null
+++ b/misc/openoffice2/patches/patch-eh
@@ -0,0 +1,9 @@
+$NetBSD: patch-eh,v 1.1 2008/11/24 11:58:44 hira Exp $
+
+--- sysui/desktop/share/printeradmin.sh.orig	2008-11-24 16:06:52.000000000 +0900
++++ sysui/desktop/share/printeradmin.sh	2008-11-24 16:07:29.000000000 +0900
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ 
+-exec /etc/%PREFIX/program/spadmin 
++exec @OO_PREFIX@/%PREFIX/program/spadmin