From ekarkkai@pp.htv.fi  Tue Jan  6 01:19:31 2004
Return-Path: <ekarkkai@pp.htv.fi>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C431916A4D0; Tue,  6 Jan 2004 01:19:31 -0800 (PST)
Received: from cs143215.pp.htv.fi (cs143215.pp.htv.fi [213.243.143.215])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 50A8443D46; Tue,  6 Jan 2004 01:19:25 -0800 (PST)
	(envelope-from ekarkkai@pp.htv.fi)
Received: from thunderbolt.my.domain (thunderbolt.my.domain [192.168.1.30])
	by cs143215.pp.htv.fi (8.12.10/8.12.10) with ESMTP id i069JNGk000254;
	Tue, 6 Jan 2004 11:19:23 +0200 (EET)
	(envelope-from ekarkkai@pp.htv.fi)
Received: from thunderbolt.my.domain (localhost [127.0.0.1])
	by thunderbolt.my.domain (8.12.9p1/8.12.9) with ESMTP id i069JMwf040698;
	Tue, 6 Jan 2004 11:19:23 +0200 (EET)
	(envelope-from ejk@thunderbolt.my.domain)
Received: (from ejk@localhost)
	by thunderbolt.my.domain (8.12.9p1/8.12.9/Submit) id i069JMb5040697;
	Tue, 6 Jan 2004 11:19:22 +0200 (EET)
Message-Id: <200401060919.i069JMb5040697@thunderbolt.my.domain>
Date: Tue, 6 Jan 2004 11:19:22 +0200 (EET)
From: Esa Karkkainen <ejk@iki.fi>
Reply-To: Esa Karkkainen <ejk@iki.fi>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Esa Karkkainen <ejk@iki.fi>, ports@freebsd.org
Subject: audio/grip does not compile when "make WITH_CDPARANOIA=yes" is used
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 06 01:20:15 PST 2004
>Closed-Date:    Tue Jan 06 04:51:09 PST 2004
>Last-Modified:  Tue Jan 06 04:51:09 PST 2004
>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:

From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: Esa Karkkainen <ejk@iki.fi>
Subject: Re: ports/60972: audio/grip does not compile when "make
 WITH_CDPARANOIA=yes" is used
Date: Tue, 6 Jan 2004 21:21:03 +0900

 Since USE_GNOME=gnomehack implies it, adding USE_REINPLACE=yes
 line is unnecessary in this case.
 
 I guess this patch should be the most simple solution.
 
 
 diff -urN /usr/ports/audio/grip/Makefile audio/grip/Makefile
 --- /usr/ports/audio/grip/Makefile	Tue Jan  6 21:08:05 2004
 +++ audio/grip/Makefile	Tue Jan  6 21:11:43 2004
 @@ -30,4 +30,7 @@
  CONFIGURE_ARGS+=	--disable-cdpar
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} -e 's|<cdda/cdda|<cdda|g' ${WRKSRC}/src/cdpar.c
 +
  .include <bsd.port.mk>
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Tue Jan 6 04:51:03 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60972 
>Unformatted:
