18 files changed, 28 insertions, 35 deletions

diff --git a/multimedia/audacious-plugins-gtk3/Makefile b/multimedia/audacious-plugins-gtk3/Makefile
index 511c10cccf29..709d4ad6a776 100644
--- a/multimedia/audacious-plugins-gtk3/Makefile
+++ b/multimedia/audacious-plugins-gtk3/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	audacious-plugins
 PORTVERSION=	3.9
 DISTVERSIONSUFFIX=	-gtk3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 #MASTER_SITES=	http://distfiles.audacious-media-player.org/
 PKGNAMESUFFIX=	${DISTVERSIONSUFFIX}
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index c71e01573621..180e2e633f74 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	3.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index e63609f39707..ea7766e14708 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	3.4.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	https://ffmpeg.org/releases/
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 06ca80b3bbde..967e0d3e64ff 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	1.2.0
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
 
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 5830df5e954a..c993d90a2bc7 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmerlin
 PORTVERSION=	1.2.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile
index ba1708a33aaf..bd747026b703 100644
--- a/multimedia/kodi-devel/Makefile
+++ b/multimedia/kodi-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	18.0.g201803211302
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 PKGNAMESUFFIX?=	-devel
 
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index a07322e2c522..f154b9f603d7 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	17.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia java
 
 MAINTAINER=	mickael.maillot@gmail.com
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index ca6b3eaaefe1..e0efab084756 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libav
 PORTVERSION=	12.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index fdbe0f05dfdf..fb03f36d8459 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.2.6
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 3fc04f4af012..fb82ba2b1135 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 506ef8eb46d6..2e2de88f7922 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpv
 PORTVERSION=	0.27.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index ae698c468466..59f0a382aa7d 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qmmp
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 34b9c490fc75..7eda5f5578a1 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qmmp
 PORTVERSION=	0.11.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index 051df58923e2..c6f38b11bd40 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -2,26 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	vcdimager
-PORTVERSION=	0.7.24
-PORTREVISION=	7
+PORTVERSION=	2.0.1
 CATEGORIES=	multimedia
 MASTER_SITES=	GNU
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	GNU VCDImager/VCDRip -- The GNU VideoCD Image Maker/Ripping Tool
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpopt.so:devel/popt \
 		libxml2.so:textproc/libxml2 \
 		libcdio.so:sysutils/libcdio
 
+USES=		gmake libtool localbase makeinfo pathfix pkgconfig
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pathfix pkgconfig
-USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+TEST_TARGET=	check
 
 INFO=		vcdimager vcdxrip vcd-info
 
diff --git a/multimedia/vcdimager/distinfo b/multimedia/vcdimager/distinfo
index d474f5a4535c..5fd1304c59d0 100644
--- a/multimedia/vcdimager/distinfo
+++ b/multimedia/vcdimager/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vcdimager-0.7.24.tar.gz) = 075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694
-SIZE (vcdimager-0.7.24.tar.gz) = 1066815
+TIMESTAMP = 1519291369
+SHA256 (vcdimager-2.0.1.tar.gz) = 67515fefb9829d054beae40f3e840309be60cda7d68753cafdd526727758f67a
+SIZE (vcdimager-2.0.1.tar.gz) = 1115207
diff --git a/multimedia/vcdimager/files/patch-docs-vcdimager.texi b/multimedia/vcdimager/files/patch-docs-vcdimager.texi
deleted file mode 100644
index a4053a2d4615..000000000000
--- a/multimedia/vcdimager/files/patch-docs-vcdimager.texi
+++ /dev/null
@@ -1,10 +0,0 @@
---- docs/vcdimager.texi.orig	Sat Jun 18 13:11:08 2005
-+++ docs/vcdimager.texi	Sun Mar 12 14:57:41 2006
-@@ -61,7 +61,6 @@
- @direntry
- * VCDImager: (vcdimager).                       GNU Video CD imaging utilities
- * vcdimager: (vcdimager)vcdimager.              Video CD simple formatter
--* vcd-info:  (vcdimager)vcd-info.               Video CD diagnostic tool
- * cdxa2mpeg: (vcdimager)cdxa2mpeg.              Strip RIFF/CD-XA container
- * vcdxminfo: (vcdimager)vcdxminfo.              Display MPEG stream properties
- * vcdxgen: (vcdimager)vcdxgen.                  Video CD XML template generator
diff --git a/multimedia/vcdimager/pkg-descr b/multimedia/vcdimager/pkg-descr
index 060c6df3c102..892991aaa23c 100644
--- a/multimedia/vcdimager/pkg-descr
+++ b/multimedia/vcdimager/pkg-descr
@@ -14,5 +14,6 @@ Features
 - Extraction of Video CD's into files (incl. the PBC information)
 - Use of XML for the description of Video CD's
 
-WWW: http://www.gnu.org/software/vcdimager/
-     http://www.vcdimager.org/
+GitHub repo: https://github.com/rocky/vcdimager
+
+WWW: https://www.gnu.org/software/vcdimager/
diff --git a/multimedia/vcdimager/pkg-plist b/multimedia/vcdimager/pkg-plist
index fdba71d1e537..873bdc6206f1 100644
--- a/multimedia/vcdimager/pkg-plist
+++ b/multimedia/vcdimager/pkg-plist
@@ -1,10 +1,10 @@
+bin/cdxa2mpeg
 bin/vcd-info
 bin/vcdimager
-bin/cdxa2mpeg
 bin/vcdxbuild
 bin/vcdxgen
-bin/vcdxrip
 bin/vcdxminfo
+bin/vcdxrip
 include/libvcd/files.h
 include/libvcd/files_private.h
 include/libvcd/inf.h