Date: Tue, 6 Jan 2004 11:19:22 +0200 (EET) From: Esa Karkkainen <ejk@iki.fi> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Esa Karkkainen <ejk@iki.fi> Subject: ports/60972: audio/grip does not compile when "make WITH_CDPARANOIA=yes" is used Message-ID: <200401060919.i069JMb5040697@thunderbolt.my.domain> Resent-Message-ID: <200401060920.i069KFTE001642@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60972 >Category: ports >Synopsis: audio/grip does not compile when "make WITH_CDPARANOIA=yes" is used >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jan 06 01:20:15 PST 2004 >Closed-Date: >Last-Modified: >Originator: Esa Karkkainen >Release: FreeBSD 5.1-RELEASE-p11 i386 >Organization: Is in state of disintegration >Environment: System: FreeBSD 5.1-RELEASE-p11 Sat Dec 13 17:28:07 EET 2003 Ports cvsupped at Tue Jan 6 10:52:51 EET 2004 >Description: Port audio/grip does not compile when "make WITH_CDPARANOIA=yes" is used >How-To-Repeat: cd /usr/ports/audio/grip && make WITH_CDPARANOIA=yes all [ snip ] cdpar.c:47:33: cdda/cdda_interface.h: No such file or directory cdpar.c:48:32: cdda/cdda_paranoia.h: No such file or directory cdpar.c: In function `CDPCallback': [ snip ] gmake[2]: *** [cdpar.o] Error 1 gmake[2]: Leaving directory `/usr/ports/audio/grip/work/grip-3.1.4/src' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/usr/ports/audio/grip/work/grip-3.1.4' gmake: *** [all] Error 2 *** Error code 2 Stop in /usr/ports/audio/grip. >Fix: I have supplied two fixes which have same net effect. First patch is tad strange, but passes "portlint -A". Second patch is "traditional" fix. ---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<--- --- Makefile.orig Tue Jan 6 09:59:01 2004 +++ Makefile Tue Jan 6 11:07:45 2004 @@ -21,11 +21,14 @@ USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui vte USE_GMAKE= yes GNU_CONFIGURE= yes +USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .if defined(WITH_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia +post-patch: + @${REINPLACE_CMD} -e 's#<cdda/cdda_#<cdda_#' ${WRKSRC}/src/cdpar.c .else CONFIGURE_ARGS+= --disable-cdpar .endif ---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<--- ---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<--- diff -ruN grip.old/files/patch-src-cdpar.c grip/files/patch-src-cdpar.c --- grip.old/files/patch-src-cdpar.c Thu Jan 1 02:00:00 1970 +++ grip/files/patch-src-cdpar.c Tue Jan 6 10:46:05 2004 @@ -0,0 +1,13 @@ +--- src/cdpar.c.orig Sun Dec 21 23:03:15 2003 ++++ src/cdpar.c Tue Jan 6 10:42:30 2004 +@@ -44,8 +44,8 @@ + #define size16 short + #define size32 int + +-#include <cdda/cdda_interface.h> +-#include <cdda/cdda_paranoia.h> ++#include <cdda_interface.h> ++#include <cdda_paranoia.h> + + static void PutNum(long num,int f,int endianness,int bytes); + static void WriteWav(int f,long bytes); ---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<--- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401060919.i069JMb5040697>