From root@ahze.net  Tue Apr 27 21:04:29 2004
Return-Path: <root@ahze.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2787616A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Apr 2004 21:04:29 -0700 (PDT)
Received: from ahze.ahze.net (adsl-068-209-163-003.sip.clt.bellsouth.net [68.209.163.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8631F43D49
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Apr 2004 21:04:28 -0700 (PDT)
	(envelope-from root@ahze.net)
Received: by ahze.ahze.net (Postfix, from userid 0)
	id 9255A650E; Wed, 28 Apr 2004 00:05:15 -0400 (EDT)
Message-Id: <20040428040515.9255A650E@ahze.ahze.net>
Date: Wed, 28 Apr 2004 00:05:15 -0400 (EDT)
From: michael johnson <ahze@ahze.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] audio/grip: update to 3.2.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         66040
>Category:       ports
>Synopsis:       [PATCH] audio/grip: update to 3.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 27 21:10:18 PDT 2004
>Closed-Date:    Sun May 02 17:34:44 PDT 2004
>Last-Modified:  Sun May 02 17:34:44 PDT 2004
>Originator:     michael johnson
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #43: Thu Apr 22 05:38:22 EDT 2004
>Description:
- Update to 3.2.0
- add more to OPTIONS and default cdrom device

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- grip-3.2.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/grip/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile	20 Apr 2004 22:09:46 -0000	1.47
+++ Makefile	28 Apr 2004 04:03:13 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	grip
-PORTVERSION=	3.1.10
+PORTVERSION=	3.2.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,17 +21,73 @@
 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"
 CONFIGURE_ARGS+=	--disable-cdpar
 
-OPTIONS=	CDPARANOIA "Enable cdparanoia support" off
+OPTIONS=	CDPARANOIA "Ripper: Enable cdparanoia support" on \
+		CDDA2WAV "Ripper: cdda2wav: Install sysutils/cdrtools" off \
+		LAME "Encoder: lame: Install audio/lame" on \
+		BLADEENC "Encoder: bladeenc: Install audio/bladeenc" off \
+		FLAC "Encoder: flac: Install audio/flac" off \
+		GOGO "Encoder: gogo: Install audio/gogo" off \
+		VORBIS "Encoder: oggenc: Install audio/vorbis-tools" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_CDROM_DEVICE)
+DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
+.else
+.if ${OSVERSION} < 500000
+DEFAULT_CDROM_DEVICE=/dev/acd0c
+.else
+DEFAULT_CDROM_DEVICE=/dev/acd0
+.endif
+.endif
+
 .if defined(WITH_CDPARANOIA)
 LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
 CONFIGURE_ARGS+=	--enable-cdpar
 .endif
 
+.if defined(WITH_CDDA2WAV)
+RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
+.endif
+
+.if defined(WITH_BLADEENC)
+RUN_DEPENDS+=	bladeenc:${PORTSDIR}/audio/bladeenc
+.endif
+
+.if defined(WITH_FLAC)
+RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
+.endif
+
+.if defined(WITH_GOGO)
+RUN_DEPENDS+=	gogo:${PORTSDIR}/audio/gogo
+.endif
+
+.if defined(WITH_LAME)
+RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
+.endif
+
+.if defined(WITH_BLADEENC)
+RUN_DEPENDS+=	bladeenc:${PORTSDIR}/audio/bladeenc
+.endif
+
+.if defined(WITH_VORBIS)
+RUN_DEPENDS+=	ogg123:${PORTSDIR}/audio/vorbis-tools
+.endif
+
+pre-everything::
+.if !defined(WITH_CDROM_DEVICE)
+	@${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"
+	@${ECHO_MSG} "===> Define WITH_CDROM_DEVICE if you want to change the default"
+	@${ECHO_MSG} "===> For example, 'make WITH_CDROM_DEVICE=\"/dev/somedevice\"'"
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
+		${WRKSRC}/src/grip.c
+
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/grip/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- distinfo	20 Apr 2004 21:45:10 -0000	1.23
+++ distinfo	28 Apr 2004 04:03:13 -0000
@@ -1,2 +1,7 @@
+<<<<<<< distinfo
+MD5 (grip-3.2.0.tar.gz) = 9b51933a03dd7d7ddfbb3643fc82c2d0
+SIZE (grip-3.2.0.tar.gz) = 722039
+=======
 MD5 (grip-3.1.10.tar.gz) = d38c119bec6fbede18029ab654ddb197
 SIZE (grip-3.1.10.tar.gz) = 721984
+>>>>>>> 1.23
--- grip-3.2.0.patch ends here ---

>Release-Note:
>Audit-Trail:

From: Michael Johnson <ahze@ahze.net>
To: freebsd-ports-bugs@FreeBSD.org, FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/66040: [PATCH] audio/grip: update to 3.2.0
Date: Wed, 28 Apr 2004 12:45:40 -0400

 --Apple-Mail-3--363158353
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain; charset=US-ASCII; format=flowed
 
 I'll take maintainer if there are no objections??
 
 Michael
 
 --Apple-Mail-3--363158353
 content-type: application/pgp-signature; x-mac-type=70674453;
 	name=PGP.sig
 content-description: This is a digitally signed message part
 content-disposition: inline; filename=PGP.sig
 content-transfer-encoding: 7bit
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (Darwin)
 
 iD8DBQFAj9+05H4WREStzy0RAiQcAJ4/l99jNmLEO1A2YfqOX2Qq8nauHQCfQykK
 uEMq7DWasIbmBmdpujqvd1o=
 =FLgz
 -----END PGP SIGNATURE-----
 
 --Apple-Mail-3--363158353--
 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sun May 2 17:34:36 PDT 2004 
State-Changed-Why:  
Committed, thanks! 

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