- Fix icons (.desktop) and mime type

- Bump portrevision

Yes now you should have your icons back in the menus :)

Reported by:	wblock and ajtiM <lumiwa@gmail.com>

3 files changed, 56 insertions, 6 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 224e8c4bbc50..21f734655e43 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -7,6 +7,8 @@
 
 .include "${.CURDIR}/Makefile.common"
 
+PORTREVISION=	1
+
 MASTER_SITE_SUBDIR=	src/${PORTVERSION}/
 MASTER_SITES+=	http://dev-www.libreoffice.org/src/:ext \
 		http://download.go-oo.org/src/:GoOOSrc \
@@ -404,7 +406,7 @@ post-install:
 	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s lib \( -type f -o -type l \) -print >> ${PLISTF}
 	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -d lib/libreoffice -type d -exec ${ECHO_CMD} "@dirrm {}" \; >> ${PLISTD}
 
-.for subdir in icons mimelnk
+.for subdir in applications icons mime mimelnk
 	@cd ${LODESTDIR}/${PREFIX} && ${FIND}  -H -s share/${subdir} \( -type f -o -type l \) -print >> ${PLISTF}
 	@cd ${LODESTDIR}/${PREFIX}/ && ${FIND} -d share/${subdir} -type d \
 		-exec ${ECHO_CMD} "@unexec ${RMDIR} %D/{}  2>/dev/null || ${TRUE}" \; >> ${PLISTD}
diff --git a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
index dcf5c8bf24ec..8c9bed5368e8 100644
--- a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
+++ b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
@@ -1,5 +1,5 @@
---- bin/distro-install-desktop-integration.orig	2012-04-18 17:18:32.000000000 +0200
-+++ bin/distro-install-desktop-integration	2012-04-20 14:35:47.000000000 +0200
+--- ./bin/distro-install-desktop-integration.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./bin/distro-install-desktop-integration	2012-04-23 19:17:27.574712717 +0200
 @@ -91,13 +91,13 @@
  }
  
@@ -17,9 +17,11 @@
      -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
      -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
      -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-@@ -112,15 +112,15 @@
+@@ -111,16 +111,17 @@
+     export PRODUCTVERSION=
      export KDEMAINDIR=$PREFIXDIR
      export GNOMEDIR=$PREFIXDIR
++    export PREFIXDIR=$PREFIXDIR
      export GNOME_MIME_THEME=hicolor
 -    /bin/bash ./create_tree.sh
 +    bash ./create_tree.sh
@@ -36,7 +38,7 @@
  if test -d $DESTDIR/opt ; then
      rm -f $DESTDIR/opt/$INSTALLDIRNAME
      rmdir --ignore-fail-on-non-empty $DESTDIR/opt
-@@ -129,7 +129,7 @@
+@@ -129,7 +130,7 @@
  # we want non-versioned desktop files
  cd $DESTDIR/$INSTALLDIR/share/xdg
  # we want non-versioned stuff in the distro packages
@@ -45,7 +47,7 @@
      -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
      -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
      -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-@@ -144,7 +144,7 @@
+@@ -144,7 +145,7 @@
                 $PREFIXDIR/share/mime/packages \
                 $PREFIXDIR/share/mime-info \
                 $PREFIXDIR/share/icons ; do
diff --git a/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh b/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh
new file mode 100644
index 000000000000..699066ab780c
--- /dev/null
+++ b/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh
@@ -0,0 +1,46 @@
+--- ./sysui/desktop/share/create_tree.sh.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./sysui/desktop/share/create_tree.sh	2012-04-23 19:19:44.734593732 +0200
+@@ -42,32 +42,32 @@
+   chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".*
+ fi
+ 
+-mkdir -p "${DESTDIR}/usr/bin"
++mkdir -p "${DESTDIR}/${PREFIXSDIR}/bin"
+ 
+ test -n "${OFFICE_PREFIX}" && office_prefix="${OFFICE_PREFIX}" || office_prefix=/opt
+ office_root=${office_prefix}/${PREFIX}
+ 
+ #this symlink is needed to have the API boostrap functions running right
+-ln -sf "${office_root}/program/soffice" "${DESTDIR}/usr/bin/${PREFIX}"
++ln -sf "${office_root}/program/soffice" "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}"
+ 
+-cp printeradmin.sh "${DESTDIR}/usr/bin/${PREFIX}-printeradmin"
+-chmod 0755 "${DESTDIR}/usr/bin/${PREFIX}-printeradmin"
++cp printeradmin.sh "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}-printeradmin"
++chmod 0755 "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}-printeradmin"
+ 
+ if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != lodev${PRODUCTVERSION}  ; then
+     # compat symlinks
+     mkdir -p "${DESTDIR}${office_prefix}"
+     ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}"
+-    ln -sf /usr/bin/${PREFIX} "${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}"
+-    ln -sf /usr/bin/${PREFIX}-printeradmin "${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}-printeradmin"
++    ln -sf /${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}"
++    ln -sf /${PREFIXDIR}/bin/${PREFIX}-printeradmin "${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}-printeradmin"
+ fi
+ 
+ test "${PREFIX}" = lodev${PRODUCTVERSION} && mime_def_file="lodev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml"
+-mkdir -p "${DESTDIR}/usr/share/mime/packages"
+-cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/$mime_def_file"
+-chmod 0644 "${DESTDIR}/usr/share/mime/packages/$mime_def_file"
++mkdir -p "${DESTDIR}/${PREFIXDIR}/share/mime/packages"
++cp openoffice.org.xml "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file"
++chmod 0644 "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file"
+ 
+-mkdir -p "${DESTDIR}/usr/share/applications"
++mkdir -p "${DESTDIR}/${PREFIXDIR}/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}/${PREFIXDIR}/share/applications/${PREFIX}-${i}"
+ done
+