libreoffice-3.4.3 fails to upgrade

Christoph Moench-Tegeder cmt at burggraben.net
Mon Sep 5 16:36:36 UTC 2011


## Baptiste Daroussin (bapt at freebsd.org):

> > Looks like it may be related to this commit:
> > 
> > http://www.freebsd.org/cgi/cvsweb.cgi/ports/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
> > 
> > Bapt, please would you investigate?
> > 
> > Chris
> > 
> 
> I just fixed it.
> 
> sorrt about that

Just to be clear what we're talking about... Version 1.2 (latest in the
cvsweb I'm seeing on www.freebsd.org) won't cut it, as the mktemp in
line 81 of distro-install-desktop-integration needs to be fixed, too
(remove the -t).

See here (this is only the first - and fixed - hunk of that patch):

--- distro-install-desktop-integration.orig	2011-09-05 17:59:59.000000000 +0200
+++ distro-install-desktop-integration	2011-09-05 18:01:11.000000000 +0200
@@ -74,12 +74,12 @@
     test -n "$oowrapper_name" && create_man_link "$oowrapper_name" "$used_man_page" "$file_list"
     
     # add desktop file to the right file list
-    test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo "/usr/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
+    test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo "$PREFIXDIR/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
 }
 
 # install desktop integration from plain packages
-sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX`
-cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp"
+sysui_temp=`mktemp -d distro-pack-desktop-integration-XXXXXX`
+cp -a sysui/unx*/misc/libreoffice/* "$sysui_temp"
 cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
 builddir=`pwd`
 cd $sysui_temp


Regards,
Christoph

-- 
Spare Space


More information about the freebsd-ports mailing list