Update to 0.92

PR:		192271

4 files changed, 8 insertions, 50 deletions

diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index aedf7b540124..c6184cf4cc52 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libcdio
-PORTVERSION=	0.83
-PORTREVISION=	3
+PORTVERSION=	0.92
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libcdio
@@ -11,8 +10,7 @@ MASTER_SITE_SUBDIR=	libcdio
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Compact Disc Input and Control Library
 
-LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb \
-		libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
+LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -30,8 +28,6 @@ INFO=		libcdio
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/jp/man1|/ja/man1|' \
-		${WRKSRC}/src/cd-paranoia/doc/ja/Makefile.in
 	${REINPLACE_CMD} -e "s,freebsd5\.\*,freebsd*," ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/libcdio/distinfo b/sysutils/libcdio/distinfo
index b98d80b170bd..ca692a7ef109 100644
--- a/sysutils/libcdio/distinfo
+++ b/sysutils/libcdio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libcdio-0.83.tar.gz) = 235017e3eccb86424f9c108f2c5d5fca62630bda8c9dcf23b425ba9c5e2482c0
-SIZE (libcdio-0.83.tar.gz) = 2323747
+SHA256 (libcdio-0.92.tar.gz) = 3336bf352aff43b5023e41a6d23525172a3b4ee433c467bd0fab5b8becb33fad
+SIZE (libcdio-0.92.tar.gz) = 2710084
diff --git a/sysutils/libcdio/files/patch-configure b/sysutils/libcdio/files/patch-configure
deleted file mode 100644
index 7087a379e92e..000000000000
--- a/sysutils/libcdio/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig	2012-01-16 15:15:37.000000000 -0600
-+++ configure.ac	2012-01-16 15:16:15.000000000 -0600
-@@ -430,7 +430,7 @@
-  	LT_NO_UNDEFINED="-no-undefined"
-   	cd_drivers="${cd_drivers}, MinGW "
- 	;;
--     freebsd4.*|freebsd5.*|freebsd6*|freebsd7*|freebsd8*|dragonfly*|kfreebsd*)
-+     freebsd4.*|freebsd5.*|freebsd[6-9]*|freebsd10*|dragonfly*|kfreebsd*)
-      	AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
-                   [Define 1 if you have FreeBSD CD-ROM support])
-  	LIBS="$LIBS -lcam"
---- configure.orig	2012-01-16 15:14:32.000000000 -0600
-+++ configure	2012-01-16 15:15:26.000000000 -0600
-@@ -16849,7 +16849,7 @@
-  	LT_NO_UNDEFINED="-no-undefined"
-   	cd_drivers="${cd_drivers}, MinGW "
- 	;;
--     freebsd4.*|freebsd5.*|freebsd6*|freebsd7*|freebsd8*|dragonfly*|kfreebsd*)
-+     freebsd4.*|freebsd5.*|freebsd[6-9]*|freebsd10*|dragonfly*|kfreebsd*)
- 
- $as_echo "#define HAVE_FREEBSD_CDROM 1" >>confdefs.h
- 
diff --git a/sysutils/libcdio/pkg-plist b/sysutils/libcdio/pkg-plist
index 4a70e20719ea..0e1f53e5b86f 100644
--- a/sysutils/libcdio/pkg-plist
+++ b/sysutils/libcdio/pkg-plist
@@ -1,6 +1,5 @@
 bin/cd-drive
 bin/cd-info
-bin/cd-paranoia
 bin/cd-read
 bin/cdda-player
 bin/iso-info
@@ -10,10 +9,8 @@ include/cdio/audio.h
 include/cdio/bytesex.h
 include/cdio/bytesex_asm.h
 include/cdio/cd_types.h
-include/cdio/cdda.h
 include/cdio/cdio.h
 include/cdio/cdio_config.h
-include/cdio/cdio_unconfig.h
 include/cdio/cdtext.h
 include/cdio/device.h
 include/cdio/disc.h
@@ -27,7 +24,6 @@ include/cdio/mmc_cmds.h
 include/cdio/mmc_hl_cmds.h
 include/cdio/mmc_ll_cmds.h
 include/cdio/mmc_util.h
-include/cdio/paranoia.h
 include/cdio/posix.h
 include/cdio/read.h
 include/cdio/rock.h
@@ -53,24 +49,16 @@ include/cdio++/read.hpp
 include/cdio++/track.hpp
 lib/libcdio.a
 lib/libcdio.so
-lib/libcdio.so.13
-lib/libcdio.so.13.0.0
+lib/libcdio.so.15
+lib/libcdio.so.15.0.0
 lib/libcdio++.a
 lib/libcdio++.so
 lib/libcdio++.so.0
 lib/libcdio++.so.0.0.2
-lib/libcdio_cdda.a
-lib/libcdio_cdda.so
-lib/libcdio_cdda.so.1
-lib/libcdio_cdda.so.1.0.0
-lib/libcdio_paranoia.a
-lib/libcdio_paranoia.so
-lib/libcdio_paranoia.so.1
-lib/libcdio_paranoia.so.1.0.0
 lib/libiso9660.a
 lib/libiso9660.so
-lib/libiso9660.so.8
-lib/libiso9660.so.8.0.0
+lib/libiso9660.so.9
+lib/libiso9660.so.9.0.0
 lib/libiso9660++.a
 lib/libiso9660++.so
 lib/libiso9660++.so.0
@@ -80,16 +68,12 @@ lib/libudf.so
 lib/libudf.so.0
 lib/libudf.so.0.0.0
 libdata/pkgconfig/libcdio.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
-man/ja/man1/cd-paranoia.1.gz
 man/man1/cd-drive.1.gz
 man/man1/cd-info.1.gz
-man/man1/cd-paranoia.1.gz
 man/man1/cd-read.1.gz
 man/man1/iso-info.1.gz
 man/man1/iso-read.1.gz