Date: Tue, 9 Oct 2012 23:33:13 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305621 - in head/textproc: libexttextcat libtextcat Message-ID: <201210092333.q99NXDEq008556@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Oct 9 23:33:12 2012 New Revision: 305621 URL: http://svn.freebsd.org/changeset/ports/305621 Log: Allow textproc/libtextcat and textproc/libexttextcat to coexist on the same system. Reviewed by: thierry, crees, bapt Approved by: bapt (using his portmgr and office hats), thierry Modified: head/textproc/libexttextcat/Makefile head/textproc/libexttextcat/pkg-plist head/textproc/libtextcat/Makefile Modified: head/textproc/libexttextcat/Makefile ============================================================================== --- head/textproc/libexttextcat/Makefile Tue Oct 9 23:16:12 2012 (r305620) +++ head/textproc/libexttextcat/Makefile Tue Oct 9 23:33:12 2012 (r305621) @@ -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 @@ COMMENT= Language guessing by N-Gram-Bas LICENSE= BSD -CONFLICTS_INSTALL= libtextcat* - USE_XZ= yes GNU_CONFIGURE= yes USE_GMAKE= yes @@ -20,15 +19,21 @@ USE_LDCONFIG= yes 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> .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: Modified: head/textproc/libexttextcat/pkg-plist ============================================================================== --- head/textproc/libexttextcat/pkg-plist Tue Oct 9 23:16:12 2012 (r305620) +++ head/textproc/libexttextcat/pkg-plist Tue Oct 9 23:33:12 2012 (r305621) @@ -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 @@ share/vala/vapi/libexttextcat.vapi %%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 Modified: head/textproc/libtextcat/Makefile ============================================================================== --- head/textproc/libtextcat/Makefile Tue Oct 9 23:16:12 2012 (r305620) +++ head/textproc/libtextcat/Makefile Tue Oct 9 23:33:12 2012 (r305621) @@ -7,7 +7,7 @@ PORTNAME= libtextcat PORTVERSION= 2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= http://software.wise-guys.nl/download/ @@ -17,14 +17,18 @@ COMMENT= Language guessing by N-Gram-Bas 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 @@ regression-test: ../src/testtextcat conf.txt < $$t ; \ done) -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210092333.q99NXDEq008556>