textproc/libtextcat & textproc/libexttextcat Living Peacefully Together

[Cy Schubert]

Hi all,

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.

Not sure why exmh wanted to encode it in base64 so here it is again in 
plain text, albeit munged due to space compression.

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



-------------- next part --------------
Cheers,
Cy Schubert <Cy.Schubert at komquats.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.