- update to 0.77

- Add a cd-paranoia OPTION

PR:		97291
Submitted by:	Alexander Botero-Lowry <alex@foxybanana.com>

4 files changed, 57 insertions, 25 deletions

diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index cf35eca53be6..f7829ea5b1d4 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 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 @@ USE_ICONV=	yes
 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>
diff --git a/sysutils/libcdio/distinfo b/sysutils/libcdio/distinfo
index 7c8b078d0bc6..daa74388ca45 100644
--- a/sysutils/libcdio/distinfo
+++ b/sysutils/libcdio/distinfo
@@ -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
diff --git a/sysutils/libcdio/files/patch-example_C++_Makefile.in b/sysutils/libcdio/files/patch-example_C++_Makefile.in
deleted file mode 100644
index 2355b472cc21..000000000000
--- a/sysutils/libcdio/files/patch-example_C++_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- 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
diff --git a/sysutils/libcdio/pkg-plist b/sysutils/libcdio/pkg-plist
index f5ca24f4edd5..3b8490e15e0c 100644
--- a/sysutils/libcdio/pkg-plist
+++ b/sysutils/libcdio/pkg-plist
@@ -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/device.h
 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++