Index: head/multimedia/libx264/Makefile
===================================================================
--- head/multimedia/libx264/Makefile
+++ head/multimedia/libx264/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	libx264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
Index: head/multimedia/libx264/files/patch-x264.h
===================================================================
--- head/multimedia/libx264/files/patch-x264.h
+++ head/multimedia/libx264/files/patch-x264.h
@@ -0,0 +1,15 @@
+Our stdint.h is a symlink to sys/stdint.h so we need to teach x264
+the header guard of the sys/stdint.h file.
+
+Accepted upstream, see https://reviews.freebsd.org/D2863 for details.
+--- x264.h.orig	2015-06-19 08:05:22.728325000 +0200
++++ x264.h	2015-06-19 08:05:39.433879000 +0200
+@@ -29,7 +29,7 @@
+ #define X264_X264_H
+ 
+ #if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_STDINT_H_INCLUDED) && !defined(_STDINT) &&\
+-    !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES)
++    !defined(_SYS_STDINT_H_) && !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES)
+ # ifdef _MSC_VER
+ #  pragma message("You must include stdint.h or inttypes.h before x264.h")
+ # else