aboutsummaryrefslogtreecommitdiffstats
path: root/editors/libreoffice
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2011-09-05 23:02:08 +0800
committerbapt <bapt@FreeBSD.org>2011-09-05 23:02:08 +0800
commite94d401cd215456028acee8062e52fd63b498f0e (patch)
treeda468f31932b35ffec026f0c6902e9789a4d66fb /editors/libreoffice
parentdd5ca0f9b6feb75579baa72d0e357654d1c36151 (diff)
downloadfreebsd-ports-gnome-e94d401cd215456028acee8062e52fd63b498f0e.tar.gz
freebsd-ports-gnome-e94d401cd215456028acee8062e52fd63b498f0e.tar.zst
freebsd-ports-gnome-e94d401cd215456028acee8062e52fd63b498f0e.zip
use the right patches
Diffstat (limited to 'editors/libreoffice')
-rw-r--r--editors/libreoffice/files/patch-bin__distro-install-desktop-integration10
-rw-r--r--editors/libreoffice/files/patch-clone__libs-core__sysui__desktop__share__create_tree.sh6
2 files changed, 8 insertions, 8 deletions
diff --git a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
index ff07b212addc..e4a21dc3f830 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 2011-09-04 17:25:30.637120995 +0000
-+++ bin/distro-install-desktop-integration 2011-09-04 17:19:02.078137343 +0000
+--- bin/distro-install-desktop-integration.orig 2011-09-05 16:57:47.578974736 +0200
++++ bin/distro-install-desktop-integration 2011-09-05 17:00:00.931583334 +0200
@@ -74,12 +74,12 @@
test -n "$oowrapper_name" && create_man_link "$oowrapper_name" "$used_man_page" "$file_list"
@@ -15,7 +15,7 @@
cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
builddir=`pwd`
cd $sysui_temp
-@@ -98,8 +98,8 @@
+@@ -96,8 +96,8 @@
export ICON_PREFIX=$INSTALLDIRNAME
export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons
export PRODUCTVERSION=
@@ -26,7 +26,7 @@
export GNOME_MIME_THEME=hicolor
/bin/bash ./create_tree.sh
)
-@@ -108,8 +108,8 @@
+@@ -106,8 +106,8 @@
# we do not want some stuff from the plain packages
rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME*
@@ -37,7 +37,7 @@
if test -d $DESTDIR/opt ; then
rm -f $DESTDIR/opt/$INSTALLDIRNAME
rmdir --ignore-fail-on-non-empty $DESTDIR/opt
-@@ -130,12 +130,12 @@
+@@ -126,12 +126,12 @@
# put the stuff installed by create_tree.sh into the right file lists
# desktop files will be added by the corresponding add_wrapper command
if test -f $DESTDIR/gid_Module_Root_Brand ; then
diff --git a/editors/libreoffice/files/patch-clone__libs-core__sysui__desktop__share__create_tree.sh b/editors/libreoffice/files/patch-clone__libs-core__sysui__desktop__share__create_tree.sh
index 6e5111e1dad9..9bca31ffad52 100644
--- a/editors/libreoffice/files/patch-clone__libs-core__sysui__desktop__share__create_tree.sh
+++ b/editors/libreoffice/files/patch-clone__libs-core__sysui__desktop__share__create_tree.sh
@@ -1,5 +1,5 @@
---- clone/libs-core/sysui/desktop/share/create_tree.sh.orig 2011-09-04 16:44:43.591133517 +0000
-+++ clone/libs-core/sysui/desktop/share/create_tree.sh 2011-09-04 17:05:55.429128701 +0000
+--- clone/libs-core/sysui/desktop/share/create_tree.sh.orig 2011-08-15 20:34:57.000000000 +0200
++++ clone/libs-core/sysui/desktop/share/create_tree.sh 2011-09-05 16:44:54.715256916 +0200
@@ -41,31 +41,31 @@
chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.*
fi
@@ -15,7 +15,7 @@
+ln -sf ${office_root}/program/soffice ${DESTDIR}${PREFIXDIR}/bin/${PREFIX}
-cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
--chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${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} ${DESTDIR}${PREFIXDIR}/bin/${PREFIX}-printeradmin