Update sysutils/libcdio to 2.0.0

- Add regression tests

Update multimedia/vcdimager to 2.0.1
- Previous version is incompatible with new libcdio API; update was neccesary
- Add regression tests
- Fix LICENSE
- Sort pkg-plist
- Update WWW in pkg-descr

Bump PORTREVISON on dependent ports due to libcdio shared libary increase

Changes (libcdio):	http://git.savannah.gnu.org/cgit/libcdio.git/plain/NEWS?h=release-2.0.0
Changes (vcdimager):	https://github.com/rocky/vcdimager/blob/3b56705/NEWS
Differential Revision:	https://reviews.freebsd.org/D14469

9 files changed, 46 insertions, 18 deletions

diff --git a/sysutils/gstreamer-plugins-cdio/Makefile b/sysutils/gstreamer-plugins-cdio/Makefile
index a50e3c0e3a4f..f3c12c981c0c 100644
--- a/sysutils/gstreamer-plugins-cdio/Makefile
+++ b/sysutils/gstreamer-plugins-cdio/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 CATEGORIES=	sysutils
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Gstreamer compact disc input and control library
 
diff --git a/sysutils/gstreamer1-plugins-cdio/Makefile b/sysutils/gstreamer1-plugins-cdio/Makefile
index 2026cfe98a15..b7079b82080f 100644
--- a/sysutils/gstreamer1-plugins-cdio/Makefile
+++ b/sysutils/gstreamer1-plugins-cdio/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 COMMENT=	GStreamer compact disc input and control library
diff --git a/sysutils/libcdio-paranoia/Makefile b/sysutils/libcdio-paranoia/Makefile
index 38a1606d44c3..6599b3f0d0e8 100644
--- a/sysutils/libcdio-paranoia/Makefile
+++ b/sysutils/libcdio-paranoia/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libcdio-paranoia
 PORTVERSION=	10.2+0.94+1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU/libcdio
 
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index cb4364537851..a82ea35bd3da 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libcdio
-PORTVERSION=	0.94
+PORTVERSION=	2.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU
 
@@ -13,11 +13,14 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcddb.so:audio/libcddb
+TEST_DEPENDS=	genisoimage:sysutils/genisoimage
 
-USES=		cpe gmake iconv localbase libtool \
-		ncurses pathfix perl5 pkgconfig
+USES=		cpe gmake iconv libtool localbase \
+		ncurses pathfix perl5 pkgconfig shebangfix
 USE_PERL5=	build
 USE_LDCONFIG=	yes
+SHEBANG_FILES=	test/check_bad_iso.sh
+bash_CMD=	${SH}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
@@ -26,8 +29,6 @@ LIBS+=		${ICONV_LIB}
 INFO=		libcdio
 CPE_VENDOR=	gnu
 INSTALL_TARGET=	install-strip
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|freebsd10\.\*|freebsd*|g' ${WRKSRC}/configure
+TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/sysutils/libcdio/distinfo b/sysutils/libcdio/distinfo
index a7c4ab1d888f..6bdb59f96a49 100644
--- a/sysutils/libcdio/distinfo
+++ b/sysutils/libcdio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484801785
-SHA256 (libcdio-0.94.tar.gz) = 96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a
-SIZE (libcdio-0.94.tar.gz) = 2355452
+TIMESTAMP = 1519235055
+SHA256 (libcdio-2.0.0.tar.gz) = 1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958
+SIZE (libcdio-2.0.0.tar.gz) = 2354813
diff --git a/sysutils/libcdio/files/patch-test_driver_mmc__read.c b/sysutils/libcdio/files/patch-test_driver_mmc__read.c
new file mode 100644
index 000000000000..063dc838bfac
--- /dev/null
+++ b/sysutils/libcdio/files/patch-test_driver_mmc__read.c
@@ -0,0 +1,13 @@
+Fix segmentation fault
+
+--- test/driver/mmc_read.c.orig	2018-03-30 10:52:05 UTC
++++ test/driver/mmc_read.c
+@@ -136,7 +136,7 @@ handle_outcome(CdIo_t *p_cdio, driver_return_code_t i_
+     print_status_sense(i_status, *pi_sense_avail, p_temp_sense_reply, i_flag & 1);
+     if (18 <= *pi_sense_avail) {
+         memset(p_sense_reply, 0, sizeof(cdio_mmc_request_sense_t));
+-        memcpy(p_sense_reply, p_temp_sense_reply, *pi_sense_avail);
++        memcpy(p_sense_reply, p_temp_sense_reply, sizeof(cdio_mmc_request_sense_t));
+     } else
+         memset(p_sense_reply, 0, sizeof(cdio_mmc_request_sense_t));
+     cdio_free(p_temp_sense_reply);
diff --git a/sysutils/libcdio/files/patch-test_driver_mmc__write.c b/sysutils/libcdio/files/patch-test_driver_mmc__write.c
new file mode 100644
index 000000000000..f0d51fff0e50
--- /dev/null
+++ b/sysutils/libcdio/files/patch-test_driver_mmc__write.c
@@ -0,0 +1,13 @@
+Fix segmentation fault
+
+--- test/driver/mmc_write.c.orig	2018-03-30 10:51:54 UTC
++++ test/driver/mmc_write.c
+@@ -118,7 +118,7 @@ handle_outcome(CdIo_t *p_cdio, driver_return_code_t i_
+     print_status_sense(i_status, *pi_sense_avail, p_temp_sense_reply, i_flag & 1);
+     if (18 <= *pi_sense_avail) {
+         memset(p_sense_reply, 0, sizeof(cdio_mmc_request_sense_t));
+-        memcpy(p_sense_reply, p_temp_sense_reply, *pi_sense_avail);
++        memcpy(p_sense_reply, p_temp_sense_reply, sizeof(cdio_mmc_request_sense_t));
+     } else
+         memset(p_sense_reply, 0, sizeof(cdio_mmc_request_sense_t));
+     cdio_free(p_temp_sense_reply);
diff --git a/sysutils/libcdio/pkg-plist b/sysutils/libcdio/pkg-plist
index c7941cf2f56b..c37f3b3373a8 100644
--- a/sysutils/libcdio/pkg-plist
+++ b/sysutils/libcdio/pkg-plist
@@ -50,20 +50,20 @@ include/cdio/version.h
 include/cdio/xa.h
 lib/libcdio++.a
 lib/libcdio++.so
-lib/libcdio++.so.0
-lib/libcdio++.so.0.0.2
+lib/libcdio++.so.1
+lib/libcdio++.so.1.0.0
 lib/libcdio.a
 lib/libcdio.so
-lib/libcdio.so.16
-lib/libcdio.so.16.0.0
+lib/libcdio.so.18
+lib/libcdio.so.18.0.0
 lib/libiso9660++.a
 lib/libiso9660++.so
 lib/libiso9660++.so.0
 lib/libiso9660++.so.0.0.0
 lib/libiso9660.a
 lib/libiso9660.so
-lib/libiso9660.so.10
-lib/libiso9660.so.10.0.0
+lib/libiso9660.so.11
+lib/libiso9660.so.11.0.0
 lib/libudf.a
 lib/libudf.so
 lib/libudf.so.0
diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index 3c2cbb93f945..5f2cb432ff9e 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	unieject
 PORTVERSION=	6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	SF