From owner-freebsd-office@FreeBSD.ORG  Mon Sep  5 16:44:06 2011
Return-Path: <owner-freebsd-office@FreeBSD.ORG>
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 395FA1065672;
	Mon,  5 Sep 2011 16:44:06 +0000 (UTC)
	(envelope-from bapt@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 03ACF8FC13;
	Mon,  5 Sep 2011 16:44:06 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p85Gi5Df084738;
	Mon, 5 Sep 2011 16:44:05 GMT (envelope-from bapt@freebsd.org)
Received: (from bapt@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p85Gi5hE084737;
	Mon, 5 Sep 2011 16:44:05 GMT (envelope-from bapt@freebsd.org)
X-Authentication-Warning: freefall.freebsd.org: bapt set sender to
	bapt@freebsd.org using -f
Date: Mon, 5 Sep 2011 18:44:02 +0200
From: Baptiste Daroussin <bapt@freebsd.org>
To: Christoph Moench-Tegeder <cmt@burggraben.net>
Message-ID: <20110905164402.GB70234@azathoth.lan>
References: <4E64CDA3.2010907@eskk.nu>
	<CADLo839imyvNQE9-KcAjZKSdRr3X1hAYV_szoaJu5qBTh4NgHQ@mail.gmail.com>
	<4E64D9AB.2040702@eskk.nu>
	<CADLo83_Xyr71f6jCc40xV-sL_aiAXsnZOemg619yAwxHcAsQww@mail.gmail.com>
	<20110905153115.GA69747@azathoth.lan>
	<20110905161132.GA84391@elch.exwg.net>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="61jdw2sOBCFtR2d/"
Content-Disposition: inline
In-Reply-To: <20110905161132.GA84391@elch.exwg.net>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: office@freebsd.org, freebsd-ports@freebsd.org,
	Chris Rees <utisoft@gmail.com>, Leslie Jensen <leslie@eskk.nu>
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 <freebsd-office.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-office>, 
	<mailto:freebsd-office-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-office>
List-Post: <mailto:freebsd-office@freebsd.org>
List-Help: <mailto:freebsd-office-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-office>,
	<mailto:freebsd-office-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Sep 2011 16:44:06 -0000


--61jdw2sOBCFtR2d/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Sep 05, 2011 at 06:11:33PM +0200, Christoph Moench-Tegeder wrote:
> ## Baptiste Daroussin (bapt@freebsd.org):
>=20
> > > Looks like it may be related to this commit:
> > >=20
> > > http://www.freebsd.org/cgi/cvsweb.cgi/ports/editors/libreoffice/files=
/patch-bin__distro-install-desktop-integration
> > >=20
> > > Bapt, please would you investigate?
> > >=20
> > > Chris
> > >=20
> >=20
> > I just fixed it.
> >=20
> > sorrt about that
>=20
> 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).
>=20
> See here (this is only the first - and fixed - hunk of that patch):
>=20
> --- 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" "$use=
d_man_page" "$file_list"
>     =20
>      # add desktop file to the right file list
> -    test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo "/usr/sh=
are/applications/$desktop_file" >>"$DESTDIR/$file_list"
> +    test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo "$PREFIX=
DIR/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
>  }
> =20
>  # install desktop integration from plain packages
> -sysui_temp=3D`mktemp -t -d distro-pack-desktop-integration-XXXXXX`
> -cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp"
> +sysui_temp=3D`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=3D`pwd`
>  cd $sysui_temp
>=20
>=20
> Regards,
> Christoph
>=20

You are right, once again sorry for the mess.

/me promise to not touch libreoffice for a while :)

Bapt

--61jdw2sOBCFtR2d/
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (FreeBSD)

iEYEARECAAYFAk5k/FIACgkQ8kTtMUmk6Ezv9wCgvifF+g0qgyvDAOu5VW0qO1HM
FysAoLtQPI1xAvgzRz/etQg4fbMlKnuv
=fGuD
-----END PGP SIGNATURE-----

--61jdw2sOBCFtR2d/--