Modernise compiler handling

- Retire OTCHAIN OPTION
- Retire support for gcc 4.2 from base
- Depend on c11 compliant compiler via USES=compiler:c11
- Respect CC,CXX,CPP from environment (fixes bug 196811)
- Bump PORTREVISION (default package on 8.x changes)

4 files changed, 5 insertions, 57 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index b89949dcdc5f..60b17f981af0 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 
 COMMENT=	High performance media player supporting many formats
 
@@ -11,7 +12,7 @@ COMMENT=	High performance media player supporting many formats
 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 \
+		OPENJPEG OPUS PULSEAUDIO REAL RTC RTCPU RTMP \
 		SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \
 		WIN32 X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 
@@ -25,7 +26,6 @@ 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
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index e1a45901177a..49087d7e0938 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -84,11 +84,6 @@ CONFIGURE_ARGS+=	--disable-tv-v4l1 \
 # 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
@@ -109,37 +104,14 @@ BROKEN=		Does not compile on sparc64
 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
+.if ${CHOSEN_COMPILER_TYPE} == clang
 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)
+.endif # ${CHOSEN_COMPILER_TYPE} == clang
 
 .if ${ARCH} == "armv6"
 CFLAGS_armv6+=	-no-integrated-as
diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared
index 539090ae7501..c6de486cd0c2 100644
--- a/multimedia/mplayer/Makefile.shared
+++ b/multimedia/mplayer/Makefile.shared
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
 
-USES=		gmake iconv ncurses tar:xz
+USES=		compiler:c11 gmake iconv ncurses tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/multimedia/mplayer/files/extra-patch-base_system_gcc b/multimedia/mplayer/files/extra-patch-base_system_gcc
deleted file mode 100644
index b827ce858696..000000000000
--- a/multimedia/mplayer/files/extra-patch-base_system_gcc
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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))
- 
--#if ARCH_X86_64 && defined(PIC)
-+#if ARCH_X86_64
- #    define BROKEN_RELOCATIONS 1
- #endif
-