Index: head/multimedia/mp4v2/Makefile
===================================================================
--- head/multimedia/mp4v2/Makefile	(revision 458677)
+++ head/multimedia/mp4v2/Makefile	(revision 458678)
@@ -1,31 +1,32 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mp4v2
 PORTVERSION=	1.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/riggs/mp4v2
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Library and tools to read, create, and modify mp4 files
 
 LICENSE=	MPL11
 
 CONFLICTS=	mpeg4ip-libmp4v2-[0-9.]*
-USES=		compiler gmake libtool tar:bzip2
+USES=		compiler:features gmake libtool tar:bzip2
 MAKEFILE=	GNUmakefile
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	"FOUND_HELP2MAN=no"
+CXXFLAGS+=	${COMPILER_FEATURES:Mc++11:C/.+/-Wno-error=narrowing/}
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.pre.mk>
 
 # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
 .if ${COMPILER_TYPE} == gcc
 CONFIGURE_ARGS=	--disable-gch
 .endif
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mp4v2/files/patch-src_mp4.cpp
===================================================================
--- head/multimedia/mp4v2/files/patch-src_mp4.cpp	(nonexistent)
+++ head/multimedia/mp4v2/files/patch-src_mp4.cpp	(revision 458678)
@@ -0,0 +1,18 @@
+src/mp4.cpp:679:20: error: cannot initialize return object of type 'mp4v2_ismacrypParams *' (aka 'mp4v2_ismacryp_session_params *') with an rvalue of type 'MP4TrackId' (aka 'unsigned int')
+            return MP4_INVALID_TRACK_ID;
+                   ^~~~~~~~~~~~~~~~~~~~
+./include/mp4v2/general.h:45:33: note: expanded from macro 'MP4_INVALID_TRACK_ID'
+#define MP4_INVALID_TRACK_ID    ((MP4TrackId)0)       /**< Constant: invalid MP4TrackId. */
+                                ^~~~~~~~~~~~~~~
+
+--- src/mp4.cpp.orig	2009-07-13 23:07:12 UTC
++++ src/mp4.cpp
+@@ -676,7 +676,7 @@ MP4FileHandle MP4ReadProvider( const char* fileName, u
+         }
+ 
+         catch (...) {
+-            return MP4_INVALID_TRACK_ID;
++            return NULL;
+         }
+     }
+ 

Property changes on: head/multimedia/mp4v2/files/patch-src_mp4.cpp
___________________________________________________________________
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
Index: head/multimedia/mp4v2/files/patch-src_rtphint.cpp
===================================================================
--- head/multimedia/mp4v2/files/patch-src_rtphint.cpp	(nonexistent)
+++ head/multimedia/mp4v2/files/patch-src_rtphint.cpp	(revision 458678)
@@ -0,0 +1,15 @@
+src/rtphint.cpp:348:32: error: comparison between pointer and integer ('const char *' and 'int')
+                    if (pSlash != '\0') {
+                        ~~~~~~ ^  ~~~~
+
+--- src/rtphint.cpp.orig	2009-07-13 23:07:12 UTC
++++ src/rtphint.cpp
+@@ -345,7 +345,7 @@ void MP4RtpHintTrack::GetPayload(
+                 pSlash = strchr(pSlash, '/');
+                 if (pSlash != NULL) {
+                     pSlash++;
+-                    if (pSlash != '\0') {
++                    if (*pSlash != '\0') {
+                         length = strlen(pRtpMap) - (pSlash - pRtpMap);
+                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
+                         strncpy(*ppEncodingParams, pSlash, length);

Property changes on: head/multimedia/mp4v2/files/patch-src_rtphint.cpp
___________________________________________________________________
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