Index: head/multimedia/mplayer/Makefile
===================================================================
--- head/multimedia/mplayer/Makefile	(revision 377322)
+++ head/multimedia/mplayer/Makefile	(revision 377323)
@@ -1,180 +1,176 @@
 # Created by: Thomas E. Zander with help from Vladimir Kushnir
 # $FreeBSD$
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
 
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
 
 OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
 		LADSPA LIBMNG LIRC LZO NAS OCFLAGS  OPENAL OPENGL \
 		OPENJPEG OPUS OTCHAIN PULSEAUDIO REAL RTC RTCPU RTMP \
 		SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \
 		WIN32 X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 
 OPTIONS_RADIO=	RGCD
 OPTIONS_RADIO_RGCD=	CDIO CDPARANOIA
 
 OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL RTCPU \
 		SKINS WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
 
 BLURAY_DESC?=	BluRay support
 ENCA_DESC?=	Charset conversion via enca
 LZO_DESC?=	External liblzo support
 OCFLAGS_DESC?=	Use optimized compiler flags
 OTCHAIN_DESC?=	Use up-to-date gcc toolchain on legacy systems
 REAL_DESC?=	Enable realplayer plugin
 RTC_DESC?=	Add support for kernel real time clock
 RTCPU_DESC?=	Use runtime CPU detection on supported archs
 SKINS_DESC?=	Install skins for GUI
 WIN32_DESC?=	Install win32 binary codecs
 X11DGA_DESC?=	X11 DGA video driver support
 X11VM_DESC?=	X11 VidMode support
 
 SUB_FILES=	pkg-message
 
 CONFLICTS=	mplayer2-2.*
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
 USES+=		iconv pkgconfig
 
 .include "${.CURDIR}/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-arts \
 			--disable-directfb \
 			--disable-faac \
 			--disable-libdca \
 			--disable-toolame \
 			--disable-twolame \
 			--disable-x264 \
 			--disable-xvid \
 			--disable-libdirac-lavc \
 			--disable-mencoder \
 			--disable-mpg123 \
 			--disable-musepack \
 			--disable-theora
 
 .include "${.CURDIR}/Makefile.options"
 
-.if ${ARCH} == "armv6"
-CFLAGS_armv6+=	-no-integrated-as
-.endif
-
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	GMPLAYER=""
 DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
 .if ${PORT_OPTIONS:MSKINS}
 RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins
 .endif
 
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gui
 
 .else
 PLIST_SUB+=	GMPLAYER="@comment "
 .endif #GUI && X11
 
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 xproto xscrnsaver
 .if ${PORT_OPTIONS:MXVIDEO}
 USE_XORG+=	xv
 .else
 CONFIGURE_ARGS+=--disable-xv
 .endif
 .if ${PORT_OPTIONS:MX11DGA}
 USE_XORG+=	xxf86dga
 .else
 CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
 .endif
 .if ${PORT_OPTIONS:MOPENGL}
 USE_XORG+=	glproto
 LIB_DEPENDS+=	libGL.so:${PORTSDIR}/graphics/libGL
 .else
 CONFIGURE_ARGS+=--disable-gl
 .endif
 .if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama xineramaproto
 .else
 CONFIGURE_ARGS+=--disable-xinerama
 .endif
 .if ${PORT_OPTIONS:MX11VM}
 USE_XORG+=	xxf86vm
 .else
 CONFIGURE_ARGS+=--disable-vm
 .endif
 .if ${PORT_OPTIONS:MXVMC}
 USE_XORG+=	xvmc
 CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
 .endif
 .else	#X11
 CONFIGURE_ARGS+=--disable-x11
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${ECHO_MSG} "If you want to use the GUI, you can use the skins from"
 	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
 	@${ECHO_MSG} "or download them from"
 	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
 
 post-patch:
 .if ${OSVERSION} >= 900010
 	@${REINPLACE_CMD} -e \
 		'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 	@${REINPLACE_CMD} \
 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
 		${REINPLACE_CMD} -E \
 			-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 			-e 's|[[:space:]]gcc| ${CC}|' \
 			-e 's|\$$\(CC\)|${CC}|' \
 			-e 's|/usr/X11R6|${LOCALBASE}|'
 	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 .if ${PORT_OPTIONS:MRTC}
 	@${REINPLACE_CMD} -e \
 		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
 		${WRKSRC}/mplayer.c
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc
 .for conf in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc
 .endfor
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
 	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
 	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png
 .endif
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mplayer/Makefile.options
===================================================================
--- head/multimedia/mplayer/Makefile.options	(revision 377322)
+++ head/multimedia/mplayer/Makefile.options	(revision 377323)
@@ -1,178 +1,181 @@
 # Contains non-trivial handling of option variables
 # and build environment. Must be included after
 # bsd.port.pre.mk
 #
 # Some of the knobs are not tunable by the OPTIONS framework. These are
 # explained here in detail.
 #
 # $FreeBSD$
 #
 # Feature options:
 # These options influence some general behaviour of mplayer. Almost all of the featues,
 # for example all the codecs, are selected via the OPTIONS framework.
 # The following options WITH_DVD_DEVICE, WITH_CDROM_DEVICE, are *not*
 # selected via the options framework and must be set via make.conf or by passing
 # the variable to make during build, e.g. make WITH_DVD_DEVICE=/dev/cd0
 #
 # WITH_DVD_DEVICE=/path/to/desired/device
 # default: /dev/cd0
 # This option changes the default device where mplayer looks for
 # a DVD medium
 #
 # WITH_CDROM_DEVICE=/path/to/desired/device
 # default: /dev/cd0
 # This option changes the default cdrom device, maybe useful for VCDs
 
 # Non-OPTIONS knob handling
 # =========================
 
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
 DEFAULT_DVD_DEVICE=/dev/cd0
 .endif
 
 .if defined(WITH_CDROM_DEVICE)
 DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
 .else
 DEFAULT_CDROM_DEVICE=/dev/cd0
 .endif
 
 .if defined(WITH_KERN_HZ)
 DEFAULT_KERN_HZ=${WITH_KERN_HZ}
 .else
 DEFAULT_KERN_HZ=1024
 .endif
 
 
 # Non-simplified OPTIONS handling
 # ===============================
 
 .if ${PORT_OPTIONS:MIPV6}
 CATEGORIES+=	ipv6
 .else
 CONFIGURE_ARGS+=	--disable-inet6
 .endif
 
 .if ${PORT_OPTIONS:MRTMP}
 LIB_DEPENDS+=		librtmp.so:${PORTSDIR}/multimedia/librtmp
 CONFIGURE_ARGS+=	--enable-librtmp
 EXTRA_LIBS+=		-lrtmp
 .else
 CONFIGURE_ARGS+=	--disable-librtmp
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 LIB_DEPENDS+=		libaa.so:${PORTSDIR}/graphics/aalib
 .else
 CONFIGURE_ARGS+=	--disable-sdl
 .endif
 
 .if ${PORT_OPTIONS:MV4L}
 BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS+=		libv4l2.so:${PORTSDIR}/multimedia/libv4l
 CONFIGURE_ARGS+=	--enable-tv-v4l1 \
 			--enable-tv-v4l2
 EXTRA_LIBS+=		-lv4l1 -lv4l2
 .else
 CONFIGURE_ARGS+=	--disable-tv-v4l1 \
 			--disable-tv-v4l2
 .endif
 
 
 # Build system handling (including OPTIONS)
 # =========================================
 
 # Supported architectures for clang
 .if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "armv6"
 MPLAYER_CLANG_SUPPORTED_ARCH=	yes
 .endif
 
 # Supported architectures for runtime CPU detection
 .if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ppc"
 MPLAYER_RTCPU_SUPPORTED_ARCH=	yes
 .endif
 
 # Unsupported architectures for inline assembly
 .if ${ARCH} == "ppc"
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
 # Unsupported architectures
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
 .if ${PORT_OPTIONS:MRTCPU} \
 	&& defined(MPLAYER_RTCPU_SUPPORTED_ARCH)
 CONFIGURE_ARGS+=--enable-runtime-cpudetection
 .endif
 
 .if ${OSVERSION} >= 900033 \
 	&& exists(/usr/bin/clang) \
 	&& defined(MPLAYER_CLANG_SUPPORTED_ARCH)
 WITH_BASE_CLANG=yes
 .endif
 
 .if defined(WITH_BASE_CLANG)
 CC=		clang
 CXX=		clang++
 CPP=		clang-cpp
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang-version
 # Require 16 byte stack realignment on i386 to interface
 # properly with hand crafted assembler code in ffmpeg
 .if ${ARCH} == "i386"
 CFLAGS+=	-mstack-alignment=16 -mstackrealign
 .endif # ${ARCH} == "i386"
 .else
 .if ${PORT_OPTIONS:MOTCHAIN}
 USE_GCC?=	yes
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 .else
 CONFIGURE_ARGS+=--disable-ssse3 --disable-sse4 --disable-sse42 \
 		--disable-avx --disable-fast-cmov
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-base_system_gcc
 .if ${ARCH} == "amd64"
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif # ${ARCH} == "amd64"
 .endif # ${PORT_OPTIONS:MOTCHAIN}
 .endif # defined(WITH_BASE_CLANG)
 
+.if ${ARCH} == "armv6"
+CFLAGS_armv6+=	-no-integrated-as
+.endif
 
 # Extra build options for debugging and optimised CFLAGS
 # ======================================================
 
 .if ${PORT_OPTIONS:MDEBUG}
 WITH_DEBUG=	yes
 CONFIGURE_ARGS+=	--enable-debug=3
 .else
 .if ${PORT_OPTIONS:MOCFLAGS}
 CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math
 .endif #OCFLAGS
 .endif #DEBUG
 
 # Edge case: binary codecs on i386, mostly superseded by internal ffmpeg
 # ======================================================================
 
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 .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
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .else
 CONFIGURE_ARGS+=	--disable-win32dll \
 			--disable-qtx
 .endif
 .endif # ARCH == i386/amd64
 
 
 # Additional extra libraries handling
 # ===================================
 
 .if defined(EXTRA_LIBS)
 CONFIGURE_ARGS+=	--extra-libs="${EXTRA_LIBS}"
 .endif