From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 3 16:40:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86B861065672 for ; Wed, 3 Oct 2012 16:40:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 546128FC17 for ; Wed, 3 Oct 2012 16:40:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q93GeAEj026315 for ; Wed, 3 Oct 2012 16:40:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q93GeAiV026314; Wed, 3 Oct 2012 16:40:10 GMT (envelope-from gnats) Resent-Date: Wed, 3 Oct 2012 16:40:10 GMT Resent-Message-Id: <201210031640.q93GeAiV026314@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Cy Schubert (cy) Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 986691065676 for ; Wed, 3 Oct 2012 16:35:54 +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 58CA58FC08 for ; Wed, 3 Oct 2012 16:35:54 +0000 (UTC) Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd5ml3no-ssvc.prod.shaw.ca) ([10.0.144.222]) by pd6mo1no-svcs.prod.shaw.ca with ESMTP; 03 Oct 2012 10:35:53 -0600 Received: from unknown (HELO spqr.komquats.com) ([96.50.7.119]) by pd5ml3no-dmz.prod.shaw.ca with ESMTP; 03 Oct 2012 10:35:53 -0600 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTP id DB4EAE7 for ; Wed, 3 Oct 2012 09:35:52 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.14.5/8.14.5) with ESMTP id q93GZqw8009338 for ; Wed, 3 Oct 2012 09:35:52 -0700 (PDT) (envelope-from cy@slippy.cwsent.com) Received: (from cy@localhost) by slippy.cwsent.com (8.14.5/8.13.1/Submit) id q93GZqVZ009337; Wed, 3 Oct 2012 09:35:52 -0700 (PDT) (envelope-from cy) Message-Id: <201210031635.q93GZqVZ009337@slippy.cwsent.com> Date: Wed, 3 Oct 2012 09:35:52 -0700 (PDT) From: Cy Schubert (cy) To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/172305: [Patch] textproc/libtextcat & textproc/libexttextcat Living Peacefully Together X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Cy Schubert \(cy\)" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2012 16:40:10 -0000 >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@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: