From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 29 16:40:02 2008 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 87F7B106569F for ; Fri, 29 Aug 2008 16:40:02 +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 E64F58FC24 for ; Fri, 29 Aug 2008 16:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7TGe19v079465 for ; Fri, 29 Aug 2008 16:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7TGe16Z079461; Fri, 29 Aug 2008 16:40:01 GMT (envelope-from gnats) Resent-Date: Fri, 29 Aug 2008 16:40:01 GMT Resent-Message-Id: <200808291640.m7TGe16Z079461@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, bf Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0288E10656EF for ; Fri, 29 Aug 2008 16:39:13 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id E14BD8FC15 for ; Fri, 29 Aug 2008 16:39:12 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m7TGdCAs070807 for ; Fri, 29 Aug 2008 16:39:12 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m7TGdC7C070806; Fri, 29 Aug 2008 16:39:12 GMT (envelope-from nobody) Message-Id: <200808291639.m7TGdC7C070806@www.freebsd.org> Date: Fri, 29 Aug 2008 16:39:12 GMT From: bf To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/126955: [PATCH]sysutils/cdrtools-devel: fix build problems when audio/cdparanoia is installed X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Aug 2008 16:40:02 -0000 >Number: 126955 >Category: ports >Synopsis: [PATCH]sysutils/cdrtools-devel: fix build problems when audio/cdparanoia is installed >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Aug 29 16:40:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: bf >Release: >Organization: >Environment: >Description: sysutils/cdrtools-devel includes an incompatible cdda_paranoia.h from audio/cdparanoia port instead of it's own bundled header, causing a build failure. To avoid this, rename the bundled header and the statements using it. I was going to submit this with an update to 2.01.01a47, but changes in the gettext and iconv handling in the new version require additional patching, and I don't have the time to attend to it now. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN cdrtools-devel.orig/Makefile cdrtools-devel/Makefile --- cdrtools-devel.orig/Makefile 2008-08-29 10:45:41.893399648 -0400 +++ cdrtools-devel/Makefile 2008-08-29 12:12:26.383386504 -0400 @@ -130,6 +130,10 @@ # @${REINPLACE_CMD} -E -e \ # 's|#define.+INSERT_YOUR_EMAIL_ADDRESS_HERE|& "${MAINTAINER}"|' \ # ${WRKSRC}/cdrecord/cdrecord.c + ${FIND} -X ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \ + -e 's|cdda_paranoia.h|schily_cdda_paranoia.h|g' + ${MV} ${WRKSRC}/libparanoia/cdda_paranoia.h ${WRKSRC}/libparanoia/schily_cdda_paranoia.h + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \ >Release-Note: >Audit-Trail: >Unformatted: