From owner-freebsd-office@FreeBSD.ORG  Mon Sep  5 15:31:20 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 8C870106566C;
	Mon,  5 Sep 2011 15:31:20 +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 57EFB8FC0C;
	Mon,  5 Sep 2011 15:31:20 +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 p85FVKEx017908;
	Mon, 5 Sep 2011 15:31:20 GMT (envelope-from bapt@freebsd.org)
Received: (from bapt@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p85FVJfr017772;
	Mon, 5 Sep 2011 15:31:19 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 17:31:15 +0200
From: Baptiste Daroussin <bapt@freebsd.org>
To: Chris Rees <utisoft@gmail.com>
Message-ID: <20110905153115.GA69747@azathoth.lan>
References: <4E64CDA3.2010907@eskk.nu>
	<CADLo839imyvNQE9-KcAjZKSdRr3X1hAYV_szoaJu5qBTh4NgHQ@mail.gmail.com>
	<4E64D9AB.2040702@eskk.nu>
	<CADLo83_Xyr71f6jCc40xV-sL_aiAXsnZOemg619yAwxHcAsQww@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="pWyiEgJYm5f9v55/"
Content-Disposition: inline
In-Reply-To: <CADLo83_Xyr71f6jCc40xV-sL_aiAXsnZOemg619yAwxHcAsQww@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: office@freebsd.org, freebsd-ports@freebsd.org,
	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 15:31:20 -0000


--pWyiEgJYm5f9v55/
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Sep 05, 2011 at 03:52:35PM +0100, Chris Rees wrote:
> On 5 September 2011 15:16, Leslie Jensen <leslie@eskk.nu> wrote:
> > 2011-09-05 15:51, Chris Rees skrev:
> >>
> >> On 5 Sep 2011 14:45, "Leslie Jensen"<leslie@eskk.nu> =A0wrote:
> >>> =3D=3D=3D> =A0 =A0libreoffice-3.4.3 depends on file: /usr/local/bin/p=
erl5.14.1 -
> >>
> >> found
> >>>
> >>> =3D=3D=3D> =A0 Applying FreeBSD patches for libreoffice-3.4.3
> >>> 1 out of 4 hunks failed--saving rejects to
> >>
> >> bin/distro-install-desktop-integration.rej
> >>>
> >>> =3D> =A0Patch patch-bin__distro-install-desktop-integration failed to=
 apply
> >>
> >> cleanly.
> >>>
> >>> *** Error code 1
> >>>
> >>> Stop in /usr/ports/editors/libreoffice.
> >>> *** Error code 1
> >>>
> >>> Stop in /usr/ports/editors/libreoffice.
> >>>
> >>> =3D=3D=3D>>> =A0make failed for editors/libreoffice
> >>> =3D=3D=3D>>> =A0Aborting update
> >>>
> >>> =3D=3D=3D>>> =A0Update for editors/libreoffice failed
> >>> =3D=3D=3D>>> =A0Aborting update
> >>>
> >>>
> >>> /Leslie
> >>
> >> Please update your ports tree, make clean and try again.
> >>
> >> Chris
> >
> >
> > Have done it again, but unfortunately same result.
> >
>=20
> Sorry about that.
>=20
> Looks like it may be related to this commit:
>=20
> http://www.freebsd.org/cgi/cvsweb.cgi/ports/editors/libreoffice/files/pat=
ch-bin__distro-install-desktop-integration
>=20
> Bapt, please would you investigate?
>=20
> Chris
>=20

I just fixed it.

sorrt about that

Bapt

--pWyiEgJYm5f9v55/
Content-Type: application/pgp-signature

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

iEYEARECAAYFAk5k60MACgkQ8kTtMUmk6ExkqACdENek/9YXuMdYO4VBZO9909Gg
1wIAn0Mu7BeaCiKiNA7AXKBeS6nLSMsa
=pBY5
-----END PGP SIGNATURE-----

--pWyiEgJYm5f9v55/--