Index: head/multimedia/mencoder/Makefile
===================================================================
--- head/multimedia/mencoder/Makefile	(revision 397318)
+++ head/multimedia/mencoder/Makefile	(revision 397319)
@@ -1,131 +1,131 @@
 # Created by: Thomas E. Zander
 # $FreeBSD$
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Convenient video file and movie encoder
 
 .include "${.CURDIR}/../mplayer/Makefile.common"
 
 OPTIONS_DEFINE=	AMR_NB AMR_WB BLURAY CDIO DEBUG DV FAAC FONTCONFIG \
 		FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \
 		MAD NAS OCFLAGS OPENAL OPENJPEG OPUS PULSEAUDIO REAL \
 		RTMP SCHROEDINGER SMB THEORA TWOLAME V4L VPX \
 		X264 XVID
 
 OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS X264 XVID
 
 OPTIONS_DEFINE_i386=	RTCPU
 OPTIONS_DEFINE_amd64=	RTCPU
 OPTIONS_DEFINE_powerpc=	RTCPU
 
 OPTIONS_DEFAULT_i386=	RTCPU
 OPTIONS_DEFAULT_amd64=	RTCPU
 OPTIONS_DEFAULT_powerpc=RTCPU
 
 BLURAY_DESC?=	BluRay support
 LZO_DESC?=	Enable external liblzo library
 OCFLAGS_DESC?=	Use optimized compiler flags
 REAL_DESC?=	Enable realplayer plugin
 RTCPU_DESC?=	Use runtime CPU detection
 
 RESTRICTED=	Port has restricted dependencies
 
 PATCHDIR=	${.CURDIR}/../mplayer/files
 FILESDIR=	${PATCHDIR}
 DATADIR=	${PREFIX}/share/mplayer
 
 TOOLFILES=	aconvert.sh binary_codecs.sh calcbpp.pl \
 		checktree.sh countquant.pl divx2svcd.sh \
 		dvd2divxscript.pl edgedetect.fp edgeenh.fp \
 		emboss.fp mencvcd.sh midentify.sh \
 		mpconsole.sh mphelp_check.py mplmult.sh \
 		plotpsnr.pl psnr-video.sh qepdvcd.sh \
 		subedit.pl subsearch.sh vobshift.py \
 		w32codec_dl.pl wma2ogg.pl
 
 USES+=		alias iconv pkgconfig shebangfix
 SHEBANG_FILES=	TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl	\
 		TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \
 		TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \
 		TOOLS/qepdvcd.sh TOOLS/subedit.pl TOOLS/w32codec_dl.pl \
 		TOOLS/wma2ogg.pl
 
 .include "${.CURDIR}/../mplayer/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-mplayer \
 			--disable-libdca \
 			--disable-x11 \
 			--disable-vdpau \
 			--disable-rtc \
 			--disable-arts \
 			--disable-caca \
 			--disable-lirc \
 			--disable-sdl \
 			--disable-svga \
 			--disable-aa \
 			--disable-joystick \
 			--disable-directfb \
 			--disable-mpg123 \
 			--disable-enca \
 			--disable-musepack
 
 LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
 
 ALL_TARGET=	mencoder
 
 .include "${.CURDIR}/../mplayer/Makefile.options"
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 pre-patch:
 	${MV} ${WRKDIR}/ffmpeg-${FFMPEG_VERSION} ${WRKSRC}/ffmpeg
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
 		${REINPLACE_CMD} -E \
 			-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 			-e 's|[[:space:]]gcc| ${CC}|' \
 			-e 's|\$$\(CC\)|${CC}|' \
 			-e 's|/usr/X11R6|${LOCALBASE}|'
 	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/mencoder.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tools
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools
 .for tool in ${TOOLFILES}
 	${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mencoder/distinfo
===================================================================
--- head/multimedia/mencoder/distinfo	(revision 397318)
+++ head/multimedia/mencoder/distinfo	(revision 397319)
@@ -1,4 +1,4 @@
-SHA256 (ffmpeg-2.7.2.tar.bz2) = 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2
-SIZE (ffmpeg-2.7.2.tar.bz2) = 8157217
+SHA256 (ffmpeg-2.8.tar.bz2) = 9565236404d3515aab754283c687c0a001019003148bf7f708e643608c0690b8
+SIZE (ffmpeg-2.8.tar.bz2) = 8563832
 SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7
 SIZE (mplayer-1.1.20150822.tar.xz) = 5162400
Index: head/multimedia/mplayer/Makefile
===================================================================
--- head/multimedia/mplayer/Makefile	(revision 397318)
+++ head/multimedia/mplayer/Makefile	(revision 397319)
@@ -1,177 +1,177 @@
 # Created by: Thomas E. Zander with help from Vladimir Kushnir
 # $FreeBSD$
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common"
 
 OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
 		LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \
 		OPENJPEG OPUS PULSEAUDIO REAL RTC RTMP \
 		SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \
 		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 
 OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL \
 		SKINS X11 X11DGA X11VM XINERAMA XVIDEO
 
 OPTIONS_DEFINE_i386=	RTCPU
 OPTIONS_DEFINE_amd64=	RTCPU
 OPTIONS_DEFINE_powerpc=	RTCPU
 
 OPTIONS_DEFAULT_i386=	RTCPU VDPAU
 OPTIONS_DEFAULT_amd64=	RTCPU VDPAU
 OPTIONS_DEFAULT_powerpc=RTCPU
 
 BLURAY_DESC?=	BluRay support
 ENCA_DESC?=	Charset conversion via enca
 LZO_DESC?=	External liblzo support
 OCFLAGS_DESC?=	Use optimized compiler flags
 REAL_DESC?=	Enable realplayer plugin
 RTC_DESC?=	Add support for kernel real time clock
 RTCPU_DESC?=	Use runtime CPU detection
 SKINS_DESC?=	Install skins for GUI
 X11DGA_DESC?=	X11 DGA video driver support
 X11VM_DESC?=	X11 VidMode support
 
 SUB_FILES=	pkg-message
 
 CONFLICTS=	mplayer2-2.*
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
 USES+=		iconv pkgconfig
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-arts \
 			--disable-directfb \
 			--disable-faac \
 			--disable-libdca \
 			--disable-toolame \
 			--disable-twolame \
 			--disable-x264 \
 			--disable-xvid \
 			--disable-libdirac-lavc \
 			--disable-mencoder \
 			--disable-mpg123 \
 			--disable-musepack \
 			--disable-theora
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.options"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	GMPLAYER=""
 DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
 .if ${PORT_OPTIONS:MSKINS}
 RUN_DEPENDS+=	mplayer-skins>=0:${PORTSDIR}/multimedia/mplayer-skins
 .endif
 
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gui
 
 .else
 PLIST_SUB+=	GMPLAYER="@comment "
 .endif #GUI && X11
 
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 xproto xscrnsaver
 .if ${PORT_OPTIONS:MXVIDEO}
 USE_XORG+=	xv
 .else
 CONFIGURE_ARGS+=--disable-xv
 .endif
 .if ${PORT_OPTIONS:MX11DGA}
 USE_XORG+=	xxf86dga
 .else
 CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
 .endif
 .if ${PORT_OPTIONS:MOPENGL}
 USE_GL+=	gl
 .else
 CONFIGURE_ARGS+=--disable-gl
 .endif
 .if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama xineramaproto
 .else
 CONFIGURE_ARGS+=--disable-xinerama
 .endif
 .if ${PORT_OPTIONS:MX11VM}
 USE_XORG+=	xxf86vm
 .else
 CONFIGURE_ARGS+=--disable-vm
 .endif
 .if ${PORT_OPTIONS:MXVMC}
 USE_XORG+=	xvmc
 CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
 .endif
 .else	#X11
 CONFIGURE_ARGS+=--disable-x11
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${ECHO_MSG} "If you want to use the GUI, you can use the skins from"
 	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
 	@${ECHO_MSG} "or download them from"
 	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
 
 pre-patch:
 	${MV} ${WRKDIR}/ffmpeg-${FFMPEG_VERSION} ${WRKSRC}/ffmpeg
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
 		${REINPLACE_CMD} -E \
 			-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 			-e 's|[[:space:]]gcc| ${CC}|' \
 			-e 's|\$$\(CC\)|${CC}|' \
 			-e 's|/usr/X11R6|${LOCALBASE}|'
 	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 
 post-patch-RTC-on:
 	@${REINPLACE_CMD} -e 's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' ${WRKSRC}/mplayer.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc
 .for conf in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc
 .endfor
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
 	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
 	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png
 .endif
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mplayer/Makefile.common
===================================================================
--- head/multimedia/mplayer/Makefile.common	(revision 397318)
+++ head/multimedia/mplayer/Makefile.common	(revision 397319)
@@ -1,54 +1,54 @@
 # Contains the build infrastructural definitions for both
 # mplayer and mencoder....the variables that we need to set
 # before we include bsd.port.pre.mk
 #
 # $FreeBSD$
 
 MPLAYER_SNAPSHOT_DATE=	2015-08-22
 MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
-FFMPEG_VERSION=	2.7.2
+FFMPEG_VERSION=	2.8
 MASTER_SITES=	LOCAL/riggs/mplayer:local \
 		http://ffmpeg.org/releases/:ffmpeg
 DISTFILES+=	ffmpeg-${FFMPEG_VERSION}.tar.bz2:ffmpeg \
 		${DISTNAME}.tar.xz:local
 DISTNAME=	mplayer-${MPLAYER_PORT_VERSION:S/.r/./g}
 WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
 
 USES=		compiler:c11 gmake iconv ncurses tar:bzip2 tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc="${CC}" \
 		--host-cc="${CC}" \
 		--as="${AS}" \
 		--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
 		--extra-libs="-L${PREFIX}/lib" \
 		--disable-alsa \
 		--disable-bitmap-font \
 		--disable-crystalhd \
 		--disable-esd \
 		--disable-faad \
 		--disable-ggi \
 		--disable-ggiwmh \
 		--disable-liba52 \
 		--disable-libbs2b \
 		--disable-libdirac-lavc \
 		--disable-libilbc \
 		--disable-libnut \
 		--disable-libvorbis \
 		--disable-live \
 		--disable-joystick \
 		--disable-mad \
 		--disable-libmpeg2 \
 		--disable-nemesi \
 		--disable-speex \
 		--enable-ass-internal
 
 WANT_GNOME=	yes
 WANT_SDL=	yes
Index: head/multimedia/mplayer/distinfo
===================================================================
--- head/multimedia/mplayer/distinfo	(revision 397318)
+++ head/multimedia/mplayer/distinfo	(revision 397319)
@@ -1,4 +1,4 @@
-SHA256 (ffmpeg-2.7.2.tar.bz2) = 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2
-SIZE (ffmpeg-2.7.2.tar.bz2) = 8157217
+SHA256 (ffmpeg-2.8.tar.bz2) = 9565236404d3515aab754283c687c0a001019003148bf7f708e643608c0690b8
+SIZE (ffmpeg-2.8.tar.bz2) = 8563832
 SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7
 SIZE (mplayer-1.1.20150822.tar.xz) = 5162400