- Fix installation path of kde mimelnk files.

 - Don't install locolor icons without kde option.

No PKGREVISION bump because the icons are not used without kde.

3 files changed, 90 insertions, 91 deletions

diff --git a/misc/openoffice2/PLIST b/misc/openoffice2/PLIST
index f6e72f57784..fc477ae0e10 100644
--- a/misc/openoffice2/PLIST
+++ b/misc/openoffice2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/11/24 11:58:44 hira Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/11/26 15:48:16 hira Exp $
 bin/scalc
 bin/sdraw
 bin/simpress
@@ -112,70 +112,70 @@ 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.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-base.png
+${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-calc.png
+${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-draw.png
+${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-extension.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}-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
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
+${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
+${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-base.png
+${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-calc.png
+${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-draw.png
+${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-extension.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}-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
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
+${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
+${PLIST.kde}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
@@ -338,10 +338,3 @@ 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 a45e6be6ff8..6a86467d0cf 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2008/11/24 11:58:44 hira Exp $
+$NetBSD: distinfo,v 1.50 2008/11/26 15:48:16 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,6 +70,6 @@ SHA1 (patch-du) = 6aac97b36a36c2200ed56429e7a03b88481c4858
 SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
 SHA1 (patch-ec) = 05f45563ab1f27984e81945a4ea2ddd9e40b16ac
 SHA1 (patch-ed) = 37a3a9527c74500dbcd047f90f218f57d059548f
-SHA1 (patch-ef) = 57fa71f4b68bde84b95256b364f2fc418219db9e
+SHA1 (patch-ef) = 03c1e3fb27e0ba12dec92866fb592f66442a0c1a
 SHA1 (patch-eg) = 2b3d35e13e059e37996efc651dcca0a4a44a30e8
 SHA1 (patch-eh) = 9635ab017d28c6606126ccd1c5194685ef1828aa
diff --git a/misc/openoffice2/patches/patch-ef b/misc/openoffice2/patches/patch-ef
index 87ec9cf5459..4210b41ebcc 100644
--- a/misc/openoffice2/patches/patch-ef
+++ b/misc/openoffice2/patches/patch-ef
@@ -1,14 +1,24 @@
-$NetBSD: patch-ef,v 1.1 2008/11/24 11:58:44 hira Exp $
+$NetBSD: patch-ef,v 1.2 2008/11/26 15:48:16 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 @@
+--- sysui/desktop/share/create_tree.sh.orig	2007-05-11 00:00:24.000000000 +0900
++++ sysui/desktop/share/create_tree.sh	2008-11-27 00:40:42.000000000 +0900
+@@ -1,46 +1,41 @@
  umask 022
  
 -if [ "${KDEMAINDIR}" ]
--then
++ICON_THEMES="hicolor/??x??"
++
++if [ "${KDE}" ]
+ then
++  for i in `cat mimelnklist`; do
++    ${BSD_INSTALL_DATA} $i ${DESTDIR}${_PREFIX}/share/kde/mimelnk/application/${PREFIX}-$i
++  done
++  ICON_THEMES="${ICON_THEMES} locolor"
++fi
++
    echo Copying icons .. 
-   for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"`
+-  for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"`
++  for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES} -name "*.png"`
    do
 -    targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i`
 -    mkdir -p $targetdir
@@ -17,19 +27,15 @@ $NetBSD: patch-ef,v 1.1 2008/11/24 11:58:44 hira Exp $
      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
+-  done
 -  
 -  mkdir -p ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application
-+
-+if [ "${KDE}" ]
-+then
-   for i in `cat mimelnklist`; do
+-  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
++    ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/$i $destfile
    done
 -  chmod 0644 ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/*  
- fi
+-fi
  
 -if [ "${GNOMEDIR}" ]
 +if [ "${GNOME}" ]
@@ -57,15 +63,15 @@ $NetBSD: patch-ef,v 1.1 2008/11/24 11:58:44 hira Exp $
 -  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
++
++  ${BSD_INSTALL_DATA} openoffice.applications ${DESTDIR}${_PREFIX}/share/application-registry/${PREFIX}.applications
  
 -  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 @@
+@@ -88,29 +83,22 @@
        ln -sf $link_target_dir${ICON_PREFIX:-}${ICON_PREFIX:+-}extension.png                   ${link_dir}/gnome-mime-application-vnd.openofficeorg.extension.png
      done
    fi