Date: Tue, 09 Oct 2012 12:48:07 -0700 From: Cy Schubert <Cy.Schubert@komquats.com> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: Cy Schubert <Cy.Schubert@komquats.com>, thierry@FreeBSD.org, office@FreeBSD.org Subject: Re: textproc/libtextcat & textproc/libexttextcat Living Peacefully Together Message-ID: <201210091948.q99Jm7HU082152@slippy.cwsent.com> In-Reply-To: Message from Baptiste Daroussin <bapt@FreeBSD.org> of "Wed, 03 Oct 2012 19:34:30 %2B0200." <20121003173430.GC6377@ithaqua.etoilebsd.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multipart MIME message. --==_Exmh_1349811984_28160 Content-Type: text/plain; charset=us-ascii In message <20121003173430.GC6377@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> + .if ${PORT_OPTIONS:MCOMPAT_TEXTCAT} +.if exists(${PREFIX}/lib/libtextcat.a) +CONFLICTS_INSTALL= libtextcat* +.endif PLIST_SUB+= TEXTCAT='' +PLIST_SUB+= EXEEXT='' .else PLIST_SUB+= TEXTCAT='@comment ' +PLIST_SUB+= EXEEXT='x' +MAKE_ARGS= EXEEXT=x .endif post-install: @@ -48,4 +55,4 @@ check: cd ${WRKSRC}/src && make check -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: libexttextcat/pkg-plist =================================================================== --- libexttextcat/pkg-plist (revision 305162) +++ libexttextcat/pkg-plist (working copy) @@ -1,4 +1,4 @@ -bin/createfp +bin/createfp%%EXEEXT%% include/libexttextcat/common.h include/libexttextcat/constants.h include/libexttextcat/exttextcat-version.h @@ -174,6 +174,6 @@ %%DATADIR%%/zh-Hant.lm %%DATADIR%%/zu.lm @dirrm %%DATADIR%% -@dirrm share/vala/vapi -@dirrm share/vala/ +@dirrmtry share/vala/vapi +@dirrmtry share/vala/ @dirrm include/libexttextcat Index: libtextcat/Makefile =================================================================== --- libtextcat/Makefile (revision 305162) +++ libtextcat/Makefile (working copy) @@ -17,14 +17,18 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= libexttextcat* - USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes PORTDOCS= LICENSE README TODO +.include <bsd.port.pre.mk> + +.if exists($(PREFIX)/lib/libtextcat.a) +CONFLICTS_INSTALL= libexttextcat* +.endif + post-install: ${INSTALL_DATA} ${WRKSRC}/src/textcat.h ${PREFIX}/include/ ${MKDIR} ${DATADIR}/LM @@ -44,4 +48,4 @@ ../src/testtextcat conf.txt < $$t ; \ done) -.include <bsd.port.mk> +.include <bsd.port.post.mk> --==_Exmh_1349811984_28160 Content-Type: text/plain ; name="textcats.diff"; charset=us-ascii Content-Description: textcats.diff Content-Disposition: attachment; filename="textcats.diff" 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> + .if ${PORT_OPTIONS:MCOMPAT_TEXTCAT} +.if exists(${PREFIX}/lib/libtextcat.a) +CONFLICTS_INSTALL= libtextcat* +.endif PLIST_SUB+= TEXTCAT='' +PLIST_SUB+= EXEEXT='' .else PLIST_SUB+= TEXTCAT='@comment ' +PLIST_SUB+= EXEEXT='x' +MAKE_ARGS= EXEEXT=x .endif post-install: @@ -48,4 +55,4 @@ check: cd ${WRKSRC}/src && make check -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: libexttextcat/pkg-plist =================================================================== --- libexttextcat/pkg-plist (revision 305162) +++ libexttextcat/pkg-plist (working copy) @@ -1,4 +1,4 @@ -bin/createfp +bin/createfp%%EXEEXT%% include/libexttextcat/common.h include/libexttextcat/constants.h include/libexttextcat/exttextcat-version.h @@ -174,6 +174,6 @@ %%DATADIR%%/zh-Hant.lm %%DATADIR%%/zu.lm @dirrm %%DATADIR%% -@dirrm share/vala/vapi -@dirrm share/vala/ +@dirrmtry share/vala/vapi +@dirrmtry share/vala/ @dirrm include/libexttextcat Index: libtextcat/Makefile =================================================================== --- libtextcat/Makefile (revision 305162) +++ libtextcat/Makefile (working copy) @@ -17,14 +17,18 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= libexttextcat* - USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes PORTDOCS= LICENSE README TODO +.include <bsd.port.pre.mk> + +.if exists($(PREFIX)/lib/libtextcat.a) +CONFLICTS_INSTALL= libexttextcat* +.endif + post-install: ${INSTALL_DATA} ${WRKSRC}/src/textcat.h ${PREFIX}/include/ ${MKDIR} ${DATADIR}/LM @@ -44,4 +48,4 @@ ../src/testtextcat conf.txt < $$t ; \ done) -.include <bsd.port.mk> +.include <bsd.port.post.mk> --==_Exmh_1349811984_28160-- Cheers, Cy Schubert <Cy.Schubert@komquats.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210091948.q99Jm7HU082152>