From nobody@FreeBSD.org  Mon Mar 18 18:50:36 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 7B073D3C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Mar 2013 18:50:36 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 662A3169
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Mar 2013 18:50:36 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2IIoZB6031256
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Mar 2013 18:50:35 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r2IIoZvB031255;
	Mon, 18 Mar 2013 18:50:35 GMT
	(envelope-from nobody)
Message-Id: <201303181850.r2IIoZvB031255@red.freebsd.org>
Date: Mon, 18 Mar 2013 18:50:35 GMT
From: Thomas Zander <thomas.e.zander@googlemail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update of mplayer/mencoder to a recent snapshot
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         177083
>Category:       ports
>Synopsis:       Update of mplayer/mencoder to a recent snapshot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    naddy
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 18 19:00:00 UTC 2013
>Closed-Date:    Sat Mar 23 15:46:13 UTC 2013
>Last-Modified:  Sat Mar 23 15:50:00 UTC 2013
>Originator:     Thomas Zander
>Release:        
>Organization:
>Environment:
>Description:
The attached patch updates our ports of mplayer and mencoder to a recent snapshot. Major changes:
- Reduce the number of dependencies (use internal ffmpeg whenever possible) in mplayer
- Do not build with clang on i386
- Use new options framework

A CFT was in effect for more than a week on the ports mailing list with this patchset, no regression was reported.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -r afac93245f41 mencoder/Makefile
--- a/mencoder/Makefile	Fri Mar 08 17:22:14 2013 +0100
+++ b/mencoder/Makefile	Mon Mar 18 19:43:46 2013 +0100
@@ -1,56 +1,28 @@
-# New ports collection makefile for:	mencoder
-# Date created:		23 June 2007
-# Whom:			Thomas E. Zander
+# Created by: Thomas E. Zander
 # $FreeBSD: head/multimedia/mencoder/Makefile 303671 2012-09-04 20:56:27Z nox $
-#
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	Convenient video file and movie encoder
 
 .include "${.CURDIR}/../mplayer/Makefile.shared"
 
-OPTIONS=	DEBUG "Include debug symbols in mencoder's binary" off
-OPTIONS+=	RTCPU "Allow runtime CPU detection" on
-OPTIONS+=	OCFLAGS "Use optimized compiler flags" on
-OPTIONS+=	OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off
-OPTIONS+=	IPV6 "Include inet6 network support" on
-OPTIONS+=	JACK "Enable JackIt audio server support" off
-OPTIONS+=	NAS "Enable NAS sound server support" off
-OPTIONS+=	OPENAL "Enable OpenAL sound support" off
-OPTIONS+=	PULSE "Enable PulseAudio" off
-OPTIONS+=	FONTCONFIG "Enable fontconfig support" off
-OPTIONS+=	LIBUNGIF "Enable gif support" on
-OPTIONS+=	OPENJPEG "Enable JPEG2000 support" off
-OPTIONS+=	MNG "Enable MNG input support" off
-OPTIONS+=	LIBDV "Enable libdv support" off
-OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
-OPTIONS+=	AMR_NB "AMR Narrow Band encoder (opencore)" off
-OPTIONS+=	AMR_WB "AMR Wide Band encoder (opencore)" off
-OPTIONS+=	GSM "GSM audio codec" off
-OPTIONS+=	TWOLAME "Enable twolame MPEG audio codec support" off
-OPTIONS+=	FAAC "Enable FAAC audio codec support" off
-OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
-OPTIONS+=	SPEEX "Enable speex audio codec support" off
-OPTIONS+=	WIN32 "Enable win32 codec set on the IA32 arch" on
-OPTIONS+=	THEORA "Enable ogg theora video support" off
-OPTIONS+=	XVID "Enable XVID video codec support" on
-OPTIONS+=	X264 "Enable x264 (H.264) video codec support" on
-OPTIONS+=	VPX "Enable VP8 video via libvpx" off
-OPTIONS+=	DIRAC "Enable dirac video codec support" off
-OPTIONS+=	SCHROEDINGER "Dirac codec via libschroedinger" off
-OPTIONS+=	REALPLAYER "Enable real player plugin" off
-OPTIONS+=	LIVEMEDIA "Enable LIVE555 streaming support" off
-OPTIONS+=	SMB "Enable Samba input support" off
-OPTIONS+=	BLURAY "Build with libbluray support" off
-OPTIONS+=	FRIBIDI "Enable FriBiDi support" off
-OPTIONS+=	LIBCDIO "Enable libcdio support" off
-OPTIONS+=	CDPARANOIA "Enable cdparanoia support" off
-OPTIONS+=	LIBLZO "Enable external liblzo library" off
-OPTIONS+=	V4L "Enable Video4Linux TV support" off
-OPTIONS+=	LIBRTMP "Enable RTMPDump Streaming Media support" off
+OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \
+		DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK LADSPA \
+		LIBMNG LIVEMEDIA LZO MAD NAS OCFLAGS OPENAL OPENJPEG \
+		OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER SMB \
+		THEORA TWOLAME V4L VPX WIN32 X264 XVID
+
+OPTIONS_DEFAULT=GIF IPV6 OCFLAGS RTCPU WIN32 X264 XVID
+
+BLURAY_DESC?=	BluRay support
+OCFLAGS_DESC?=	Use optimized compiler flags
+OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
+REAL_DESC?=	Enable realplayer plugin
+RTCPU_DESC?=	Use runtime CPU detection
+WIN32_DESC?=	Install win32 binary codecs
 
 MAN1=		mencoder.1
 
@@ -95,37 +67,37 @@
 
 .include "${.CURDIR}/../mplayer/Makefile.options"
 
-.if defined(WITH_FONTCONFIG)
+.if ${PORT_OPTIONS:MFONTCONFIG}
 LIB_DEPENDS+=		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 .else
 CONFIGURE_ARGS+=	--disable-fontconfig
 .endif
 
-.if defined(WITH_TWOLAME)
+.if ${PORT_OPTIONS:MTWOLAME}
 LIB_DEPENDS+=		twolame:${PORTSDIR}/audio/twolame
 .else
 CONFIGURE_ARGS+=	--disable-twolame
 .endif
 
-.if defined(WITH_FAAC)
+.if ${PORT_OPTIONS:MFAAC}
 LIB_DEPENDS+=		faac:${PORTSDIR}/audio/faac
 .else
 CONFIGURE_ARGS+=	--disable-faac
 .endif
 
-.if !defined(WITHOUT_X264)
+.if ${PORT_OPTIONS:MX264}
 LIB_DEPENDS+=		x264.125:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
 .endif
 
-.if !defined(WITHOUT_XVID)
+.if ${PORT_OPTIONS:MXVID}
 LIB_DEPENDS+=		xvidcore:${PORTSDIR}/multimedia/xvid
 .else
 CONFIGURE_ARGS+=	--disable-xvid
 .endif
 
-.ifdef(WITH_DIRAC)
+.if ${PORT_OPTIONS:MDIRAC}
 LIB_DEPENDS+=		dirac_encoder:${PORTSDIR}/multimedia/dirac
 .else
 CONFIGURE_ARGS+=	--disable-libdirac-lavc
@@ -135,9 +107,10 @@
 	@${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. As this one is a slave port of multimedia/"
-	@${ECHO_MSG} "mplayer, you might want to check mplayer's Makefile(s) in"
-	@${ECHO_MSG} "order to learn more about them."
+	@${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:"
+	@${ECHO_MSG} "WITH_LANG=<LanguageCode>"
+	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0"
+	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0"
 
 post-patch:
 .if ${OSVERSION} >= 900010
diff -r afac93245f41 mencoder/distinfo
--- a/mencoder/distinfo	Fri Mar 08 17:22:14 2013 +0100
+++ b/mencoder/distinfo	Mon Mar 18 19:43:46 2013 +0100
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.1.20120721.tar.xz) = 30b120bf8543b7cfad36272e3ae29a017282caa90f4d635fe157f29036393787
-SIZE (mplayer-1.1.20120721.tar.xz) = 10480368
+SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258
+SIZE (mplayer-1.1.20130308.tar.xz) = 10326840
diff -r afac93245f41 mplayer/Makefile
--- a/mplayer/Makefile	Fri Mar 08 17:22:14 2013 +0100
+++ b/mplayer/Makefile	Mon Mar 18 19:43:46 2013 +0100
@@ -3,67 +3,39 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
 
-OPTIONS=	DEBUG "Include debug symbols in mplayer's binaries" off
-OPTIONS+=	RTCPU "Allow runtime CPU detection" on
-OPTIONS+=	OCFLAGS "Use optimized compiler flags" on
-OPTIONS+=	OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off
-OPTIONS+=	IPV6 "Include inet6 network support" on
-OPTIONS+=	X11 "Enable X11 support for mplayer's video output" on
-OPTIONS+=	X11XV "X11 video drivers: XV" on
-OPTIONS+=	X11DGA "X11 video drivers: DGA" on
-OPTIONS+=	X11GL "X11 video drivers: OpenGL" on
-OPTIONS+=	X11XIN "X11 video drivers: Xinerama" on
-OPTIONS+=	X11VM "X11 VidMode support" on
-OPTIONS+=	X11XVMC "Enable XvMC acceleration" off
-OPTIONS+=	VDPAU "Enable Nvidia VDPAU acceleration" off
-OPTIONS+=	GUI "Enable GTK2 graphical user interface with X11" on
-OPTIONS+=	SDL "Enable SDL video output" off
-OPTIONS+=	SKINS "Force dependency on mplayer-skins" on
-OPTIONS+=	RTC "Add support for kernel real time clock timing" off
-OPTIONS+=	ARTS "Enable KDE sound system support" off
-OPTIONS+=	ESOUND "Enable GNOME esound support" off
-OPTIONS+=	JACK "Enable JackIt audio server support" off
-OPTIONS+=	NAS "Enable NAS sound server support" off
-OPTIONS+=	OPENAL "Enable OpenAL sound support" off
-OPTIONS+=	PULSE "Enable PulseAudio" off
-OPTIONS+=	LIBUNGIF "Enable gif support" on
-OPTIONS+=	OPENJPEG "Enable JPEG2000 support" off
-OPTIONS+=	MNG "Enable MNG input support" off
-OPTIONS+=	AALIB "Enable aalib support" off
-OPTIONS+=	LIBCACA "Enable libcaca support" off
-OPTIONS+=	SVGALIB "Enable svgalib support" off
-OPTIONS+=	LIBDV "Enable libdv support" off
-OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
-OPTIONS+=	AMR_NB "AMR Narrow Band encoder (opencore)" off
-OPTIONS+=	AMR_WB "AMR Wide Band encoder (opencore)" off
-OPTIONS+=	GSM "GSM audio codec" off
-OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
-OPTIONS+=	SPEEX "Enable speex audio codec support" on
-OPTIONS+=	THEORA "Enable ogg theora video support" off
-OPTIONS+=	VPX "Enable VP8 video via libvpx" off
-OPTIONS+=	SCHROEDINGER "Dirac codec via libschroedinger" off
-.if !defined(PACKAGE_BUILDING)
-OPTIONS+=	WIN32 "Enable win32 codec set on the IA32 arch" on
-.endif
-OPTIONS+=	REALPLAYER "Enable real player plugin" off
-OPTIONS+=	LIVEMEDIA "Enable LIVE555 streaming support" off
-OPTIONS+=	SMB "Enable Samba input support" off
-OPTIONS+=	BLURAY "Build with libbluray support" off
-OPTIONS+=	FRIBIDI "Enable FriBiDi support" off
-OPTIONS+=	LIRC "Enable lirc support" off
-OPTIONS+=	LIBCDIO "Enable libcdio support" off
-OPTIONS+=	CDPARANOIA "Enable cdparanoia support" off
-OPTIONS+=	LIBLZO "Enable external liblzo library" off
-OPTIONS+=	JOYSTICK "Enable joystick support" off
-OPTIONS+=	V4L "Enable Video4Linux TV support" off
-OPTIONS+=	LIBRTMP "Enable RTMPDump Streaming Media support" off
-OPTIONS+=	ENCA "Enable enca charset detection" off
+OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ARTS BLURAY CACA DEBUG DV \
+		ENCA ESOUND FRIBIDI GIF GSM GUI IPV6 JACK \
+		JOYSTICK LADSPA LIBMNG LIRC LIVEMEDIA LZO MAD \
+		NAS OCFLAGS OPENAL OPENGL OPENJPEG OTCHAIN \
+		PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
+		SKINS SMB SVGALIB V4L VDPAU WIN32 \
+		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
+
+OPTIONS_RADIO=	RGCD
+OPTIONS_RADIO_RGCD=	CDIO CDPARANOIA
+
+OPTIONS_DEFAULT=GUI IPV6 OCFLAGS OPENGL RTCPU SKINS \
+		WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
+
+BLURAY_DESC?=	BluRay support
+ENCA_DESC?=	Charset conversion via enca
+JOYSTICK_DESC?=	Joystick support
+LZO_DESC?=	External liblzo support
+OCFLAGS_DESC?=	Use optimized compiler flags
+OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
+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
+WIN32_DESC?=	Install win32 binary codecs
+X11DGA_DESC?=	X11 DGA video driver support
+X11VM_DESC?=	X11 VidMode support
 
 MAN1=		mplayer.1
 MANCOMPRESSED=	no
@@ -82,13 +54,15 @@
 			--disable-faac \
 			--disable-faad \
 			--disable-libdca \
+			--disable-toolame \
 			--disable-twolame \
 			--disable-x264 \
 			--disable-xvid \
 			--disable-libdirac-lavc \
 			--disable-mencoder \
 			--disable-mpg123 \
-			--disable-musepack
+			--disable-musepack \
+			--disable-theora
 
 # Fix a problem with unknown assembly opcodes in embedded ffmpeg
 .if ${ARCH} == "ppc"
@@ -97,11 +71,11 @@
 
 .include "${.CURDIR}/Makefile.options"
 
-.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 MLINKS+=	mplayer.1 gmplayer.1
 PLIST_SUB+=	GMPLAYER=""
 DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
-.if !defined(WITHOUT_SKINS)
+.if ${PORT_OPTIONS:MSKINS}
 RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins
 .endif
 
@@ -114,52 +88,52 @@
 
 .else
 PLIST_SUB+=	GMPLAYER="@comment "
-.endif #WITHOUT_GUI
+.endif #GUI && X11
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11
-.if !defined(WITHOUT_X11XV)
+.if ${PORT_OPTIONS:MXVIDEO}
 USE_XORG+=	xv
 .else
 CONFIGURE_ARGS+=--disable-xv
 .endif
-.if !defined(WITHOUT_X11DGA)
+.if ${PORT_OPTIONS:MX11DGA}
 USE_XORG+=	xxf86dga
 .else
 CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
 .endif
-.if !defined(WITHOUT_X11GL)
+.if ${PORT_OPTIONS:MOPENGL}
 USE_XORG+=	glproto
 LIB_DEPENDS+=	GL:${PORTSDIR}/graphics/libGL
 .else
 CONFIGURE_ARGS+=--disable-gl
 .endif
-.if !defined(WITHOUT_X11XIN)
+.if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama xineramaproto
 .else
 CONFIGURE_ARGS+=--disable-xinerama
 .endif
-.if !defined(WITHOUT_X11VM)
+.if ${PORT_OPTIONS:MX11VM}
 USE_XORG+=	xxf86vm
 .else
 CONFIGURE_ARGS+=--disable-vm
 .endif
-.if defined(WITH_X11XVMC)
+.if ${PORT_OPTIONS:MXVMC}
 USE_XORG+=	xvmc
 CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
 .endif
-.else				#WITHOUT_X11
+.else	#X11
 CONFIGURE_ARGS+=--disable-x11 \
 		--disable-fontconfig
 .endif
 
-.if defined(WITH_VDPAU)
+.if ${PORT_OPTIONS:MVDPAU}
 LIB_DEPENDS+=	vdpau:${PORTSDIR}/multimedia/libvdpau
 .else
 CONFIGURE_ARGS+=	--disable-vdpau
 .endif
 
-.if defined(WITH_RTC)
+.if ${PORT_OPTIONS:MRTC}
 BUILD_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
 RUN_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
 CONFIGURE_ARGS+=	--enable-rtc
@@ -167,45 +141,43 @@
 CONFIGURE_ARGS+=	--disable-rtc
 .endif
 
-.if defined(WITH_ARTS)
+.if ${PORT_OPTIONS:MARTS}
 LIB_DEPENDS+=		artsc:${PORTSDIR}/audio/arts
 .else
 CONFIGURE_ARGS+=	--disable-arts
 .endif
 
-.if defined(WITH_LIBCACA)
+.if ${PORT_OPTIONS:MCACA}
 LIB_DEPENDS+=		caca:${PORTSDIR}/graphics/libcaca
 .else
 CONFIGURE_ARGS+=	--disable-caca
 .endif
 
-.if defined(WITH_LIRC)
+.if ${PORT_OPTIONS:MLIRC}
 LIB_DEPENDS+=		lirc_client:${PORTSDIR}/comms/lirc
 .else
 CONFIGURE_ARGS+=	--disable-lirc
 .endif
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
-WITH_AALIB=	yes
-.undef(WITHOUT_AALIB)
 .else
 CONFIGURE_ARGS+=	--disable-sdl
 .endif
 
-.if defined(WITH_SVGALIB)
+.if ${PORT_OPTIONS:MSVGALIB}
 LIB_DEPENDS+=		vga:${PORTSDIR}/graphics/svgalib
 .else
 CONFIGURE_ARGS+=	--disable-svga
 .endif
 
-.if defined(WITH_AALIB)
+.if ${PORT_OPTIONS:MAALIB} || ${PORT_OPTIONS:MSDL}
 LIB_DEPENDS+=		aa:${PORTSDIR}/graphics/aalib
 .else
 CONFIGURE_ARGS+=	--disable-aa
 .endif
 
-.if defined(WITH_ESOUND)
+.if ${PORT_OPTIONS:MESOUND}
 USE_GNOME+=	esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
@@ -217,14 +189,14 @@
 DEFAULT_KERN_HZ=1024
 .endif
 
-.if defined(WITH_JOYSTICK)
+.if ${PORT_OPTIONS:MJOYSTICK}
 BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
 CONFIGURE_ARGS+=--enable-joystick
 .else
 CONFIGURE_ARGS+=--disable-joystick
 .endif
 
-.if defined(WITH_ENCA)
+.if ${PORT_OPTIONS:MENCA}
 LIB_DEPENDS+=		enca:${PORTSDIR}/converters/enca
 .else
 CONFIGURE_ARGS+=	--disable-enca
@@ -234,14 +206,17 @@
 	@${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. You might want to check Makefile.options"
-	@${ECHO_MSG} "in order to learn more about them."
+	@${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:"
+	@${ECHO_MSG} "WITH_LANG=<LanguageCode>"
+	@${ECHO_MSG} "WITH_KERN_HZ=1024"
+	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0"
+	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0"
 
-.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
-	@${ECHO_MSG} "If you want to use the GUI, you can either install"
+.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 official skin collections from"
-	@${ECHO_MSG} "http://www.mplayerhq.hu/homepage/dload.html"
+	@${ECHO_MSG} "or download them from"
+	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
 
 post-patch:
@@ -269,7 +244,7 @@
 		'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'
-.if defined(WITH_RTC)
+.if ${PORT_OPTIONS:MRTC}
 	@${REINPLACE_CMD} -e \
 		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
 		${WRKSRC}/mplayer.c
@@ -283,7 +258,7 @@
 .for conf in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}/examples/etc
 .endfor
-.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
 	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png
 .endif
diff -r afac93245f41 mplayer/Makefile.options
--- a/mplayer/Makefile.options	Fri Mar 08 17:22:14 2013 +0100
+++ b/mplayer/Makefile.options	Mon Mar 18 19:43:46 2013 +0100
@@ -14,14 +14,12 @@
 # the variable to make during build, e.g. make WITH_DVD_DEVICE=/dev/cd0
 #
 # WITH_DVD_DEVICE=/path/to/desired/device
-# default 5.x: /dev/acd0
-# default 4.x: /dev/acd0c
+# default: /dev/cd0
 # This option changes the default device where mplayer looks for
 # a DVD medium
 #
 # WITH_CDROM_DEVICE=/path/to/desired/device
-# default 5.x: /dev/acd0
-# default 4.x: /dev/acd0c
+# default: /dev/cd0
 # This option changes the default cdrom device, maybe useful for VCDs
 #
 # WITH_LANG=<your choice>
@@ -39,24 +37,24 @@
 
 #On i386, gcc runs out of general purpose registers when
 #trying to compile a debug version with the default flags.
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 .if ${ARCH} == "i386"
 DEBUG_FLAGS=	-g -O -fomit-frame-pointer
 .endif
 .else
-.if defined(WITHOUT_OCFLAGS)
+.if ${PORT_OPTIONS:MOCFLAGS}
+CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math
+.else
 CFLAGS+=	-O -fomit-frame-pointer
-.else
-CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math
-.endif
-.endif #WITH_DEBUG
+.endif #OCFLAGS
+.endif #DEBUG
 
 #Supported architectures for clang
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+.if ${ARCH} == "amd64"
 MPLAYER_CLANG_SUPPORTED_ARCH=	yes
 .endif
 
-.if !defined(WITHOUT_RTCPU)
+.if ${PORT_OPTIONS:MRTCPU}
 CONFIGURE_ARGS+=--enable-runtime-cpudetection
 .endif
 
@@ -70,8 +68,9 @@
 CC=		clang
 CXX=		clang++
 CPP=		clang-cpp
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang-version
 .else
-.if defined(WITH_OTCHAIN)
+.if ${PORT_OPTIONS:MOTCHAIN}
 USE_GCC?=	4.6+
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 .else
@@ -85,61 +84,55 @@
 .endif
 .endif
 
-.if defined(WITHOUT_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
+CATEGORIES+=	ipv6
+.else
 CONFIGURE_ARGS+=	--disable-inet6
-.else
-CATEGORIES+=	ipv6
 .endif
 
-.if !defined(WITHOUT_LIBUNGIF)
+.if ${PORT_OPTIONS:MGIF}
 LIB_DEPENDS+=		gif:${PORTSDIR}/graphics/giflib
 .else
 CONFIGURE_ARGS+=	--disable-gif
 .endif
 
-.if defined(WITH_OPENJPEG)
+.if ${PORT_OPTIONS:MOPENJPEG}
 LIB_DEPENDS+=		openjpeg:${PORTSDIR}/graphics/openjpeg
 .else
 CONFIGURE_ARGS+=	--disable-libopenjpeg
 .endif
 
-.if defined(WITH_MAD)
+.if ${PORT_OPTIONS:MMAD}
 LIB_DEPENDS+=		mad:${PORTSDIR}/audio/libmad
 .else
 CONFIGURE_ARGS+=	--disable-mad
 .endif
 
-.if defined(WITH_LIBDV)
+.if ${PORT_OPTIONS:MDV}
 LIB_DEPENDS+=		dv:${PORTSDIR}/multimedia/libdv
 .else
 CONFIGURE_ARGS+=	--disable-libdv
 .endif
 
-.if defined(WITH_THEORA)
+.if ${PORT_OPTIONS:MTHEORA}
 LIB_DEPENDS+=		theora:${PORTSDIR}/multimedia/libtheora
 .else
 CONFIGURE_ARGS+=	--disable-theora
 .endif
 
-.if defined(WITH_VPX)
+.if ${PORT_OPTIONS:MVPX}
 LIB_DEPENDS+=		vpx:${PORTSDIR}/multimedia/libvpx
 .else
 CONFIGURE_ARGS+=	--disable-libvpx-lavc
 .endif
 
-.if defined(WITH_SCHROEDINGER)
+.if ${PORT_OPTIONS:MSCHROEDINGER}
 LIB_DEPENDS+=		schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
 .else
 CONFIGURE_ARGS+=	--disable-libschroedinger-lavc
 .endif
 
-.if !defined(WITHOUT_SPEEX)
-LIB_DEPENDS+=		speex:${PORTSDIR}/audio/speex
-.else
-CONFIGURE_ARGS+=	--disable-speex
-.endif
-
-.if defined(WITH_LIVEMEDIA)
+.if ${PORT_OPTIONS:MLIVEMEDIA}
 CONFIGURE_ARGS+=	--enable-live
 BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 CFLAGS+=		-I${LOCALBASE}/live/liveMedia/include \
@@ -159,67 +152,67 @@
 CONFIGURE_ARGS+=	--disable-live
 .endif
 
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=		jack:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--disable-jack
 .endif
 
-.if defined(WITH_NAS)
+.if ${PORT_OPTIONS:MNAS}
 LIB_DEPENDS+=		audio:${PORTSDIR}/audio/nas
 .else
 CONFIGURE_ARGS+=	--disable-nas
 .endif
 
-.if defined(WITH_OPENAL)
+.if ${PORT_OPTIONS:MOPENAL}
 USE_OPENAL=	soft
 .else
 CONFIGURE_ARGS+=	--disable-openal
 .endif
 
-.if defined(WITH_PULSE)
+.if ${PORT_OPTIONS:MPULSEAUDIO}
 LIB_DEPENDS+=		pulse:${PORTSDIR}/audio/pulseaudio
 .else
 CONFIGURE_ARGS+=	--disable-pulse
 .endif
 
-.if defined(WITH_BLURAY)
+.if ${PORT_OPTIONS:MBLURAY}
 LIB_DEPENDS+=		bluray:${PORTSDIR}/multimedia/libbluray
 .else
 CONFIGURE_ARGS+=	--disable-bluray
 .endif
 
-.if defined(WITH_SMB)
+.if ${PORT_OPTIONS:MSMB}
 LIB_DEPENDS+=		smbclient:${PORTSDIR}/net/samba-libsmbclient
 .else
 CONFIGURE_ARGS+=	--disable-smb
 .endif
 
-.if defined(WITH_FRIBIDI)
+.if ${PORT_OPTIONS:MFRIBIDI}
 LIB_DEPENDS+=		fribidi:${PORTSDIR}/converters/fribidi
 .else
 CONFIGURE_ARGS+=	--disable-fribidi
 .endif
 
-.if defined(WITH_CDPARANOIA)
+.if ${PORT_OPTIONS:MCDPARANOIA}
 LIB_DEPENDS+=		cdda_paranoia:${PORTSDIR}/audio/cdparanoia
 .else
 CONFIGURE_ARGS+=	--disable-cdparanoia
 .endif
 
-.if defined(WITH_LIBCDIO) && !defined(WITH_CDPARANOIA)
+.if ${PORT_OPTIONS:MCDIO}
 LIB_DEPENDS+=		cdio:${PORTSDIR}/sysutils/libcdio
 .else
 CONFIGURE_ARGS+=	--disable-libcdio
 .endif
 
-.if defined(WITH_LADSPA)
+.if ${PORT_OPTIONS:MLADSPA}
 RUN_DEPENDS+=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
 .else
 CONFIGURE_ARGS+=	--disable-ladspa
 .endif
 
-.if defined(WITH_LIBLZO)
+.if ${PORT_OPTIONS:MLZO}
 LIB_DEPENDS+=		lzo2:${PORTSDIR}/archivers/lzo2
 .else
 CONFIGURE_ARGS+=	--disable-liblzo
@@ -228,17 +221,17 @@
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
-DEFAULT_DVD_DEVICE=/dev/acd0
+DEFAULT_DVD_DEVICE=/dev/cd0
 .endif
 
 .if defined(WITH_CDROM_DEVICE)
 DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
 .else
-DEFAULT_CDROM_DEVICE=/dev/acd0
+DEFAULT_CDROM_DEVICE=/dev/cd0
 .endif
 
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
-.if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
+.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 CONFIGURE_ARGS+=	--codecsdir=${LOCALBASE}/lib/win32
 CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
@@ -249,32 +242,32 @@
 .endif
 .endif # ARCH == i386/amd64
 
-.if defined(WITH_REALPLAYER)
+.if ${PORT_OPTIONS:MREAL}
 RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 .else
 CONFIGURE_ARGS+=	--disable-real
 .endif
 
-.if defined(WITH_AMR_NB) || defined (WITH_AMR_WB)
+.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB}
 LIB_DEPENDS+=		opencore-amrnb:${PORTSDIR}/audio/opencore-amr
 .endif
 
-.ifdef(WITHOUT_AMR_NB)
+.if !${PORT_OPTIONS:MAMR_NB}
 CONFIGURE_ARGS+=	--disable-libopencore_amrnb
 .endif
 
-.ifdef(WITHOUT_AMR_WB)
+.if !${PORT_OPTIONS:MAMR_WB}
 CONFIGURE_ARGS+=	--disable-libopencore_amrwb
 .endif
 
-.ifdef(WITH_GSM)
+.if ${PORT_OPTIONS:MGSM}
 LIB_DEPENDS+=		gsm:${PORTSDIR}/audio/gsm
 .else
 CONFIGURE_ARGS+=	--disable-libgsm
 .endif
 
-.if defined(WITH_V4L)
+.if ${PORT_OPTIONS:MV4L}
 BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS+=		v4l2.0:${PORTSDIR}/multimedia/libv4l
 CONFIGURE_ARGS+=	--enable-tv-v4l1 \
@@ -285,7 +278,7 @@
 			--disable-tv-v4l2
 .endif
 
-.if defined(WITH_LIBRTMP)
+.if ${PORT_OPTIONS:MRTMP}
 LIB_DEPENDS+=		rtmp:${PORTSDIR}/multimedia/rtmpdump
 CONFIGURE_ARGS+=	--enable-librtmp
 EXTRA_LIBS+=		-lrtmp
@@ -293,7 +286,7 @@
 CONFIGURE_ARGS+=	--disable-librtmp
 .endif
 
-.if defined(WITH_MNG)
+.if ${PORT_OPTIONS:MLIBMNG}
 LIB_DEPENDS+=		mng:${PORTSDIR}/graphics/libmng
 .else
 CONFIGURE_ARGS+=	--disable-mng
diff -r afac93245f41 mplayer/Makefile.shared
--- a/mplayer/Makefile.shared	Fri Mar 08 17:22:14 2013 +0100
+++ b/mplayer/Makefile.shared	Mon Mar 18 19:43:46 2013 +0100
@@ -4,7 +4,7 @@
 #
 # $FreeBSD: head/multimedia/mplayer/Makefile.shared 312152 2013-02-13 10:39:13Z ak $
 
-MPLAYER_SNAPSHOT_DATE=	2012-07-21
+MPLAYER_SNAPSHOT_DATE=	2013-03-08
 MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
@@ -40,7 +40,11 @@
 		--disable-alsa \
 		--disable-libbs2b \
 		--disable-mp3lib \
-		--enable-ass-internal
+		--enable-ass-internal \
+		--disable-libvorbis \
+		--disable-speex \
+		--disable-libopus \
+		--disable-libilbc
 
 WANT_GNOME=	yes
 WANT_SDL=	yes
diff -r afac93245f41 mplayer/distinfo
--- a/mplayer/distinfo	Fri Mar 08 17:22:14 2013 +0100
+++ b/mplayer/distinfo	Mon Mar 18 19:43:46 2013 +0100
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.1.20120721.tar.xz) = 30b120bf8543b7cfad36272e3ae29a017282caa90f4d635fe157f29036393787
-SIZE (mplayer-1.1.20120721.tar.xz) = 10480368
+SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258
+SIZE (mplayer-1.1.20130308.tar.xz) = 10326840
diff -r afac93245f41 mplayer/files/extra-patch-base_system_gcc
--- a/mplayer/files/extra-patch-base_system_gcc	Fri Mar 08 17:22:14 2013 +0100
+++ b/mplayer/files/extra-patch-base_system_gcc	Mon Mar 18 19:43:46 2013 +0100
@@ -1,5 +1,18 @@
---- ffmpeg/libavutil/x86_cpu.h.orig	2010-10-06 03:26:13.000000000 +0200
-+++ ffmpeg/libavutil/x86_cpu.h	2010-11-04 21:01:40.581647958 +0100
+--- configure.orig	2013-03-03 11:29:18.000000000 +0100
++++ configure	2013-03-08 18:41:56.973900357 +0100
+@@ -2834,10 +2834,6 @@
+ def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
+ def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'
+ 
+-if x86_64 ; then
+-inline_asm_check '"mov (%eax), %eax"' || die "Your binutils version is too old to compile for 64-bit (on OSX try --cc=clang)"
+-fi
+-
+ if x86 ; then
+ 
+ echocheck ".align is a power of two"
+--- ffmpeg/libavutil/x86/asm.h.orig	2012-10-26 02:48:45.000000000 +0200
++++ ffmpeg/libavutil/x86/asm.h	2013-03-08 18:45:58.593916599 +0100
 @@ -71,7 +71,7 @@
  #define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
  #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
@@ -9,16 +22,3 @@
  #    define BROKEN_RELOCATIONS 1
  #endif
  
---- configure.orig	2011-12-31 00:40:03.990976000 +0100
-+++ configure	2011-12-31 01:33:51.407685009 +0100
-@@ -2683,10 +2683,6 @@
- def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
- def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'
- 
--if x86_64 ; then
--inline_asm_check '"mov (%eax), %eax"' || die "Your binutils version is too old to compile for 64-bit"
--fi
--
- if x86 ; then
- 
- echocheck ".align is a power of two"
diff -r afac93245f41 mplayer/files/extra-patch-base_system_log2f
--- a/mplayer/files/extra-patch-base_system_log2f	Fri Mar 08 17:22:14 2013 +0100
+++ b/mplayer/files/extra-patch-base_system_log2f	Mon Mar 18 19:43:46 2013 +0100
@@ -1,22 +1,21 @@
---- configure.orig	2012-07-24 20:47:24.721531229 +0200
-+++ configure	2012-07-24 20:49:56.207569906 +0200
-@@ -3130,7 +3130,7 @@
+--- configure.orig	2013-03-03 11:29:18.000000000 +0100
++++ configure	2013-03-08 19:04:01.903917043 +0100
+@@ -3265,7 +3265,7 @@
  echores "$_kstat"
  
  
--for func in cbrtf exp2 exp2f isnan isinf llrint llrintf log2 log2f lrint lrintf rint round roundf trunc truncf; do
-+for func in cbrtf exp2 exp2f isnan isinf llrint llrintf lrint lrintf rint round roundf trunc truncf; do
+-for func in atanf cbrt cbrtf cosf expf exp2 exp2f isnan isinf llrint llrintf log2 log2f log10f lrint lrintf rint round roundf sinf trunc truncf; do
++for func in atanf cbrt cbrtf cosf expf exp2 exp2f isnan isinf llrint llrintf lrint lrintf rint round roundf sinf trunc truncf; do
  echocheck $func
  eval _$func=no
  statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE && eval _$func=yes
-@@ -3142,7 +3142,9 @@
-   echores no
+@@ -3278,6 +3278,9 @@
  fi
  done
--
-+for func in log2 log2f; do
+ 
++for func in log2 log2f log10f; do
 +  eval def_$func="\"#define HAVE_$(echo $func | tr '[a-z]' '[A-Z]') 0\""
 +done
  
- echocheck "mkstemp"
- _mkstemp=no
+ for func in atan2f ldexpf powf; do
+ echocheck $func
diff -r afac93245f41 mplayer/files/extra-patch-clang-version
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mplayer/files/extra-patch-clang-version	Mon Mar 18 19:43:46 2013 +0100
@@ -0,0 +1,22 @@
+--- configure.orig	2013-03-10 17:43:53.684182000 +0100
++++ configure	2013-03-10 17:47:47.157190568 +0100
+@@ -1614,7 +1614,7 @@
+     if $_cc -v 2>&1 | grep -q "clang"; then
+       echocheck "$_cc version"
+       cc_vendor=clang
+-      cc_version=$($_cc -dumpversion 2>&1)
++      cc_version=$($_cc -v 2>&1 | head -n 1 | cut -d ' ' -f 4)
+       res_comment="experimental support only"
+       echores "clang $cc_version"
+       break
+--- Makefile.orig	2013-03-10 17:44:21.865184000 +0100
++++ Makefile	2013-03-10 17:47:47.248184374 +0100
+@@ -792,7 +792,7 @@
+ 
+ # rebuild version.h each time the working copy is updated
+ version.h: version.sh $(wildcard .svn/entries .git/logs/HEAD)
+-	./$< `$(CC) -dumpversion`
++	./$< `$(CC) -v 2>&1 | head -n 1 | cut -d ' ' -f 4`
+ 
+ %$(EXESUF): %.c
+ 	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^
diff -r afac93245f41 mplayer/files/patch-configure
--- a/mplayer/files/patch-configure	Fri Mar 08 17:22:14 2013 +0100
+++ b/mplayer/files/patch-configure	Mon Mar 18 19:43:46 2013 +0100
@@ -1,6 +1,6 @@
---- configure.orig	2012-07-20 15:11:42.000000000 +0200
-+++ configure	2012-10-08 19:16:19.637797462 +0200
-@@ -645,7 +645,7 @@
+--- configure.orig	2013-03-03 11:29:18.000000000 +0100
++++ configure	2013-03-10 17:43:16.499183171 +0100
+@@ -668,7 +668,7 @@
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
@@ -9,7 +9,7 @@
  _ranlib=ranlib
  _windres=windres
  _cc=cc
-@@ -1467,7 +1467,6 @@
+@@ -1534,7 +1534,6 @@
  
    *)
      echo "Unknown parameter: $ac_option"
@@ -17,7 +17,7 @@
      ;;
  
    esac
-@@ -1515,7 +1514,7 @@
+@@ -1669,7 +1668,7 @@
    case "$(uname -m 2>&1)" in
        x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
        ia64) host_arch=ia64 ;;
@@ -26,16 +26,15 @@
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -1555,7 +1554,7 @@
+@@ -1709,6 +1708,7 @@
  fi
  
  extra_cflags="-I. -Iffmpeg $extra_cflags"
--extra_ldflags="-lm $extra_ldflags"
-+extra_ldflags="-lm $extra_ldflags -L$_prefix/lib"
++extra_ldflags="$extra_ldflags -L$_prefix/lib"
  _timer=timer-linux.c
  _getch=getch2.c
  
-@@ -3601,7 +3600,7 @@
+@@ -3765,7 +3765,7 @@
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
@@ -44,7 +43,7 @@
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -3611,7 +3610,7 @@
+@@ -3775,7 +3775,7 @@
  EOF
  _pthreads=no
  if ! hpux ; then
@@ -53,7 +52,7 @@
      # for crosscompilation, we cannot execute the program, be happy if we can link statically
      cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
    done
-@@ -6271,7 +6270,7 @@
+@@ -6470,7 +6470,7 @@
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
@@ -62,7 +61,7 @@
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -6733,6 +6732,16 @@
+@@ -6954,6 +6954,16 @@
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
@@ -79,7 +78,7 @@
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7125,7 +7134,7 @@
+@@ -7346,7 +7356,7 @@
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@@ -88,7 +87,7 @@
  fi
  echores "$_mencoder"
  
-@@ -7463,8 +7472,11 @@
+@@ -7684,8 +7694,11 @@
  if test "$_gui" = yes ; then
  
    # Required libraries
@@ -102,7 +101,7 @@
      die "The GUI requires libavcodec with PNG support (needs zlib)."
    fi
    test "$_freetype" = no && test "$_bitmap_font" = no &&
-@@ -8029,7 +8041,7 @@
+@@ -8271,7 +8284,7 @@
  EXESUF      = $_exesuf
  EXESUFS_ALL = .exe
  
diff -r afac93245f41 mplayer/files/patch-libavcodec-libgsm.c
--- a/mplayer/files/patch-libavcodec-libgsm.c	Fri Mar 08 17:22:14 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- ffmpeg/libavcodec/libgsm.c.orig	2012-01-29 19:20:05.000000000 +0100
-+++ ffmpeg/libavcodec/libgsm.c	2012-03-22 18:07:58.682722034 +0100
-@@ -27,7 +27,7 @@
- 
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
- 
--#include <gsm/gsm.h>
-+#include <gsm.h>
- 
- #include "avcodec.h"
- #include "gsm.h"
diff -r afac93245f41 mplayer/files/patch-libavcodec-mpegaudio_parser.c
--- a/mplayer/files/patch-libavcodec-mpegaudio_parser.c	Fri Mar 08 17:22:14 2013 +0100
+++ b/mplayer/files/patch-libavcodec-mpegaudio_parser.c	Mon Mar 18 19:43:46 2013 +0100
@@ -1,11 +1,10 @@
---- ffmpeg/libavcodec/mpegaudio_parser.c.orig	2012-03-04 19:20:05.000000000 +0100
-+++ ffmpeg/libavcodec/mpegaudio_parser.c	2012-05-01 14:57:54.645626270 +0200
-@@ -78,7 +78,7 @@
-                     if (s->header_count > 1) {
+--- ffmpeg/libavcodec/mpegaudio_parser.c.orig	2013-03-05 19:20:04.000000000 +0100
++++ ffmpeg/libavcodec/mpegaudio_parser.c	2013-03-08 18:28:59.428478324 +0100
+@@ -81,6 +81,7 @@
                          avctx->sample_rate= sr;
                          avctx->channels   = channels;
--                        s1->duration      = frame_size;
+                         s1->duration      = frame_size;
 +                        avctx->frame_size = frame_size;
-                         avctx->bit_rate   = bit_rate;
-                     }
-                     break;
+                         if (s->no_bitrate || !avctx->bit_rate) {
+                             s->no_bitrate = 1;
+                             avctx->bit_rate += (bit_rate - avctx->bit_rate) / s->header_count;


>Release-Note:
>Audit-Trail:

From: Thomas Zander <thomas.e.zander@googlemail.com>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org
Cc:  
Subject: Re: ports/177083: Update of mplayer/mencoder to a recent snapshot
Date: Mon, 18 Mar 2013 22:57:07 +0100

 An issue with the GSM option has just surfaced. I'll send an updated
 patch as soon as possible.

From: Thomas Zander <thomas.e.zander@googlemail.com>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org
Cc:  
Subject: Re: ports/177083: Update of mplayer/mencoder to a recent snapshot
Date: Fri, 22 Mar 2013 18:28:59 +0100

 --90e6ba2121bb691a2804d886caac
 Content-Type: text/plain; charset=ISO-8859-1
 
 New patch set with minor corrections fixed the reported problems via
 the ports mailing list:
 - compile errors with libgsm
 - proper handling of WITH_DVD_DEVICE and WITH_CDROM_DEVICE
 
 No other regressions are known at the moment.
 
 --90e6ba2121bb691a2804d886caac
 Content-Type: text/plain; charset=US-ASCII; name="m.diff.txt"
 Content-Disposition: attachment; filename="m.diff.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_helmg6440
 
 ZGlmZiAtciBhZmFjOTMyNDVmNDEgbWVuY29kZXIvTWFrZWZpbGUKLS0tIGEvbWVuY29kZXIvTWFr
 ZWZpbGUJRnJpIE1hciAwOCAxNzoyMjoxNCAyMDEzICswMTAwCisrKyBiL21lbmNvZGVyL01ha2Vm
 aWxlCUZyaSBNYXIgMjIgMTg6MjY6MzUgMjAxMyArMDEwMApAQCAtMSw1NiArMSwyOCBAQAotIyBO
 ZXcgcG9ydHMgY29sbGVjdGlvbiBtYWtlZmlsZSBmb3I6CW1lbmNvZGVyCi0jIERhdGUgY3JlYXRl
 ZDoJCTIzIEp1bmUgMjAwNwotIyBXaG9tOgkJCVRob21hcyBFLiBaYW5kZXIKKyMgQ3JlYXRlZCBi
 eTogVGhvbWFzIEUuIFphbmRlcgogIyAkRnJlZUJTRDogaGVhZC9tdWx0aW1lZGlhL21lbmNvZGVy
 L01ha2VmaWxlIDMwMzY3MSAyMDEyLTA5LTA0IDIwOjU2OjI3WiBub3ggJAotIwogCiBQT1JUTkFN
 RT0JbWVuY29kZXIKIFBPUlRWRVJTSU9OPQkke01QTEFZRVJfUE9SVF9WRVJTSU9OfQotUE9SVFJF
 VklTSU9OPQkxCitQT1JUUkVWSVNJT049CTAKIAogQ09NTUVOVD0JQ29udmVuaWVudCB2aWRlbyBm
 aWxlIGFuZCBtb3ZpZSBlbmNvZGVyCiAKIC5pbmNsdWRlICIkey5DVVJESVJ9Ly4uL21wbGF5ZXIv
 TWFrZWZpbGUuc2hhcmVkIgogCi1PUFRJT05TPQlERUJVRyAiSW5jbHVkZSBkZWJ1ZyBzeW1ib2xz
 IGluIG1lbmNvZGVyJ3MgYmluYXJ5IiBvZmYKLU9QVElPTlMrPQlSVENQVSAiQWxsb3cgcnVudGlt
 ZSBDUFUgZGV0ZWN0aW9uIiBvbgotT1BUSU9OUys9CU9DRkxBR1MgIlVzZSBvcHRpbWl6ZWQgY29t
 cGlsZXIgZmxhZ3MiIG9uCi1PUFRJT05TKz0JT1RDSEFJTiAiVXNlIGdjYyA0LjYrIHRvb2xjaGFp
 biBvbiBsZWdhY3kgc3lzdGVtcyIgb2ZmCi1PUFRJT05TKz0JSVBWNiAiSW5jbHVkZSBpbmV0NiBu
 ZXR3b3JrIHN1cHBvcnQiIG9uCi1PUFRJT05TKz0JSkFDSyAiRW5hYmxlIEphY2tJdCBhdWRpbyBz
 ZXJ2ZXIgc3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JTkFTICJFbmFibGUgTkFTIHNvdW5kIHNlcnZl
 ciBzdXBwb3J0IiBvZmYKLU9QVElPTlMrPQlPUEVOQUwgIkVuYWJsZSBPcGVuQUwgc291bmQgc3Vw
 cG9ydCIgb2ZmCi1PUFRJT05TKz0JUFVMU0UgIkVuYWJsZSBQdWxzZUF1ZGlvIiBvZmYKLU9QVElP
 TlMrPQlGT05UQ09ORklHICJFbmFibGUgZm9udGNvbmZpZyBzdXBwb3J0IiBvZmYKLU9QVElPTlMr
 PQlMSUJVTkdJRiAiRW5hYmxlIGdpZiBzdXBwb3J0IiBvbgotT1BUSU9OUys9CU9QRU5KUEVHICJF
 bmFibGUgSlBFRzIwMDAgc3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JTU5HICJFbmFibGUgTU5HIGlu
 cHV0IHN1cHBvcnQiIG9mZgotT1BUSU9OUys9CUxJQkRWICJFbmFibGUgbGliZHYgc3VwcG9ydCIg
 b2ZmCi1PUFRJT05TKz0JTUFEICJFbmFibGUgbWFkIE1QRUcgYXVkaW8gZW5naW5lIHN1cHBvcnQi
 IG9mZgotT1BUSU9OUys9CUFNUl9OQiAiQU1SIE5hcnJvdyBCYW5kIGVuY29kZXIgKG9wZW5jb3Jl
 KSIgb2ZmCi1PUFRJT05TKz0JQU1SX1dCICJBTVIgV2lkZSBCYW5kIGVuY29kZXIgKG9wZW5jb3Jl
 KSIgb2ZmCi1PUFRJT05TKz0JR1NNICJHU00gYXVkaW8gY29kZWMiIG9mZgotT1BUSU9OUys9CVRX
 T0xBTUUgIkVuYWJsZSB0d29sYW1lIE1QRUcgYXVkaW8gY29kZWMgc3VwcG9ydCIgb2ZmCi1PUFRJ
 T05TKz0JRkFBQyAiRW5hYmxlIEZBQUMgYXVkaW8gY29kZWMgc3VwcG9ydCIgb2ZmCi1PUFRJT05T
 Kz0JTEFEU1BBICJFbmFibGUgTEFEU1BBIHBsdWdpbiBzdXBwb3J0IiBvZmYKLU9QVElPTlMrPQlT
 UEVFWCAiRW5hYmxlIHNwZWV4IGF1ZGlvIGNvZGVjIHN1cHBvcnQiIG9mZgotT1BUSU9OUys9CVdJ
 TjMyICJFbmFibGUgd2luMzIgY29kZWMgc2V0IG9uIHRoZSBJQTMyIGFyY2giIG9uCi1PUFRJT05T
 Kz0JVEhFT1JBICJFbmFibGUgb2dnIHRoZW9yYSB2aWRlbyBzdXBwb3J0IiBvZmYKLU9QVElPTlMr
 PQlYVklEICJFbmFibGUgWFZJRCB2aWRlbyBjb2RlYyBzdXBwb3J0IiBvbgotT1BUSU9OUys9CVgy
 NjQgIkVuYWJsZSB4MjY0IChILjI2NCkgdmlkZW8gY29kZWMgc3VwcG9ydCIgb24KLU9QVElPTlMr
 PQlWUFggIkVuYWJsZSBWUDggdmlkZW8gdmlhIGxpYnZweCIgb2ZmCi1PUFRJT05TKz0JRElSQUMg
 IkVuYWJsZSBkaXJhYyB2aWRlbyBjb2RlYyBzdXBwb3J0IiBvZmYKLU9QVElPTlMrPQlTQ0hST0VE
 SU5HRVIgIkRpcmFjIGNvZGVjIHZpYSBsaWJzY2hyb2VkaW5nZXIiIG9mZgotT1BUSU9OUys9CVJF
 QUxQTEFZRVIgIkVuYWJsZSByZWFsIHBsYXllciBwbHVnaW4iIG9mZgotT1BUSU9OUys9CUxJVkVN
 RURJQSAiRW5hYmxlIExJVkU1NTUgc3RyZWFtaW5nIHN1cHBvcnQiIG9mZgotT1BUSU9OUys9CVNN
 QiAiRW5hYmxlIFNhbWJhIGlucHV0IHN1cHBvcnQiIG9mZgotT1BUSU9OUys9CUJMVVJBWSAiQnVp
 bGQgd2l0aCBsaWJibHVyYXkgc3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JRlJJQklESSAiRW5hYmxl
 IEZyaUJpRGkgc3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JTElCQ0RJTyAiRW5hYmxlIGxpYmNkaW8g
 c3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JQ0RQQVJBTk9JQSAiRW5hYmxlIGNkcGFyYW5vaWEgc3Vw
 cG9ydCIgb2ZmCi1PUFRJT05TKz0JTElCTFpPICJFbmFibGUgZXh0ZXJuYWwgbGlibHpvIGxpYnJh
 cnkiIG9mZgotT1BUSU9OUys9CVY0TCAiRW5hYmxlIFZpZGVvNExpbnV4IFRWIHN1cHBvcnQiIG9m
 ZgotT1BUSU9OUys9CUxJQlJUTVAgIkVuYWJsZSBSVE1QRHVtcCBTdHJlYW1pbmcgTWVkaWEgc3Vw
 cG9ydCIgb2ZmCitPUFRJT05TX0RFRklORT0gQU1SX05CIEFNUl9XQiBCTFVSQVkgQ0RJTyBDRFBB
 UkFOT0lBIERFQlVHIERJUkFDIFwKKwkJRFYgRkFBQyBGT05UQ09ORklHIEZSSUJJREkgR0lGIEdT
 TSBJUFY2IEpBQ0sgTEFEU1BBIFwKKwkJTElCTU5HIExJVkVNRURJQSBMWk8gTUFEIE5BUyBPQ0ZM
 QUdTIE9QRU5BTCBPUEVOSlBFRyBcCisJCU9UQ0hBSU4gUFVMU0VBVURJTyBSRUFMIFJUQ1BVIFJU
 TVAgU0NIUk9FRElOR0VSIFNNQiBcCisJCVRIRU9SQSBUV09MQU1FIFY0TCBWUFggV0lOMzIgWDI2
 NCBYVklECisKK09QVElPTlNfREVGQVVMVD1HSUYgSVBWNiBPQ0ZMQUdTIFJUQ1BVIFdJTjMyIFgy
 NjQgWFZJRAorCitCTFVSQVlfREVTQz89CUJsdVJheSBzdXBwb3J0CitPQ0ZMQUdTX0RFU0M/PQlV
 c2Ugb3B0aW1pemVkIGNvbXBpbGVyIGZsYWdzCitPVENIQUlOX0RFU0M/PQlVc2UgZ2NjIDQuNisg
 dG9vbGNoYWluIG9uIGxlZ2FjeSBzeXN0ZW1zCitSRUFMX0RFU0M/PQlFbmFibGUgcmVhbHBsYXll
 ciBwbHVnaW4KK1JUQ1BVX0RFU0M/PQlVc2UgcnVudGltZSBDUFUgZGV0ZWN0aW9uCitXSU4zMl9E
 RVNDPz0JSW5zdGFsbCB3aW4zMiBiaW5hcnkgY29kZWNzCiAKIE1BTjE9CQltZW5jb2Rlci4xCiAK
 QEAgLTk1LDM3ICs2NywzNyBAQAogCiAuaW5jbHVkZSAiJHsuQ1VSRElSfS8uLi9tcGxheWVyL01h
 a2VmaWxlLm9wdGlvbnMiCiAKLS5pZiBkZWZpbmVkKFdJVEhfRk9OVENPTkZJRykKKy5pZiAke1BP
 UlRfT1BUSU9OUzpNRk9OVENPTkZJR30KIExJQl9ERVBFTkRTKz0JCWZvbnRjb25maWc6JHtQT1JU
 U0RJUn0veDExLWZvbnRzL2ZvbnRjb25maWcKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlz
 YWJsZS1mb250Y29uZmlnCiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lUSF9UV09MQU1FKQorLmlm
 ICR7UE9SVF9PUFRJT05TOk1UV09MQU1FfQogTElCX0RFUEVORFMrPQkJdHdvbGFtZToke1BPUlRT
 RElSfS9hdWRpby90d29sYW1lCiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPQktLWRpc2FibGUtdHdv
 bGFtZQogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfRkFBQykKKy5pZiAke1BPUlRfT1BUSU9O
 UzpNRkFBQ30KIExJQl9ERVBFTkRTKz0JCWZhYWM6JHtQT1JUU0RJUn0vYXVkaW8vZmFhYwogLmVs
 c2UKIENPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxlLWZhYWMKIC5lbmRpZgogCi0uaWYgIWRlZmlu
 ZWQoV0lUSE9VVF9YMjY0KQorLmlmICR7UE9SVF9PUFRJT05TOk1YMjY0fQogTElCX0RFUEVORFMr
 PQkJeDI2NC4xMjU6JHtQT1JUU0RJUn0vbXVsdGltZWRpYS94MjY0CiAuZWxzZQogQ09ORklHVVJF
 X0FSR1MrPQktLWRpc2FibGUteDI2NAogLmVuZGlmCiAKLS5pZiAhZGVmaW5lZChXSVRIT1VUX1hW
 SUQpCisuaWYgJHtQT1JUX09QVElPTlM6TVhWSUR9CiBMSUJfREVQRU5EUys9CQl4dmlkY29yZTok
 e1BPUlRTRElSfS9tdWx0aW1lZGlhL3h2aWQKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlz
 YWJsZS14dmlkCiAuZW5kaWYKIAotLmlmZGVmKFdJVEhfRElSQUMpCisuaWYgJHtQT1JUX09QVElP
 TlM6TURJUkFDfQogTElCX0RFUEVORFMrPQkJZGlyYWNfZW5jb2Rlcjoke1BPUlRTRElSfS9tdWx0
 aW1lZGlhL2RpcmFjCiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPQktLWRpc2FibGUtbGliZGlyYWMt
 bGF2YwpAQCAtMTM1LDkgKzEwNywxMCBAQAogCUAke0VDSE9fTVNHfSAiTiAtIE8gLSBUIC0gRSIK
 IAlAJHtFQ0hPX01TR30gIiIKIAlAJHtFQ0hPX01TR30gIlRoZXJlIGFyZSBzb21lIGtub2JzIHdo
 aWNoICpjYW4qICpub3QqIGJlIHNlbGVjdGVkIHZpYSB0aGUiCi0JQCR7RUNIT19NU0d9ICJPUFRJ
 T05TIGZyYW1ld29yay4gQXMgdGhpcyBvbmUgaXMgYSBzbGF2ZSBwb3J0IG9mIG11bHRpbWVkaWEv
 IgotCUAke0VDSE9fTVNHfSAibXBsYXllciwgeW91IG1pZ2h0IHdhbnQgdG8gY2hlY2sgbXBsYXll
 cidzIE1ha2VmaWxlKHMpIGluIgotCUAke0VDSE9fTVNHfSAib3JkZXIgdG8gbGVhcm4gbW9yZSBh
 Ym91dCB0aGVtLiIKKwlAJHtFQ0hPX01TR30gIk9QVElPTlMgZnJhbWV3b3JrLiBBdCB0aGUgbW9t
 ZW50LCB0aGVpciBkZWZhdWx0cyBhcmU6IgorCUAke0VDSE9fTVNHfSAiV0lUSF9MQU5HPTxMYW5n
 dWFnZUNvZGU+IgorCUAke0VDSE9fTVNHfSAiREVGQVVMVF9EVkRfREVWSUNFPS9kZXYvY2QwIgor
 CUAke0VDSE9fTVNHfSAiREVGQVVMVF9DRFJPTV9ERVZJQ0U9L2Rldi9jZDAiCiAKIHBvc3QtcGF0
 Y2g6CiAuaWYgJHtPU1ZFUlNJT059ID49IDkwMDAxMApkaWZmIC1yIGFmYWM5MzI0NWY0MSBtZW5j
 b2Rlci9kaXN0aW5mbwotLS0gYS9tZW5jb2Rlci9kaXN0aW5mbwlGcmkgTWFyIDA4IDE3OjIyOjE0
 IDIwMTMgKzAxMDAKKysrIGIvbWVuY29kZXIvZGlzdGluZm8JRnJpIE1hciAyMiAxODoyNjozNSAy
 MDEzICswMTAwCkBAIC0xLDIgKzEsMiBAQAotU0hBMjU2IChtcGxheWVyLTEuMS4yMDEyMDcyMS50
 YXIueHopID0gMzBiMTIwYmY4NTQzYjdjZmFkMzYyNzJlM2FlMjlhMDE3MjgyY2FhOTBmNGQ2MzVm
 ZTE1N2YyOTAzNjM5Mzc4NwotU0laRSAobXBsYXllci0xLjEuMjAxMjA3MjEudGFyLnh6KSA9IDEw
 NDgwMzY4CitTSEEyNTYgKG1wbGF5ZXItMS4xLjIwMTMwMzA4LnRhci54eikgPSA5MjBiZDY5MTQz
 ZDViODY3ZmQwMDQxYTk5YjYzMDJhMzllZDQ4ZWNjMTY3M2ZlM2EwNTFiM2FiY2NmZjE3MjU4CitT
 SVpFIChtcGxheWVyLTEuMS4yMDEzMDMwOC50YXIueHopID0gMTAzMjY4NDAKZGlmZiAtciBhZmFj
 OTMyNDVmNDEgbXBsYXllci9NYWtlZmlsZQotLS0gYS9tcGxheWVyL01ha2VmaWxlCUZyaSBNYXIg
 MDggMTc6MjI6MTQgMjAxMyArMDEwMAorKysgYi9tcGxheWVyL01ha2VmaWxlCUZyaSBNYXIgMjIg
 MTg6MjY6MzUgMjAxMyArMDEwMApAQCAtMyw2NyArMywzOSBAQAogCiBQT1JUTkFNRT0JbXBsYXll
 cgogUE9SVFZFUlNJT049CSR7TVBMQVlFUl9QT1JUX1ZFUlNJT059Ci1QT1JUUkVWSVNJT049CTIK
 K1BPUlRSRVZJU0lPTj0JMAogCiBDT01NRU5UPQlIaWdoIHBlcmZvcm1hbmNlIG1lZGlhIHBsYXll
 ciBzdXBwb3J0aW5nIG1hbnkgZm9ybWF0cwogCiAuaW5jbHVkZSAiJHsuQ1VSRElSfS9NYWtlZmls
 ZS5zaGFyZWQiCiAKLU9QVElPTlM9CURFQlVHICJJbmNsdWRlIGRlYnVnIHN5bWJvbHMgaW4gbXBs
 YXllcidzIGJpbmFyaWVzIiBvZmYKLU9QVElPTlMrPQlSVENQVSAiQWxsb3cgcnVudGltZSBDUFUg
 ZGV0ZWN0aW9uIiBvbgotT1BUSU9OUys9CU9DRkxBR1MgIlVzZSBvcHRpbWl6ZWQgY29tcGlsZXIg
 ZmxhZ3MiIG9uCi1PUFRJT05TKz0JT1RDSEFJTiAiVXNlIGdjYyA0LjYrIHRvb2xjaGFpbiBvbiBs
 ZWdhY3kgc3lzdGVtcyIgb2ZmCi1PUFRJT05TKz0JSVBWNiAiSW5jbHVkZSBpbmV0NiBuZXR3b3Jr
 IHN1cHBvcnQiIG9uCi1PUFRJT05TKz0JWDExICJFbmFibGUgWDExIHN1cHBvcnQgZm9yIG1wbGF5
 ZXIncyB2aWRlbyBvdXRwdXQiIG9uCi1PUFRJT05TKz0JWDExWFYgIlgxMSB2aWRlbyBkcml2ZXJz
 OiBYViIgb24KLU9QVElPTlMrPQlYMTFER0EgIlgxMSB2aWRlbyBkcml2ZXJzOiBER0EiIG9uCi1P
 UFRJT05TKz0JWDExR0wgIlgxMSB2aWRlbyBkcml2ZXJzOiBPcGVuR0wiIG9uCi1PUFRJT05TKz0J
 WDExWElOICJYMTEgdmlkZW8gZHJpdmVyczogWGluZXJhbWEiIG9uCi1PUFRJT05TKz0JWDExVk0g
 IlgxMSBWaWRNb2RlIHN1cHBvcnQiIG9uCi1PUFRJT05TKz0JWDExWFZNQyAiRW5hYmxlIFh2TUMg
 YWNjZWxlcmF0aW9uIiBvZmYKLU9QVElPTlMrPQlWRFBBVSAiRW5hYmxlIE52aWRpYSBWRFBBVSBh
 Y2NlbGVyYXRpb24iIG9mZgotT1BUSU9OUys9CUdVSSAiRW5hYmxlIEdUSzIgZ3JhcGhpY2FsIHVz
 ZXIgaW50ZXJmYWNlIHdpdGggWDExIiBvbgotT1BUSU9OUys9CVNETCAiRW5hYmxlIFNETCB2aWRl
 byBvdXRwdXQiIG9mZgotT1BUSU9OUys9CVNLSU5TICJGb3JjZSBkZXBlbmRlbmN5IG9uIG1wbGF5
 ZXItc2tpbnMiIG9uCi1PUFRJT05TKz0JUlRDICJBZGQgc3VwcG9ydCBmb3Iga2VybmVsIHJlYWwg
 dGltZSBjbG9jayB0aW1pbmciIG9mZgotT1BUSU9OUys9CUFSVFMgIkVuYWJsZSBLREUgc291bmQg
 c3lzdGVtIHN1cHBvcnQiIG9mZgotT1BUSU9OUys9CUVTT1VORCAiRW5hYmxlIEdOT01FIGVzb3Vu
 ZCBzdXBwb3J0IiBvZmYKLU9QVElPTlMrPQlKQUNLICJFbmFibGUgSmFja0l0IGF1ZGlvIHNlcnZl
 ciBzdXBwb3J0IiBvZmYKLU9QVElPTlMrPQlOQVMgIkVuYWJsZSBOQVMgc291bmQgc2VydmVyIHN1
 cHBvcnQiIG9mZgotT1BUSU9OUys9CU9QRU5BTCAiRW5hYmxlIE9wZW5BTCBzb3VuZCBzdXBwb3J0
 IiBvZmYKLU9QVElPTlMrPQlQVUxTRSAiRW5hYmxlIFB1bHNlQXVkaW8iIG9mZgotT1BUSU9OUys9
 CUxJQlVOR0lGICJFbmFibGUgZ2lmIHN1cHBvcnQiIG9uCi1PUFRJT05TKz0JT1BFTkpQRUcgIkVu
 YWJsZSBKUEVHMjAwMCBzdXBwb3J0IiBvZmYKLU9QVElPTlMrPQlNTkcgIkVuYWJsZSBNTkcgaW5w
 dXQgc3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JQUFMSUIgIkVuYWJsZSBhYWxpYiBzdXBwb3J0IiBv
 ZmYKLU9QVElPTlMrPQlMSUJDQUNBICJFbmFibGUgbGliY2FjYSBzdXBwb3J0IiBvZmYKLU9QVElP
 TlMrPQlTVkdBTElCICJFbmFibGUgc3ZnYWxpYiBzdXBwb3J0IiBvZmYKLU9QVElPTlMrPQlMSUJE
 ViAiRW5hYmxlIGxpYmR2IHN1cHBvcnQiIG9mZgotT1BUSU9OUys9CU1BRCAiRW5hYmxlIG1hZCBN
 UEVHIGF1ZGlvIGVuZ2luZSBzdXBwb3J0IiBvZmYKLU9QVElPTlMrPQlBTVJfTkIgIkFNUiBOYXJy
 b3cgQmFuZCBlbmNvZGVyIChvcGVuY29yZSkiIG9mZgotT1BUSU9OUys9CUFNUl9XQiAiQU1SIFdp
 ZGUgQmFuZCBlbmNvZGVyIChvcGVuY29yZSkiIG9mZgotT1BUSU9OUys9CUdTTSAiR1NNIGF1ZGlv
 IGNvZGVjIiBvZmYKLU9QVElPTlMrPQlMQURTUEEgIkVuYWJsZSBMQURTUEEgcGx1Z2luIHN1cHBv
 cnQiIG9mZgotT1BUSU9OUys9CVNQRUVYICJFbmFibGUgc3BlZXggYXVkaW8gY29kZWMgc3VwcG9y
 dCIgb24KLU9QVElPTlMrPQlUSEVPUkEgIkVuYWJsZSBvZ2cgdGhlb3JhIHZpZGVvIHN1cHBvcnQi
 IG9mZgotT1BUSU9OUys9CVZQWCAiRW5hYmxlIFZQOCB2aWRlbyB2aWEgbGlidnB4IiBvZmYKLU9Q
 VElPTlMrPQlTQ0hST0VESU5HRVIgIkRpcmFjIGNvZGVjIHZpYSBsaWJzY2hyb2VkaW5nZXIiIG9m
 ZgotLmlmICFkZWZpbmVkKFBBQ0tBR0VfQlVJTERJTkcpCi1PUFRJT05TKz0JV0lOMzIgIkVuYWJs
 ZSB3aW4zMiBjb2RlYyBzZXQgb24gdGhlIElBMzIgYXJjaCIgb24KLS5lbmRpZgotT1BUSU9OUys9
 CVJFQUxQTEFZRVIgIkVuYWJsZSByZWFsIHBsYXllciBwbHVnaW4iIG9mZgotT1BUSU9OUys9CUxJ
 VkVNRURJQSAiRW5hYmxlIExJVkU1NTUgc3RyZWFtaW5nIHN1cHBvcnQiIG9mZgotT1BUSU9OUys9
 CVNNQiAiRW5hYmxlIFNhbWJhIGlucHV0IHN1cHBvcnQiIG9mZgotT1BUSU9OUys9CUJMVVJBWSAi
 QnVpbGQgd2l0aCBsaWJibHVyYXkgc3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JRlJJQklESSAiRW5h
 YmxlIEZyaUJpRGkgc3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JTElSQyAiRW5hYmxlIGxpcmMgc3Vw
 cG9ydCIgb2ZmCi1PUFRJT05TKz0JTElCQ0RJTyAiRW5hYmxlIGxpYmNkaW8gc3VwcG9ydCIgb2Zm
 Ci1PUFRJT05TKz0JQ0RQQVJBTk9JQSAiRW5hYmxlIGNkcGFyYW5vaWEgc3VwcG9ydCIgb2ZmCi1P
 UFRJT05TKz0JTElCTFpPICJFbmFibGUgZXh0ZXJuYWwgbGlibHpvIGxpYnJhcnkiIG9mZgotT1BU
 SU9OUys9CUpPWVNUSUNLICJFbmFibGUgam95c3RpY2sgc3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0J
 VjRMICJFbmFibGUgVmlkZW80TGludXggVFYgc3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JTElCUlRN
 UCAiRW5hYmxlIFJUTVBEdW1wIFN0cmVhbWluZyBNZWRpYSBzdXBwb3J0IiBvZmYKLU9QVElPTlMr
 PQlFTkNBICJFbmFibGUgZW5jYSBjaGFyc2V0IGRldGVjdGlvbiIgb2ZmCitPUFRJT05TX0RFRklO
 RT0gQUFMSUIgQU1SX05CIEFNUl9XQiBBUlRTIEJMVVJBWSBDQUNBIERFQlVHIERWIFwKKwkJRU5D
 QSBFU09VTkQgRlJJQklESSBHSUYgR1NNIEdVSSBJUFY2IEpBQ0sgXAorCQlKT1lTVElDSyBMQURT
 UEEgTElCTU5HIExJUkMgTElWRU1FRElBIExaTyBNQUQgXAorCQlOQVMgT0NGTEFHUyBPUEVOQUwg
 T1BFTkdMIE9QRU5KUEVHIE9UQ0hBSU4gXAorCQlQVUxTRUFVRElPIFJFQUwgUlRDIFJUQ1BVIFJU
 TVAgU0NIUk9FRElOR0VSIFNETCBcCisJCVNLSU5TIFNNQiBTVkdBTElCIFY0TCBWRFBBVSBXSU4z
 MiBcCisJCVgxMSBYMTFER0EgWDExVk0gWElORVJBTUEgWFZJREVPIFhWTUMKKworT1BUSU9OU19S
 QURJTz0JUkdDRAorT1BUSU9OU19SQURJT19SR0NEPQlDRElPIENEUEFSQU5PSUEKKworT1BUSU9O
 U19ERUZBVUxUPUdVSSBJUFY2IE9DRkxBR1MgT1BFTkdMIFJUQ1BVIFNLSU5TIFwKKwkJV0lOMzIg
 WDExIFgxMURHQSBYMTFWTSBYSU5FUkFNQSBYVklERU8KKworQkxVUkFZX0RFU0M/PQlCbHVSYXkg
 c3VwcG9ydAorRU5DQV9ERVNDPz0JQ2hhcnNldCBjb252ZXJzaW9uIHZpYSBlbmNhCitKT1lTVElD
 S19ERVNDPz0JSm95c3RpY2sgc3VwcG9ydAorTFpPX0RFU0M/PQlFeHRlcm5hbCBsaWJsem8gc3Vw
 cG9ydAorT0NGTEFHU19ERVNDPz0JVXNlIG9wdGltaXplZCBjb21waWxlciBmbGFncworT1RDSEFJ
 Tl9ERVNDPz0JVXNlIGdjYyA0LjYrIHRvb2xjaGFpbiBvbiBsZWdhY3kgc3lzdGVtcworUkVBTF9E
 RVNDPz0JRW5hYmxlIHJlYWxwbGF5ZXIgcGx1Z2luCitSVENfREVTQz89CUFkZCBzdXBwb3J0IGZv
 ciBrZXJuZWwgcmVhbCB0aW1lIGNsb2NrCitSVENQVV9ERVNDPz0JVXNlIHJ1bnRpbWUgQ1BVIGRl
 dGVjdGlvbgorU0tJTlNfREVTQz89CUluc3RhbGwgc2tpbnMgZm9yIEdVSQorV0lOMzJfREVTQz89
 CUluc3RhbGwgd2luMzIgYmluYXJ5IGNvZGVjcworWDExREdBX0RFU0M/PQlYMTEgREdBIHZpZGVv
 IGRyaXZlciBzdXBwb3J0CitYMTFWTV9ERVNDPz0JWDExIFZpZE1vZGUgc3VwcG9ydAogCiBNQU4x
 PQkJbXBsYXllci4xCiBNQU5DT01QUkVTU0VEPQlubwpAQCAtODIsMTMgKzU0LDE1IEBACiAJCQkt
 LWRpc2FibGUtZmFhYyBcCiAJCQktLWRpc2FibGUtZmFhZCBcCiAJCQktLWRpc2FibGUtbGliZGNh
 IFwKKwkJCS0tZGlzYWJsZS10b29sYW1lIFwKIAkJCS0tZGlzYWJsZS10d29sYW1lIFwKIAkJCS0t
 ZGlzYWJsZS14MjY0IFwKIAkJCS0tZGlzYWJsZS14dmlkIFwKIAkJCS0tZGlzYWJsZS1saWJkaXJh
 Yy1sYXZjIFwKIAkJCS0tZGlzYWJsZS1tZW5jb2RlciBcCiAJCQktLWRpc2FibGUtbXBnMTIzIFwK
 LQkJCS0tZGlzYWJsZS1tdXNlcGFjaworCQkJLS1kaXNhYmxlLW11c2VwYWNrIFwKKwkJCS0tZGlz
 YWJsZS10aGVvcmEKIAogIyBGaXggYSBwcm9ibGVtIHdpdGggdW5rbm93biBhc3NlbWJseSBvcGNv
 ZGVzIGluIGVtYmVkZGVkIGZmbXBlZwogLmlmICR7QVJDSH0gPT0gInBwYyIKQEAgLTk3LDExICs3
 MSwxMSBAQAogCiAuaW5jbHVkZSAiJHsuQ1VSRElSfS9NYWtlZmlsZS5vcHRpb25zIgogCi0uaWYg
 IWRlZmluZWQoV0lUSE9VVF9HVUkpICYmICFkZWZpbmVkKFdJVEhPVVRfWDExKQorLmlmICR7UE9S
 VF9PUFRJT05TOk1HVUl9ICYmICR7UE9SVF9PUFRJT05TOk1YMTF9CiBNTElOS1MrPQltcGxheWVy
 LjEgZ21wbGF5ZXIuMQogUExJU1RfU1VCKz0JR01QTEFZRVI9IiIKIERFU0tUT1BfRU5UUklFUz0J
 Ik1QbGF5ZXIiICJIaWdoIHBlcmZvcm1hbmNlIG1lZGlhIHBsYXllciIgIm1wbGF5ZXIiICJnbXBs
 YXllciIgIiIgZmFsc2UKLS5pZiAhZGVmaW5lZChXSVRIT1VUX1NLSU5TKQorLmlmICR7UE9SVF9P
 UFRJT05TOk1TS0lOU30KIFJVTl9ERVBFTkRTKz0JJHtMT0NBTEJBU0V9L3NoYXJlL21wbGF5ZXIv
 c2tpbnM6JHtQT1JUU0RJUn0vbXVsdGltZWRpYS9tcGxheWVyLXNraW5zCiAuZW5kaWYKIApAQCAt
 MTE0LDUyICs4OCw1MiBAQAogCiAuZWxzZQogUExJU1RfU1VCKz0JR01QTEFZRVI9IkBjb21tZW50
 ICIKLS5lbmRpZiAjV0lUSE9VVF9HVUkKKy5lbmRpZiAjR1VJICYmIFgxMQogCi0uaWYgIWRlZmlu
 ZWQoV0lUSE9VVF9YMTEpCisuaWYgJHtQT1JUX09QVElPTlM6TVgxMX0KIFVTRV9YT1JHPQl4MTEK
 LS5pZiAhZGVmaW5lZChXSVRIT1VUX1gxMVhWKQorLmlmICR7UE9SVF9PUFRJT05TOk1YVklERU99
 CiBVU0VfWE9SRys9CXh2CiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPS0tZGlzYWJsZS14dgogLmVu
 ZGlmCi0uaWYgIWRlZmluZWQoV0lUSE9VVF9YMTFER0EpCisuaWYgJHtQT1JUX09QVElPTlM6TVgx
 MURHQX0KIFVTRV9YT1JHKz0JeHhmODZkZ2EKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9LS1kaXNh
 YmxlLWRnYTEgLS1kaXNhYmxlLWRnYTIKIC5lbmRpZgotLmlmICFkZWZpbmVkKFdJVEhPVVRfWDEx
 R0wpCisuaWYgJHtQT1JUX09QVElPTlM6TU9QRU5HTH0KIFVTRV9YT1JHKz0JZ2xwcm90bwogTElC
 X0RFUEVORFMrPQlHTDoke1BPUlRTRElSfS9ncmFwaGljcy9saWJHTAogLmVsc2UKIENPTkZJR1VS
 RV9BUkdTKz0tLWRpc2FibGUtZ2wKIC5lbmRpZgotLmlmICFkZWZpbmVkKFdJVEhPVVRfWDExWElO
 KQorLmlmICR7UE9SVF9PUFRJT05TOk1YSU5FUkFNQX0KIFVTRV9YT1JHKz0JeGluZXJhbWEgeGlu
 ZXJhbWFwcm90bwogLmVsc2UKIENPTkZJR1VSRV9BUkdTKz0tLWRpc2FibGUteGluZXJhbWEKIC5l
 bmRpZgotLmlmICFkZWZpbmVkKFdJVEhPVVRfWDExVk0pCisuaWYgJHtQT1JUX09QVElPTlM6TVgx
 MVZNfQogVVNFX1hPUkcrPQl4eGY4NnZtCiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPS0tZGlzYWJs
 ZS12bQogLmVuZGlmCi0uaWYgZGVmaW5lZChXSVRIX1gxMVhWTUMpCisuaWYgJHtQT1JUX09QVElP
 TlM6TVhWTUN9CiBVU0VfWE9SRys9CXh2bWMKIENPTkZJR1VSRV9BUkdTKz0tLWVuYWJsZS14dm1j
 IC0td2l0aC14dm1jbGliPVh2TUNXCiAuZW5kaWYKLS5lbHNlCQkJCSNXSVRIT1VUX1gxMQorLmVs
 c2UJI1gxMQogQ09ORklHVVJFX0FSR1MrPS0tZGlzYWJsZS14MTEgXAogCQktLWRpc2FibGUtZm9u
 dGNvbmZpZwogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfVkRQQVUpCisuaWYgJHtQT1JUX09Q
 VElPTlM6TVZEUEFVfQogTElCX0RFUEVORFMrPQl2ZHBhdToke1BPUlRTRElSfS9tdWx0aW1lZGlh
 L2xpYnZkcGF1CiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPQktLWRpc2FibGUtdmRwYXUKIC5lbmRp
 ZgogCi0uaWYgZGVmaW5lZChXSVRIX1JUQykKKy5pZiAke1BPUlRfT1BUSU9OUzpNUlRDfQogQlVJ
 TERfREVQRU5EUys9CSR7TE9DQUxCQVNFfS9tb2R1bGVzL3J0Yy5rbzoke1BPUlRTRElSfS9lbXVs
 YXRvcnMvcnRjCiBSVU5fREVQRU5EUys9CSR7TE9DQUxCQVNFfS9tb2R1bGVzL3J0Yy5rbzoke1BP
 UlRTRElSfS9lbXVsYXRvcnMvcnRjCiBDT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLXJ0YwpAQCAt
 MTY3LDQ1ICsxNDEsNDMgQEAKIENPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxlLXJ0YwogLmVuZGlm
 CiAKLS5pZiBkZWZpbmVkKFdJVEhfQVJUUykKKy5pZiAke1BPUlRfT1BUSU9OUzpNQVJUU30KIExJ
 Ql9ERVBFTkRTKz0JCWFydHNjOiR7UE9SVFNESVJ9L2F1ZGlvL2FydHMKIC5lbHNlCiBDT05GSUdV
 UkVfQVJHUys9CS0tZGlzYWJsZS1hcnRzCiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lUSF9MSUJD
 QUNBKQorLmlmICR7UE9SVF9PUFRJT05TOk1DQUNBfQogTElCX0RFUEVORFMrPQkJY2FjYToke1BP
 UlRTRElSfS9ncmFwaGljcy9saWJjYWNhCiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPQktLWRpc2Fi
 bGUtY2FjYQogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfTElSQykKKy5pZiAke1BPUlRfT1BU
 SU9OUzpNTElSQ30KIExJQl9ERVBFTkRTKz0JCWxpcmNfY2xpZW50OiR7UE9SVFNESVJ9L2NvbW1z
 L2xpcmMKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1saXJjCiAuZW5kaWYKIAot
 LmlmIGRlZmluZWQoV0lUSF9TREwpCisuaWYgJHtQT1JUX09QVElPTlM6TVNETH0KIFVTRV9TREw9
 CXNkbAotV0lUSF9BQUxJQj0JeWVzCi0udW5kZWYoV0lUSE9VVF9BQUxJQikKIC5lbHNlCiBDT05G
 SUdVUkVfQVJHUys9CS0tZGlzYWJsZS1zZGwKIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX1NW
 R0FMSUIpCisuaWYgJHtQT1JUX09QVElPTlM6TVNWR0FMSUJ9CiBMSUJfREVQRU5EUys9CQl2Z2E6
 JHtQT1JUU0RJUn0vZ3JhcGhpY3Mvc3ZnYWxpYgogLmVsc2UKIENPTkZJR1VSRV9BUkdTKz0JLS1k
 aXNhYmxlLXN2Z2EKIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX0FBTElCKQorLmlmICR7UE9S
 VF9PUFRJT05TOk1BQUxJQn0gfHwgJHtQT1JUX09QVElPTlM6TVNETH0KIExJQl9ERVBFTkRTKz0J
 CWFhOiR7UE9SVFNESVJ9L2dyYXBoaWNzL2FhbGliCiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPQkt
 LWRpc2FibGUtYWEKIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX0VTT1VORCkKKy5pZiAke1BP
 UlRfT1BUSU9OUzpNRVNPVU5EfQogVVNFX0dOT01FKz0JZXNvdW5kCiAuZWxzZQogQ09ORklHVVJF
 X0FSR1MrPQktLWRpc2FibGUtZXNkCkBAIC0yMTcsMTQgKzE4OSwxNCBAQAogREVGQVVMVF9LRVJO
 X0haPTEwMjQKIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX0pPWVNUSUNLKQorLmlmICR7UE9S
 VF9PUFRJT05TOk1KT1lTVElDS30KIEJVSUxEX0RFUEVORFMrPQkke0xPQ0FMQkFTRX0vaW5jbHVk
 ZS9saW51eC9qb3lzdGljay5oOiR7UE9SVFNESVJ9L2RldmVsL2xpbnV4LWpzCiBDT05GSUdVUkVf
 QVJHUys9LS1lbmFibGUtam95c3RpY2sKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9LS1kaXNhYmxl
 LWpveXN0aWNrCiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lUSF9FTkNBKQorLmlmICR7UE9SVF9P
 UFRJT05TOk1FTkNBfQogTElCX0RFUEVORFMrPQkJZW5jYToke1BPUlRTRElSfS9jb252ZXJ0ZXJz
 L2VuY2EKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1lbmNhCkBAIC0yMzQsMTQg
 KzIwNiwxNyBAQAogCUAke0VDSE9fTVNHfSAiTiAtIE8gLSBUIC0gRSIKIAlAJHtFQ0hPX01TR30g
 IiIKIAlAJHtFQ0hPX01TR30gIlRoZXJlIGFyZSBzb21lIGtub2JzIHdoaWNoICpjYW4qICpub3Qq
 IGJlIHNlbGVjdGVkIHZpYSB0aGUiCi0JQCR7RUNIT19NU0d9ICJPUFRJT05TIGZyYW1ld29yay4g
 WW91IG1pZ2h0IHdhbnQgdG8gY2hlY2sgTWFrZWZpbGUub3B0aW9ucyIKLQlAJHtFQ0hPX01TR30g
 ImluIG9yZGVyIHRvIGxlYXJuIG1vcmUgYWJvdXQgdGhlbS4iCisJQCR7RUNIT19NU0d9ICJPUFRJ
 T05TIGZyYW1ld29yay4gQXQgdGhlIG1vbWVudCwgdGhlaXIgZGVmYXVsdHMgYXJlOiIKKwlAJHtF
 Q0hPX01TR30gIldJVEhfTEFORz08TGFuZ3VhZ2VDb2RlPiIKKwlAJHtFQ0hPX01TR30gIldJVEhf
 S0VSTl9IWj0xMDI0IgorCUAke0VDSE9fTVNHfSAiREVGQVVMVF9EVkRfREVWSUNFPS9kZXYvY2Qw
 IgorCUAke0VDSE9fTVNHfSAiREVGQVVMVF9DRFJPTV9ERVZJQ0U9L2Rldi9jZDAiCiAKLS5pZiAh
 ZGVmaW5lZChXSVRIT1VUX0dVSSkgJiYgIWRlZmluZWQoV0lUSE9VVF9YMTEpCi0JQCR7RUNIT19N
 U0d9ICJJZiB5b3Ugd2FudCB0byB1c2UgdGhlIEdVSSwgeW91IGNhbiBlaXRoZXIgaW5zdGFsbCIK
 Ky5pZiAke1BPUlRfT1BUSU9OUzpNR1VJfSAmJiAke1BPUlRfT1BUSU9OUzpNWDExfQorCUAke0VD
 SE9fTVNHfSAiSWYgeW91IHdhbnQgdG8gdXNlIHRoZSBHVUksIHlvdSBjYW4gdXNlIHRoZSBza2lu
 cyBmcm9tIgogCUAke0VDSE9fTVNHfSAiJHtQT1JUU0RJUn0vbXVsdGltZWRpYS9tcGxheWVyLXNr
 aW5zIgotCUAke0VDSE9fTVNHfSAib3IgZG93bmxvYWQgb2ZmaWNpYWwgc2tpbiBjb2xsZWN0aW9u
 cyBmcm9tIgotCUAke0VDSE9fTVNHfSAiaHR0cDovL3d3dy5tcGxheWVyaHEuaHUvaG9tZXBhZ2Uv
 ZGxvYWQuaHRtbCIKKwlAJHtFQ0hPX01TR30gIm9yIGRvd25sb2FkIHRoZW0gZnJvbSIKKwlAJHtF
 Q0hPX01TR30gImh0dHA6Ly93d3cubXBsYXllcmhxLmh1LyIKIC5lbmRpZgogCiBwb3N0LXBhdGNo
 OgpAQCAtMjY5LDcgKzI0NCw3IEBACiAJCSdzfC91c3IvXFw6bG9jYWwvXFw6ZXRjL1xcOm1wbGF5
 ZXJ8JHtEQVRBRElSOlMvXC8vXC9cXFw6L2d9fGcgOyBcCiAJCSBzfC9kZXYvXFw6KGR2ZFtbOmFs
 bnVtOl1dKltbOj46XV0pfCR7REVGQVVMVF9EVkRfREVWSUNFOlMvZGV2XC8vZGV2XC9cXFw6L318
 ZyA7IFwKIAkJIHN8L2Rldi9cXDooY2Ryb21bWzphbG51bTpdXSpbWzo+Ol1dKXwke0RFRkFVTFRf
 Q0RST01fREVWSUNFOlMvZGV2XC8vZGV2XC9cXFw6L318ZycKLS5pZiBkZWZpbmVkKFdJVEhfUlRD
 KQorLmlmICR7UE9SVF9PUFRJT05TOk1SVEN9CiAJQCR7UkVJTlBMQUNFX0NNRH0gLWUgXAogCQkn
 c3xpcnFwID0gMTAyNHxpcnFwID0gJHtERUZBVUxUX0tFUk5fSFp9fCcgXAogCQkke1dSS1NSQ30v
 bXBsYXllci5jCkBAIC0yODMsNyArMjU4LDcgQEAKIC5mb3IgY29uZiBpbiAke0NPTkZGSUxFU30K
 IAkke0lOU1RBTExfREFUQX0gJHtXUktTUkN9L2V0Yy8ke2NvbmZ9ICR7REFUQURJUn0vZXhhbXBs
 ZXMvZXRjCiAuZW5kZm9yCi0uaWYgIWRlZmluZWQoV0lUSE9VVF9HVUkpICYmICFkZWZpbmVkKFdJ
 VEhPVVRfWDExKQorLmlmICR7UE9SVF9PUFRJT05TOk1HVUl9ICYmICR7UE9SVF9PUFRJT05TOk1Y
 MTF9CiAJQCR7TE59IC1zZiAke1BSRUZJWH0vYmluL21wbGF5ZXIgJHtQUkVGSVh9L2Jpbi9nbXBs
 YXllcgogCSR7Q1B9IC1mICR7V1JLU1JDfS9ldGMvbXBsYXllcjI1NngyNTYucG5nICR7TE9DQUxC
 QVNFfS9zaGFyZS9waXhtYXBzL21wbGF5ZXIucG5nCiAuZW5kaWYKZGlmZiAtciBhZmFjOTMyNDVm
 NDEgbXBsYXllci9NYWtlZmlsZS5vcHRpb25zCi0tLSBhL21wbGF5ZXIvTWFrZWZpbGUub3B0aW9u
 cwlGcmkgTWFyIDA4IDE3OjIyOjE0IDIwMTMgKzAxMDAKKysrIGIvbXBsYXllci9NYWtlZmlsZS5v
 cHRpb25zCUZyaSBNYXIgMjIgMTg6MjY6MzUgMjAxMyArMDEwMApAQCAtMTQsMTQgKzE0LDEyIEBA
 CiAjIHRoZSB2YXJpYWJsZSB0byBtYWtlIGR1cmluZyBidWlsZCwgZS5nLiBtYWtlIFdJVEhfRFZE
 X0RFVklDRT0vZGV2L2NkMAogIwogIyBXSVRIX0RWRF9ERVZJQ0U9L3BhdGgvdG8vZGVzaXJlZC9k
 ZXZpY2UKLSMgZGVmYXVsdCA1Lng6IC9kZXYvYWNkMAotIyBkZWZhdWx0IDQueDogL2Rldi9hY2Qw
 YworIyBkZWZhdWx0OiAvZGV2L2NkMAogIyBUaGlzIG9wdGlvbiBjaGFuZ2VzIHRoZSBkZWZhdWx0
 IGRldmljZSB3aGVyZSBtcGxheWVyIGxvb2tzIGZvcgogIyBhIERWRCBtZWRpdW0KICMKICMgV0lU
 SF9DRFJPTV9ERVZJQ0U9L3BhdGgvdG8vZGVzaXJlZC9kZXZpY2UKLSMgZGVmYXVsdCA1Lng6IC9k
 ZXYvYWNkMAotIyBkZWZhdWx0IDQueDogL2Rldi9hY2QwYworIyBkZWZhdWx0OiAvZGV2L2NkMAog
 IyBUaGlzIG9wdGlvbiBjaGFuZ2VzIHRoZSBkZWZhdWx0IGNkcm9tIGRldmljZSwgbWF5YmUgdXNl
 ZnVsIGZvciBWQ0RzCiAjCiAjIFdJVEhfTEFORz08eW91ciBjaG9pY2U+CkBAIC0zOSwyNCArMzcs
 MjQgQEAKIAogI09uIGkzODYsIGdjYyBydW5zIG91dCBvZiBnZW5lcmFsIHB1cnBvc2UgcmVnaXN0
 ZXJzIHdoZW4KICN0cnlpbmcgdG8gY29tcGlsZSBhIGRlYnVnIHZlcnNpb24gd2l0aCB0aGUgZGVm
 YXVsdCBmbGFncy4KLS5pZiBkZWZpbmVkKFdJVEhfREVCVUcpCisuaWYgJHtQT1JUX09QVElPTlM6
 TURFQlVHfQogLmlmICR7QVJDSH0gPT0gImkzODYiCiBERUJVR19GTEFHUz0JLWcgLU8gLWZvbWl0
 LWZyYW1lLXBvaW50ZXIKIC5lbmRpZgogLmVsc2UKLS5pZiBkZWZpbmVkKFdJVEhPVVRfT0NGTEFH
 UykKKy5pZiAke1BPUlRfT1BUSU9OUzpNT0NGTEFHU30KK0NGTEFHUys9CS1PMyAtZm9taXQtZnJh
 bWUtcG9pbnRlciAtZmZhc3QtbWF0aAorLmVsc2UKIENGTEFHUys9CS1PIC1mb21pdC1mcmFtZS1w
 b2ludGVyCi0uZWxzZQotQ0ZMQUdTKz0JLU8zIC1mb21pdC1mcmFtZS1wb2ludGVyIC1mZmFzdC1t
 YXRoCi0uZW5kaWYKLS5lbmRpZiAjV0lUSF9ERUJVRworLmVuZGlmICNPQ0ZMQUdTCisuZW5kaWYg
 I0RFQlVHCiAKICNTdXBwb3J0ZWQgYXJjaGl0ZWN0dXJlcyBmb3IgY2xhbmcKLS5pZiAke0FSQ0h9
 ID09ICJpMzg2IiB8fCAke0FSQ0h9ID09ICJhbWQ2NCIKKy5pZiAke0FSQ0h9ID09ICJhbWQ2NCIK
 IE1QTEFZRVJfQ0xBTkdfU1VQUE9SVEVEX0FSQ0g9CXllcwogLmVuZGlmCiAKLS5pZiAhZGVmaW5l
 ZChXSVRIT1VUX1JUQ1BVKQorLmlmICR7UE9SVF9PUFRJT05TOk1SVENQVX0KIENPTkZJR1VSRV9B
 UkdTKz0tLWVuYWJsZS1ydW50aW1lLWNwdWRldGVjdGlvbgogLmVuZGlmCiAKQEAgLTcwLDggKzY4
 LDkgQEAKIENDPQkJY2xhbmcKIENYWD0JCWNsYW5nKysKIENQUD0JCWNsYW5nLWNwcAorRVhUUkFf
 UEFUQ0hFUys9CSR7RklMRVNESVJ9L2V4dHJhLXBhdGNoLWNsYW5nLXZlcnNpb24KIC5lbHNlCi0u
 aWYgZGVmaW5lZChXSVRIX09UQ0hBSU4pCisuaWYgJHtQT1JUX09QVElPTlM6TU9UQ0hBSU59CiBV
 U0VfR0NDPz0JNC42KwogQlVJTERfREVQRU5EUys9CSR7TE9DQUxCQVNFfS9iaW4vYXM6JHtQT1JU
 U0RJUn0vZGV2ZWwvYmludXRpbHMKIC5lbHNlCkBAIC04NSw2MSArODQsNTUgQEAKIC5lbmRpZgog
 LmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhPVVRfSVBWNikKKy5pZiAke1BPUlRfT1BUSU9OUzpN
 SVBWNn0KK0NBVEVHT1JJRVMrPQlpcHY2CisuZWxzZQogQ09ORklHVVJFX0FSR1MrPQktLWRpc2Fi
 bGUtaW5ldDYKLS5lbHNlCi1DQVRFR09SSUVTKz0JaXB2NgogLmVuZGlmCiAKLS5pZiAhZGVmaW5l
 ZChXSVRIT1VUX0xJQlVOR0lGKQorLmlmICR7UE9SVF9PUFRJT05TOk1HSUZ9CiBMSUJfREVQRU5E
 Uys9CQlnaWY6JHtQT1JUU0RJUn0vZ3JhcGhpY3MvZ2lmbGliCiAuZWxzZQogQ09ORklHVVJFX0FS
 R1MrPQktLWRpc2FibGUtZ2lmCiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lUSF9PUEVOSlBFRykK
 Ky5pZiAke1BPUlRfT1BUSU9OUzpNT1BFTkpQRUd9CiBMSUJfREVQRU5EUys9CQlvcGVuanBlZzok
 e1BPUlRTRElSfS9ncmFwaGljcy9vcGVuanBlZwogLmVsc2UKIENPTkZJR1VSRV9BUkdTKz0JLS1k
 aXNhYmxlLWxpYm9wZW5qcGVnCiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lUSF9NQUQpCisuaWYg
 JHtQT1JUX09QVElPTlM6TU1BRH0KIExJQl9ERVBFTkRTKz0JCW1hZDoke1BPUlRTRElSfS9hdWRp
 by9saWJtYWQKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1tYWQKIC5lbmRpZgog
 Ci0uaWYgZGVmaW5lZChXSVRIX0xJQkRWKQorLmlmICR7UE9SVF9PUFRJT05TOk1EVn0KIExJQl9E
 RVBFTkRTKz0JCWR2OiR7UE9SVFNESVJ9L211bHRpbWVkaWEvbGliZHYKIC5lbHNlCiBDT05GSUdV
 UkVfQVJHUys9CS0tZGlzYWJsZS1saWJkdgogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfVEhF
 T1JBKQorLmlmICR7UE9SVF9PUFRJT05TOk1USEVPUkF9CiBMSUJfREVQRU5EUys9CQl0aGVvcmE6
 JHtQT1JUU0RJUn0vbXVsdGltZWRpYS9saWJ0aGVvcmEKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9
 CS0tZGlzYWJsZS10aGVvcmEKIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX1ZQWCkKKy5pZiAk
 e1BPUlRfT1BUSU9OUzpNVlBYfQogTElCX0RFUEVORFMrPQkJdnB4OiR7UE9SVFNESVJ9L211bHRp
 bWVkaWEvbGlidnB4CiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPQktLWRpc2FibGUtbGlidnB4LWxh
 dmMKIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX1NDSFJPRURJTkdFUikKKy5pZiAke1BPUlRf
 T1BUSU9OUzpNU0NIUk9FRElOR0VSfQogTElCX0RFUEVORFMrPQkJc2Nocm9lZGluZ2VyLTEuMC4x
 MToke1BPUlRTRElSfS9tdWx0aW1lZGlhL3NjaHJvZWRpbmdlcgogLmVsc2UKIENPTkZJR1VSRV9B
 UkdTKz0JLS1kaXNhYmxlLWxpYnNjaHJvZWRpbmdlci1sYXZjCiAuZW5kaWYKIAotLmlmICFkZWZp
 bmVkKFdJVEhPVVRfU1BFRVgpCi1MSUJfREVQRU5EUys9CQlzcGVleDoke1BPUlRTRElSfS9hdWRp
 by9zcGVleAotLmVsc2UKLUNPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxlLXNwZWV4Ci0uZW5kaWYK
 LQotLmlmIGRlZmluZWQoV0lUSF9MSVZFTUVESUEpCisuaWYgJHtQT1JUX09QVElPTlM6TUxJVkVN
 RURJQX0KIENPTkZJR1VSRV9BUkdTKz0JLS1lbmFibGUtbGl2ZQogQlVJTERfREVQRU5EUys9CQkk
 e0xPQ0FMQkFTRX0vbGl2ZS9saXZlTWVkaWEvbGlibGl2ZU1lZGlhLmE6JHtQT1JUU0RJUn0vbmV0
 L2xpdmVNZWRpYQogQ0ZMQUdTKz0JCS1JJHtMT0NBTEJBU0V9L2xpdmUvbGl2ZU1lZGlhL2luY2x1
 ZGUgXApAQCAtMTU5LDY3ICsxNTIsNjcgQEAKIENPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxlLWxp
 dmUKIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX0pBQ0spCisuaWYgJHtQT1JUX09QVElPTlM6
 TUpBQ0t9CiBMSUJfREVQRU5EUys9CQlqYWNrOiR7UE9SVFNESVJ9L2F1ZGlvL2phY2sKIC5lbHNl
 CiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1qYWNrCiAuZW5kaWYKIAotLmlmIGRlZmluZWQo
 V0lUSF9OQVMpCisuaWYgJHtQT1JUX09QVElPTlM6TU5BU30KIExJQl9ERVBFTkRTKz0JCWF1ZGlv
 OiR7UE9SVFNESVJ9L2F1ZGlvL25hcwogLmVsc2UKIENPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxl
 LW5hcwogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfT1BFTkFMKQorLmlmICR7UE9SVF9PUFRJ
 T05TOk1PUEVOQUx9CiBVU0VfT1BFTkFMPQlzb2Z0CiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPQkt
 LWRpc2FibGUtb3BlbmFsCiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lUSF9QVUxTRSkKKy5pZiAk
 e1BPUlRfT1BUSU9OUzpNUFVMU0VBVURJT30KIExJQl9ERVBFTkRTKz0JCXB1bHNlOiR7UE9SVFNE
 SVJ9L2F1ZGlvL3B1bHNlYXVkaW8KIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1w
 dWxzZQogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfQkxVUkFZKQorLmlmICR7UE9SVF9PUFRJ
 T05TOk1CTFVSQVl9CiBMSUJfREVQRU5EUys9CQlibHVyYXk6JHtQT1JUU0RJUn0vbXVsdGltZWRp
 YS9saWJibHVyYXkKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1ibHVyYXkKIC5l
 bmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX1NNQikKKy5pZiAke1BPUlRfT1BUSU9OUzpNU01CfQog
 TElCX0RFUEVORFMrPQkJc21iY2xpZW50OiR7UE9SVFNESVJ9L25ldC9zYW1iYS1saWJzbWJjbGll
 bnQKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1zbWIKIC5lbmRpZgogCi0uaWYg
 ZGVmaW5lZChXSVRIX0ZSSUJJREkpCisuaWYgJHtQT1JUX09QVElPTlM6TUZSSUJJREl9CiBMSUJf
 REVQRU5EUys9CQlmcmliaWRpOiR7UE9SVFNESVJ9L2NvbnZlcnRlcnMvZnJpYmlkaQogLmVsc2UK
 IENPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxlLWZyaWJpZGkKIC5lbmRpZgogCi0uaWYgZGVmaW5l
 ZChXSVRIX0NEUEFSQU5PSUEpCisuaWYgJHtQT1JUX09QVElPTlM6TUNEUEFSQU5PSUF9CiBMSUJf
 REVQRU5EUys9CQljZGRhX3BhcmFub2lhOiR7UE9SVFNESVJ9L2F1ZGlvL2NkcGFyYW5vaWEKIC5l
 bHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1jZHBhcmFub2lhCiAuZW5kaWYKIAotLmlm
 IGRlZmluZWQoV0lUSF9MSUJDRElPKSAmJiAhZGVmaW5lZChXSVRIX0NEUEFSQU5PSUEpCisuaWYg
 JHtQT1JUX09QVElPTlM6TUNESU99CiBMSUJfREVQRU5EUys9CQljZGlvOiR7UE9SVFNESVJ9L3N5
 c3V0aWxzL2xpYmNkaW8KIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1saWJjZGlv
 CiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lUSF9MQURTUEEpCisuaWYgJHtQT1JUX09QVElPTlM6
 TUxBRFNQQX0KIFJVTl9ERVBFTkRTKz0JJHtMT0NBTEJBU0V9L2xpYi9sYWRzcGEvYW1wLnNvOiR7
 UE9SVFNESVJ9L2F1ZGlvL2xhZHNwYQogLmVsc2UKIENPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxl
 LWxhZHNwYQogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfTElCTFpPKQorLmlmICR7UE9SVF9P
 UFRJT05TOk1MWk99CiBMSUJfREVQRU5EUys9CQlsem8yOiR7UE9SVFNESVJ9L2FyY2hpdmVycy9s
 em8yCiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPQktLWRpc2FibGUtbGlibHpvCkBAIC0yMjgsMTcg
 KzIyMSwxNyBAQAogLmlmIGRlZmluZWQoV0lUSF9EVkRfREVWSUNFKQogREVGQVVMVF9EVkRfREVW
 SUNFPSR7V0lUSF9EVkRfREVWSUNFfQogLmVsc2UKLURFRkFVTFRfRFZEX0RFVklDRT0vZGV2L2Fj
 ZDAKK0RFRkFVTFRfRFZEX0RFVklDRT0vZGV2L2NkMAogLmVuZGlmCiAKIC5pZiBkZWZpbmVkKFdJ
 VEhfQ0RST01fREVWSUNFKQogREVGQVVMVF9DRFJPTV9ERVZJQ0U9JHtXSVRIX0NEUk9NX0RFVklD
 RX0KIC5lbHNlCi1ERUZBVUxUX0NEUk9NX0RFVklDRT0vZGV2L2FjZDAKK0RFRkFVTFRfQ0RST01f
 REVWSUNFPS9kZXYvY2QwCiAuZW5kaWYKIAogLmlmICR7QVJDSH0gPT0gImkzODYiIHx8ICR7QVJD
 SH0gPT0gImFtZDY0IgotLmlmICFkZWZpbmVkKFdJVEhPVVRfV0lOMzIpICYmICFkZWZpbmVkKFBB
 Q0tBR0VfQlVJTERJTkcpICYmICR7QVJDSH0gPT0gImkzODYiCisuaWYgJHtQT1JUX09QVElPTlM6
 TVdJTjMyfSAmJiAhZGVmaW5lZChQQUNLQUdFX0JVSUxESU5HKSAmJiAke0FSQ0h9ID09ICJpMzg2
 IgogUlVOX0RFUEVORFMrPQkke0NPREVDX0RFVEVDVElPTl9GSUxFfToke0NPREVDX1BPUlR9CiBD
 T05GSUdVUkVfQVJHUys9CS0tY29kZWNzZGlyPSR7TE9DQUxCQVNFfS9saWIvd2luMzIKIENPREVD
 X1BPUlQ9CSR7UE9SVFNESVJ9L211bHRpbWVkaWEvd2luMzItY29kZWNzCkBAIC0yNDksMzIgKzI0
 MiwzMiBAQAogLmVuZGlmCiAuZW5kaWYgIyBBUkNIID09IGkzODYvYW1kNjQKIAotLmlmIGRlZmlu
 ZWQoV0lUSF9SRUFMUExBWUVSKQorLmlmICR7UE9SVF9PUFRJT05TOk1SRUFMfQogUlVOX0RFUEVO
 RFMrPQkJcmVhbHBsYXk6JHtQT1JUU0RJUn0vbXVsdGltZWRpYS9saW51eC1yZWFscGxheWVyCiBC
 VUlMRF9ERVBFTkRTKz0JCXJlYWxwbGF5OiR7UE9SVFNESVJ9L211bHRpbWVkaWEvbGludXgtcmVh
 bHBsYXllcgogLmVsc2UKIENPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxlLXJlYWwKIC5lbmRpZgog
 Ci0uaWYgZGVmaW5lZChXSVRIX0FNUl9OQikgfHwgZGVmaW5lZCAoV0lUSF9BTVJfV0IpCisuaWYg
 JHtQT1JUX09QVElPTlM6TUFNUl9OQn0gfHwgJHtQT1JUX09QVElPTlM6TUFNUl9XQn0KIExJQl9E
 RVBFTkRTKz0JCW9wZW5jb3JlLWFtcm5iOiR7UE9SVFNESVJ9L2F1ZGlvL29wZW5jb3JlLWFtcgog
 LmVuZGlmCiAKLS5pZmRlZihXSVRIT1VUX0FNUl9OQikKKy5pZiAhJHtQT1JUX09QVElPTlM6TUFN
 Ul9OQn0KIENPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxlLWxpYm9wZW5jb3JlX2Ftcm5iCiAuZW5k
 aWYKIAotLmlmZGVmKFdJVEhPVVRfQU1SX1dCKQorLmlmICEke1BPUlRfT1BUSU9OUzpNQU1SX1dC
 fQogQ09ORklHVVJFX0FSR1MrPQktLWRpc2FibGUtbGlib3BlbmNvcmVfYW1yd2IKIC5lbmRpZgog
 Ci0uaWZkZWYoV0lUSF9HU00pCisuaWYgJHtQT1JUX09QVElPTlM6TUdTTX0KIExJQl9ERVBFTkRT
 Kz0JCWdzbToke1BPUlRTRElSfS9hdWRpby9nc20KIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0t
 ZGlzYWJsZS1saWJnc20KIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX1Y0TCkKKy5pZiAke1BP
 UlRfT1BUSU9OUzpNVjRMfQogQlVJTERfREVQRU5EUys9CQkke0xPQ0FMQkFTRX0vaW5jbHVkZS9s
 aW51eC92aWRlb2RldjIuaDoke1BPUlRTRElSfS9tdWx0aW1lZGlhL3Y0bF9jb21wYXQKIExJQl9E
 RVBFTkRTKz0JCXY0bDIuMDoke1BPUlRTRElSfS9tdWx0aW1lZGlhL2xpYnY0bAogQ09ORklHVVJF
 X0FSR1MrPQktLWVuYWJsZS10di12NGwxIFwKQEAgLTI4NSw3ICsyNzgsNyBAQAogCQkJLS1kaXNh
 YmxlLXR2LXY0bDIKIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX0xJQlJUTVApCisuaWYgJHtQ
 T1JUX09QVElPTlM6TVJUTVB9CiBMSUJfREVQRU5EUys9CQlydG1wOiR7UE9SVFNESVJ9L211bHRp
 bWVkaWEvcnRtcGR1bXAKIENPTkZJR1VSRV9BUkdTKz0JLS1lbmFibGUtbGlicnRtcAogRVhUUkFf
 TElCUys9CQktbHJ0bXAKQEAgLTI5Myw3ICsyODYsNyBAQAogQ09ORklHVVJFX0FSR1MrPQktLWRp
 c2FibGUtbGlicnRtcAogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfTU5HKQorLmlmICR7UE9S
 VF9PUFRJT05TOk1MSUJNTkd9CiBMSUJfREVQRU5EUys9CQltbmc6JHtQT1JUU0RJUn0vZ3JhcGhp
 Y3MvbGlibW5nCiAuZWxzZQogQ09ORklHVVJFX0FSR1MrPQktLWRpc2FibGUtbW5nCmRpZmYgLXIg
 YWZhYzkzMjQ1ZjQxIG1wbGF5ZXIvTWFrZWZpbGUuc2hhcmVkCi0tLSBhL21wbGF5ZXIvTWFrZWZp
 bGUuc2hhcmVkCUZyaSBNYXIgMDggMTc6MjI6MTQgMjAxMyArMDEwMAorKysgYi9tcGxheWVyL01h
 a2VmaWxlLnNoYXJlZAlGcmkgTWFyIDIyIDE4OjI2OjM1IDIwMTMgKzAxMDAKQEAgLTQsNyArNCw3
 IEBACiAjCiAjICRGcmVlQlNEOiBoZWFkL211bHRpbWVkaWEvbXBsYXllci9NYWtlZmlsZS5zaGFy
 ZWQgMzEyMTUyIDIwMTMtMDItMTMgMTA6Mzk6MTNaIGFrICQKIAotTVBMQVlFUl9TTkFQU0hPVF9E
 QVRFPQkyMDEyLTA3LTIxCitNUExBWUVSX1NOQVBTSE9UX0RBVEU9CTIwMTMtMDMtMDgKIE1QTEFZ
 RVJfUE9SVF9WRVJTSU9OPQkxLjEuciR7TVBMQVlFUl9TTkFQU0hPVF9EQVRFOlMvLS8vZ30KIENB
 VEVHT1JJRVM/PQltdWx0aW1lZGlhIGF1ZGlvCiBNQVNURVJfU0lURVM9CSR7TUFTVEVSX1NJVEVf
 R09PR0xFX0NPREV9CkBAIC00MCw3ICs0MCwxMSBAQAogCQktLWRpc2FibGUtYWxzYSBcCiAJCS0t
 ZGlzYWJsZS1saWJiczJiIFwKIAkJLS1kaXNhYmxlLW1wM2xpYiBcCi0JCS0tZW5hYmxlLWFzcy1p
 bnRlcm5hbAorCQktLWVuYWJsZS1hc3MtaW50ZXJuYWwgXAorCQktLWRpc2FibGUtbGlidm9yYmlz
 IFwKKwkJLS1kaXNhYmxlLXNwZWV4IFwKKwkJLS1kaXNhYmxlLWxpYm9wdXMgXAorCQktLWRpc2Fi
 bGUtbGliaWxiYwogCiBXQU5UX0dOT01FPQl5ZXMKIFdBTlRfU0RMPQl5ZXMKZGlmZiAtciBhZmFj
 OTMyNDVmNDEgbXBsYXllci9kaXN0aW5mbwotLS0gYS9tcGxheWVyL2Rpc3RpbmZvCUZyaSBNYXIg
 MDggMTc6MjI6MTQgMjAxMyArMDEwMAorKysgYi9tcGxheWVyL2Rpc3RpbmZvCUZyaSBNYXIgMjIg
 MTg6MjY6MzUgMjAxMyArMDEwMApAQCAtMSwyICsxLDIgQEAKLVNIQTI1NiAobXBsYXllci0xLjEu
 MjAxMjA3MjEudGFyLnh6KSA9IDMwYjEyMGJmODU0M2I3Y2ZhZDM2MjcyZTNhZTI5YTAxNzI4MmNh
 YTkwZjRkNjM1ZmUxNTdmMjkwMzYzOTM3ODcKLVNJWkUgKG1wbGF5ZXItMS4xLjIwMTIwNzIxLnRh
 ci54eikgPSAxMDQ4MDM2OAorU0hBMjU2IChtcGxheWVyLTEuMS4yMDEzMDMwOC50YXIueHopID0g
 OTIwYmQ2OTE0M2Q1Yjg2N2ZkMDA0MWE5OWI2MzAyYTM5ZWQ0OGVjYzE2NzNmZTNhMDUxYjNhYmNj
 ZmYxNzI1OAorU0laRSAobXBsYXllci0xLjEuMjAxMzAzMDgudGFyLnh6KSA9IDEwMzI2ODQwCmRp
 ZmYgLXIgYWZhYzkzMjQ1ZjQxIG1wbGF5ZXIvZmlsZXMvZXh0cmEtcGF0Y2gtYmFzZV9zeXN0ZW1f
 Z2NjCi0tLSBhL21wbGF5ZXIvZmlsZXMvZXh0cmEtcGF0Y2gtYmFzZV9zeXN0ZW1fZ2NjCUZyaSBN
 YXIgMDggMTc6MjI6MTQgMjAxMyArMDEwMAorKysgYi9tcGxheWVyL2ZpbGVzL2V4dHJhLXBhdGNo
 LWJhc2Vfc3lzdGVtX2djYwlGcmkgTWFyIDIyIDE4OjI2OjM1IDIwMTMgKzAxMDAKQEAgLTEsNSAr
 MSwxOCBAQAotLS0tIGZmbXBlZy9saWJhdnV0aWwveDg2X2NwdS5oLm9yaWcJMjAxMC0xMC0wNiAw
 MzoyNjoxMy4wMDAwMDAwMDAgKzAyMDAKLSsrKyBmZm1wZWcvbGliYXZ1dGlsL3g4Nl9jcHUuaAky
 MDEwLTExLTA0IDIxOjAxOjQwLjU4MTY0Nzk1OCArMDEwMAorLS0tIGNvbmZpZ3VyZS5vcmlnCTIw
 MTMtMDMtMDMgMTE6Mjk6MTguMDAwMDAwMDAwICswMTAwCisrKysgY29uZmlndXJlCTIwMTMtMDMt
 MDggMTg6NDE6NTYuOTczOTAwMzU3ICswMTAwCitAQCAtMjgzNCwxMCArMjgzNCw2IEBACisgZGVm
 X2VieF9hdmFpbGFibGU9JyNkZWZpbmUgSEFWRV9FQlhfQVZBSUxBQkxFIDAnCisgZGVmX3htbV9j
 bG9iYmVycz0nI2RlZmluZSBIQVZFX1hNTV9DTE9CQkVSUyAwJworIAorLWlmIHg4Nl82NCA7IHRo
 ZW4KKy1pbmxpbmVfYXNtX2NoZWNrICcibW92ICglZWF4KSwgJWVheCInIHx8IGRpZSAiWW91ciBi
 aW51dGlscyB2ZXJzaW9uIGlzIHRvbyBvbGQgdG8gY29tcGlsZSBmb3IgNjQtYml0IChvbiBPU1gg
 dHJ5IC0tY2M9Y2xhbmcpIgorLWZpCistCisgaWYgeDg2IDsgdGhlbgorIAorIGVjaG9jaGVjayAi
 LmFsaWduIGlzIGEgcG93ZXIgb2YgdHdvIgorLS0tIGZmbXBlZy9saWJhdnV0aWwveDg2L2FzbS5o
 Lm9yaWcJMjAxMi0xMC0yNiAwMjo0ODo0NS4wMDAwMDAwMDAgKzAyMDAKKysrKyBmZm1wZWcvbGli
 YXZ1dGlsL3g4Ni9hc20uaAkyMDEzLTAzLTA4IDE4OjQ1OjU4LjU5MzkxNjU5OSArMDEwMAogQEAg
 LTcxLDcgKzcxLDcgQEAKICAjZGVmaW5lIEhBVkVfN1JFR1MgKEFSQ0hfWDg2XzY0IHx8IChIQVZF
 X0VCWF9BVkFJTEFCTEUgJiYgSEFWRV9FQlBfQVZBSUxBQkxFKSkKICAjZGVmaW5lIEhBVkVfNlJF
 R1MgKEFSQ0hfWDg2XzY0IHx8IChIQVZFX0VCWF9BVkFJTEFCTEUgfHwgSEFWRV9FQlBfQVZBSUxB
 QkxFKSkKQEAgLTksMTYgKzIyLDMgQEAKICAjICAgIGRlZmluZSBCUk9LRU5fUkVMT0NBVElPTlMg
 MQogICNlbmRpZgogIAotLS0tIGNvbmZpZ3VyZS5vcmlnCTIwMTEtMTItMzEgMDA6NDA6MDMuOTkw
 OTc2MDAwICswMTAwCi0rKysgY29uZmlndXJlCTIwMTEtMTItMzEgMDE6MzM6NTEuNDA3Njg1MDA5
 ICswMTAwCi1AQCAtMjY4MywxMCArMjY4Myw2IEBACi0gZGVmX2VieF9hdmFpbGFibGU9JyNkZWZp
 bmUgSEFWRV9FQlhfQVZBSUxBQkxFIDAnCi0gZGVmX3htbV9jbG9iYmVycz0nI2RlZmluZSBIQVZF
 X1hNTV9DTE9CQkVSUyAwJwotIAotLWlmIHg4Nl82NCA7IHRoZW4KLS1pbmxpbmVfYXNtX2NoZWNr
 ICcibW92ICglZWF4KSwgJWVheCInIHx8IGRpZSAiWW91ciBiaW51dGlscyB2ZXJzaW9uIGlzIHRv
 byBvbGQgdG8gY29tcGlsZSBmb3IgNjQtYml0IgotLWZpCi0tCi0gaWYgeDg2IDsgdGhlbgotIAot
 IGVjaG9jaGVjayAiLmFsaWduIGlzIGEgcG93ZXIgb2YgdHdvIgpkaWZmIC1yIGFmYWM5MzI0NWY0
 MSBtcGxheWVyL2ZpbGVzL2V4dHJhLXBhdGNoLWJhc2Vfc3lzdGVtX2xvZzJmCi0tLSBhL21wbGF5
 ZXIvZmlsZXMvZXh0cmEtcGF0Y2gtYmFzZV9zeXN0ZW1fbG9nMmYJRnJpIE1hciAwOCAxNzoyMjox
 NCAyMDEzICswMTAwCisrKyBiL21wbGF5ZXIvZmlsZXMvZXh0cmEtcGF0Y2gtYmFzZV9zeXN0ZW1f
 bG9nMmYJRnJpIE1hciAyMiAxODoyNjozNSAyMDEzICswMTAwCkBAIC0xLDIyICsxLDIxIEBACi0t
 LS0gY29uZmlndXJlLm9yaWcJMjAxMi0wNy0yNCAyMDo0NzoyNC43MjE1MzEyMjkgKzAyMDAKLSsr
 KyBjb25maWd1cmUJMjAxMi0wNy0yNCAyMDo0OTo1Ni4yMDc1Njk5MDYgKzAyMDAKLUBAIC0zMTMw
 LDcgKzMxMzAsNyBAQAorLS0tIGNvbmZpZ3VyZS5vcmlnCTIwMTMtMDMtMDMgMTE6Mjk6MTguMDAw
 MDAwMDAwICswMTAwCisrKysgY29uZmlndXJlCTIwMTMtMDMtMDggMTk6MDQ6MDEuOTAzOTE3MDQz
 ICswMTAwCitAQCAtMzI2NSw3ICszMjY1LDcgQEAKICBlY2hvcmVzICIkX2tzdGF0IgogIAogIAot
 LWZvciBmdW5jIGluIGNicnRmIGV4cDIgZXhwMmYgaXNuYW4gaXNpbmYgbGxyaW50IGxscmludGYg
 bG9nMiBsb2cyZiBscmludCBscmludGYgcmludCByb3VuZCByb3VuZGYgdHJ1bmMgdHJ1bmNmOyBk
 bwotK2ZvciBmdW5jIGluIGNicnRmIGV4cDIgZXhwMmYgaXNuYW4gaXNpbmYgbGxyaW50IGxscmlu
 dGYgbHJpbnQgbHJpbnRmIHJpbnQgcm91bmQgcm91bmRmIHRydW5jIHRydW5jZjsgZG8KKy1mb3Ig
 ZnVuYyBpbiBhdGFuZiBjYnJ0IGNicnRmIGNvc2YgZXhwZiBleHAyIGV4cDJmIGlzbmFuIGlzaW5m
 IGxscmludCBsbHJpbnRmIGxvZzIgbG9nMmYgbG9nMTBmIGxyaW50IGxyaW50ZiByaW50IHJvdW5k
 IHJvdW5kZiBzaW5mIHRydW5jIHRydW5jZjsgZG8KKytmb3IgZnVuYyBpbiBhdGFuZiBjYnJ0IGNi
 cnRmIGNvc2YgZXhwZiBleHAyIGV4cDJmIGlzbmFuIGlzaW5mIGxscmludCBsbHJpbnRmIGxyaW50
 IGxyaW50ZiByaW50IHJvdW5kIHJvdW5kZiBzaW5mIHRydW5jIHRydW5jZjsgZG8KICBlY2hvY2hl
 Y2sgJGZ1bmMKICBldmFsIF8kZnVuYz1ubwogIHN0YXRlbWVudF9jaGVjayBtYXRoLmggIiR7ZnVu
 Y30oMi4wKSIgLURfSVNPQzk5X1NPVVJDRSAmJiBldmFsIF8kZnVuYz15ZXMKLUBAIC0zMTQyLDcg
 KzMxNDIsOSBAQAotICAgZWNob3JlcyBubworQEAgLTMyNzgsNiArMzI3OCw5IEBACiAgZmkKICBk
 b25lCi0tCi0rZm9yIGZ1bmMgaW4gbG9nMiBsb2cyZjsgZG8KKyAKKytmb3IgZnVuYyBpbiBsb2cy
 IGxvZzJmIGxvZzEwZjsgZG8KICsgIGV2YWwgZGVmXyRmdW5jPSJcIiNkZWZpbmUgSEFWRV8kKGVj
 aG8gJGZ1bmMgfCB0ciAnW2Etel0nICdbQS1aXScpIDBcIiIKICtkb25lCiAgCi0gZWNob2NoZWNr
 ICJta3N0ZW1wIgotIF9ta3N0ZW1wPW5vCisgZm9yIGZ1bmMgaW4gYXRhbjJmIGxkZXhwZiBwb3dm
 OyBkbworIGVjaG9jaGVjayAkZnVuYwpkaWZmIC1yIGFmYWM5MzI0NWY0MSBtcGxheWVyL2ZpbGVz
 L2V4dHJhLXBhdGNoLWNsYW5nLXZlcnNpb24KLS0tIC9kZXYvbnVsbAlUaHUgSmFuIDAxIDAwOjAw
 OjAwIDE5NzAgKzAwMDAKKysrIGIvbXBsYXllci9maWxlcy9leHRyYS1wYXRjaC1jbGFuZy12ZXJz
 aW9uCUZyaSBNYXIgMjIgMTg6MjY6MzUgMjAxMyArMDEwMApAQCAtMCwwICsxLDIyIEBACistLS0g
 Y29uZmlndXJlLm9yaWcJMjAxMy0wMy0xMCAxNzo0Mzo1My42ODQxODIwMDAgKzAxMDAKKysrKyBj
 b25maWd1cmUJMjAxMy0wMy0xMCAxNzo0Nzo0Ny4xNTcxOTA1NjggKzAxMDAKK0BAIC0xNjE0LDcg
 KzE2MTQsNyBAQAorICAgICBpZiAkX2NjIC12IDI+JjEgfCBncmVwIC1xICJjbGFuZyI7IHRoZW4K
 KyAgICAgICBlY2hvY2hlY2sgIiRfY2MgdmVyc2lvbiIKKyAgICAgICBjY192ZW5kb3I9Y2xhbmcK
 Ky0gICAgICBjY192ZXJzaW9uPSQoJF9jYyAtZHVtcHZlcnNpb24gMj4mMSkKKysgICAgICBjY192
 ZXJzaW9uPSQoJF9jYyAtdiAyPiYxIHwgaGVhZCAtbiAxIHwgY3V0IC1kICcgJyAtZiA0KQorICAg
 ICAgIHJlc19jb21tZW50PSJleHBlcmltZW50YWwgc3VwcG9ydCBvbmx5IgorICAgICAgIGVjaG9y
 ZXMgImNsYW5nICRjY192ZXJzaW9uIgorICAgICAgIGJyZWFrCistLS0gTWFrZWZpbGUub3JpZwky
 MDEzLTAzLTEwIDE3OjQ0OjIxLjg2NTE4NDAwMCArMDEwMAorKysrIE1ha2VmaWxlCTIwMTMtMDMt
 MTAgMTc6NDc6NDcuMjQ4MTg0Mzc0ICswMTAwCitAQCAtNzkyLDcgKzc5Miw3IEBACisgCisgIyBy
 ZWJ1aWxkIHZlcnNpb24uaCBlYWNoIHRpbWUgdGhlIHdvcmtpbmcgY29weSBpcyB1cGRhdGVkCisg
 dmVyc2lvbi5oOiB2ZXJzaW9uLnNoICQod2lsZGNhcmQgLnN2bi9lbnRyaWVzIC5naXQvbG9ncy9I
 RUFEKQorLQkuLyQ8IGAkKENDKSAtZHVtcHZlcnNpb25gCisrCS4vJDwgYCQoQ0MpIC12IDI+JjEg
 fCBoZWFkIC1uIDEgfCBjdXQgLWQgJyAnIC1mIDRgCisgCisgJSQoRVhFU1VGKTogJS5jCisgCSQo
 Q0MpICQoQ0NfREVQRkxBR1MpICQoQ0ZMQUdTKSAtbyAkQCAkXgpkaWZmIC1yIGFmYWM5MzI0NWY0
 MSBtcGxheWVyL2ZpbGVzL3BhdGNoLWNvbmZpZ3VyZQotLS0gYS9tcGxheWVyL2ZpbGVzL3BhdGNo
 LWNvbmZpZ3VyZQlGcmkgTWFyIDA4IDE3OjIyOjE0IDIwMTMgKzAxMDAKKysrIGIvbXBsYXllci9m
 aWxlcy9wYXRjaC1jb25maWd1cmUJRnJpIE1hciAyMiAxODoyNjozNSAyMDEzICswMTAwCkBAIC0x
 LDYgKzEsNiBAQAotLS0tIGNvbmZpZ3VyZS5vcmlnCTIwMTItMDctMjAgMTU6MTE6NDIuMDAwMDAw
 MDAwICswMjAwCi0rKysgY29uZmlndXJlCTIwMTItMTAtMDggMTk6MTY6MTkuNjM3Nzk3NDYyICsw
 MjAwCi1AQCAtNjQ1LDcgKzY0NSw3IEBACistLS0gY29uZmlndXJlLm9yaWcJMjAxMy0wMy0wMyAx
 MToyOToxOC4wMDAwMDAwMDAgKzAxMDAKKysrKyBjb25maWd1cmUJMjAxMy0wMy0yMiAxNzoyMDo0
 NC40NTI3NzU2NzMgKzAxMDAKK0BAIC02NjgsNyArNjY4LDcgQEAKICBfaXdtbXh0PWF1dG8KICBf
 bXRycj1hdXRvCiAgX2FsdGl2ZWM9YXV0bwpAQCAtOSw3ICs5LDcgQEAKICBfcmFubGliPXJhbmxp
 YgogIF93aW5kcmVzPXdpbmRyZXMKICBfY2M9Y2MKLUBAIC0xNDY3LDcgKzE0NjcsNiBAQAorQEAg
 LTE1MzQsNyArMTUzNCw2IEBACiAgCiAgICAqKQogICAgICBlY2hvICJVbmtub3duIHBhcmFtZXRl
 cjogJGFjX29wdGlvbiIKQEAgLTE3LDcgKzE3LDcgQEAKICAgICAgOzsKICAKICAgIGVzYWMKLUBA
 IC0xNTE1LDcgKzE1MTQsNyBAQAorQEAgLTE2NjksNyArMTY2OCw3IEBACiAgICBjYXNlICIkKHVu
 YW1lIC1tIDI+JjEpIiBpbgogICAgICAgIHg4Nl82NHxhbWQ2NHxpWzMtOV04Nip8aTg2cGN8eDg2
 fHg4NnBjfGs1fGs2fGs2XzJ8azZfM3xrNi0yfGs2LTN8cGVudGl1bSp8YXRobG9uKnxpNTg2X2k2
 ODZ8aTU4Ni1pNjg2KSBob3N0X2FyY2g9aTM4NiA7OwogICAgICAgIGlhNjQpIGhvc3RfYXJjaD1p
 YTY0IDs7CkBAIC0yNiwxNiArMjYsMTUgQEAKICAgICAgICBhbHBoYSkgaG9zdF9hcmNoPWFscGhh
 IDs7CiAgICAgICAgc3VuNCp8c3BhcmMqKSBob3N0X2FyY2g9c3BhcmMgOzsKICAgICAgICBwYXJp
 c2MqfGhwcGEqfDkwMDAqKSBob3N0X2FyY2g9aHBwYSA7OwotQEAgLTE1NTUsNyArMTU1NCw3IEBA
 CitAQCAtMTcwOSw2ICsxNzA4LDcgQEAKICBmaQogIAogIGV4dHJhX2NmbGFncz0iLUkuIC1JZmZt
 cGVnICRleHRyYV9jZmxhZ3MiCi0tZXh0cmFfbGRmbGFncz0iLWxtICRleHRyYV9sZGZsYWdzIgot
 K2V4dHJhX2xkZmxhZ3M9Ii1sbSAkZXh0cmFfbGRmbGFncyAtTCRfcHJlZml4L2xpYiIKKytleHRy
 YV9sZGZsYWdzPSIkZXh0cmFfbGRmbGFncyAtTCRfcHJlZml4L2xpYiIKICBfdGltZXI9dGltZXIt
 bGludXguYwogIF9nZXRjaD1nZXRjaDIuYwogIAotQEAgLTM2MDEsNyArMzYwMCw3IEBACitAQCAt
 Mzc2NSw3ICszNzY1LDcgQEAKICBpZiBsaW51eCA7IHRoZW4KICAgIFRIUkVBRF9DRkxBR1M9LURf
 UkVFTlRSQU5UCiAgZWxpZiBmcmVlYnNkIHx8IG5ldGJzZCB8fCBvcGVuYnNkIHx8IGJzZG9zIDsg
 dGhlbgpAQCAtNDQsNyArNDMsNyBAQAogIGZpCiAgaWYgdGVzdCAiJF9wdGhyZWFkcyIgPSBhdXRv
 IDsgdGhlbgogIGNhdCA+ICRUTVBDIDw8IEVPRgotQEAgLTM2MTEsNyArMzYxMCw3IEBACitAQCAt
 Mzc3NSw3ICszNzc1LDcgQEAKICBFT0YKICBfcHRocmVhZHM9bm8KICBpZiAhIGhwdXggOyB0aGVu
 CkBAIC01Myw3ICs1MiwyNSBAQAogICAgICAjIGZvciBjcm9zc2NvbXBpbGF0aW9uLCB3ZSBjYW5u
 b3QgZXhlY3V0ZSB0aGUgcHJvZ3JhbSwgYmUgaGFwcHkgaWYgd2UgY2FuIGxpbmsgc3RhdGljYWxs
 eQogICAgICBjY19jaGVjayAkVEhSRUFEX0NGTEFHUyAkbGRfdG1wICYmICh0bXBfcnVuIHx8IHRl
 c3QgIiRsZF9zdGF0aWMiKSAmJiBsZF9wdGhyZWFkPSIkbGRfdG1wIiAmJiBfcHRocmVhZHM9eWVz
 ICYmIGJyZWFrCiAgICBkb25lCi1AQCAtNjI3MSw3ICs2MjcwLDcgQEAKK0BAIC01OTA0LDcgKzU5
 MDQsNyBAQAorIGVsaWYgZHJhZ29uZmx5IDsgdGhlbgorICAgZGVmYXVsdF9jZHJvbV9kZXZpY2U9
 Ii9kZXYvY2QwIgorIGVsaWYgZnJlZWJzZCA7IHRoZW4KKy0gIGRlZmF1bHRfY2Ryb21fZGV2aWNl
 PSIvZGV2L2FjZDAiCisrICBkZWZhdWx0X2Nkcm9tX2RldmljZT0iL2Rldi9jZHJvbSIKKyBlbGlm
 IG9wZW5ic2QgOyB0aGVuCisgICBkZWZhdWx0X2Nkcm9tX2RldmljZT0iL2Rldi9yY2QwYyIKKyBl
 bGlmIHN1bm9zIDsgdGhlbgorQEAgLTU5MTcsNyArNTkxNyw3IEBACisgICBkZWZhdWx0X2Nkcm9t
 X2RldmljZT0iL2Rldi9jZHJvbSIKKyBmaQorIAorLWlmIHdpbjMyIHx8IG9zMiB8fCBkcmFnb25m
 bHkgfHwgZnJlZWJzZCB8fCBvcGVuYnNkIHx8IHN1bm9zIHx8IGFtaWdhb3MgOyB0aGVuCisraWYg
 d2luMzIgfHwgb3MyIHx8IGRyYWdvbmZseSB8fCBvcGVuYnNkIHx8IHN1bm9zIHx8IGFtaWdhb3Mg
 OyB0aGVuCisgICBkZWZhdWx0X2R2ZF9kZXZpY2U9JGRlZmF1bHRfY2Ryb21fZGV2aWNlCisgZWxp
 ZiBkYXJ3aW4gOyB0aGVuCisgICBkZWZhdWx0X2R2ZF9kZXZpY2U9Ii9kZXYvcmRpc2tOIgorQEAg
 LTY0NzAsNyArNjQ3MCw3IEBACiAgZWNob2NoZWNrICJsaWJnc20iCiAgaWYgdGVzdCAiJF9saWJn
 c20iID0gYXV0byA7IHRoZW4KICAgIF9saWJnc209bm8KQEAgLTYyLDcgKzc5LDcgQEAKICBmaQog
 IGlmIHRlc3QgIiRfbGliZ3NtIiA9IHllcyA7IHRoZW4KICAgIGRlZl9saWJnc209JyNkZWZpbmUg
 Q09ORklHX0xJQkdTTSAxJwotQEAgLTY3MzMsNiArNjczMiwxNiBAQAorQEAgLTY5NTQsNiArNjk1
 NCwxNiBAQAogICAgbm9saWJydG1wPW5vCiAgICBkZWZfbGlicnRtcD0nI2RlZmluZSBDT05GSUdf
 TElCUlRNUCAxJwogICAgaW5wdXRtb2R1bGVzPSJsaWJydG1wICRpbnB1dG1vZHVsZXMiCkBAIC03
 OSw3ICs5Niw3IEBACiAgZWxzZQogICAgbm9saWJydG1wPXllcwogICAgX2xpYnJ0bXA9bm8KLUBA
 IC03MTI1LDcgKzcxMzQsNyBAQAorQEAgLTczNDYsNyArNzM1Niw3IEBACiAgZWNob2NoZWNrICJt
 ZW5jb2RlciIKICBpZiB0ZXN0ICIkX21lbmNvZGVyIiA9IG5vIDsgdGhlbgogICAgIyBtcGVnMXZp
 ZGVvIGZvciB2Zl9sYXZjLCBzbm93IGZvciB2Zl91c3BwIC8gdmZfbWNkZWludCwKQEAgLTg4LDcg
 KzEwNSw3IEBACiAgZmkKICBlY2hvcmVzICIkX21lbmNvZGVyIgogIAotQEAgLTc0NjMsOCArNzQ3
 MiwxMSBAQAorQEAgLTc2ODQsOCArNzY5NCwxMSBAQAogIGlmIHRlc3QgIiRfZ3VpIiA9IHllcyA7
 IHRoZW4KICAKICAgICMgUmVxdWlyZWQgbGlicmFyaWVzCkBAIC0xMDIsNyArMTE5LDcgQEAKICAg
 ICAgZGllICJUaGUgR1VJIHJlcXVpcmVzIGxpYmF2Y29kZWMgd2l0aCBQTkcgc3VwcG9ydCAobmVl
 ZHMgemxpYikuIgogICAgZmkKICAgIHRlc3QgIiRfZnJlZXR5cGUiID0gbm8gJiYgdGVzdCAiJF9i
 aXRtYXBfZm9udCIgPSBubyAmJgotQEAgLTgwMjksNyArODA0MSw3IEBACitAQCAtODI3MSw3ICs4
 Mjg0LDcgQEAKICBFWEVTVUYgICAgICA9ICRfZXhlc3VmCiAgRVhFU1VGU19BTEwgPSAuZXhlCiAg
 CmRpZmYgLXIgYWZhYzkzMjQ1ZjQxIG1wbGF5ZXIvZmlsZXMvcGF0Y2gtbGliYXZjb2RlYy1saWJn
 c20uYwotLS0gYS9tcGxheWVyL2ZpbGVzL3BhdGNoLWxpYmF2Y29kZWMtbGliZ3NtLmMJRnJpIE1h
 ciAwOCAxNzoyMjoxNCAyMDEzICswMTAwCisrKyBiL21wbGF5ZXIvZmlsZXMvcGF0Y2gtbGliYXZj
 b2RlYy1saWJnc20uYwlGcmkgTWFyIDIyIDE4OjI2OjM1IDIwMTMgKzAxMDAKQEAgLTEsMTEgKzEs
 MTQgQEAKLS0tLSBmZm1wZWcvbGliYXZjb2RlYy9saWJnc20uYy5vcmlnCTIwMTItMDEtMjkgMTk6
 MjA6MDUuMDAwMDAwMDAwICswMTAwCi0rKysgZmZtcGVnL2xpYmF2Y29kZWMvbGliZ3NtLmMJMjAx
 Mi0wMy0yMiAxODowNzo1OC42ODI3MjIwMzQgKzAxMDAKLUBAIC0yNyw3ICsyNyw3IEBACi0gCist
 LS0gZmZtcGVnL2xpYmF2Y29kZWMvbGliZ3NtLmMub3JpZwkyMDEzLTAzLTA3IDE5OjIwOjA0LjAw
 MDAwMDAwMCArMDEwMAorKysrIGZmbXBlZy9saWJhdmNvZGVjL2xpYmdzbS5jCTIwMTMtMDMtMjIg
 MTY6MzE6MTQuOTgzNzgwODQyICswMTAwCitAQCAtMjgsMTEgKzI4LDcgQEAKICAvLyBUaGUgaWRp
 b3N5bmNyYXNpZXMgb2YgR1NNLWluLVdBViBhcmUgZXhwbGFpbmVkIGF0IGh0dHA6Ly9rYnMuY3Mu
 dHUtYmVybGluLmRlL35qdXR0YS90b2FzdC5odG1sCiAgCisgI2luY2x1ZGUgImNvbmZpZy5oIgor
 LSNpZiBIQVZFX0dTTV9ICisgI2luY2x1ZGUgPGdzbS5oPgorLSNlbHNlCiAtI2luY2x1ZGUgPGdz
 bS9nc20uaD4KLSsjaW5jbHVkZSA8Z3NtLmg+CistI2VuZGlmCiAgCi0gI2luY2x1ZGUgImF2Y29k
 ZWMuaCIKLSAjaW5jbHVkZSAiZ3NtLmgiCisgI2luY2x1ZGUgImxpYmF2dXRpbC9jaGFubmVsX2xh
 eW91dC5oIgorICNpbmNsdWRlICJsaWJhdnV0aWwvY29tbW9uLmgiCmRpZmYgLXIgYWZhYzkzMjQ1
 ZjQxIG1wbGF5ZXIvZmlsZXMvcGF0Y2gtbGliYXZjb2RlYy1tcGVnYXVkaW9fcGFyc2VyLmMKLS0t
 IGEvbXBsYXllci9maWxlcy9wYXRjaC1saWJhdmNvZGVjLW1wZWdhdWRpb19wYXJzZXIuYwlGcmkg
 TWFyIDA4IDE3OjIyOjE0IDIwMTMgKzAxMDAKKysrIGIvbXBsYXllci9maWxlcy9wYXRjaC1saWJh
 dmNvZGVjLW1wZWdhdWRpb19wYXJzZXIuYwlGcmkgTWFyIDIyIDE4OjI2OjM1IDIwMTMgKzAxMDAK
 QEAgLTEsMTEgKzEsMTAgQEAKLS0tLSBmZm1wZWcvbGliYXZjb2RlYy9tcGVnYXVkaW9fcGFyc2Vy
 LmMub3JpZwkyMDEyLTAzLTA0IDE5OjIwOjA1LjAwMDAwMDAwMCArMDEwMAotKysrIGZmbXBlZy9s
 aWJhdmNvZGVjL21wZWdhdWRpb19wYXJzZXIuYwkyMDEyLTA1LTAxIDE0OjU3OjU0LjY0NTYyNjI3
 MCArMDIwMAotQEAgLTc4LDcgKzc4LDcgQEAKLSAgICAgICAgICAgICAgICAgICAgIGlmIChzLT5o
 ZWFkZXJfY291bnQgPiAxKSB7CistLS0gZmZtcGVnL2xpYmF2Y29kZWMvbXBlZ2F1ZGlvX3BhcnNl
 ci5jLm9yaWcJMjAxMy0wMy0wNSAxOToyMDowNC4wMDAwMDAwMDAgKzAxMDAKKysrKyBmZm1wZWcv
 bGliYXZjb2RlYy9tcGVnYXVkaW9fcGFyc2VyLmMJMjAxMy0wMy0wOCAxODoyODo1OS40Mjg0Nzgz
 MjQgKzAxMDAKK0BAIC04MSw2ICs4MSw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgYXZj
 dHgtPnNhbXBsZV9yYXRlPSBzcjsKICAgICAgICAgICAgICAgICAgICAgICAgICBhdmN0eC0+Y2hh
 bm5lbHMgICA9IGNoYW5uZWxzOwotLSAgICAgICAgICAgICAgICAgICAgICAgIHMxLT5kdXJhdGlv
 biAgICAgID0gZnJhbWVfc2l6ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgICBzMS0+ZHVyYXRp
 b24gICAgICA9IGZyYW1lX3NpemU7CiArICAgICAgICAgICAgICAgICAgICAgICAgYXZjdHgtPmZy
 YW1lX3NpemUgPSBmcmFtZV9zaXplOwotICAgICAgICAgICAgICAgICAgICAgICAgIGF2Y3R4LT5i
 aXRfcmF0ZSAgID0gYml0X3JhdGU7Ci0gICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg
 ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgICAgICBpZiAocy0+bm9fYml0
 cmF0ZSB8fCAhYXZjdHgtPmJpdF9yYXRlKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg
 IHMtPm5vX2JpdHJhdGUgPSAxOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdmN0eC0+
 Yml0X3JhdGUgKz0gKGJpdF9yYXRlIC0gYXZjdHgtPmJpdF9yYXRlKSAvIHMtPmhlYWRlcl9jb3Vu
 dDsK
 --90e6ba2121bb691a2804d886caac--
Responsible-Changed-From-To: freebsd-ports-bugs->naddy 
Responsible-Changed-By: naddy 
Responsible-Changed-When: Sat Mar 23 14:12:11 UTC 2013 
Responsible-Changed-Why:  
I'll take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177083 
State-Changed-From-To: open->closed 
State-Changed-By: naddy 
State-Changed-When: Sat Mar 23 15:45:51 UTC 2013 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177083 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177083: commit references a PR
Date: Sat, 23 Mar 2013 15:45:44 +0000 (UTC)

 Author: naddy
 Date: Sat Mar 23 15:45:25 2013
 New Revision: 315041
 URL: http://svnweb.freebsd.org/changeset/ports/315041
 
 Log:
   Update mplayer and mencoder to a recent snapshot. Major changes:
   - Reduce the number of dependencies (use internal ffmpeg whenever possible)
     in mplayer
   - Do not build with clang on i386
   - Use new options framework
   
   PR:		177083
   Submitted by:	Thomas Zander <thomas.e.zander@googlemail.com> (maintainer)
 
 Added:
   head/multimedia/mplayer/files/extra-patch-clang-version   (contents, props changed)
 Modified:
   head/multimedia/mencoder/Makefile
   head/multimedia/mencoder/distinfo   (contents, props changed)
   head/multimedia/mplayer/Makefile
   head/multimedia/mplayer/Makefile.options
   head/multimedia/mplayer/Makefile.shared
   head/multimedia/mplayer/distinfo   (contents, props changed)
   head/multimedia/mplayer/files/extra-patch-base_system_gcc   (contents, props changed)
   head/multimedia/mplayer/files/extra-patch-base_system_log2f   (contents, props changed)
   head/multimedia/mplayer/files/patch-configure   (contents, props changed)
   head/multimedia/mplayer/files/patch-libavcodec-libgsm.c   (contents, props changed)
   head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c   (contents, props changed)
 
 Modified: head/multimedia/mencoder/Makefile
 ==============================================================================
 --- head/multimedia/mencoder/Makefile	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mencoder/Makefile	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -1,56 +1,28 @@
 -# New ports collection makefile for:	mencoder
 -# Date created:		23 June 2007
 -# Whom:			Thomas E. Zander
 +# Created by: Thomas E. Zander
  # $FreeBSD$
 -#
  
  PORTNAME=	mencoder
  PORTVERSION=	${MPLAYER_PORT_VERSION}
 -PORTREVISION=	1
 +PORTREVISION=	0
  
  COMMENT=	Convenient video file and movie encoder
  
  .include "${.CURDIR}/../mplayer/Makefile.shared"
  
 -OPTIONS=	DEBUG "Include debug symbols in mencoder's binary" off
 -OPTIONS+=	RTCPU "Allow runtime CPU detection" on
 -OPTIONS+=	OCFLAGS "Use optimized compiler flags" on
 -OPTIONS+=	OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off
 -OPTIONS+=	IPV6 "Include inet6 network support" on
 -OPTIONS+=	JACK "Enable JackIt audio server support" off
 -OPTIONS+=	NAS "Enable NAS sound server support" off
 -OPTIONS+=	OPENAL "Enable OpenAL sound support" off
 -OPTIONS+=	PULSE "Enable PulseAudio" off
 -OPTIONS+=	FONTCONFIG "Enable fontconfig support" off
 -OPTIONS+=	LIBUNGIF "Enable gif support" on
 -OPTIONS+=	OPENJPEG "Enable JPEG2000 support" off
 -OPTIONS+=	MNG "Enable MNG input support" off
 -OPTIONS+=	LIBDV "Enable libdv support" off
 -OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
 -OPTIONS+=	AMR_NB "AMR Narrow Band encoder (opencore)" off
 -OPTIONS+=	AMR_WB "AMR Wide Band encoder (opencore)" off
 -OPTIONS+=	GSM "GSM audio codec" off
 -OPTIONS+=	TWOLAME "Enable twolame MPEG audio codec support" off
 -OPTIONS+=	FAAC "Enable FAAC audio codec support" off
 -OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
 -OPTIONS+=	SPEEX "Enable speex audio codec support" off
 -OPTIONS+=	WIN32 "Enable win32 codec set on the IA32 arch" on
 -OPTIONS+=	THEORA "Enable ogg theora video support" off
 -OPTIONS+=	XVID "Enable XVID video codec support" on
 -OPTIONS+=	X264 "Enable x264 (H.264) video codec support" on
 -OPTIONS+=	VPX "Enable VP8 video via libvpx" off
 -OPTIONS+=	DIRAC "Enable dirac video codec support" off
 -OPTIONS+=	SCHROEDINGER "Dirac codec via libschroedinger" off
 -OPTIONS+=	REALPLAYER "Enable real player plugin" off
 -OPTIONS+=	LIVEMEDIA "Enable LIVE555 streaming support" off
 -OPTIONS+=	SMB "Enable Samba input support" off
 -OPTIONS+=	BLURAY "Build with libbluray support" off
 -OPTIONS+=	FRIBIDI "Enable FriBiDi support" off
 -OPTIONS+=	LIBCDIO "Enable libcdio support" off
 -OPTIONS+=	CDPARANOIA "Enable cdparanoia support" off
 -OPTIONS+=	LIBLZO "Enable external liblzo library" off
 -OPTIONS+=	V4L "Enable Video4Linux TV support" off
 -OPTIONS+=	LIBRTMP "Enable RTMPDump Streaming Media support" off
 +OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \
 +		DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK LADSPA \
 +		LIBMNG LIVEMEDIA LZO MAD NAS OCFLAGS OPENAL OPENJPEG \
 +		OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER SMB \
 +		THEORA TWOLAME V4L VPX WIN32 X264 XVID
 +
 +OPTIONS_DEFAULT=GIF IPV6 OCFLAGS RTCPU WIN32 X264 XVID
 +
 +BLURAY_DESC?=	BluRay support
 +OCFLAGS_DESC?=	Use optimized compiler flags
 +OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
 +REAL_DESC?=	Enable realplayer plugin
 +RTCPU_DESC?=	Use runtime CPU detection
 +WIN32_DESC?=	Install win32 binary codecs
  
  MAN1=		mencoder.1
  
 @@ -95,37 +67,37 @@ ALL_TARGET=	mencoder
  
  .include "${.CURDIR}/../mplayer/Makefile.options"
  
 -.if defined(WITH_FONTCONFIG)
 +.if ${PORT_OPTIONS:MFONTCONFIG}
  LIB_DEPENDS+=		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  .else
  CONFIGURE_ARGS+=	--disable-fontconfig
  .endif
  
 -.if defined(WITH_TWOLAME)
 +.if ${PORT_OPTIONS:MTWOLAME}
  LIB_DEPENDS+=		twolame:${PORTSDIR}/audio/twolame
  .else
  CONFIGURE_ARGS+=	--disable-twolame
  .endif
  
 -.if defined(WITH_FAAC)
 +.if ${PORT_OPTIONS:MFAAC}
  LIB_DEPENDS+=		faac:${PORTSDIR}/audio/faac
  .else
  CONFIGURE_ARGS+=	--disable-faac
  .endif
  
 -.if !defined(WITHOUT_X264)
 +.if ${PORT_OPTIONS:MX264}
  LIB_DEPENDS+=		x264.125:${PORTSDIR}/multimedia/x264
  .else
  CONFIGURE_ARGS+=	--disable-x264
  .endif
  
 -.if !defined(WITHOUT_XVID)
 +.if ${PORT_OPTIONS:MXVID}
  LIB_DEPENDS+=		xvidcore:${PORTSDIR}/multimedia/xvid
  .else
  CONFIGURE_ARGS+=	--disable-xvid
  .endif
  
 -.ifdef(WITH_DIRAC)
 +.if ${PORT_OPTIONS:MDIRAC}
  LIB_DEPENDS+=		dirac_encoder:${PORTSDIR}/multimedia/dirac
  .else
  CONFIGURE_ARGS+=	--disable-libdirac-lavc
 @@ -135,9 +107,10 @@ 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. As this one is a slave port of multimedia/"
 -	@${ECHO_MSG} "mplayer, you might want to check mplayer's Makefile(s) in"
 -	@${ECHO_MSG} "order to learn more about them."
 +	@${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:"
 +	@${ECHO_MSG} "WITH_LANG=<LanguageCode>"
 +	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0"
 +	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0"
  
  post-patch:
  .if ${OSVERSION} >= 900010
 
 Modified: head/multimedia/mencoder/distinfo
 ==============================================================================
 --- head/multimedia/mencoder/distinfo	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mencoder/distinfo	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -1,2 +1,2 @@
 -SHA256 (mplayer-1.1.20120721.tar.xz) = 30b120bf8543b7cfad36272e3ae29a017282caa90f4d635fe157f29036393787
 -SIZE (mplayer-1.1.20120721.tar.xz) = 10480368
 +SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258
 +SIZE (mplayer-1.1.20130308.tar.xz) = 10326840
 
 Modified: head/multimedia/mplayer/Makefile
 ==============================================================================
 --- head/multimedia/mplayer/Makefile	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mplayer/Makefile	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -3,67 +3,39 @@
  
  PORTNAME=	mplayer
  PORTVERSION=	${MPLAYER_PORT_VERSION}
 -PORTREVISION=	2
 +PORTREVISION=	0
  
  COMMENT=	High performance media player supporting many formats
  
  .include "${.CURDIR}/Makefile.shared"
  
 -OPTIONS=	DEBUG "Include debug symbols in mplayer's binaries" off
 -OPTIONS+=	RTCPU "Allow runtime CPU detection" on
 -OPTIONS+=	OCFLAGS "Use optimized compiler flags" on
 -OPTIONS+=	OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off
 -OPTIONS+=	IPV6 "Include inet6 network support" on
 -OPTIONS+=	X11 "Enable X11 support for mplayer's video output" on
 -OPTIONS+=	X11XV "X11 video drivers: XV" on
 -OPTIONS+=	X11DGA "X11 video drivers: DGA" on
 -OPTIONS+=	X11GL "X11 video drivers: OpenGL" on
 -OPTIONS+=	X11XIN "X11 video drivers: Xinerama" on
 -OPTIONS+=	X11VM "X11 VidMode support" on
 -OPTIONS+=	X11XVMC "Enable XvMC acceleration" off
 -OPTIONS+=	VDPAU "Enable Nvidia VDPAU acceleration" off
 -OPTIONS+=	GUI "Enable GTK2 graphical user interface with X11" on
 -OPTIONS+=	SDL "Enable SDL video output" off
 -OPTIONS+=	SKINS "Force dependency on mplayer-skins" on
 -OPTIONS+=	RTC "Add support for kernel real time clock timing" off
 -OPTIONS+=	ARTS "Enable KDE sound system support" off
 -OPTIONS+=	ESOUND "Enable GNOME esound support" off
 -OPTIONS+=	JACK "Enable JackIt audio server support" off
 -OPTIONS+=	NAS "Enable NAS sound server support" off
 -OPTIONS+=	OPENAL "Enable OpenAL sound support" off
 -OPTIONS+=	PULSE "Enable PulseAudio" off
 -OPTIONS+=	LIBUNGIF "Enable gif support" on
 -OPTIONS+=	OPENJPEG "Enable JPEG2000 support" off
 -OPTIONS+=	MNG "Enable MNG input support" off
 -OPTIONS+=	AALIB "Enable aalib support" off
 -OPTIONS+=	LIBCACA "Enable libcaca support" off
 -OPTIONS+=	SVGALIB "Enable svgalib support" off
 -OPTIONS+=	LIBDV "Enable libdv support" off
 -OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
 -OPTIONS+=	AMR_NB "AMR Narrow Band encoder (opencore)" off
 -OPTIONS+=	AMR_WB "AMR Wide Band encoder (opencore)" off
 -OPTIONS+=	GSM "GSM audio codec" off
 -OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
 -OPTIONS+=	SPEEX "Enable speex audio codec support" on
 -OPTIONS+=	THEORA "Enable ogg theora video support" off
 -OPTIONS+=	VPX "Enable VP8 video via libvpx" off
 -OPTIONS+=	SCHROEDINGER "Dirac codec via libschroedinger" off
 -.if !defined(PACKAGE_BUILDING)
 -OPTIONS+=	WIN32 "Enable win32 codec set on the IA32 arch" on
 -.endif
 -OPTIONS+=	REALPLAYER "Enable real player plugin" off
 -OPTIONS+=	LIVEMEDIA "Enable LIVE555 streaming support" off
 -OPTIONS+=	SMB "Enable Samba input support" off
 -OPTIONS+=	BLURAY "Build with libbluray support" off
 -OPTIONS+=	FRIBIDI "Enable FriBiDi support" off
 -OPTIONS+=	LIRC "Enable lirc support" off
 -OPTIONS+=	LIBCDIO "Enable libcdio support" off
 -OPTIONS+=	CDPARANOIA "Enable cdparanoia support" off
 -OPTIONS+=	LIBLZO "Enable external liblzo library" off
 -OPTIONS+=	JOYSTICK "Enable joystick support" off
 -OPTIONS+=	V4L "Enable Video4Linux TV support" off
 -OPTIONS+=	LIBRTMP "Enable RTMPDump Streaming Media support" off
 -OPTIONS+=	ENCA "Enable enca charset detection" off
 +OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ARTS BLURAY CACA DEBUG DV \
 +		ENCA ESOUND FRIBIDI GIF GSM GUI IPV6 JACK \
 +		JOYSTICK LADSPA LIBMNG LIRC LIVEMEDIA LZO MAD \
 +		NAS OCFLAGS OPENAL OPENGL OPENJPEG OTCHAIN \
 +		PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
 +		SKINS SMB SVGALIB V4L VDPAU WIN32 \
 +		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 +
 +OPTIONS_RADIO=	RGCD
 +OPTIONS_RADIO_RGCD=	CDIO CDPARANOIA
 +
 +OPTIONS_DEFAULT=GUI IPV6 OCFLAGS OPENGL RTCPU SKINS \
 +		WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
 +
 +BLURAY_DESC?=	BluRay support
 +ENCA_DESC?=	Charset conversion via enca
 +JOYSTICK_DESC?=	Joystick support
 +LZO_DESC?=	External liblzo support
 +OCFLAGS_DESC?=	Use optimized compiler flags
 +OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
 +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
 +WIN32_DESC?=	Install win32 binary codecs
 +X11DGA_DESC?=	X11 DGA video driver support
 +X11VM_DESC?=	X11 VidMode support
  
  MAN1=		mplayer.1
  MANCOMPRESSED=	no
 @@ -82,13 +54,15 @@ CONFIGURE_ARGS+=	--disable-directfb \
  			--disable-faac \
  			--disable-faad \
  			--disable-libdca \
 +			--disable-toolame \
  			--disable-twolame \
  			--disable-x264 \
  			--disable-xvid \
  			--disable-libdirac-lavc \
  			--disable-mencoder \
  			--disable-mpg123 \
 -			--disable-musepack
 +			--disable-musepack \
 +			--disable-theora
  
  # Fix a problem with unknown assembly opcodes in embedded ffmpeg
  .if ${ARCH} == "ppc"
 @@ -97,11 +71,11 @@ CONFIGURE_ARGS+=	--disable-asm
  
  .include "${.CURDIR}/Makefile.options"
  
 -.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
 +.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
  MLINKS+=	mplayer.1 gmplayer.1
  PLIST_SUB+=	GMPLAYER=""
  DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
 -.if !defined(WITHOUT_SKINS)
 +.if ${PORT_OPTIONS:MSKINS}
  RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins
  .endif
  
 @@ -114,52 +88,52 @@ WITH_LANG=	""
  
  .else
  PLIST_SUB+=	GMPLAYER="@comment "
 -.endif #WITHOUT_GUI
 +.endif #GUI && X11
  
 -.if !defined(WITHOUT_X11)
 +.if ${PORT_OPTIONS:MX11}
  USE_XORG=	x11
 -.if !defined(WITHOUT_X11XV)
 +.if ${PORT_OPTIONS:MXVIDEO}
  USE_XORG+=	xv
  .else
  CONFIGURE_ARGS+=--disable-xv
  .endif
 -.if !defined(WITHOUT_X11DGA)
 +.if ${PORT_OPTIONS:MX11DGA}
  USE_XORG+=	xxf86dga
  .else
  CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
  .endif
 -.if !defined(WITHOUT_X11GL)
 +.if ${PORT_OPTIONS:MOPENGL}
  USE_XORG+=	glproto
  LIB_DEPENDS+=	GL:${PORTSDIR}/graphics/libGL
  .else
  CONFIGURE_ARGS+=--disable-gl
  .endif
 -.if !defined(WITHOUT_X11XIN)
 +.if ${PORT_OPTIONS:MXINERAMA}
  USE_XORG+=	xinerama xineramaproto
  .else
  CONFIGURE_ARGS+=--disable-xinerama
  .endif
 -.if !defined(WITHOUT_X11VM)
 +.if ${PORT_OPTIONS:MX11VM}
  USE_XORG+=	xxf86vm
  .else
  CONFIGURE_ARGS+=--disable-vm
  .endif
 -.if defined(WITH_X11XVMC)
 +.if ${PORT_OPTIONS:MXVMC}
  USE_XORG+=	xvmc
  CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
  .endif
 -.else				#WITHOUT_X11
 +.else	#X11
  CONFIGURE_ARGS+=--disable-x11 \
  		--disable-fontconfig
  .endif
  
 -.if defined(WITH_VDPAU)
 +.if ${PORT_OPTIONS:MVDPAU}
  LIB_DEPENDS+=	vdpau:${PORTSDIR}/multimedia/libvdpau
  .else
  CONFIGURE_ARGS+=	--disable-vdpau
  .endif
  
 -.if defined(WITH_RTC)
 +.if ${PORT_OPTIONS:MRTC}
  BUILD_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
  RUN_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
  CONFIGURE_ARGS+=	--enable-rtc
 @@ -167,45 +141,43 @@ CONFIGURE_ARGS+=	--enable-rtc
  CONFIGURE_ARGS+=	--disable-rtc
  .endif
  
 -.if defined(WITH_ARTS)
 +.if ${PORT_OPTIONS:MARTS}
  LIB_DEPENDS+=		artsc:${PORTSDIR}/audio/arts
  .else
  CONFIGURE_ARGS+=	--disable-arts
  .endif
  
 -.if defined(WITH_LIBCACA)
 +.if ${PORT_OPTIONS:MCACA}
  LIB_DEPENDS+=		caca:${PORTSDIR}/graphics/libcaca
  .else
  CONFIGURE_ARGS+=	--disable-caca
  .endif
  
 -.if defined(WITH_LIRC)
 +.if ${PORT_OPTIONS:MLIRC}
  LIB_DEPENDS+=		lirc_client:${PORTSDIR}/comms/lirc
  .else
  CONFIGURE_ARGS+=	--disable-lirc
  .endif
  
 -.if defined(WITH_SDL)
 +.if ${PORT_OPTIONS:MSDL}
  USE_SDL=	sdl
 -WITH_AALIB=	yes
 -.undef(WITHOUT_AALIB)
  .else
  CONFIGURE_ARGS+=	--disable-sdl
  .endif
  
 -.if defined(WITH_SVGALIB)
 +.if ${PORT_OPTIONS:MSVGALIB}
  LIB_DEPENDS+=		vga:${PORTSDIR}/graphics/svgalib
  .else
  CONFIGURE_ARGS+=	--disable-svga
  .endif
  
 -.if defined(WITH_AALIB)
 +.if ${PORT_OPTIONS:MAALIB} || ${PORT_OPTIONS:MSDL}
  LIB_DEPENDS+=		aa:${PORTSDIR}/graphics/aalib
  .else
  CONFIGURE_ARGS+=	--disable-aa
  .endif
  
 -.if defined(WITH_ESOUND)
 +.if ${PORT_OPTIONS:MESOUND}
  USE_GNOME+=	esound
  .else
  CONFIGURE_ARGS+=	--disable-esd
 @@ -217,14 +189,14 @@ DEFAULT_KERN_HZ=${WITH_KERN_HZ}
  DEFAULT_KERN_HZ=1024
  .endif
  
 -.if defined(WITH_JOYSTICK)
 +.if ${PORT_OPTIONS:MJOYSTICK}
  BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
  CONFIGURE_ARGS+=--enable-joystick
  .else
  CONFIGURE_ARGS+=--disable-joystick
  .endif
  
 -.if defined(WITH_ENCA)
 +.if ${PORT_OPTIONS:MENCA}
  LIB_DEPENDS+=		enca:${PORTSDIR}/converters/enca
  .else
  CONFIGURE_ARGS+=	--disable-enca
 @@ -234,14 +206,17 @@ 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. You might want to check Makefile.options"
 -	@${ECHO_MSG} "in order to learn more about them."
 +	@${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:"
 +	@${ECHO_MSG} "WITH_LANG=<LanguageCode>"
 +	@${ECHO_MSG} "WITH_KERN_HZ=1024"
 +	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0"
 +	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0"
  
 -.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
 -	@${ECHO_MSG} "If you want to use the GUI, you can either install"
 +.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 official skin collections from"
 -	@${ECHO_MSG} "http://www.mplayerhq.hu/homepage/dload.html"
 +	@${ECHO_MSG} "or download them from"
 +	@${ECHO_MSG} "http://www.mplayerhq.hu/"
  .endif
  
  post-patch:
 @@ -269,7 +244,7 @@ post-patch:
  		'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'
 -.if defined(WITH_RTC)
 +.if ${PORT_OPTIONS:MRTC}
  	@${REINPLACE_CMD} -e \
  		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
  		${WRKSRC}/mplayer.c
 @@ -283,7 +258,7 @@ post-install:
  .for conf in ${CONFFILES}
  	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}/examples/etc
  .endfor
 -.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
 +.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
  	@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
  	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png
  .endif
 
 Modified: head/multimedia/mplayer/Makefile.options
 ==============================================================================
 --- head/multimedia/mplayer/Makefile.options	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mplayer/Makefile.options	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -14,14 +14,12 @@
  # the variable to make during build, e.g. make WITH_DVD_DEVICE=/dev/cd0
  #
  # WITH_DVD_DEVICE=/path/to/desired/device
 -# default 5.x: /dev/acd0
 -# default 4.x: /dev/acd0c
 +# default: /dev/cd0
  # This option changes the default device where mplayer looks for
  # a DVD medium
  #
  # WITH_CDROM_DEVICE=/path/to/desired/device
 -# default 5.x: /dev/acd0
 -# default 4.x: /dev/acd0c
 +# default: /dev/cd0
  # This option changes the default cdrom device, maybe useful for VCDs
  #
  # WITH_LANG=<your choice>
 @@ -39,24 +37,24 @@ CONFIGURE_ARGS+=--language=${WITH_LANG}
  
  #On i386, gcc runs out of general purpose registers when
  #trying to compile a debug version with the default flags.
 -.if defined(WITH_DEBUG)
 +.if ${PORT_OPTIONS:MDEBUG}
  .if ${ARCH} == "i386"
  DEBUG_FLAGS=	-g -O -fomit-frame-pointer
  .endif
  .else
 -.if defined(WITHOUT_OCFLAGS)
 -CFLAGS+=	-O -fomit-frame-pointer
 -.else
 +.if ${PORT_OPTIONS:MOCFLAGS}
  CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math
 -.endif
 -.endif #WITH_DEBUG
 +.else
 +CFLAGS+=	-O -fomit-frame-pointer
 +.endif #OCFLAGS
 +.endif #DEBUG
  
  #Supported architectures for clang
 -.if ${ARCH} == "i386" || ${ARCH} == "amd64"
 +.if ${ARCH} == "amd64"
  MPLAYER_CLANG_SUPPORTED_ARCH=	yes
  .endif
  
 -.if !defined(WITHOUT_RTCPU)
 +.if ${PORT_OPTIONS:MRTCPU}
  CONFIGURE_ARGS+=--enable-runtime-cpudetection
  .endif
  
 @@ -70,8 +68,9 @@ WITH_BASE_CLANG=yes
  CC=		clang
  CXX=		clang++
  CPP=		clang-cpp
 +EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang-version
  .else
 -.if defined(WITH_OTCHAIN)
 +.if ${PORT_OPTIONS:MOTCHAIN}
  USE_GCC?=	4.6+
  BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
  .else
 @@ -85,61 +84,55 @@ MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bi
  .endif
  .endif
  
 -.if defined(WITHOUT_IPV6)
 -CONFIGURE_ARGS+=	--disable-inet6
 -.else
 +.if ${PORT_OPTIONS:MIPV6}
  CATEGORIES+=	ipv6
 +.else
 +CONFIGURE_ARGS+=	--disable-inet6
  .endif
  
 -.if !defined(WITHOUT_LIBUNGIF)
 +.if ${PORT_OPTIONS:MGIF}
  LIB_DEPENDS+=		gif:${PORTSDIR}/graphics/giflib
  .else
  CONFIGURE_ARGS+=	--disable-gif
  .endif
  
 -.if defined(WITH_OPENJPEG)
 +.if ${PORT_OPTIONS:MOPENJPEG}
  LIB_DEPENDS+=		openjpeg:${PORTSDIR}/graphics/openjpeg
  .else
  CONFIGURE_ARGS+=	--disable-libopenjpeg
  .endif
  
 -.if defined(WITH_MAD)
 +.if ${PORT_OPTIONS:MMAD}
  LIB_DEPENDS+=		mad:${PORTSDIR}/audio/libmad
  .else
  CONFIGURE_ARGS+=	--disable-mad
  .endif
  
 -.if defined(WITH_LIBDV)
 +.if ${PORT_OPTIONS:MDV}
  LIB_DEPENDS+=		dv:${PORTSDIR}/multimedia/libdv
  .else
  CONFIGURE_ARGS+=	--disable-libdv
  .endif
  
 -.if defined(WITH_THEORA)
 +.if ${PORT_OPTIONS:MTHEORA}
  LIB_DEPENDS+=		theora:${PORTSDIR}/multimedia/libtheora
  .else
  CONFIGURE_ARGS+=	--disable-theora
  .endif
  
 -.if defined(WITH_VPX)
 +.if ${PORT_OPTIONS:MVPX}
  LIB_DEPENDS+=		vpx:${PORTSDIR}/multimedia/libvpx
  .else
  CONFIGURE_ARGS+=	--disable-libvpx-lavc
  .endif
  
 -.if defined(WITH_SCHROEDINGER)
 +.if ${PORT_OPTIONS:MSCHROEDINGER}
  LIB_DEPENDS+=		schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
  .else
  CONFIGURE_ARGS+=	--disable-libschroedinger-lavc
  .endif
  
 -.if !defined(WITHOUT_SPEEX)
 -LIB_DEPENDS+=		speex:${PORTSDIR}/audio/speex
 -.else
 -CONFIGURE_ARGS+=	--disable-speex
 -.endif
 -
 -.if defined(WITH_LIVEMEDIA)
 +.if ${PORT_OPTIONS:MLIVEMEDIA}
  CONFIGURE_ARGS+=	--enable-live
  BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
  CFLAGS+=		-I${LOCALBASE}/live/liveMedia/include \
 @@ -159,67 +152,67 @@ LDFLAGS+=		-L${LOCALBASE}/live/liveMedia
  CONFIGURE_ARGS+=	--disable-live
  .endif
  
 -.if defined(WITH_JACK)
 +.if ${PORT_OPTIONS:MJACK}
  LIB_DEPENDS+=		jack:${PORTSDIR}/audio/jack
  .else
  CONFIGURE_ARGS+=	--disable-jack
  .endif
  
 -.if defined(WITH_NAS)
 +.if ${PORT_OPTIONS:MNAS}
  LIB_DEPENDS+=		audio:${PORTSDIR}/audio/nas
  .else
  CONFIGURE_ARGS+=	--disable-nas
  .endif
  
 -.if defined(WITH_OPENAL)
 +.if ${PORT_OPTIONS:MOPENAL}
  USE_OPENAL=	soft
  .else
  CONFIGURE_ARGS+=	--disable-openal
  .endif
  
 -.if defined(WITH_PULSE)
 +.if ${PORT_OPTIONS:MPULSEAUDIO}
  LIB_DEPENDS+=		pulse:${PORTSDIR}/audio/pulseaudio
  .else
  CONFIGURE_ARGS+=	--disable-pulse
  .endif
  
 -.if defined(WITH_BLURAY)
 +.if ${PORT_OPTIONS:MBLURAY}
  LIB_DEPENDS+=		bluray:${PORTSDIR}/multimedia/libbluray
  .else
  CONFIGURE_ARGS+=	--disable-bluray
  .endif
  
 -.if defined(WITH_SMB)
 +.if ${PORT_OPTIONS:MSMB}
  LIB_DEPENDS+=		smbclient:${PORTSDIR}/net/samba-libsmbclient
  .else
  CONFIGURE_ARGS+=	--disable-smb
  .endif
  
 -.if defined(WITH_FRIBIDI)
 +.if ${PORT_OPTIONS:MFRIBIDI}
  LIB_DEPENDS+=		fribidi:${PORTSDIR}/converters/fribidi
  .else
  CONFIGURE_ARGS+=	--disable-fribidi
  .endif
  
 -.if defined(WITH_CDPARANOIA)
 +.if ${PORT_OPTIONS:MCDPARANOIA}
  LIB_DEPENDS+=		cdda_paranoia:${PORTSDIR}/audio/cdparanoia
  .else
  CONFIGURE_ARGS+=	--disable-cdparanoia
  .endif
  
 -.if defined(WITH_LIBCDIO) && !defined(WITH_CDPARANOIA)
 +.if ${PORT_OPTIONS:MCDIO}
  LIB_DEPENDS+=		cdio:${PORTSDIR}/sysutils/libcdio
  .else
  CONFIGURE_ARGS+=	--disable-libcdio
  .endif
  
 -.if defined(WITH_LADSPA)
 +.if ${PORT_OPTIONS:MLADSPA}
  RUN_DEPENDS+=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
  .else
  CONFIGURE_ARGS+=	--disable-ladspa
  .endif
  
 -.if defined(WITH_LIBLZO)
 +.if ${PORT_OPTIONS:MLZO}
  LIB_DEPENDS+=		lzo2:${PORTSDIR}/archivers/lzo2
  .else
  CONFIGURE_ARGS+=	--disable-liblzo
 @@ -228,17 +221,17 @@ CONFIGURE_ARGS+=	--disable-liblzo
  .if defined(WITH_DVD_DEVICE)
  DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
  .else
 -DEFAULT_DVD_DEVICE=/dev/acd0
 +DEFAULT_DVD_DEVICE=/dev/cd0
  .endif
  
  .if defined(WITH_CDROM_DEVICE)
  DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
  .else
 -DEFAULT_CDROM_DEVICE=/dev/acd0
 +DEFAULT_CDROM_DEVICE=/dev/cd0
  .endif
  
  .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 -.if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
 +.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
  RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
  CONFIGURE_ARGS+=	--codecsdir=${LOCALBASE}/lib/win32
  CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
 @@ -249,32 +242,32 @@ CONFIGURE_ARGS+=	--disable-win32dll \
  .endif
  .endif # ARCH == i386/amd64
  
 -.if defined(WITH_REALPLAYER)
 +.if ${PORT_OPTIONS:MREAL}
  RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
  BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
  .else
  CONFIGURE_ARGS+=	--disable-real
  .endif
  
 -.if defined(WITH_AMR_NB) || defined (WITH_AMR_WB)
 +.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB}
  LIB_DEPENDS+=		opencore-amrnb:${PORTSDIR}/audio/opencore-amr
  .endif
  
 -.ifdef(WITHOUT_AMR_NB)
 +.if !${PORT_OPTIONS:MAMR_NB}
  CONFIGURE_ARGS+=	--disable-libopencore_amrnb
  .endif
  
 -.ifdef(WITHOUT_AMR_WB)
 +.if !${PORT_OPTIONS:MAMR_WB}
  CONFIGURE_ARGS+=	--disable-libopencore_amrwb
  .endif
  
 -.ifdef(WITH_GSM)
 +.if ${PORT_OPTIONS:MGSM}
  LIB_DEPENDS+=		gsm:${PORTSDIR}/audio/gsm
  .else
  CONFIGURE_ARGS+=	--disable-libgsm
  .endif
  
 -.if defined(WITH_V4L)
 +.if ${PORT_OPTIONS:MV4L}
  BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
  LIB_DEPENDS+=		v4l2.0:${PORTSDIR}/multimedia/libv4l
  CONFIGURE_ARGS+=	--enable-tv-v4l1 \
 @@ -285,7 +278,7 @@ CONFIGURE_ARGS+=	--disable-tv-v4l1 \
  			--disable-tv-v4l2
  .endif
  
 -.if defined(WITH_LIBRTMP)
 +.if ${PORT_OPTIONS:MRTMP}
  LIB_DEPENDS+=		rtmp:${PORTSDIR}/multimedia/rtmpdump
  CONFIGURE_ARGS+=	--enable-librtmp
  EXTRA_LIBS+=		-lrtmp
 @@ -293,7 +286,7 @@ EXTRA_LIBS+=		-lrtmp
  CONFIGURE_ARGS+=	--disable-librtmp
  .endif
  
 -.if defined(WITH_MNG)
 +.if ${PORT_OPTIONS:MLIBMNG}
  LIB_DEPENDS+=		mng:${PORTSDIR}/graphics/libmng
  .else
  CONFIGURE_ARGS+=	--disable-mng
 
 Modified: head/multimedia/mplayer/Makefile.shared
 ==============================================================================
 --- head/multimedia/mplayer/Makefile.shared	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mplayer/Makefile.shared	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -4,7 +4,7 @@
  #
  # $FreeBSD$
  
 -MPLAYER_SNAPSHOT_DATE=	2012-07-21
 +MPLAYER_SNAPSHOT_DATE=	2013-03-08
  MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
  CATEGORIES?=	multimedia audio
  MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 @@ -40,7 +40,11 @@ CONFIGURE_ARGS=	--cc="${CC}" \
  		--disable-alsa \
  		--disable-libbs2b \
  		--disable-mp3lib \
 -		--enable-ass-internal
 +		--enable-ass-internal \
 +		--disable-libvorbis \
 +		--disable-speex \
 +		--disable-libopus \
 +		--disable-libilbc
  
  WANT_GNOME=	yes
  WANT_SDL=	yes
 
 Modified: head/multimedia/mplayer/distinfo
 ==============================================================================
 --- head/multimedia/mplayer/distinfo	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mplayer/distinfo	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -1,2 +1,2 @@
 -SHA256 (mplayer-1.1.20120721.tar.xz) = 30b120bf8543b7cfad36272e3ae29a017282caa90f4d635fe157f29036393787
 -SIZE (mplayer-1.1.20120721.tar.xz) = 10480368
 +SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258
 +SIZE (mplayer-1.1.20130308.tar.xz) = 10326840
 
 Modified: head/multimedia/mplayer/files/extra-patch-base_system_gcc
 ==============================================================================
 --- head/multimedia/mplayer/files/extra-patch-base_system_gcc	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mplayer/files/extra-patch-base_system_gcc	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -1,24 +1,24 @@
 ---- ffmpeg/libavutil/x86_cpu.h.orig	2010-10-06 03:26:13.000000000 +0200
 -+++ ffmpeg/libavutil/x86_cpu.h	2010-11-04 21:01:40.581647958 +0100
 -@@ -71,7 +71,7 @@
 - #define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
 - #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
 - 
 --#if ARCH_X86_64 && defined(PIC)
 -+#if ARCH_X86_64
 - #    define BROKEN_RELOCATIONS 1
 - #endif
 - 
 ---- configure.orig	2011-12-31 00:40:03.990976000 +0100
 -+++ configure	2011-12-31 01:33:51.407685009 +0100
 -@@ -2683,10 +2683,6 @@
 +--- configure.orig	2013-03-03 11:29:18.000000000 +0100
 ++++ configure	2013-03-08 18:41:56.973900357 +0100
 +@@ -2834,10 +2834,6 @@
   def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
   def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'
   
  -if x86_64 ; then
 --inline_asm_check '"mov (%eax), %eax"' || die "Your binutils version is too old to compile for 64-bit"
 +-inline_asm_check '"mov (%eax), %eax"' || die "Your binutils version is too old to compile for 64-bit (on OSX try --cc=clang)"
  -fi
  -
   if x86 ; then
   
   echocheck ".align is a power of two"
 +--- ffmpeg/libavutil/x86/asm.h.orig	2012-10-26 02:48:45.000000000 +0200
 ++++ ffmpeg/libavutil/x86/asm.h	2013-03-08 18:45:58.593916599 +0100
 +@@ -71,7 +71,7 @@
 + #define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
 + #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
 + 
 +-#if ARCH_X86_64 && defined(PIC)
 ++#if ARCH_X86_64
 + #    define BROKEN_RELOCATIONS 1
 + #endif
 + 
 
 Modified: head/multimedia/mplayer/files/extra-patch-base_system_log2f
 ==============================================================================
 --- head/multimedia/mplayer/files/extra-patch-base_system_log2f	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mplayer/files/extra-patch-base_system_log2f	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -1,22 +1,21 @@
 ---- configure.orig	2012-07-24 20:47:24.721531229 +0200
 -+++ configure	2012-07-24 20:49:56.207569906 +0200
 -@@ -3130,7 +3130,7 @@
 +--- configure.orig	2013-03-03 11:29:18.000000000 +0100
 ++++ configure	2013-03-08 19:04:01.903917043 +0100
 +@@ -3265,7 +3265,7 @@
   echores "$_kstat"
   
   
 --for func in cbrtf exp2 exp2f isnan isinf llrint llrintf log2 log2f lrint lrintf rint round roundf trunc truncf; do
 -+for func in cbrtf exp2 exp2f isnan isinf llrint llrintf lrint lrintf rint round roundf trunc truncf; do
 +-for func in atanf cbrt cbrtf cosf expf exp2 exp2f isnan isinf llrint llrintf log2 log2f log10f lrint lrintf rint round roundf sinf trunc truncf; do
 ++for func in atanf cbrt cbrtf cosf expf exp2 exp2f isnan isinf llrint llrintf lrint lrintf rint round roundf sinf trunc truncf; do
   echocheck $func
   eval _$func=no
   statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE && eval _$func=yes
 -@@ -3142,7 +3142,9 @@
 -   echores no
 +@@ -3278,6 +3278,9 @@
   fi
   done
 --
 -+for func in log2 log2f; do
 + 
 ++for func in log2 log2f log10f; do
  +  eval def_$func="\"#define HAVE_$(echo $func | tr '[a-z]' '[A-Z]') 0\""
  +done
   
 - echocheck "mkstemp"
 - _mkstemp=no
 + for func in atan2f ldexpf powf; do
 + echocheck $func
 
 Added: head/multimedia/mplayer/files/extra-patch-clang-version
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/mplayer/files/extra-patch-clang-version	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -0,0 +1,22 @@
 +--- configure.orig	2013-03-10 17:43:53.684182000 +0100
 ++++ configure	2013-03-10 17:47:47.157190568 +0100
 +@@ -1614,7 +1614,7 @@
 +     if $_cc -v 2>&1 | grep -q "clang"; then
 +       echocheck "$_cc version"
 +       cc_vendor=clang
 +-      cc_version=$($_cc -dumpversion 2>&1)
 ++      cc_version=$($_cc -v 2>&1 | head -n 1 | cut -d ' ' -f 4)
 +       res_comment="experimental support only"
 +       echores "clang $cc_version"
 +       break
 +--- Makefile.orig	2013-03-10 17:44:21.865184000 +0100
 ++++ Makefile	2013-03-10 17:47:47.248184374 +0100
 +@@ -792,7 +792,7 @@
 + 
 + # rebuild version.h each time the working copy is updated
 + version.h: version.sh $(wildcard .svn/entries .git/logs/HEAD)
 +-	./$< `$(CC) -dumpversion`
 ++	./$< `$(CC) -v 2>&1 | head -n 1 | cut -d ' ' -f 4`
 + 
 + %$(EXESUF): %.c
 + 	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^
 
 Modified: head/multimedia/mplayer/files/patch-configure
 ==============================================================================
 --- head/multimedia/mplayer/files/patch-configure	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mplayer/files/patch-configure	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -1,6 +1,6 @@
 ---- configure.orig	2012-07-20 15:11:42.000000000 +0200
 -+++ configure	2012-10-08 19:16:19.637797462 +0200
 -@@ -645,7 +645,7 @@
 +--- configure.orig	2013-03-03 11:29:18.000000000 +0100
 ++++ configure	2013-03-22 17:20:44.452775673 +0100
 +@@ -668,7 +668,7 @@
   _iwmmxt=auto
   _mtrr=auto
   _altivec=auto
 @@ -9,7 +9,7 @@
   _ranlib=ranlib
   _windres=windres
   _cc=cc
 -@@ -1467,7 +1467,6 @@
 +@@ -1534,7 +1534,6 @@
   
     *)
       echo "Unknown parameter: $ac_option"
 @@ -17,7 +17,7 @@
       ;;
   
     esac
 -@@ -1515,7 +1514,7 @@
 +@@ -1669,7 +1668,7 @@
     case "$(uname -m 2>&1)" in
         x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
         ia64) host_arch=ia64 ;;
 @@ -26,16 +26,15 @@
         alpha) host_arch=alpha ;;
         sun4*|sparc*) host_arch=sparc ;;
         parisc*|hppa*|9000*) host_arch=hppa ;;
 -@@ -1555,7 +1554,7 @@
 +@@ -1709,6 +1708,7 @@
   fi
   
   extra_cflags="-I. -Iffmpeg $extra_cflags"
 --extra_ldflags="-lm $extra_ldflags"
 -+extra_ldflags="-lm $extra_ldflags -L$_prefix/lib"
 ++extra_ldflags="$extra_ldflags -L$_prefix/lib"
   _timer=timer-linux.c
   _getch=getch2.c
   
 -@@ -3601,7 +3600,7 @@
 +@@ -3765,7 +3765,7 @@
   if linux ; then
     THREAD_CFLAGS=-D_REENTRANT
   elif freebsd || netbsd || openbsd || bsdos ; then
 @@ -44,7 +43,7 @@
   fi
   if test "$_pthreads" = auto ; then
   cat > $TMPC << EOF
 -@@ -3611,7 +3610,7 @@
 +@@ -3775,7 +3775,7 @@
   EOF
   _pthreads=no
   if ! hpux ; then
 @@ -53,7 +52,25 @@
       # for crosscompilation, we cannot execute the program, be happy if we can link statically
       cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
     done
 -@@ -6271,7 +6270,7 @@
 +@@ -5904,7 +5904,7 @@
 + elif dragonfly ; then
 +   default_cdrom_device="/dev/cd0"
 + elif freebsd ; then
 +-  default_cdrom_device="/dev/acd0"
 ++  default_cdrom_device="/dev/cdrom"
 + elif openbsd ; then
 +   default_cdrom_device="/dev/rcd0c"
 + elif sunos ; then
 +@@ -5917,7 +5917,7 @@
 +   default_cdrom_device="/dev/cdrom"
 + fi
 + 
 +-if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
 ++if win32 || os2 || dragonfly || openbsd || sunos || amigaos ; then
 +   default_dvd_device=$default_cdrom_device
 + elif darwin ; then
 +   default_dvd_device="/dev/rdiskN"
 +@@ -6470,7 +6470,7 @@
   echocheck "libgsm"
   if test "$_libgsm" = auto ; then
     _libgsm=no
 @@ -62,7 +79,7 @@
   fi
   if test "$_libgsm" = yes ; then
     def_libgsm='#define CONFIG_LIBGSM 1'
 -@@ -6733,6 +6732,16 @@
 +@@ -6954,6 +6954,16 @@
     nolibrtmp=no
     def_librtmp='#define CONFIG_LIBRTMP 1'
     inputmodules="librtmp $inputmodules"
 @@ -79,7 +96,7 @@
   else
     nolibrtmp=yes
     _librtmp=no
 -@@ -7125,7 +7134,7 @@
 +@@ -7346,7 +7356,7 @@
   echocheck "mencoder"
   if test "$_mencoder" = no ; then
     # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
 @@ -88,7 +105,7 @@
   fi
   echores "$_mencoder"
   
 -@@ -7463,8 +7472,11 @@
 +@@ -7684,8 +7694,11 @@
   if test "$_gui" = yes ; then
   
     # Required libraries
 @@ -102,7 +119,7 @@
       die "The GUI requires libavcodec with PNG support (needs zlib)."
     fi
     test "$_freetype" = no && test "$_bitmap_font" = no &&
 -@@ -8029,7 +8041,7 @@
 +@@ -8271,7 +8284,7 @@
   EXESUF      = $_exesuf
   EXESUFS_ALL = .exe
   
 
 Modified: head/multimedia/mplayer/files/patch-libavcodec-libgsm.c
 ==============================================================================
 --- head/multimedia/mplayer/files/patch-libavcodec-libgsm.c	Sat Mar 23 15:23:07 2013	(r315040)
 +++ head/multimedia/mplayer/files/patch-libavcodec-libgsm.c	Sat Mar 23 15:45:25 2013	(r315041)
 @@ -1,11 +1,14 @@
 ---- ffmpeg/libavcodec/libgsm.c.orig	2012-01-29 19:20:05.000000000 +0100
 -+++ ffmpeg/libavcodec/libgsm.c	2012-03-22 18:07:58.682722034 +0100
 -@@ -27,7 +27,7 @@
 - 
 
 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
