- Install hicolor and locolor icons.
 - Install gnome icons (with gnome option only).
 - Install MIME info files.
 - Fix name of .dekstop files.
 - Add missing file to REPLACE_PERL.
 - Use startup scripts in OOo (don't generate these in Makefile).
 - Remove java option from FreeBSD and NetBSD/amd64.

This should fix PR pkg/39994.  Bump PKGREVISION.


(hira)

$NetBSD: patch-ef,v 1.1 2008/11/22 07:57:03 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 @@
 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
+    cp ${BSD_INSTALL_DATA} ${DESTDIR}${_PREFIX}/share/kde/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,24 +80,17 @@
       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
 
-office_root=/opt/${PREFIX}
+office_root=${DESTDIR}${OO_PREFIX}
 
-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice
+# ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice
 
-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
+${BSD_INSTALL_SCRIPT} openoffice.sh ${DESTDIR}${_PREFIX}/bin/${PREFIX}
+${BSD_INSTALL_SCRIPT} printeradmin.sh ${DESTDIR}${_PREFIX}/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}/${PREFIX}/share/xdg/$i ${DESTDIR}${_PREFIX}/share/applications/${PREFIX}-$i
 done
 

$NetBSD: patch-eg,v 1.1 2008/11/22 07:57:03 hira Exp $

--- sysui/desktop/share/openoffice.sh.orig	2008-11-22 11:15:35.000000000 +0900
+++ sysui/desktop/share/openoffice.sh	2008-11-22 11:19:10.000000000 +0900
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /opt/%PREFIX/program/soffice "$@"
+exec @OO_PREFIX@/%PREFIX/program/soffice "$@"

$NetBSD: patch-eh,v 1.1 2008/11/22 07:57:03 hira Exp $

--- sysui/desktop/share/printeradmin.sh.orig	2008-11-22 11:15:39.000000000 +0900
+++ sysui/desktop/share/printeradmin.sh	2008-11-22 11:18:57.000000000 +0900
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /opt/%PREFIX/program/spadmin 
+exec @OO_PREFIX@/%PREFIX/program/spadmin