Date: Fri, 29 Aug 2008 16:39:12 GMT From: bf <bf2006a@yahoo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/126955: [PATCH]sysutils/cdrtools-devel: fix build problems when audio/cdparanoia is installed Message-ID: <200808291639.m7TGdC7C070806@www.freebsd.org> Resent-Message-ID: <200808291640.m7TGe16Z079461@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808291639.m7TGdC7C070806>