Update to 0.82

Parts from:
PR:		140388
Submitted by:	lippe

6 files changed, 29 insertions, 100 deletions

diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index 2f07f110bed3..2c0343697bb0 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libcdio
-PORTVERSION=	0.78.2
-PORTREVISION=	3
+PORTVERSION=	0.82
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libcdio
@@ -15,7 +14,8 @@ MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Compact Disc Input and Control Library
 
 LIB_DEPENDS=	cddb.4:${PORTSDIR}/audio/libcddb \
-		popt.0:${PORTSDIR}/devel/popt
+		popt.0:${PORTSDIR}/devel/popt \
+		cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget pkgconfig gnomehack
@@ -26,27 +26,22 @@ CONFIGURE_ARGS+=	--with-libpopt-prefix=${LOCALBASE} \
 			--with-libiconv-prefix=${LOCALBASE} \
 USE_PERL5_BUILD=yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+MAN1=	cd-drive.1 cd-info.1 iso-read.1 iso-info.1 cd-read.1
 
 INFO=		libcdio
 
-OPTIONS=	PARANOIA "Support for accessing audio via CD Paranoia" on
-
 .include <bsd.port.pre.mk>
 
-.ifdef(WITH_PARANOIA)
-LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-PLIST_SUB+=	PARANOIA=""
-MANLANG=	"" ja
-MAN1=	cd-paranoia.1
-.else
-CONFIGURE_ARGS+=	--without-cd-paranoia
-PLIST_SUB+=	PARANOIA="@comment "
-.endif
+_MANLANG=	"" ja
+_MAN1=	cd-paranoia.1
+.for lang in ${_MANLANG}
+_MANPAGES+=	${_MAN1:S%^%${MAN1PREFIX}/man/${lang}/man1/%}
+.endfor
 
 post-patch:
 .ifdef(WITH_PARANOIA)
 	${REINPLACE_CMD} -e 's|/jp/man1|/ja/man1|' \
-		 ${WRKSRC}/src/cd-paranoia/doc/jp/Makefile.in
+		${WRKSRC}/src/cd-paranoia/doc/ja/Makefile.in
 .else
 	${REINPLACE_CMD} -e 's|libcdio_paranoia.pc||; s|libcdio_cdda.pc||' \
 		 ${WRKSRC}/Makefile.in
diff --git a/sysutils/libcdio/distinfo b/sysutils/libcdio/distinfo
index 6c7f8e6f8344..bf7dda9bbb46 100644
--- a/sysutils/libcdio/distinfo
+++ b/sysutils/libcdio/distinfo
@@ -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
diff --git a/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c b/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c
deleted file mode 100644
index 9b2435b1c20d..000000000000
--- a/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- 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,
diff --git a/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h b/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h
deleted file mode 100644
index 89d23c58614c..000000000000
--- a/sysutils/libcdio/files/patch-lib_driver_FreeBSD_freebsd.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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);
diff --git a/sysutils/libcdio/files/patch-src_cd-drive.c b/sysutils/libcdio/files/patch-src_cd-drive.c
deleted file mode 100644
index 7d7bcb988750..000000000000
--- a/sysutils/libcdio/files/patch-src_cd-drive.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/cd-drive.c.orig
-+++ src/cd-drive.c
-@@ -28,7 +28,7 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
--#include <getopt.h>
-+#include "getopt.h"
- #include <cdio/cdio.h>
- #include <cdio/mmc.h>
- 
diff --git a/sysutils/libcdio/pkg-plist b/sysutils/libcdio/pkg-plist
index bc1aad114b8d..9044fecbb890 100644
--- a/sysutils/libcdio/pkg-plist
+++ b/sysutils/libcdio/pkg-plist
@@ -1,6 +1,6 @@
 bin/cd-drive
 bin/cd-info
-%%PARANOIA%%bin/cd-paranoia
+bin/cd-paranoia
 bin/cd-read
 bin/cdda-player
 bin/iso-info
@@ -49,23 +49,23 @@ include/cdio++/track.hpp
 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
-%%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/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
-lib/libiso9660.so.5
+lib/libiso9660.so.7
 lib/libiso9660++.a
 lib/libiso9660++.la
 lib/libiso9660++.so
@@ -75,8 +75,11 @@ lib/libudf.la
 lib/libudf.so
 lib/libudf.so.0
 libdata/pkgconfig/libcdio.pc
-%%PARANOIA%%libdata/pkgconfig/libcdio_cdda.pc
-%%PARANOIA%%libdata/pkgconfig/libcdio_paranoia.pc
+libdata/pkgconfig/libcdio_cdda.pc
+libdata/pkgconfig/libcdio_paranoia.pc
+libdata/pkgconfig/libudf.pc
+libdata/pkgconfig/libcdio++.pc
+libdata/pkgconfig/libiso9660++.pc
 libdata/pkgconfig/libiso9660.pc
 @dirrm include/cdio
 @dirrm include/cdio++