Index: head/net-p2p/retroshare/Makefile
===================================================================
--- head/net-p2p/retroshare/Makefile	(revision 468857)
+++ head/net-p2p/retroshare/Makefile	(revision 468858)
@@ -1,58 +1,56 @@
 # Created by: glocke@bsdstammtisch.at
 # $FreeBSD$
 
 PORTNAME=	retroshare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.3
 PORTREVISION=	1
 CATEGORIES=	net-p2p
 
 MAINTAINER=	peter@netkey.at
 COMMENT=	Private and secure decentralised communication platform
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BROKEN=		fails to build with ffmpeg 4.0
-
 LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher \
 		libspeex.so:audio/speex \
 		libspeexdsp.so:audio/speexdsp \
 		libupnp.so:devel/upnp \
 		libgnome-keyring.so:security/libgnome-keyring \
 		libgpgme.so:security/gpgme \
 		libopencv_highgui.so:graphics/opencv \
 		libopencv_imgproc.so:graphics/opencv-core \
 		libavcodec.so:multimedia/ffmpeg \
 		libcurl.so:ftp/curl \
 		libmicrohttpd.so:www/libmicrohttpd
 
 USES=		compiler:features desktop-file-utils dos2unix pkgconfig qmake ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	RetroShare
 GH_PROJECT=	RetroShare
 USE_GNOME=	libxml2 libxslt
 USE_GL=		gl
 USE_QT5=	core gui multimedia printsupport network widgets xml \
 		buildtools_build uitools_build
 DOS2UNIX_FILES=	retroshare-nogui/src/retroshare-nogui.pro
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/libretroshare/src/libretroshare.pro
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/retroshare-gui/src/retroshare-gui.pro
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
 	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
 		${WRKSRC}/data/retroshare.desktop
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/data/retroshare.desktop
 .if defined(GH_TAGNAME)
 	@${REINPLACE_CMD} -e 's|RS_REVISION_NUMBER.*|RS_REVISION_NUMBER   0x${GH_TAGNAME}|' \
 		${WRKSRC}/libretroshare/src/retroshare/rsversion.h
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net-p2p/retroshare/files/patch-ffmpeg4
===================================================================
--- head/net-p2p/retroshare/files/patch-ffmpeg4	(nonexistent)
+++ head/net-p2p/retroshare/files/patch-ffmpeg4	(revision 468858)
@@ -0,0 +1,53 @@
+gui/VideoProcessor.cpp:456:40: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED'
+    if (encoding_codec->capabilities & CODEC_CAP_TRUNCATED)
+                                       ^
+gui/VideoProcessor.cpp:457:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED'
+        encoding_context->flags |= CODEC_FLAG_TRUNCATED;
+                                   ^
+gui/VideoProcessor.cpp:458:32: error: use of undeclared identifier 'CODEC_FLAG_PSNR'
+    encoding_context->flags |= CODEC_FLAG_PSNR;//Peak signal-to-noise ratio
+                               ^
+gui/VideoProcessor.cpp:459:32: error: use of undeclared identifier 'CODEC_CAP_PARAM_CHANGE'
+    encoding_context->flags |= CODEC_CAP_PARAM_CHANGE;
+                               ^
+gui/VideoProcessor.cpp:552:39: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED'
+    if(decoding_codec->capabilities & CODEC_CAP_TRUNCATED)
+                                      ^
+gui/VideoProcessor.cpp:553:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED'
+        decoding_context->flags |= CODEC_FLAG_TRUNCATED; // we do not send complete frames
+                                   ^
+gui/VideoProcessor.cpp:555:33: error: use of undeclared identifier 'CODEC_FLAG2_CHUNKS'
+    decoding_context->flags2 |= CODEC_FLAG2_CHUNKS;
+                                ^
+
+--- plugins/VOIP/gui/VideoProcessor.cpp.orig	2017-08-03 19:29:52 UTC
++++ plugins/VOIP/gui/VideoProcessor.cpp
+@@ -453,10 +453,10 @@ FFmpegVideo::FFmpegVideo()
+     encoding_context->rc_max_rate = 0;
+     encoding_context->rc_buffer_size = 0;
+ #endif
+-    if (encoding_codec->capabilities & CODEC_CAP_TRUNCATED)
+-        encoding_context->flags |= CODEC_FLAG_TRUNCATED;
+-    encoding_context->flags |= CODEC_FLAG_PSNR;//Peak signal-to-noise ratio
+-    encoding_context->flags |= CODEC_CAP_PARAM_CHANGE;
++    if (encoding_codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++        encoding_context->flags |= AV_CODEC_FLAG_TRUNCATED;
++    encoding_context->flags |= AV_CODEC_FLAG_PSNR;//Peak signal-to-noise ratio
++    encoding_context->flags |= AV_CODEC_CAP_PARAM_CHANGE;
+     encoding_context->i_quant_factor = 0.769f;
+     encoding_context->b_quant_factor = 1.4f;
+     encoding_context->time_base.num = 1;
+@@ -549,10 +549,10 @@ FFmpegVideo::FFmpegVideo()
+     decoding_context->pix_fmt = AV_PIX_FMT_YUV420P;
+ #endif
+ 
+-    if(decoding_codec->capabilities & CODEC_CAP_TRUNCATED)
+-        decoding_context->flags |= CODEC_FLAG_TRUNCATED; // we do not send complete frames
++    if(decoding_codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++        decoding_context->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames
+     //we can receive truncated frames
+-    decoding_context->flags2 |= CODEC_FLAG2_CHUNKS;
++    decoding_context->flags2 |= AV_CODEC_FLAG2_CHUNKS;
+ 
+     AVDictionary* dictionary = NULL;
+     if(avcodec_open2(decoding_context, decoding_codec, &dictionary) < 0)

Property changes on: head/net-p2p/retroshare/files/patch-ffmpeg4
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property