- Fix installation 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, 85 insertions, 85 deletions

diff --git a/misc/openoffice3/PLIST b/misc/openoffice3/PLIST
index d5049b2dbcf..bf3bbf59c97 100644
--- a/misc/openoffice3/PLIST
+++ b/misc/openoffice3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/11/22 07:57:03 hira Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/11/26 15:33:23 hira Exp $
 bin/scalc
 bin/sdraw
 bin/simpress
@@ -108,68 +108,68 @@ 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}-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}-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}-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}-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
@@ -342,10 +342,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/openoffice3/distinfo b/misc/openoffice3/distinfo
index 3c1d9191468..cea3242b119 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2008/11/22 07:57:03 hira Exp $
+$NetBSD: distinfo,v 1.16 2008/11/26 15:33:23 hira Exp $
 
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d
@@ -83,6 +83,6 @@ SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834
 SHA1 (patch-ec) = 4cfdda3d07972329de9d5e1c5ea7db2b4ab47247
 SHA1 (patch-ed) = 235cd96522e8fec1cd3cc2f49f410cf832a07604
 SHA1 (patch-ee) = 6a77e56645484367a96660e7f9a3ac402bad9f2a
-SHA1 (patch-ef) = 1d31bf6ae77484f6982061203d7426e996c70aa8
+SHA1 (patch-ef) = e53a75d497bc661467ca19fd0d00fa6dac17579d
 SHA1 (patch-eg) = 970dae007766bea5c76c2312cfa7b35d44d3cb70
 SHA1 (patch-eh) = 4f4b2cebe22e83ca6acd2b226281bf756fbc9083
diff --git a/misc/openoffice3/patches/patch-ef b/misc/openoffice3/patches/patch-ef
index fb8b37e32ae..e8dd30ec371 100644
--- a/misc/openoffice3/patches/patch-ef
+++ b/misc/openoffice3/patches/patch-ef
@@ -1,14 +1,24 @@
-$NetBSD: patch-ef,v 1.1 2008/11/22 07:57:03 hira Exp $
+$NetBSD: patch-ef,v 1.2 2008/11/26 15:33:23 hira Exp $
 
 --- sysui/desktop/share/create_tree.sh.orig	2008-05-15 18:11:15.000000000 +0900
-+++ sysui/desktop/share/create_tree.sh	2008-11-22 11:47:56.000000000 +0900
-@@ -1,46 +1,38 @@
++++ sysui/desktop/share/create_tree.sh	2008-11-26 23:56:44.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
@@ -19,16 +29,13 @@ $NetBSD: patch-ef,v 1.1 2008/11/22 07:57:03 hira Exp $
 -    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
+-  for i in `cat mimelnklist`; do
 -    cp $i ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/${PREFIX}-$i
-+    cp ${BSD_INSTALL_DATA} ${DESTDIR}${_PREFIX}/share/kde/mimelnk/application/${PREFIX}-$i
-   done
+-  done
 -  chmod 0644 ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/*  
- fi
+-fi
  
 -if [ "${GNOMEDIR}" ]
 +if [ "${GNOME}" ]
@@ -64,7 +71,7 @@ $NetBSD: patch-ef,v 1.1 2008/11/22 07:57:03 hira Exp $
    then 
      echo "Creating legacy mimetype symlinks for GNOME .."
      # add symlinks so that nautilus can identify the mime-icons 
-@@ -88,24 +80,17 @@
+@@ -88,24 +83,17 @@
        ln -sf $link_target_dir${ICON_PREFIX:-}${ICON_PREFIX:+-}extension.png                   ${link_dir}/gnome-mime-application-vnd.openofficeorg.extension.png
      done
    fi