Date: Tue, 9 Oct 2012 22:10:11 +0200 From: Baptiste Daroussin <bapt@freebsd.org> To: Chris Rees <utisoft@gmail.com> Cc: Cy Schubert <Cy.Schubert@komquats.com>, Thierry Thomas <thierry@freebsd.org>, office@freebsd.org Subject: Re: textproc/libtextcat & textproc/libexttextcat Living Peacefully Together Message-ID: <20121009201011.GG8713@ithaqua.etoilebsd.net> In-Reply-To: <CADLo83933oAbZ7yLFc8j2d1PN8k9XNy2LqCKJL6OKp3F9Acsqw@mail.gmail.com> References: <bapt@FreeBSD.org> <20121003173430.GC6377@ithaqua.etoilebsd.net> <201210091948.q99Jm7HU082152@slippy.cwsent.com> <CADLo83933oAbZ7yLFc8j2d1PN8k9XNy2LqCKJL6OKp3F9Acsqw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--2NLGdgz3UMHa/lqP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 09, 2012 at 08:59:23PM +0100, Chris Rees wrote: > On 9 Oct 2012 20:48, "Cy Schubert" <Cy.Schubert@komquats.com> wrote: > > > > In message <20121003173430.GC6377@ithaqua.etoilebsd.net>, Baptiste > > Daroussin wr > > ites: > > > > > > --ctP54qlpMx3WjD+/ > > > Content-Type: text/plain; charset=3Dus-ascii > > > Content-Disposition: inline > > > Content-Transfer-Encoding: quoted-printable > > > > > > On Tue, Oct 02, 2012 at 08:18:24AM -0700, Cy Schubert wrote: > > > > Hi all, > > > >=3D20 > > > > Enclosed is a patch to enable textproc/libtextcat and=3D20 > > > > textproc/libexttextcat to be installed on the same system, allowing > both=3D > > > =3D20 > > > > openoffice and libreoffce to be installed on the same system (should > one=3D > > > =3D20 > > > > desire that). What this patch does is rename libexttextcat's create= fp > to=3D > > > =3D20 > > > > createfpx. > > > >=3D20 > > > > Not sure why exmh wanted to encode it in base64 so here it is again > in=3D20 > > > > plain text, albeit munged due to space compression. > > > >=3D20 > > > > Index: libexttextcat/Makefile > > > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D= 3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D= 3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3= D=3D3D=3D3D=3D3D=3D3D > > > > --- libexttextcat/Makefile (revision 305162) > > > > +++ libexttextcat/Makefile (working copy) > > > > @@ -2,6 +2,7 @@ > > > > =3D20 > > > > PORTNAME=3D3D libexttextcat > > > > PORTVERSION=3D3D 3.3.1 > > > > +PORTREVISION=3D3D 1 > > > > CATEGORIES=3D3D textproc > > > > MASTER_SITES=3D3D http://dev-www.libreoffice.org/src/libexttext= cat/ > > > > =3D20 > > > > @@ -10,13 +11,12 @@ > > > > =3D20 > > > > LICENSE=3D3D BSD > > > > =3D20 > > > > -CONFLICTS_INSTALL=3D3D libtextcat* > > > > - > > > > USE_XZ=3D3D yes > > > > GNU_CONFIGURE=3D3D yes > > > > USE_GMAKE=3D3D yes > > > > USE_GNOME=3D3D gnomehack > > > > USE_LDCONFIG=3D3D yes > > > > +MAKE_ARGS=3D3D EXEEXT=3D3Dx > > > > =3D20 > > > > PORTDOCS=3D3D README README.libtextcat TODO > > > > =3D20 > > > > Index: libexttextcat/pkg-plist > > > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D= 3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D= 3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3= D=3D3D=3D3D=3D3D=3D3D > > > > --- 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 > > > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D= 3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D= 3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3= D=3D3D=3D3D=3D3D=3D3D > > > > --- libtextcat/Makefile (revision 305162) > > > > +++ libtextcat/Makefile (working copy) > > > > @@ -17,8 +17,6 @@ > > > > LICENSE=3D3D BSD > > > > LICENSE_FILE=3D3D ${WRKSRC}/LICENSE > > > > =3D20 > > > > -CONFLICTS_INSTALL=3D3D libexttextcat* > > > > - > > > > USE_AUTOTOOLS=3D3D libtool > > > > GNU_CONFIGURE=3D3D yes > > > > USE_LDCONFIG=3D3D yes > > > >=3D20 > > > >=3D20 > > > >=3D20 > > > > > > consider removing the compat code from the ports in that case. > > > > This patch should address the issues. > > > > 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 @@ > > > > PORTNAME=3D libexttextcat > > PORTVERSION=3D 3.3.1 > > +PORTREVISION=3D 1 > > CATEGORIES=3D textproc > > MASTER_SITES=3D http://dev-www.libreoffice.org/src/libexttextcat/ > > > > @@ -10,8 +11,6 @@ > > > > LICENSE=3D BSD > > > > -CONFLICTS_INSTALL=3D libtextcat* > > - > > USE_XZ=3D yes > > GNU_CONFIGURE=3D yes > > USE_GMAKE=3D yes > > @@ -20,15 +19,23 @@ > > > > PORTDOCS=3D README README.libtextcat TODO > > > > -OPTIONS_DEFINE=3D COMPAT_TEXTCAT DOCS > > +OPTIONS_DEFINE=3D COMPAT_TEXTCAT DOCS > > COMPAT_TEXTCAT_DESC=3D Install libtextcat compatible files > > > > .include <bsd.port.options.mk> > > > > +.include <bsd.port.pre.mk> >=20 > This is unnecessary; options.mk defines PREFIX. >=20 > Great everywhere else though. >=20 > Chris Looks good to me (with remark of Chris) so approved :) regards, Bapt --2NLGdgz3UMHa/lqP Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlB0hKMACgkQ8kTtMUmk6ExX0QCfRLH9DVIYe93rgoWJ960ND4MX pnAAn3f1ZqaXrapXSvoWRz897bj7xg6W =nzu5 -----END PGP SIGNATURE----- --2NLGdgz3UMHa/lqP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121009201011.GG8713>