From owner-freebsd-office@FreeBSD.ORG Mon Sep 5 16:36:36 2011 Return-Path: Delivered-To: office@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32499106566C; Mon, 5 Sep 2011 16:36:36 +0000 (UTC) (envelope-from cmt@burggraben.net) Received: from smtp.burggraben.net (ns.exwg.net [88.198.69.35]) by mx1.freebsd.org (Postfix) with ESMTP id E05028FC16; Mon, 5 Sep 2011 16:36:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp.burggraben.net (Postfix) with ESMTP id 3B8AC6003CF; Mon, 5 Sep 2011 18:11:35 +0200 (CEST) X-Spam-Scanned: by amavisd-new at exwg.net Received: from smtp.burggraben.net ([127.0.0.1]) by localhost (ns.burggraben.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bvSpD0SU-+-8; Mon, 5 Sep 2011 18:11:34 +0200 (CEST) Received: from elch.exwg.net (p4FE3AD38.dip.t-dialin.net [79.227.173.56]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "elch.exwg.net", Issuer "Christoph Moench-Tegeder" (verified OK)) by smtp.burggraben.net (Postfix) with ESMTPS; Mon, 5 Sep 2011 18:11:34 +0200 (CEST) Received: by elch.exwg.net (Postfix, from userid 1000) id B2A9BAC818; Mon, 5 Sep 2011 18:11:33 +0200 (CEST) Date: Mon, 5 Sep 2011 18:11:33 +0200 From: Christoph Moench-Tegeder To: Baptiste Daroussin Message-ID: <20110905161132.GA84391@elch.exwg.net> References: <4E64CDA3.2010907@eskk.nu> <4E64D9AB.2040702@eskk.nu> <20110905153115.GA69747@azathoth.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110905153115.GA69747@azathoth.lan> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: office@freebsd.org, freebsd-ports@freebsd.org, Chris Rees , Leslie Jensen Subject: Re: libreoffice-3.4.3 fails to upgrade X-BeenThere: freebsd-office@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Office applications on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Sep 2011 16:36:36 -0000 ## Baptiste Daroussin (bapt@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