- Add missing entries to PLIST (pointed by snj@).

 - Install a missing file (openoffice3-startcenter.desktop).

Ride on previous update.

3 files changed, 32 insertions, 2 deletions

diff --git a/misc/openoffice3/PLIST b/misc/openoffice3/PLIST
index b730a4c1c51..11b09e52e07 100644
--- a/misc/openoffice3/PLIST
+++ b/misc/openoffice3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/01/20 10:19:30 hira Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/05/10 01:58:20 hira Exp $
 bin/scalc
 bin/sdraw
 bin/simpress
@@ -13,6 +13,7 @@ share/applications/${OO_UNXNAME}-draw.desktop
 share/applications/${OO_UNXNAME}-impress.desktop
 share/applications/${OO_UNXNAME}-math.desktop
 share/applications/${OO_UNXNAME}-printeradmin.desktop
+share/applications/${OO_UNXNAME}-startcenter.desktop
 share/applications/${OO_UNXNAME}-writer.desktop
 share/application-registry/${OO_UNXNAME}.applications
 share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-base.png
@@ -21,6 +22,7 @@ share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-draw.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}-startcenter.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
@@ -52,6 +54,7 @@ share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-draw.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}-startcenter.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
@@ -83,6 +86,7 @@ share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-draw.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}-startcenter.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
@@ -114,6 +118,7 @@ ${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-draw.png
 ${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-impress.png
 ${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-math.png
 ${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
+${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-startcenter.png
 ${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-writer.png
 ${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
 ${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
@@ -145,6 +150,7 @@ ${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-draw.png
 ${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-impress.png
 ${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-math.png
 ${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
+${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-startcenter.png
 ${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-writer.png
 ${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
 ${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
@@ -176,6 +182,7 @@ ${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-draw.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}-startcenter.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
@@ -207,6 +214,7 @@ ${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-draw.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}-startcenter.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
@@ -238,6 +246,7 @@ ${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-draw.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}-startcenter.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
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 1130d92720b..9b6debd2228 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2009/05/09 18:43:41 hira Exp $
+$NetBSD: distinfo,v 1.20 2009/05/10 01:58:20 hira Exp $
 
 SHA1 (openoffice-3.1.0/OOo_3.1.0_src_binfilter.tar.bz2) = 7128a2f8af0b0f1163a2f03331057242ec254f34
 RMD160 (openoffice-3.1.0/OOo_3.1.0_src_binfilter.tar.bz2) = e7ff15bd78713dcdbfd0df0ca499727cd412b070
@@ -86,3 +86,4 @@ SHA1 (patch-eg) = 970dae007766bea5c76c2312cfa7b35d44d3cb70
 SHA1 (patch-eh) = 4f4b2cebe22e83ca6acd2b226281bf756fbc9083
 SHA1 (patch-ei) = 66a1280fec23204e3f919ab1d5280f87ff68161d
 SHA1 (patch-ej) = 54cf0ae5619aae6655a66cd4c03191109546de12
+SHA1 (patch-ek) = 8539878661657b9c5a84e7084ab7289cd26f859f
diff --git a/misc/openoffice3/patches/patch-ek b/misc/openoffice3/patches/patch-ek
new file mode 100644
index 00000000000..c367533ddda
--- /dev/null
+++ b/misc/openoffice3/patches/patch-ek
@@ -0,0 +1,20 @@
+$NetBSD: patch-ek,v 1.1 2009/05/10 01:58:20 hira Exp $
+
+--- scp2/source/ooo/common_brand.scp.orig	2009-01-20 21:48:05.000000000 +0900
++++ scp2/source/ooo/common_brand.scp	2009-05-10 10:16:16.000000000 +0900
+@@ -646,6 +646,15 @@
+ #endif
+ 
+ #if defined UNX && ! defined MACOSX
++File gid_Brand_File_Share_Xdg_Startcenter
++    TXT_FILE_BODY;
++    Dir = gid_Brand_Dir_Share_Xdg;
++    Styles = (PACKED,SCPZIP_REPLACE);
++    Name = "startcenter.desktop";
++End
++#endif
++
++#if defined UNX && ! defined MACOSX
+ #ifdef ENABLE_GTK
+ File gid_Brand_File_Share_Xdg_QStart
+     TXT_FILE_BODY;