From owner-freebsd-office@FreeBSD.ORG Wed Oct 3 17:34:33 2012 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 BACFC106564A; Wed, 3 Oct 2012 17:34:33 +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 9A5818FC0C; Wed, 3 Oct 2012 17:34:33 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q93HYXDj079920; Wed, 3 Oct 2012 17:34:33 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q93HYXQL079918; Wed, 3 Oct 2012 17:34:33 GMT (envelope-from bapt@FreeBSD.org) X-Authentication-Warning: freefall.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f Date: Wed, 3 Oct 2012 19:34:30 +0200 From: Baptiste Daroussin To: Cy Schubert Message-ID: <20121003173430.GC6377@ithaqua.etoilebsd.net> References: <201210021518.q92FIOTh022625@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ctP54qlpMx3WjD+/" Content-Disposition: inline In-Reply-To: <201210021518.q92FIOTh022625@slippy.cwsent.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: thierry@FreeBSD.org, office@FreeBSD.org Subject: Re: textproc/libtextcat & textproc/libexttextcat Living Peacefully Together 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: Wed, 03 Oct 2012 17:34:33 -0000 --ctP54qlpMx3WjD+/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 02, 2012 at 08:18:24AM -0700, Cy Schubert wrote: > Hi all, >=20 > Enclosed is a patch to enable textproc/libtextcat and=20 > textproc/libexttextcat to be installed on the same system, allowing both= =20 > openoffice and libreoffce to be installed on the same system (should one= =20 > desire that). What this patch does is rename libexttextcat's createfp to= =20 > createfpx. >=20 > Not sure why exmh wanted to encode it in base64 so here it is again in=20 > plain text, albeit munged due to space compression. >=20 > Index: libexttextcat/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- libexttextcat/Makefile (revision 305162) > +++ libexttextcat/Makefile (working copy) > @@ -2,6 +2,7 @@ > =20 > PORTNAME=3D libexttextcat > PORTVERSION=3D 3.3.1 > +PORTREVISION=3D 1 > CATEGORIES=3D textproc > MASTER_SITES=3D http://dev-www.libreoffice.org/src/libexttextcat/ > =20 > @@ -10,13 +11,12 @@ > =20 > LICENSE=3D BSD > =20 > -CONFLICTS_INSTALL=3D libtextcat* > - > USE_XZ=3D yes > GNU_CONFIGURE=3D yes > USE_GMAKE=3D yes > USE_GNOME=3D gnomehack > USE_LDCONFIG=3D yes > +MAKE_ARGS=3D EXEEXT=3Dx > =20 > PORTDOCS=3D README README.libtextcat TODO > =20 > Index: libexttextcat/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- libexttextcat/pkg-plist (revision 305162) > +++ libexttextcat/pkg-plist (working copy) > @@ -1,4 +1,4 @@ > -bin/createfp > +bin/createfpx > include/libexttextcat/common.h > include/libexttextcat/constants.h > include/libexttextcat/exttextcat-version.h > Index: libtextcat/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- libtextcat/Makefile (revision 305162) > +++ libtextcat/Makefile (working copy) > @@ -17,8 +17,6 @@ > LICENSE=3D BSD > LICENSE_FILE=3D ${WRKSRC}/LICENSE > =20 > -CONFLICTS_INSTALL=3D libexttextcat* > - > USE_AUTOTOOLS=3D libtool > GNU_CONFIGURE=3D yes > USE_LDCONFIG=3D yes >=20 >=20 >=20 consider removing the compat code from the ports in that case. --ctP54qlpMx3WjD+/ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBsdyYACgkQ8kTtMUmk6EzIIACgnGLcIfOf65iXXliaEr8iDDdK WCIAn2S0GL3l2tPDG3GpiZy9z+qJ57dD =Kh+7 -----END PGP SIGNATURE----- --ctP54qlpMx3WjD+/--