Merge branch 'master' into gnome-3.24

22 files changed, 207 insertions, 142 deletions

diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index ab813e02d06d..ec4a9ee5da8a 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,6 +1,14 @@
---- configure.orig	2017-04-13 01:55:54 UTC
+--- configure.orig	2017-07-29 17:49:29 UTC
 +++ configure
-@@ -3262,12 +3262,7 @@ target_os_default=$(tolower $(uname -s))
+@@ -1875,6 +1875,7 @@ HEADERS_LIST="
+     machine_ioctl_meteor_h
+     malloc_h
+     opencv2_core_core_c_h
++    openjpeg_2_2_openjpeg_h
+     openjpeg_2_1_openjpeg_h
+     openjpeg_2_0_openjpeg_h
+     openjpeg_1_5_openjpeg_h
+@@ -3262,12 +3263,7 @@ target_os_default=$(tolower $(uname -s))
  host_os=$target_os_default
  
  # machine
@@ -14,7 +22,21 @@
  cpu="generic"
  intrinsics="none"
  
-@@ -6295,6 +6290,9 @@ elif enabled llvm_gcc; then
+@@ -5803,10 +5799,12 @@ enabled libopencore_amrwb && require lib
+ enabled libopencv         && { check_header opencv2/core/core_c.h &&
+                                { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
+                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+-                               require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
++                               require_pkg_config opencv-core-core opencv/cxcore.h cvCreateImageHeader; }
+ enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+ enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
++			       { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++                               check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
+                                { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                { check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+@@ -6295,6 +6293,9 @@ elif enabled llvm_gcc; then
  elif enabled clang; then
      check_cflags -mllvm -stack-alignment=16
      check_cflags -mstack-alignment=16
@@ -24,7 +46,7 @@
      check_cflags -Qunused-arguments
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
-@@ -6900,7 +6898,7 @@ exec_prefix=\${prefix}
+@@ -6900,7 +6901,7 @@ exec_prefix=\${prefix}
  libdir=$libdir
  includedir=$incdir
  
@@ -33,7 +55,7 @@
  Description: $comment
  Version: $version
  Requires: $(enabled shared || echo $requires)
-@@ -6914,10 +6912,10 @@ EOF
+@@ -6914,10 +6915,10 @@ EOF
  mkdir -p doc/examples/pc-uninstalled
  includedir=${source_path}
  [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c b/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c
new file mode 100644
index 000000000000..71d727521618
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c
@@ -0,0 +1,31 @@
+--- libavcodec/libopenjpegdec.c.orig	2017-07-29 17:49:30 UTC
++++ libavcodec/libopenjpegdec.c
+@@ -34,7 +34,9 @@
+ #include "internal.h"
+ #include "thread.h"
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#  include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ #  include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  include <openjpeg-2.0/openjpeg.h>
+@@ -44,7 +46,7 @@
+ #  include <openjpeg.h>
+ #endif
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  define OPENJPEG_MAJOR_VERSION 2
+ #  define OPJ(x) OPJ_##x
+ #else
+@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo
+     opj_stream_set_read_function(stream, stream_read);
+     opj_stream_set_skip_function(stream, stream_skip);
+     opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     opj_stream_set_user_data(stream, &reader, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+     opj_stream_set_user_data(stream, &reader);
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c b/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c
new file mode 100644
index 000000000000..61c2bc5cfb13
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c
@@ -0,0 +1,40 @@
+--- libavcodec/libopenjpegenc.c.orig	2017-07-29 17:49:30 UTC
++++ libavcodec/libopenjpegenc.c
+@@ -32,7 +32,9 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#  include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ #  include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  include <openjpeg-2.0/openjpeg.h>
+@@ -42,7 +44,7 @@
+ #  include <openjpeg.h>
+ #endif
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ #  define OPENJPEG_MAJOR_VERSION 2
+ #  define OPJ(x) OPJ_##x
+ #else
+@@ -305,7 +307,7 @@ static av_cold int libopenjpeg_encode_in
+ 
+     opj_set_default_encoder_parameters(&ctx->enc_params);
+ 
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     switch (ctx->cinema_mode) {
+     case OPJ_CINEMA2K_24:
+         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
+@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCo
+     opj_stream_set_write_function(stream, stream_write);
+     opj_stream_set_skip_function(stream, stream_skip);
+     opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+     opj_stream_set_user_data(stream, &writer, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+     opj_stream_set_user_data(stream, &writer);
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 07ebe632fed5..3ccc2b64428d 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libav
-PORTVERSION=	11.8
-PORTREVISION=	2
+PORTVERSION=	12.1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
@@ -11,14 +10,14 @@ COMMENT=	Realtime audio/video conversion library
 
 LICENSE=	GPLv2+
 
+BROKEN_armv6=		fails to compile: cc: warning: joined argument expects additional value: -mcpu=
+
 BUILD_DEPENDS=	yasm:devel/yasm
 LIB_DEPENDS=	libopencv_core.so:graphics/opencv-core \
 		libgmp.so:math/gmp \
 		libvdpau.so:multimedia/libvdpau \
 		libhogweed.so:security/nettle
 
-BROKEN_armv6=		fails to compile: cc: warning: joined argument expects additional value: -mcpu=
-
 USES=		cpe gmake perl5 pkgconfig tar:xz
 USE_XORG=	x11
 HAS_CONFIGURE=	yes
@@ -226,10 +225,10 @@ post-configure-DOCS-off:
 	@${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak
 
 post-install:
-.for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\
-	lib/libav/libavfilter.so.5.0.0 lib/libav/libavformat.so.56.1.0\
-	lib/libav/libavcodec.so.56.1.0 lib/libav/libavresample.so.2.1.0\
-	lib/libav/libswscale.so.3.0.0 lib/libav/libavutil.so.54.3.0
+.for a in bin/avconv bin/avprobe lib/libav/libavcodec.so.57.25.0\
+	lib/libav/libavdevice.so.56.1.0 lib/libav/libavfilter.so.6.7.0\
+	lib/libav/libavformat.so.57.7.2 lib/libav/libavresample.so.3.0.0\
+	lib/libav/libavutil.so.55.20.0 lib/libav/libswscale.so.4.0.0
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a}
 .endfor
 
diff --git a/multimedia/libav/distinfo b/multimedia/libav/distinfo
index 58a381ccf1f3..96ec66294976 100644
--- a/multimedia/libav/distinfo
+++ b/multimedia/libav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486171185
-SHA256 (libav-11.8.tar.xz) = 7014b869570b9ea759e5c06beb3e9debd024a1c5af517655a9e1ccfe145baf4e
-SIZE (libav-11.8.tar.xz) = 4865796
+TIMESTAMP = 1495507159
+SHA256 (libav-12.1.tar.xz) = fad96aa265d3d64b9e53c159559621ec888effa022908da8372164fa4cbe5d2d
+SIZE (libav-12.1.tar.xz) = 5267292
diff --git a/multimedia/libav/files/patch-libavcodec-libilbc.c b/multimedia/libav/files/patch-libavcodec-libilbc.c
deleted file mode 100644
index 905f52b272b5..000000000000
--- a/multimedia/libav/files/patch-libavcodec-libilbc.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- libavcodec/libilbc.c.orig	2016-05-25 00:36:32 UTC
-+++ libavcodec/libilbc.c
-@@ -20,6 +20,7 @@
-  */
- 
- #include <ilbc.h>
-+#include <stdint.h>
- 
- #include "libavutil/channel_layout.h"
- #include "libavutil/common.h"
-@@ -95,8 +96,8 @@ static int ilbc_decode_frame(AVCodecCont
-         return ret;
-     }
- 
--    WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0],
--                             (const WebRtc_UWord16*) buf, &s->decoder, 1);
-+    WebRtcIlbcfix_DecodeImpl((int16_t*) frame->data[0],
-+                             (const uint16_t*) buf, &s->decoder, 1);
- 
-     *got_frame_ptr = 1;
- 
-@@ -168,7 +169,7 @@ static int ilbc_encode_frame(AVCodecCont
-         return ret;
-     }
- 
--    WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16*) avpkt->data, (const WebRtc_Word16*) frame->data[0], &s->encoder);
-+    WebRtcIlbcfix_EncodeImpl((uint16_t*) avpkt->data, (const int16_t*) frame->data[0], &s->encoder);
- 
-     avpkt->size     = s->encoder.no_of_bytes;
-     *got_packet_ptr = 1;
diff --git a/multimedia/libav/files/patch-libavcodec_libvpxenc.c b/multimedia/libav/files/patch-libavcodec_libvpxenc.c
deleted file mode 100644
index 95773fcb16af..000000000000
--- a/multimedia/libav/files/patch-libavcodec_libvpxenc.c
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 6540fe0
-Author: James Zern <jzern@google.com>
-Date:   Mon Oct 19 22:44:11 2015 -0700
-
-    libvpxenc: remove some unused ctrl id mappings
-    
-    VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
-    from libvpx and the remaining values were never used here
-    
-    Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
-    Signed-off-by: James Zern <jzern@google.com>
---- libavcodec/libvpxenc.c.orig	2016-05-25 00:36:32 UTC
-+++ libavcodec/libvpxenc.c
-@@ -70,19 +70,11 @@ typedef struct VP8EncoderContext {
- 
- /** String mappings for enum vp8e_enc_control_id */
- static const char *const ctlidstr[] = {
--    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
--    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
--    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
--    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
--    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
--    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
-     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
-     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
-     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
--    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
-     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
-     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
--    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
-     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
-     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
-     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
diff --git a/multimedia/libav/pkg-plist b/multimedia/libav/pkg-plist
index 1354709fbba4..ea803344a30f 100644
--- a/multimedia/libav/pkg-plist
+++ b/multimedia/libav/pkg-plist
@@ -3,12 +3,16 @@ bin/avconv
 bin/avprobe
 include/libav/libavcodec/avcodec.h
 include/libav/libavcodec/avfft.h
+include/libav/libavcodec/d3d11va.h
+include/libav/libavcodec/dirac.h
 include/libav/libavcodec/dv_profile.h
 include/libav/libavcodec/dxva2.h
+include/libav/libavcodec/qsv.h
 include/libav/libavcodec/vaapi.h
 include/libav/libavcodec/vda.h
 include/libav/libavcodec/vdpau.h
 include/libav/libavcodec/version.h
+include/libav/libavcodec/vorbis_parser.h
 include/libav/libavcodec/xvmc.h
 include/libav/libavdevice/avdevice.h
 include/libav/libavdevice/version.h
@@ -26,7 +30,6 @@ include/libav/libavutil/adler32.h
 include/libav/libavutil/aes.h
 include/libav/libavutil/attributes.h
 include/libav/libavutil/audio_fifo.h
-include/libav/libavutil/audioconvert.h
 include/libav/libavutil/avassert.h
 include/libav/libavutil/avconfig.h
 include/libav/libavutil/avstring.h
@@ -48,6 +51,12 @@ include/libav/libavutil/fifo.h
 include/libav/libavutil/file.h
 include/libav/libavutil/frame.h
 include/libav/libavutil/hmac.h
+include/libav/libavutil/hwcontext.h
+include/libav/libavutil/hwcontext_cuda.h
+include/libav/libavutil/hwcontext_dxva2.h
+include/libav/libavutil/hwcontext_qsv.h
+include/libav/libavutil/hwcontext_vaapi.h
+include/libav/libavutil/hwcontext_vdpau.h
 include/libav/libavutil/imgutils.h
 include/libav/libavutil/intfloat.h
 include/libav/libavutil/intreadwrite.h
@@ -58,7 +67,6 @@ include/libav/libavutil/macros.h
 include/libav/libavutil/mathematics.h
 include/libav/libavutil/md5.h
 include/libav/libavutil/mem.h
-include/libav/libavutil/old_pix_fmts.h
 include/libav/libavutil/opt.h
 include/libav/libavutil/parseutils.h
 include/libav/libavutil/pixdesc.h
@@ -76,32 +84,32 @@ include/libav/libswscale/swscale.h
 include/libav/libswscale/version.h
 lib/libav/libavcodec.a
 lib/libav/libavcodec.so
-lib/libav/libavcodec.so.56
-lib/libav/libavcodec.so.56.1.0
+lib/libav/libavcodec.so.57
+lib/libav/libavcodec.so.57.25.0
 lib/libav/libavdevice.a
 lib/libav/libavdevice.so
-lib/libav/libavdevice.so.55
-lib/libav/libavdevice.so.55.0.0
+lib/libav/libavdevice.so.56
+lib/libav/libavdevice.so.56.1.0
 lib/libav/libavfilter.a
 lib/libav/libavfilter.so
-lib/libav/libavfilter.so.5
-lib/libav/libavfilter.so.5.0.0
+lib/libav/libavfilter.so.6
+lib/libav/libavfilter.so.6.7.0
 lib/libav/libavformat.a
 lib/libav/libavformat.so
-lib/libav/libavformat.so.56
-lib/libav/libavformat.so.56.1.0
+lib/libav/libavformat.so.57
+lib/libav/libavformat.so.57.7.2
 lib/libav/libavresample.a
 lib/libav/libavresample.so
-lib/libav/libavresample.so.2
-lib/libav/libavresample.so.2.1.0
+lib/libav/libavresample.so.3
+lib/libav/libavresample.so.3.0.0
 lib/libav/libavutil.a
 lib/libav/libavutil.so
-lib/libav/libavutil.so.54
-lib/libav/libavutil.so.54.3.0
+lib/libav/libavutil.so.55
+lib/libav/libavutil.so.55.20.0
 lib/libav/libswscale.a
 lib/libav/libswscale.so
-lib/libav/libswscale.so.3
-lib/libav/libswscale.so.3.0.0
+lib/libav/libswscale.so.4
+lib/libav/libswscale.so.4.0.0
 libdata/pkgconfig/libavcodec-libav.pc
 libdata/pkgconfig/libavdevice-libav.pc
 libdata/pkgconfig/libavfilter-libav.pc
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 4ad9e470b3b3..1a522764fec4 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Provides technical and tag information for video and audio files
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../../../License.html
 
+BROKEN_powerpc64=	does not build: undefined reference to fmodl
+
 LIB_DEPENDS=	libmediainfo.so:multimedia/libmediainfo \
 		libzen.so:multimedia/libzen
 
-BROKEN_powerpc64=	does not build: undefined reference to fmodl
-
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		libtool pathfix pkgconfig tar:xz
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 562dfd14125d..37b3645aa2e6 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	14.0.0
+PORTVERSION=	15.0.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index a3fa32a11f2e..24f08b834e57 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501318850
-SHA256 (mkvtoolnix-14.0.0.tar.xz) = 86aa96acb26f7ef9d7afb4d0c1fa1a086b398d563b77372c436044c3c6bba78c
-SIZE (mkvtoolnix-14.0.0.tar.xz) = 4529948
+TIMESTAMP = 1503134198
+SHA256 (mkvtoolnix-15.0.0.tar.xz) = 73dc3b6f0a7147e28c06f44427fa0e824d0a4129e40c942d7642d9f451a51195
+SIZE (mkvtoolnix-15.0.0.tar.xz) = 4552588
diff --git a/multimedia/mpc-qt/Makefile b/multimedia/mpc-qt/Makefile
index c9f2f7dbe415..33c3ef29fe4b 100644
--- a/multimedia/mpc-qt/Makefile
+++ b/multimedia/mpc-qt/Makefile
@@ -2,11 +2,9 @@
 
 PORTNAME=	mpc-qt
 DISTVERSIONPREFIX=	v
-DISTVERSION=	17.08
+DISTVERSION=	17.08-13
+DISTVERSIONSUFFIX=	-gaf00b5b
 CATEGORIES=	multimedia audio
-MASTER_SITES=	https://aur.archlinux.org/cgit/aur.git/plain/${PORTNAME}.desktop?h=${PORTNAME}-git&id=b1a6b91&dummy=/:desktop
-DISTFILES=	${PORTNAME}.desktop:desktop
-EXTRACT_ONLY=	${DISTFILES:N*\:desktop:C/:.*//}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Qt 5 clone of Media Player Classic based on libmpv
@@ -17,6 +15,7 @@ LIB_DEPENDS=	libmpv.so:multimedia/mpv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cmdrkotori
+GH_TUPLE=	Argon-:mpv-stats:1.1-24-g6a37a6d:mpv_stats/external/mpv-stats
 
 USES=		compiler:c++11-lib desktop-file-utils pkgconfig qmake
 USE_QT5=	qmake_build buildtools_build linguisttools_build \
@@ -24,20 +23,5 @@ USE_QT5=	qmake_build buildtools_build linguisttools_build \
 USE_GL=		gl
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
-PLIST_FILES=	bin/${PORTNAME} \
-		share/applications/${PORTNAME}.desktop \
-		share/pixmaps/${PORTNAME}.svg
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},' \
-		${WRKSRC}/platform/resources_paths.h
-
-do-install:
-	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.desktop \
-		${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/images/icon/logo.svg \
-		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.svg
 
 .include <bsd.port.mk>
diff --git a/multimedia/mpc-qt/distinfo b/multimedia/mpc-qt/distinfo
index 83fc605c28c9..92db71418c61 100644
--- a/multimedia/mpc-qt/distinfo
+++ b/multimedia/mpc-qt/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1502557964
-SHA256 (mpc-qt.desktop) = 7694745aac0e52c050a6bc069a0686b025e509136919d985d3c4495eec0f1c9d
-SIZE (mpc-qt.desktop) = 1270
-SHA256 (cmdrkotori-mpc-qt-v17.08_GH0.tar.gz) = 16a81194baaf10884764423a2bfc2f39860515dfb62e29cefcbe0d8f2d9dc27d
-SIZE (cmdrkotori-mpc-qt-v17.08_GH0.tar.gz) = 162691
+TIMESTAMP = 1503233282
+SHA256 (cmdrkotori-mpc-qt-v17.08-13-gaf00b5b_GH0.tar.gz) = 81c31c571ac2ec0bdafb303175fc509969e985e5ed28cf4d7ae2a42c1510a752
+SIZE (cmdrkotori-mpc-qt-v17.08-13-gaf00b5b_GH0.tar.gz) = 163383
+SHA256 (Argon--mpv-stats-1.1-24-g6a37a6d_GH0.tar.gz) = 4b180ea8f4f45bb8d822745b32d22d61b09204a2d192543429a562801f3af650
+SIZE (Argon--mpv-stats-1.1-24-g6a37a6d_GH0.tar.gz) = 15179
diff --git a/multimedia/mpc-qt/pkg-plist b/multimedia/mpc-qt/pkg-plist
new file mode 100644
index 000000000000..1afdb317d7ea
--- /dev/null
+++ b/multimedia/mpc-qt/pkg-plist
@@ -0,0 +1,6 @@
+bin/mpc-qt
+share/applications/mpc-qt.desktop
+%%PORTDOCS%%%%DOCSDIR%%/ipc.md
+share/icons/hicolor/scalable/apps/mpc-qt.svg
+%%DATADIR%%/scripts/stats.lua
+%%DATADIR%%/translations/mpc-qt_it.qm
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index a80a11fb70f3..18462f59259d 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	obs-studio
-PORTVERSION=	19.0.3
+PORTVERSION=	20.0.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/obs-studio/distinfo b/multimedia/obs-studio/distinfo
index 891a6c443c29..258a0beeff62 100644
--- a/multimedia/obs-studio/distinfo
+++ b/multimedia/obs-studio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498827383
-SHA256 (jp9000-obs-studio-19.0.3_GH0.tar.gz) = 6b846e412c64785209bde38686e1e76277686ed4477f0857688750479a6ac326
-SIZE (jp9000-obs-studio-19.0.3_GH0.tar.gz) = 5510739
+TIMESTAMP = 1502959032
+SHA256 (jp9000-obs-studio-20.0.1_GH0.tar.gz) = 3241667f180816b860622fd9ac572a86375a9a766ac45c69a886dcbdaf524643
+SIZE (jp9000-obs-studio-20.0.1_GH0.tar.gz) = 5610534
diff --git a/multimedia/obs-studio/pkg-plist b/multimedia/obs-studio/pkg-plist
index 3bb43b6dafd2..2f7063725ffa 100644
--- a/multimedia/obs-studio/pkg-plist
+++ b/multimedia/obs-studio/pkg-plist
@@ -134,6 +134,7 @@ share/obs/obs-plugins/frontend-tools/locale/ca-ES.ini
 share/obs/obs-plugins/frontend-tools/locale/cs-CZ.ini
 share/obs/obs-plugins/frontend-tools/locale/da-DK.ini
 share/obs/obs-plugins/frontend-tools/locale/de-DE.ini
+share/obs/obs-plugins/frontend-tools/locale/el-GR.ini
 share/obs/obs-plugins/frontend-tools/locale/en-US.ini
 share/obs/obs-plugins/frontend-tools/locale/es-ES.ini
 share/obs/obs-plugins/frontend-tools/locale/et-EE.ini
@@ -201,6 +202,7 @@ share/obs/obs-plugins/image-source/locale/sv-SE.ini
 share/obs/obs-plugins/image-source/locale/th-TH.ini
 share/obs/obs-plugins/image-source/locale/tr-TR.ini
 share/obs/obs-plugins/image-source/locale/uk-UA.ini
+share/obs/obs-plugins/image-source/locale/vi-VN.ini
 share/obs/obs-plugins/image-source/locale/zh-CN.ini
 share/obs/obs-plugins/image-source/locale/zh-TW.ini
 share/obs/obs-plugins/linux-capture/locale/ar-SA.ini
@@ -316,6 +318,7 @@ share/obs/obs-plugins/linux-pulseaudio/locale/sr-SP.ini
 share/obs/obs-plugins/linux-pulseaudio/locale/sv-SE.ini
 share/obs/obs-plugins/linux-pulseaudio/locale/th-TH.ini
 share/obs/obs-plugins/linux-pulseaudio/locale/tr-TR.ini
+share/obs/obs-plugins/linux-pulseaudio/locale/vi-VN.ini
 share/obs/obs-plugins/linux-pulseaudio/locale/uk-UA.ini
 share/obs/obs-plugins/linux-pulseaudio/locale/zh-CN.ini
 share/obs/obs-plugins/linux-pulseaudio/locale/zh-TW.ini
@@ -355,6 +358,7 @@ share/obs/obs-plugins/linux-v4l2/locale/sr-SP.ini
 share/obs/obs-plugins/linux-v4l2/locale/sv-SE.ini
 share/obs/obs-plugins/linux-v4l2/locale/th-TH.ini
 share/obs/obs-plugins/linux-v4l2/locale/tr-TR.ini
+share/obs/obs-plugins/linux-v4l2/locale/vi-VN.ini
 share/obs/obs-plugins/linux-v4l2/locale/uk-UA.ini
 share/obs/obs-plugins/linux-v4l2/locale/zh-CN.ini
 share/obs/obs-plugins/linux-v4l2/locale/zh-TW.ini
@@ -445,6 +449,7 @@ share/obs/obs-plugins/obs-filters/locale/sr-CS.ini
 share/obs/obs-plugins/obs-filters/locale/sr-SP.ini
 share/obs/obs-plugins/obs-filters/locale/sv-SE.ini
 share/obs/obs-plugins/obs-filters/locale/tr-TR.ini
+share/obs/obs-plugins/obs-filters/locale/vi-VN.ini
 share/obs/obs-plugins/obs-filters/locale/uk-UA.ini
 share/obs/obs-plugins/obs-filters/locale/zh-CN.ini
 share/obs/obs-plugins/obs-filters/locale/zh-TW.ini
@@ -486,6 +491,7 @@ share/obs/obs-plugins/obs-libfdk/locale/sr-SP.ini
 share/obs/obs-plugins/obs-libfdk/locale/sv-SE.ini
 share/obs/obs-plugins/obs-libfdk/locale/th-TH.ini
 share/obs/obs-plugins/obs-libfdk/locale/tr-TR.ini
+share/obs/obs-plugins/obs-libfdk/locale/vi-VN.ini
 share/obs/obs-plugins/obs-libfdk/locale/uk-UA.ini
 share/obs/obs-plugins/obs-libfdk/locale/ur-PK.ini
 share/obs/obs-plugins/obs-libfdk/locale/zh-CN.ini
@@ -563,6 +569,7 @@ share/obs/obs-plugins/obs-transitions/locale/sr-CS.ini
 share/obs/obs-plugins/obs-transitions/locale/sr-SP.ini
 share/obs/obs-plugins/obs-transitions/locale/sv-SE.ini
 share/obs/obs-plugins/obs-transitions/locale/tr-TR.ini
+share/obs/obs-plugins/obs-transitions/locale/vi-VN.ini
 share/obs/obs-plugins/obs-transitions/locale/uk-UA.ini
 share/obs/obs-plugins/obs-transitions/locale/zh-CN.ini
 share/obs/obs-plugins/obs-transitions/locale/zh-TW.ini
@@ -681,6 +688,7 @@ share/obs/obs-plugins/rtmp-services/locale/sr-SP.ini
 share/obs/obs-plugins/rtmp-services/locale/sv-SE.ini
 share/obs/obs-plugins/rtmp-services/locale/th-TH.ini
 share/obs/obs-plugins/rtmp-services/locale/tr-TR.ini
+share/obs/obs-plugins/rtmp-services/locale/vi-VN.ini
 share/obs/obs-plugins/rtmp-services/locale/uk-UA.ini
 share/obs/obs-plugins/rtmp-services/locale/ur-PK.ini
 share/obs/obs-plugins/rtmp-services/locale/zh-CN.ini
@@ -722,12 +730,14 @@ share/obs/obs-plugins/text-freetype2/locale/sr-SP.ini
 share/obs/obs-plugins/text-freetype2/locale/sv-SE.ini
 share/obs/obs-plugins/text-freetype2/locale/th-TH.ini
 share/obs/obs-plugins/text-freetype2/locale/tr-TR.ini
+share/obs/obs-plugins/text-freetype2/locale/vi-VN.ini
 share/obs/obs-plugins/text-freetype2/locale/uk-UA.ini
 share/obs/obs-plugins/text-freetype2/locale/zh-CN.ini
 share/obs/obs-plugins/text-freetype2/locale/zh-TW.ini
 share/obs/obs-plugins/text-freetype2/text_default.effect
 share/obs/obs-studio/license/gplv2.txt
 share/obs/obs-studio/locale.ini
+share/obs/obs-studio/locale/af-ZA.ini
 share/obs/obs-studio/locale/ar-SA.ini
 share/obs/obs-studio/locale/bg-BG.ini
 share/obs/obs-studio/locale/bn-BD.ini
@@ -770,6 +780,28 @@ share/obs/obs-studio/locale/uk-UA.ini
 share/obs/obs-studio/locale/vi-VN.ini
 share/obs/obs-studio/locale/zh-CN.ini
 share/obs/obs-studio/locale/zh-TW.ini
+share/obs/obs-studio/themes/Rachni.qss
+share/obs/obs-studio/themes/Rachni/checkbox_checked.png
+share/obs/obs-studio/themes/Rachni/checkbox_checked_disabled.png
+share/obs/obs-studio/themes/Rachni/checkbox_checked_focus.png
+share/obs/obs-studio/themes/Rachni/checkbox_unchecked.png
+share/obs/obs-studio/themes/Rachni/checkbox_unchecked_disabled.png
+share/obs/obs-studio/themes/Rachni/checkbox_unchecked_focus.png
+share/obs/obs-studio/themes/Rachni/down_arrow.png
+share/obs/obs-studio/themes/Rachni/down_arrow_disabled.png
+share/obs/obs-studio/themes/Rachni/left_arrow.png
+share/obs/obs-studio/themes/Rachni/left_arrow_disabled.png
+share/obs/obs-studio/themes/Rachni/radio_checked.png
+share/obs/obs-studio/themes/Rachni/radio_checked_disabled.png
+share/obs/obs-studio/themes/Rachni/radio_checked_focus.png
+share/obs/obs-studio/themes/Rachni/radio_unchecked.png
+share/obs/obs-studio/themes/Rachni/radio_unchecked_disabled.png
+share/obs/obs-studio/themes/Rachni/radio_unchecked_focus.png
+share/obs/obs-studio/themes/Rachni/right_arrow.png
+share/obs/obs-studio/themes/Rachni/right_arrow_disabled.png
+share/obs/obs-studio/themes/Rachni/sizegrip.png
+share/obs/obs-studio/themes/Rachni/up_arrow.png
+share/obs/obs-studio/themes/Rachni/up_arrow_disabled.png
 share/obs/obs-studio/themes/Dark.qss
 share/obs/obs-studio/themes/Dark/cogwheel.png
 share/obs/obs-studio/themes/Dark/down_arrow.png
diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile
index a10d50367e5d..498aa67b64ba 100644
--- a/multimedia/plexmediaserver/Makefile
+++ b/multimedia/plexmediaserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plexmediaserver
-PORTVERSION?=	1.7.5.4035
+PORTVERSION?=	1.8.1.4139
 PORTREVISION?=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	https://downloads.plex.tv/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/
@@ -12,7 +12,7 @@ MAINTAINER?=	feld@FreeBSD.org
 COMMENT=	Plex Media Server component
 
 USES=		cpe tar:bzip2
-PLEX_BUILD?=	313f93718
+PLEX_BUILD?=	c789b3fbb
 NO_BUILD=	yes
 WRKSRC=	${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}
 
diff --git a/multimedia/plexmediaserver/distinfo b/multimedia/plexmediaserver/distinfo
index 8ed47b6d1a37..206f05bfc53e 100644
--- a/multimedia/plexmediaserver/distinfo
+++ b/multimedia/plexmediaserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499211041
-SHA256 (PlexMediaServer-1.7.5.4035-313f93718-freebsd-amd64.tar.bz2) = 120c62a1a420ddbb8a220ab3165185792dd9344874070966cf67702d140f6a8a
-SIZE (PlexMediaServer-1.7.5.4035-313f93718-freebsd-amd64.tar.bz2) = 85174136
+TIMESTAMP = 1503599812
+SHA256 (PlexMediaServer-1.8.1.4139-c789b3fbb-freebsd-amd64.tar.bz2) = 72642f38ded1a1c83e0a83ff86a8feef96f5c39e534a36812a7bf9512fbd2abb
+SIZE (PlexMediaServer-1.8.1.4139-c789b3fbb-freebsd-amd64.tar.bz2) = 85463265
diff --git a/multimedia/plexmediaserver/pkg-plist b/multimedia/plexmediaserver/pkg-plist
index dc55be788f83..adaaf9fc1305 100644
--- a/multimedia/plexmediaserver/pkg-plist
+++ b/multimedia/plexmediaserver/pkg-plist
@@ -996,6 +996,7 @@
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/mytv.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/nala.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/nat_geo_wild.png
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/national geographic.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/national_general_pictures.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/nbc.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/nbc_universal.png
@@ -1006,7 +1007,6 @@
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/new_world_pictures.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/new_zealand_film_commission.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/newmarket.png
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/ngc.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/nick_at_nite.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/nick_jr.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/nickelodeon.png
@@ -1022,8 +1022,10 @@
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/oddlot.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/oko.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/only_vegas.png
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/openroad.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/oprah_winfrey_network.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/orf.png
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/original_film.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/orion.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/overturefilms.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Media-Flags.bundle/Contents/Resources/Studio/pa_works.png
@@ -1455,10 +1457,10 @@
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/ios/startup-iphone-portrait@2x.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/img/desktop/ios/startup-iphone5-portrait@2x.png
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/index.html
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main-0-99755cd0d68fb34ec303-plex-3.9.1-85417e0.js
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors-1-05ee7eb11f0adf375042-plex-3.9.1-85417e0.js
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.571a2c1e67571148c8a3e747308c8c7d.css
-%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.v3.9353e9cd31668f10add16b224dfe5d78.css
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/main-0-112e300e3d124ec05f6a-plex-3.14.1-2f399c1.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/js/vendors-1-f5ff042617091386d6a7-plex-3.14.1-2f399c1.js
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.d97149241b0a39e8f645824b418a30b8.css
+%%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/main.v3.59282ce80ac2696e9f28ed512c3563cd.css
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/setup.html
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/swf/jwplayer/jwplayer.swf
 %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/WebClient.bundle/Contents/Resources/swf/jwplayer/plex.xml
@@ -1544,6 +1546,7 @@
 %%DATADIR%%/Resources/Profiles/RokuDLNA-6000X-7.x.xml
 %%DATADIR%%/Resources/Profiles/Safari.xml
 %%DATADIR%%/Resources/Profiles/Samsung SmartTV.xml
+%%DATADIR%%/Resources/Profiles/Samsung Tizen.xml
 %%DATADIR%%/Resources/Profiles/Samsung.xml
 %%DATADIR%%/Resources/Profiles/Sony Blu-ray 2013.xml
 %%DATADIR%%/Resources/Profiles/Sony Blu-ray.xml
@@ -2386,6 +2389,7 @@
 %%DATADIR%%/Resources/Python/lib/python2.7/xmllib.py
 %%DATADIR%%/Resources/Python/lib/python2.7/xmlrpclib.py
 %%DATADIR%%/Resources/Python/lib/python2.7/zipfile.py
+%%DATADIR%%/Resources/RegionProviders.xml
 %%DATADIR%%/Resources/StatusItemTemplate.png
 %%DATADIR%%/Resources/StatusItemTemplate@2x.png
 %%DATADIR%%/Resources/Tuner/Private/README.md
diff --git a/multimedia/poe/Makefile b/multimedia/poe/Makefile
index bdb38e0c1fd8..2bea55222094 100644
--- a/multimedia/poe/Makefile
+++ b/multimedia/poe/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	poe
 PORTVERSION=	0.5.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia gnustep
 MASTER_SITES=	http://www.eskimo.com/~pburns/Poe/files/
 DISTNAME=	Poe-${PORTVERSION}
diff --git a/multimedia/syncplay/Makefile b/multimedia/syncplay/Makefile
index 89bf3faead89..65a0fe1a3b72 100644
--- a/multimedia/syncplay/Makefile
+++ b/multimedia/syncplay/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	syncplay
 PORTVERSION=	1.4.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	heckendorfc@gmail.com
@@ -10,11 +11,12 @@ COMMENT=	Synchronize video playback over networks
 
 LICENSE=	APACHE20
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	Syncplay
 
-USES=		desktop-file-utils gmake python:2 twisted
-USE_TWISTED=	run
+USES=		desktop-file-utils gmake python:2
 NO_ARCH=	yes
 
 INSTALLS_ICONS=	yes