From alex@foxybanana.com  Mon May 15 05:54:45 2006
Return-Path: <alex@foxybanana.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B767016A402;
	Mon, 15 May 2006 05:54:45 +0000 (UTC)
	(envelope-from alex@foxybanana.com)
Received: from suede.reed.edu (suede.reed.edu [134.10.2.45])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5EC7B43D45;
	Mon, 15 May 2006 05:54:45 +0000 (GMT)
	(envelope-from alex@foxybanana.com)
Received: from Laptop.mine.box (c029h217.dorm.reed.edu [134.10.29.217])
	by suede.reed.edu (8.13.6/8.13.6) with ESMTP id k4F5siJQ023704
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT);
	Sun, 14 May 2006 22:54:44 -0700
Received: from Laptop.mine.box (localhost [127.0.0.1])
	by Laptop.mine.box (8.13.6/8.13.6) with ESMTP id k4F5rk06031562;
	Sun, 14 May 2006 22:53:46 -0700 (PDT)
	(envelope-from alex@Laptop.mine.box)
Received: (from alex@localhost)
	by Laptop.mine.box (8.13.6/8.13.6/Submit) id k4F5rjsQ031561;
	Sun, 14 May 2006 22:53:45 -0700 (PDT)
	(envelope-from alex)
Message-Id: <200605150553.k4F5rjsQ031561@Laptop.mine.box>
Date: Sun, 14 May 2006 22:53:45 -0700 (PDT)
From: Alexander Botero-Lowry <alex@foxybanana.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mich@freebsd.org
Subject: [PATCH] sysutils/libcdio: Add an OPTION to enable support for cd-paranoia
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         97291
>Category:       ports
>Synopsis:       [PATCH] sysutils/libcdio: Add an OPTION to enable support for cd-paranoia
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mich
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 15 06:00:36 GMT 2006
>Closed-Date:    Wed May 24 08:42:25 GMT 2006
>Last-Modified:  Wed May 24 08:42:25 GMT 2006
>Originator:     Alexander Botero-Lowry
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD Laptop.mine.box 6.1-STABLE FreeBSD 6.1-STABLE #0: Sat May  6 22:21:39 PDT
>Description:
- Add a cd-paranoia OPTION

Port maintainer (mich@FreeBSD.org) is cc'd.

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

--- libcdio-0.76_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/libcdio/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	13 May 2006 04:15:39 -0000	1.21
+++ Makefile	15 May 2006 05:53:49 -0000
@@ -24,13 +24,25 @@
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+=	--with-libpopt-prefix=${LOCALBASE} \
 			--with-libiconv-prefix=${LOCALBASE} \
-			--without-cd-paranoia
 USE_PERL5_BUILD=yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
 
 INFO=		libcdio
+MAN1=	cd-paranoia.1
+
+OPTIONS=	PARANOIA "Support for accessing audio via CD Paranoia" off
+
+.include <bsd.port.pre.mk>
+
+.ifdef(WITH_PARANOIA)
+LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+PLIST_SUB+=	PARANOIA=""
+.else
+CONFIGURE_ARGS+=	--without-cd-paranoia
+PLIST_SUB+=	PARANOIA="@comment "
+.endif
 
 post-patch:
 	${REINPLACE_CMD} -e "s,freebsd5\.\*,freebsd5\.\*|freebsd6\.\*|freebsd7\.\*," ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/libcdio/pkg-plist,v
retrieving revision 1.14
diff -u -r1.14 pkg-plist
--- pkg-plist	23 Feb 2006 10:39:12 -0000	1.14
+++ pkg-plist	15 May 2006 05:53:49 -0000
@@ -1,5 +1,6 @@
 bin/cd-drive
 bin/cd-info
+bin/cd-paranoia
 bin/cd-read
 bin/cdda-player
 bin/iso-info
@@ -33,6 +34,14 @@
 lib/libcdio.la
 lib/libcdio.so
 lib/libcdio.so.6
+lib/libcdio_cdda.a
+lib/libcdio_cdda.la
+lib/libcdio_cdda.so
+lib/libcdio_cdda.so.0
+lib/libcdio_paranoia.a
+lib/libcdio_paranoia.la
+lib/libcdio_paranoia.so
+lib/libcdio_paranoia.so.0
 lib/libiso9660.a
 lib/libiso9660.la
 lib/libiso9660.so
--- libcdio-0.76_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mich 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon May 15 06:04:15 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97291 

From: Alexander Botero-Lowry <alex@foxybanana.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/97291: [PATCH] sysutils/libcdio: Add an OPTION to enable
 support for cd-paranoia
Date: Tue, 23 May 2006 01:13:32 -0400

 This is a multi-part message in MIME format.
 
 --=_447299fc.cyrzNVTaUPPEmVPiwR+uK6OKIIP5g2pruI5rdhucDpEviXpU
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 I noticed the port was outdated as well, and found that it didn't actually work for me with 6.1, so i updated it to 0.77. This patch also includes the paranoia stuff.
 
 Tinderbox'd on 4.11 and 6.0
 
 Alex
 
 --=_447299fc.cyrzNVTaUPPEmVPiwR+uK6OKIIP5g2pruI5rdhucDpEviXpU
 Content-Type: text/plain;
  charset=us-ascii
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="libcdio-0.77_paranoia.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/sysutils/libcdio/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- Makefile	13 May 2006 04:15:39 -0000	1.21
 +++ Makefile	23 May 2006 05:11:10 -0000
 @@ -5,8 +5,7 @@
  # $FreeBSD: ports/sysutils/libcdio/Makefile,v 1.21 2006/05/13 04:15:39 edwin Exp $
  
  PORTNAME=	libcdio
 -PORTVERSION=	0.76
 -PORTREVISION=	1
 +PORTVERSION=	0.77
  CATEGORIES=	sysutils
  MASTER_SITES=	${MASTER_SITE_GNU}
  MASTER_SITE_SUBDIR=	libcdio
 @@ -24,13 +23,25 @@
  INSTALLS_SHLIB=	yes
  CONFIGURE_ARGS+=	--with-libpopt-prefix=${LOCALBASE} \
  			--with-libiconv-prefix=${LOCALBASE} \
 -			--without-cd-paranoia
  USE_PERL5_BUILD=yes
  CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
  
  INFO=		libcdio
  
 +OPTIONS=	PARANOIA "Support for accessing audio via CD Paranoia" off
 +
 +.include <bsd.port.pre.mk>
 +
 +.ifdef(WITH_PARANOIA)
 +LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
 +PLIST_SUB+=	PARANOIA=""
 +MAN1=	cd-paranoia.1
 +.else
 +CONFIGURE_ARGS+=	--without-cd-paranoia
 +PLIST_SUB+=	PARANOIA="@comment "
 +.endif
 +
  post-patch:
  	${REINPLACE_CMD} -e "s,freebsd5\.\*,freebsd5\.\*|freebsd6\.\*|freebsd7\.\*," ${WRKSRC}/configure
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/sysutils/libcdio/distinfo,v
 retrieving revision 1.10
 diff -u -r1.10 distinfo
 --- distinfo	24 Jan 2006 01:06:14 -0000	1.10
 +++ distinfo	23 May 2006 05:11:10 -0000
 @@ -1,3 +1,3 @@
 -MD5 (libcdio-0.76.tar.gz) = 6d5f97847c8be003f4018dd2b5afe23d
 -SHA256 (libcdio-0.76.tar.gz) = 26e0d08f345de365492671703a597be2c7275885e1aeb6f9fee049725caaf04a
 -SIZE (libcdio-0.76.tar.gz) = 1821519
 +MD5 (libcdio-0.77.tar.gz) = 7ea25252009b49422055da97a96efe04
 +SHA256 (libcdio-0.77.tar.gz) = 8f9b5e1a4532ff0f46413f7050d5c9e5c8bf4267a7b37a9fbc796dfa5b61d239
 +SIZE (libcdio-0.77.tar.gz) = 1954965
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/sysutils/libcdio/pkg-plist,v
 retrieving revision 1.14
 diff -u -r1.14 pkg-plist
 --- pkg-plist	23 Feb 2006 10:39:12 -0000	1.14
 +++ pkg-plist	23 May 2006 05:11:10 -0000
 @@ -1,5 +1,6 @@
  bin/cd-drive
  bin/cd-info
 +%%PARANOIA%%bin/cd-paranoia
  bin/cd-read
  bin/cdda-player
  bin/iso-info
 @@ -16,29 +17,64 @@
  include/cdio/disc.h
  include/cdio/ds.h
  include/cdio/dvd.h
 +include/cdio/ecma_167.h
  include/cdio/iso9660.h
  include/cdio/logging.h
  include/cdio/mmc.h
  include/cdio/paranoia.h
 +include/cdio/posix.h
  include/cdio/read.h
  include/cdio/rock.h
  include/cdio/sector.h
 -include/cdio/scsi_mmc.h
  include/cdio/track.h
  include/cdio/types.h
 +include/cdio/udf.h
 +include/cdio/udf_file.h
 +include/cdio/udf_time.h
  include/cdio/util.h
  include/cdio/version.h
  include/cdio/xa.h
 +include/cdio++/cdio.hpp
 +include/cdio++/cdtext.hpp
 +include/cdio++/device.hpp
 +include/cdio++/devices.hpp
 +include/cdio++/disc.hpp
 +include/cdio++/enum.hpp
 +include/cdio++/iso9660.hpp
 +include/cdio++/mmc.hpp
 +include/cdio++/read.hpp
 +include/cdio++/track.hpp
  lib/libcdio.a
  lib/libcdio.la
  lib/libcdio.so
 -lib/libcdio.so.6
 +lib/libcdio.so.7
 +lib/libcdio++.a
 +lib/libcdio++.la
 +lib/libcdio++.so
 +lib/libcdio++.so.0
 +%%PARANOIA%%lib/libcdio_cdda.a
 +%%PARANOIA%%lib/libcdio_cdda.la
 +%%PARANOIA%%lib/libcdio_cdda.so
 +%%PARANOIA%%lib/libcdio_cdda.so.0
 +%%PARANOIA%%lib/libcdio_paranoia.a
 +%%PARANOIA%%lib/libcdio_paranoia.la
 +%%PARANOIA%%lib/libcdio_paranoia.so
 +%%PARANOIA%%lib/libcdio_paranoia.so.0
  lib/libiso9660.a
  lib/libiso9660.la
  lib/libiso9660.so
 -lib/libiso9660.so.4
 +lib/libiso9660.so.5
 +lib/libiso9660++.a
 +lib/libiso9660++.la
 +lib/libiso9660++.so
 +lib/libiso9660++.so.0
 +lib/libudf.a
 +lib/libudf.la
 +lib/libudf.so
 +lib/libudf.so.0
  libdata/pkgconfig/libcdio.pc
  libdata/pkgconfig/libcdio_cdda.pc
  libdata/pkgconfig/libcdio_paranoia.pc
  libdata/pkgconfig/libiso9660.pc
  @dirrm include/cdio
 +@dirrm include/cdio++
 Index: files/patch-example_C++_Makefile.in
 ===================================================================
 RCS file: files/patch-example_C++_Makefile.in
 diff -N files/patch-example_C++_Makefile.in
 --- files/patch-example_C++_Makefile.in	4 Oct 2005 14:15:07 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,15 +0,0 @@
 -
 -$FreeBSD: ports/sysutils/libcdio/files/patch-example_C++_Makefile.in,v 1.1 2005/10/04 14:15:07 mich Exp $
 -
 ---- example/C++/Makefile.in.orig
 -+++ example/C++/Makefile.in
 -@@ -39,8 +39,7 @@
 - build_triplet = @build@
 - host_triplet = @host@
 - noinst_PROGRAMS = device$(EXEEXT) iso1$(EXEEXT) iso2$(EXEEXT) \
 --	iso3$(EXEEXT) mmc1$(EXEEXT) mmc2$(EXEEXT) paranoia$(EXEEXT) \
 --	paranoia2$(EXEEXT)
 -+	iso3$(EXEEXT) mmc1$(EXEEXT) mmc2$(EXEEXT) 
 - subdir = example/C++
 - DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 
 --=_447299fc.cyrzNVTaUPPEmVPiwR+uK6OKIIP5g2pruI5rdhucDpEviXpU--
State-Changed-From-To: open->closed 
State-Changed-By: mich 
State-Changed-When: Wed May 24 08:42:06 UTC 2006 
State-Changed-Why:  
Committed, thanks ! 

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