Index: audio/aqualung/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/aqualung/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- audio/aqualung/Makefile 22 Aug 2009 00:13:00 -0000 1.18 +++ audio/aqualung/Makefile 8 Nov 2009 14:07:45 -0000 @@ -7,7 +7,7 @@ PORTNAME= aqualung DISTVERSION= 0.9beta10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.9beta10 @@ -27,7 +27,7 @@ mac.2:${PORTSDIR}/audio/mac \ tag.6:${PORTSDIR}/audio/taglib \ lrdf.2:${PORTSDIR}/textproc/liblrdf \ - cdio.8:${PORTSDIR}/sysutils/libcdio \ + cdio.12:${PORTSDIR}/sysutils/libcdio \ mp3lame.0:${PORTSDIR}/audio/lame \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ strfunc.9:${PORTSDIR}/devel/libstrfunc \ Index: audio/cripple/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/cripple/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- audio/cripple/Makefile 4 May 2009 18:42:24 -0000 1.6 +++ audio/cripple/Makefile 8 Nov 2009 14:07:45 -0000 @@ -7,7 +7,7 @@ PORTNAME= cripple PORTVERSION= 0.06b -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://www.vortex.prodigynet.co.uk/${PORTNAME}/ @@ -19,7 +19,7 @@ USE_CDRTOOLS= yes MAKE_JOBS_SAFE= yes -LIB_DEPENDS+= cdio.8:${PORTSDIR}/sysutils/libcdio +LIB_DEPENDS+= cdio.12:${PORTSDIR}/sysutils/libcdio RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame\ cdparanoia:${PORTSDIR}/audio/cdparanoia Index: audio/musicpd/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/musicpd/Makefile,v retrieving revision 1.46 diff -u -r1.46 Makefile --- audio/musicpd/Makefile 17 Sep 2009 09:41:09 -0000 1.46 +++ audio/musicpd/Makefile 8 Nov 2009 14:07:45 -0000 @@ -7,6 +7,7 @@ PORTNAME= musicpd PORTVERSION= 0.15 +PORTREVISION= 1 CATEGORIES= audio ipv6 MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION} DISTNAME= mpd-${PORTVERSION} @@ -130,7 +131,7 @@ --enable-zip \ --enable-iso9660 LIB_DEPENDS+= zzip.13:${PORTSDIR}/devel/zziplib \ - iso9660.5:${PORTSDIR}/sysutils/libcdio + iso9660.7:${PORTSDIR}/sysutils/libcdio .endif .if defined(WITHOUT_FFMPEG) Index: audio/sound-juicer/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/sound-juicer/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- audio/sound-juicer/Makefile 31 Jul 2009 13:49:10 -0000 1.49 +++ audio/sound-juicer/Makefile 8 Nov 2009 14:07:45 -0000 @@ -8,7 +8,7 @@ PORTNAME= sound-juicer PORTVERSION= 2.26.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -19,7 +19,7 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \ - cdio.8:${PORTSDIR}/sysutils/libcdio \ + cdio.12:${PORTSDIR}/sysutils/libcdio \ tag.6:${PORTSDIR}/audio/taglib \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ Index: audio/xmms2/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/xmms2/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- audio/xmms2/Makefile 22 Aug 2009 00:13:25 -0000 1.49 +++ audio/xmms2/Makefile 8 Nov 2009 14:07:46 -0000 @@ -121,7 +121,7 @@ .endif .if !defined(WITHOUT_CDDA) -LIB_DEPENDS+= cdio.8:${PORTSDIR}/sysutils/libcdio \ +LIB_DEPENDS+= cdio.12:${PORTSDIR}/sysutils/libcdio \ discid.2:${PORTSDIR}/audio/libdiscid PLIST_SUB+= CDDA="" .else Index: emulators/mednafen/Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/mednafen/Makefile,v retrieving revision 1.31 diff -u -r1.31 Makefile --- emulators/mednafen/Makefile 22 Aug 2009 00:20:22 -0000 1.31 +++ emulators/mednafen/Makefile 8 Nov 2009 14:07:46 -0000 @@ -7,7 +7,7 @@ PORTNAME= mednafen PORTVERSION= 0.8.B -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators games MASTER_SITES= SF/${PORTNAME}/Mednafen/${PORTVERSION} @@ -15,7 +15,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Portable multi-system emulator -LIB_DEPENDS= cdio.8:${PORTSDIR}/sysutils/libcdio \ +LIB_DEPENDS= cdio.12:${PORTSDIR}/sysutils/libcdio \ sndfile.1:${PORTSDIR}/audio/libsndfile \ vorbis.4:${PORTSDIR}/audio/libvorbis Index: multimedia/audacious-plugins/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/audacious-plugins/Makefile,v retrieving revision 1.62 diff -u -r1.62 Makefile --- multimedia/audacious-plugins/Makefile 26 Jul 2009 06:15:15 -0000 1.62 +++ multimedia/audacious-plugins/Makefile 8 Nov 2009 14:07:46 -0000 @@ -7,6 +7,7 @@ PORTNAME= audacious-plugins PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.atheme.org/ EXTRACT_SUFX= .tgz @@ -285,7 +286,7 @@ .endif .if defined(WITH_CDAUDIO) -LIB_DEPENDS+= cdio.8:${PORTSDIR}/sysutils/libcdio \ +LIB_DEPENDS+= cdio.12:${PORTSDIR}/sysutils/libcdio \ cddb.4:${PORTSDIR}/audio/libcddb CONFIGURE_ARGS+=--enable-cdaudio PLIST_SUB+= CDAUDIOPLUGIN="" Index: multimedia/bmpx/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/bmpx/Makefile,v retrieving revision 1.51 diff -u -r1.51 Makefile --- multimedia/bmpx/Makefile 31 Jul 2009 13:54:21 -0000 1.51 +++ multimedia/bmpx/Makefile 8 Nov 2009 14:07:46 -0000 @@ -7,7 +7,7 @@ PORTNAME= bmpx PORTVERSION= 0.40.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://files.backtrace.info/releases/0.40/ @@ -17,7 +17,7 @@ LIB_DEPENDS= tag.6:${PORTSDIR}/audio/taglib \ cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \ musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ - cdio.8:${PORTSDIR}/sysutils/libcdio \ + cdio.12:${PORTSDIR}/sysutils/libcdio \ glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \ gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ rsvg-2:${PORTSDIR}/graphics/librsvg2 \ Index: multimedia/gmerlin/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/gmerlin/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- multimedia/gmerlin/Makefile 12 Aug 2009 03:23:19 -0000 1.5 +++ multimedia/gmerlin/Makefile 8 Nov 2009 14:07:46 -0000 @@ -7,6 +7,7 @@ PORTNAME= gmerlin PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF @@ -77,7 +78,7 @@ .endif .if !defined(WITHOUT_LIBCDIO) -LIB_DEPENDS+= cdio.8:${PORTSDIR}/sysutils/libcdio +LIB_DEPENDS+= cdio.12:${PORTSDIR}/sysutils/libcdio PLIST_SUB+= CDIO="" .else CONFIGURE_ARGS+=--disable-libcdio Index: multimedia/gmerlin-avdecoder/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/gmerlin-avdecoder/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- multimedia/gmerlin-avdecoder/Makefile 22 Aug 2009 00:28:23 -0000 1.8 +++ multimedia/gmerlin-avdecoder/Makefile 8 Nov 2009 14:07:46 -0000 @@ -7,6 +7,7 @@ PORTNAME= gmerlin-avdecoder PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} @@ -169,7 +170,7 @@ .endif .if !defined(WITHOUT_LIBCDIO) -LIB_DEPENDS+= cdio.8:${PORTSDIR}/sysutils/libcdio +LIB_DEPENDS+= cdio.12:${PORTSDIR}/sysutils/libcdio PLIST_SUB+= LIBCDIO="" .else CONFIGURE_ARGS+=--disable-libcdio Index: multimedia/libxine/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/libxine/Makefile,v retrieving revision 1.147 diff -u -r1.147 Makefile --- multimedia/libxine/Makefile 23 Sep 2009 14:37:46 -0000 1.147 +++ multimedia/libxine/Makefile 8 Nov 2009 14:07:46 -0000 @@ -24,7 +24,7 @@ dvdread.4:${PORTSDIR}/multimedia/libdvdread \ freetype.9:${PORTSDIR}/print/freetype2 \ fame-0.9.1:${PORTSDIR}/multimedia/libfame \ - cdio.8:${PORTSDIR}/sysutils/libcdio \ + cdio.12:${PORTSDIR}/sysutils/libcdio \ modplug.0:${PORTSDIR}/audio/libmodplug \ vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \ theora.0:${PORTSDIR}/multimedia/libtheora \ Index: multimedia/vcdimager/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/vcdimager/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- multimedia/vcdimager/Makefile 2 Aug 2009 19:34:53 -0000 1.37 +++ multimedia/vcdimager/Makefile 8 Nov 2009 14:07:46 -0000 @@ -6,7 +6,7 @@ PORTNAME= vcdimager PORTVERSION= 0.7.23 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= vcdimager @@ -16,7 +16,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ xml2:${PORTSDIR}/textproc/libxml2 \ - cdio.8:${PORTSDIR}/sysutils/libcdio + cdio.12:${PORTSDIR}/sysutils/libcdio USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes Index: multimedia/vlc/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/vlc/Makefile,v retrieving revision 1.197 diff -u -r1.197 Makefile --- multimedia/vlc/Makefile 2 Nov 2009 22:51:27 -0000 1.197 +++ multimedia/vlc/Makefile 8 Nov 2009 14:07:47 -0000 @@ -10,6 +10,7 @@ PORTNAME= vlc DISTVERSION= 1.0.2 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \ @@ -256,7 +257,7 @@ .if !defined(WITHOUT_CDROM) LIB_DEPENDS+= vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \ - cdio.8:${PORTSDIR}/sysutils/libcdio + cdio.12:${PORTSDIR}/sysutils/libcdio CONFIGURE_ARGS+=--enable-vcd \ --enable-libcddb \ --disable-cddax Index: sysutils/libcdio/Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/libcdio/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- sysutils/libcdio/Makefile 20 Oct 2009 16:54:55 -0000 1.28 +++ sysutils/libcdio/Makefile 8 Nov 2009 14:07:47 -0000 @@ -5,8 +5,7 @@ # $FreeBSD: ports/sysutils/libcdio/Makefile,v 1.28 2009/10/20 16:54:55 mich Exp $ PORTNAME= libcdio -PORTVERSION= 0.78.2 -PORTREVISION= 2 +PORTVERSION= 0.82 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libcdio @@ -28,6 +27,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" INFO= libcdio +MAN1= cd-drive.1 cd-info.1 cd-read.1 iso-info.1 iso-read.1 OPTIONS= PARANOIA "Support for accessing audio via CD Paranoia" on @@ -36,7 +36,7 @@ .ifdef(WITH_PARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia PLIST_SUB+= PARANOIA="" -MAN1= cd-paranoia.1 +MAN1+= cd-paranoia.1 .else CONFIGURE_ARGS+= --without-cd-paranoia PLIST_SUB+= PARANOIA="@comment " Index: sysutils/libcdio/distinfo =================================================================== RCS file: /home/pcvs/ports/sysutils/libcdio/distinfo,v retrieving revision 1.12 diff -u -r1.12 distinfo --- sysutils/libcdio/distinfo 8 Apr 2008 09:11:20 -0000 1.12 +++ sysutils/libcdio/distinfo 8 Nov 2009 14:07:47 -0000 @@ -1,3 +1,3 @@ -MD5 (libcdio-0.78.2.tar.gz) = a6b73300d1247012a1b1246d935ac0d3 -SHA256 (libcdio-0.78.2.tar.gz) = 2792e4133a89b254644ffe526c8eab785e1de3078d3a9c1ec03653247700ebde -SIZE (libcdio-0.78.2.tar.gz) = 2024218 +MD5 (libcdio-0.82.tar.gz) = 1c29b18e01ab2b966162bc727bf3c360 +SHA256 (libcdio-0.82.tar.gz) = 1acb3de8e0927906ade7a34c5853173d3068b87b02dfba80d0bf11e47f0b5d39 +SIZE (libcdio-0.82.tar.gz) = 2240599 Index: sysutils/libcdio/pkg-plist =================================================================== RCS file: /home/pcvs/ports/sysutils/libcdio/pkg-plist,v retrieving revision 1.17 diff -u -r1.17 pkg-plist --- sysutils/libcdio/pkg-plist 8 Apr 2008 09:11:20 -0000 1.17 +++ sysutils/libcdio/pkg-plist 8 Nov 2009 14:07:47 -0000 @@ -49,11 +49,12 @@ lib/libcdio.a lib/libcdio.la lib/libcdio.so -lib/libcdio.so.8 +lib/libcdio.so.12 lib/libcdio++.a lib/libcdio++.la lib/libcdio++.so lib/libcdio++.so.0 +lib/libiso9660.so.7 %%PARANOIA%%lib/libcdio_cdda.a %%PARANOIA%%lib/libcdio_cdda.la %%PARANOIA%%lib/libcdio_cdda.so @@ -75,6 +76,9 @@ lib/libudf.so lib/libudf.so.0 libdata/pkgconfig/libcdio.pc +libdata/pkgconfig/libcdio++.pc +libdata/pkgconfig/libiso9660++.pc +libdata/pkgconfig/libudf.pc %%PARANOIA%%libdata/pkgconfig/libcdio_cdda.pc %%PARANOIA%%libdata/pkgconfig/libcdio_paranoia.pc libdata/pkgconfig/libiso9660.pc Index: sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c =================================================================== RCS file: sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c diff -N sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c --- sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c 2 Jan 2008 13:51:57 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ - -$FreeBSD: ports/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c,v 1.1 2008/01/02 13:51:57 mich Exp $ - ---- lib/driver/FreeBSD/freebsd.c.orig -+++ lib/driver/FreeBSD/freebsd.c -@@ -743,6 +743,27 @@ - #endif /*HAVE_FREEBSD_CDROM*/ - } - -+/*! Find out if media has changed since the last call. @param -+ p_user_data the environment of the CD object to be acted upon. -+ @return 1 if media has changed since last call, 0 if not. Error -+ return codes are the same as driver_return_code_t -+ */ -+int -+get_media_changed_freebsd (const void *p_user_data) -+{ -+#ifdef HAVE_FREEBSD_CDROM -+ const _img_private_t *p_env = p_user_data; -+ if ( p_env->access_mode == _AM_CAM ) { -+ return mmc_get_media_changed( p_env->gen.cdio ); -+ } -+ else -+ return DRIVER_OP_UNSUPPORTED; -+#else -+ return DRIVER_OP_NO_DRIVER; -+#endif /*HAVE_FREEBSD_CDROM*/ -+} -+ -+ - /*! - Initialization routine. This is the only thing that doesn't - get called via a function pointer. In fact *we* are the -@@ -790,6 +811,7 @@ - .get_discmode = get_discmode_generic, - .get_drive_cap = get_drive_cap_freebsd, - .get_first_track_num = get_first_track_num_generic, -+ .get_media_changed = get_media_changed_freebsd, - .get_mcn = get_mcn_freebsd, - .get_num_tracks = get_num_tracks_generic, - .get_track_channels = get_track_channels_generic, Index: sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h =================================================================== RCS file: sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h diff -N sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h --- sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h 2 Jan 2008 13:51:57 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h,v 1.1 2008/01/02 13:51:57 mich Exp $ - ---- lib/driver/FreeBSD/freebsd.h.orig -+++ lib/driver/FreeBSD/freebsd.h -@@ -158,6 +158,8 @@ - cdio_drive_write_cap_t *p_write_cap, - cdio_drive_misc_cap_t *p_misc_cap); - -+int get_media_changed_freebsd (const void *p_user_data); -+ - char *get_mcn_freebsd_ioctl (const _img_private_t *p_env); - - void free_freebsd_cam (void *obj); Index: sysutils/libcdio/files/patch-src_cd-drive.c =================================================================== RCS file: sysutils/libcdio/files/patch-src_cd-drive.c diff -N sysutils/libcdio/files/patch-src_cd-drive.c --- sysutils/libcdio/files/patch-src_cd-drive.c 12 Mar 2007 14:19:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/sysutils/libcdio/files/patch-src_cd-drive.c,v 1.1 2007/03/12 14:19:39 mich Exp $ - ---- src/cd-drive.c.orig -+++ src/cd-drive.c -@@ -28,7 +28,7 @@ - #ifdef HAVE_SYS_TYPES_H - #include - #endif --#include -+#include "getopt.h" - #include - #include - Index: sysutils/unieject/Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/unieject/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- sysutils/unieject/Makefile 7 Sep 2008 00:18:46 -0000 1.13 +++ sysutils/unieject/Makefile 8 Nov 2009 14:07:47 -0000 @@ -7,14 +7,14 @@ PORTNAME= unieject DISTVERSION= 5.3.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= SF BERLIOS MAINTAINER= ports@FreeBSD.org COMMENT= Eject(1) replacement -LIB_DEPENDS= cdio.8:${PORTSDIR}/sysutils/libcdio \ +LIB_DEPENDS= cdio.12:${PORTSDIR}/sysutils/libcdio \ confuse.0:${PORTSDIR}/devel/libconfuse \ popt.0:${PORTSDIR}/devel/popt