textproc/libtextcat & textproc/libexttextcat Living Peacefully Together
Baptiste Daroussin
bapt at freebsd.org
Tue Oct 9 20:10:14 UTC 2012
On Tue, Oct 09, 2012 at 08:59:23PM +0100, Chris Rees wrote:
> On 9 Oct 2012 20:48, "Cy Schubert" <Cy.Schubert at komquats.com> wrote:
> >
> > In message <20121003173430.GC6377 at ithaqua.etoilebsd.net>, Baptiste
> > Daroussin wr
> > ites:
> > >
> > > --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.
> >
> > This patch should address the issues.
> >
> > Index: libexttextcat/Makefile
> > ===================================================================
> > --- libexttextcat/Makefile (revision 305162)
> > +++ libexttextcat/Makefile (working copy)
> > @@ -2,6 +2,7 @@
> >
> > PORTNAME= libexttextcat
> > PORTVERSION= 3.3.1
> > +PORTREVISION= 1
> > CATEGORIES= textproc
> > MASTER_SITES= http://dev-www.libreoffice.org/src/libexttextcat/
> >
> > @@ -10,8 +11,6 @@
> >
> > LICENSE= BSD
> >
> > -CONFLICTS_INSTALL= libtextcat*
> > -
> > USE_XZ= yes
> > GNU_CONFIGURE= yes
> > USE_GMAKE= yes
> > @@ -20,15 +19,23 @@
> >
> > PORTDOCS= README README.libtextcat TODO
> >
> > -OPTIONS_DEFINE= COMPAT_TEXTCAT DOCS
> > +OPTIONS_DEFINE= COMPAT_TEXTCAT DOCS
> > COMPAT_TEXTCAT_DESC= Install libtextcat compatible files
> >
> > .include <bsd.port.options.mk>
> >
> > +.include <bsd.port.pre.mk>
>
> This is unnecessary; options.mk defines PREFIX.
>
> Great everywhere else though.
>
> Chris
Looks good to me (with remark of Chris) so approved :)
regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-office/attachments/20121009/31c992c1/attachment.sig>
More information about the freebsd-office
mailing list