From owner-svn-ports-all@FreeBSD.ORG Tue Oct 9 23:33:13 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 86F377B3; Tue, 9 Oct 2012 23:33:13 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 65ADA8FC0C; Tue, 9 Oct 2012 23:33:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q99NXDjr008560; Tue, 9 Oct 2012 23:33:13 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q99NXDEq008556; Tue, 9 Oct 2012 23:33:13 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201210092333.q99NXDEq008556@svn.freebsd.org> From: Cy Schubert Date: Tue, 9 Oct 2012 23:33:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305621 - in head/textproc: libexttextcat libtextcat X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2012 23:33:13 -0000 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 .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 + +.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 +.include