From corecode@corecode.ath.cx  Thu Jan 30 17:03:34 2003
Return-Path: <corecode@corecode.ath.cx>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D463137B401
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Jan 2003 17:03:34 -0800 (PST)
Received: from mailout03.sul.t-online.com (mailout03.sul.t-online.com [194.25.134.81])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6FB0943F43
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Jan 2003 17:03:33 -0800 (PST)
	(envelope-from corecode@corecode.ath.cx)
Received: from fwd05.sul.t-online.de 
	by mailout03.sul.t-online.com with smtp 
	id 18ePae-0000pv-03; Fri, 31 Jan 2003 02:03:32 +0100
Received: from pride.uni.stoert.net (320050403952-0001@[217.82.52.50]) by fmrl05.sul.t-online.com
	with esmtp id 18ePad-1DrZYmC; Fri, 31 Jan 2003 02:03:31 +0100
Received: from terrorfish.uni.stoert.net (terrorfish.uni.stoert.net [10.150.180.178])
	by pride.uni.stoert.net (Postfix) with ESMTP id 1F57112BD5F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 31 Jan 2003 02:03:31 +0100 (CET)
Received: from terrorfish.uni.stoert.net (localhost [127.0.0.1])
	by terrorfish.uni.stoert.net (8.12.6/8.12.6) with ESMTP id h0V13UZ0031838
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 31 Jan 2003 02:03:30 +0100 (CET)
	(envelope-from corecode@terrorfish.uni.stoert.net)
Received: (from corecode@localhost)
	by terrorfish.uni.stoert.net (8.12.6/8.12.6/Submit) id h0V13UJV031837;
	Fri, 31 Jan 2003 02:03:30 +0100 (CET)
Message-Id: <200301310103.h0V13UJV031837@terrorfish.uni.stoert.net>
Date: Fri, 31 Jan 2003 02:03:30 +0100 (CET)
From: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx>
Reply-To: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer-update: unbreak audio/cdparanoia on -CURRENT
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         47696
>Category:       ports
>Synopsis:       maintainer-update: unbreak audio/cdparanoia on -CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 30 17:10:01 PST 2003
>Closed-Date:    Sat Feb 01 09:05:50 PST 2003
>Last-Modified:  Sat Feb 01 09:05:50 PST 2003
>Originator:     Simon 'corecode' Schubert
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD terrorfish.uni.stoert.net 5.0-CURRENT FreeBSD 5.0-CURRENT #46: Thu Jan 30 15:51:45 CET 2003 corecode@terrorfish.uni.stoert.net:/usr/obj/athlon/usr/src/sys/TERRORFISH i386


	
>Description:
	o cdparanoia fails building on -CURRENT without libgnugetopt.
	  -> fix brain-o
	o remove ugly warnings while building on -CURRENT	
	
>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/cdparanoia/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	2003/01/18 15:46:20	1.9
+++ Makefile	2003/01/31 01:02:35
@@ -7,7 +7,7 @@
 
 PORTNAME=	cdparanoia
 PORTVERSION=	3.9.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio sysutils
 MASTER_SITES=	http://www.xiph.org/paranoia/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/^3\./III-alpha/}
@@ -15,19 +15,20 @@
 
 MAINTAINER=	corecode@corecode.ath.cx
 
+.if !exists(/usr/include/getopt.h)
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgnugetopt"
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 .endif
 
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 MAN1=		cdparanoia.1
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/\(^ *default:\)/\1break;/' ${WRKSRC}/interface/utils.h
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
	


>Release-Note:
>Audit-Trail:

From: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/47696: maintainer-update: unbreak audio/cdparanoia on
 -CURRENT
Date: Fri, 31 Jan 2003 02:13:30 +0100

 --=..I?XrT9wXwK(q3
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Lately FreeBSD-gnats-submit@FreeBSD.org told:
 
 > >Synopsis:       maintainer-update: unbreak audio/cdparanoia on -CURRENT
 
 forgot to mention:
 
 Pointed out by: Jonas Engman, thanks
 
 -- 
 /"\   http://corecode.ath.cx/#donate
 \ /
  \     ASCII Ribbon Campaign
 / \  Against HTML Mail and News
 
 --=..I?XrT9wXwK(q3
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (FreeBSD)
 
 iD8DBQE+Oc2+r5S+dk6z85oRAuphAKDC/QNZDP/aJtlTZhmu0aoxsMco9gCghgUn
 +igMv3HWQAyJj4EJ5k5jb5M=
 =FDZ7
 -----END PGP SIGNATURE-----
 
 --=..I?XrT9wXwK(q3--
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Sat Feb 1 09:05:37 PST 2003 
State-Changed-Why:  
Committed, thanks! 

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