From owner-freebsd-office@FreeBSD.ORG Tue Oct 2 15:18:33 2012 Return-Path: Delivered-To: office@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 68621106564A; Tue, 2 Oct 2012 15:18:33 +0000 (UTC) (envelope-from Cy.Schubert@komquats.com) Received: from idcmail-mo2no.shaw.ca (idcmail-mo2no.shaw.ca [64.59.134.9]) by mx1.freebsd.org (Postfix) with ESMTP id 1C97E8FC0A; Tue, 2 Oct 2012 15:18:32 +0000 (UTC) Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd6ml1no-ssvc.prod.shaw.ca) ([10.0.144.222]) by pd6mo1no-svcs.prod.shaw.ca with ESMTP; 02 Oct 2012 09:18:25 -0600 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=6HkG4LK5i0ZTEQwzSfMqnsQ8WbrxJ2NwB1mI+RNtyjI= c=1 sm=1 a=LZS6sOoRfLQA:10 a=QrugwKR0C_UA:10 a=wAGQQ9Az6v0A:10 a=BLceEmwcHowA:10 a=ICAaq7hcmGcA:10 a=IbtKDeXwb2+SRU442/pi3A==:17 a=_4BPYxVLAAAA:8 a=CeWrEJdnecnMeUdvTtEA:9 a=CjuIK1q_8ugA:10 a=fAj7x54EWSpB-afqW4UA:9 a=BWvPGDcYAAAA:8 a=6I5d2MoRAAAA:8 a=vZoGgzP0pyKfTN_ogUkA:9 a=V7tsTZBp22UA:10 a=SV7veod9ZcQA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO spqr.komquats.com) ([96.50.7.119]) by pd6ml1no-dmz.prod.shaw.ca with ESMTP; 02 Oct 2012 09:18:25 -0600 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTP id 5319080; Tue, 2 Oct 2012 08:18:25 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.14.5/8.14.5) with ESMTP id q92FIOTh022625; Tue, 2 Oct 2012 08:18:24 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Message-Id: <201210021518.q92FIOTh022625@slippy.cwsent.com> X-Mailer: exmh version 2.7.2 01/07/2005 with nmh-1.3 From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.komquats.com/ To: office@FreeBSD.org, thierry@FreeBSD.org Mime-Version: 1.0 Content-Type: multipart/mixed ; boundary="==_Exmh_1349190983_31970" Date: Tue, 02 Oct 2012 08:18:24 -0700 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: textproc/libtextcat & textproc/libexttextcat Living Peacefully Together X-BeenThere: freebsd-office@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Cy Schubert List-Id: Office applications on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 15:18:33 -0000 This is a multipart MIME message. --==_Exmh_1349190983_31970 Content-Type: text/plain; charset=us-ascii 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 --==_Exmh_1349190983_31970 Content-Type: text/plain; charset=us-ascii Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. --==_Exmh_1349190983_31970--