ports/172305: [Patch] textproc/libtextcat & textproc/libexttextcat Living Peacefully Together

[Cy Schubert (cy)]

>Number:         172305
>Category:       ports
>Synopsis:       [Patch] textproc/libtextcat & textproc/libexttextcat Living Peacefully Together
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 03 16:40:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Cy Schubert (cy)
>Release:        FreeBSD 9.1-PRERELEASE i386
>Organization:
FreeBSD.org
>Environment:
System: FreeBSD slippy 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240474M: Thu Sep 13 14:44:13 PDT 2012 root at slippy:/usr/obj/opt/src/svn-stable9/sys/BREAK2 i386


>Description:
Enclosed is a patch to enable textproc/libtextcat and 
textproc/libexttextcat to be installed on the same system, allowing both 
openoffice and libreoffce to be installed on the same system (should one 
desire that). What this patch does is rename libexttextcat's createfp to 
createfpx.

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,13 +11,12 @@
 
 LICENSE=	BSD
 
-CONFLICTS_INSTALL=	libtextcat*
-
 USE_XZ=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
+MAKE_ARGS=	EXEEXT=x
 
 PORTDOCS=	README README.libtextcat TODO
 
Index: libexttextcat/pkg-plist
===================================================================
--- 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
===================================================================
--- libtextcat/Makefile	(revision 305162)
+++ libtextcat/Makefile	(working copy)
@@ -17,8 +17,6 @@
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS_INSTALL=	libexttextcat*
-
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

>How-To-Repeat:
Try installing both ports on the same system, e.g. install openoffice and
libreoffice on the same system.

>Fix:

See above.


>Release-Note:
>Audit-Trail:
>Unformatted: