From owner-svn-ports-all@FreeBSD.ORG  Sat Feb  2 20:35:49 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 3AF85D54;
 Sat,  2 Feb 2013 20:35:49 +0000 (UTC) (envelope-from nox@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 15A6F393;
 Sat,  2 Feb 2013 20:35:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12KZm55088165;
 Sat, 2 Feb 2013 20:35:48 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12KZm5C088164;
 Sat, 2 Feb 2013 20:35:48 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201302022035.r12KZm5C088164@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Sat, 2 Feb 2013 20:35:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311443 - head/multimedia/vlc
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Feb 2013 20:35:49 -0000

Author: nox
Date: Sat Feb  2 20:35:48 2013
New Revision: 311443
URL: http://svnweb.freebsd.org/changeset/ports/311443

Log:
  - Prefer clang on 9.1+ (instead of gcc 4.6+ only on i386.)
  - Fix build without V4L option (the multimedia/libdvbpsi dependency is
    no longer optional.)
  - No PORTREVISION bump since the resulting package should behave the same.

Modified:
  head/multimedia/vlc/Makefile

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Sat Feb  2 20:10:42 2013	(r311442)
+++ head/multimedia/vlc/Makefile	Sat Feb  2 20:35:48 2013	(r311443)
@@ -16,7 +16,8 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
-		proxy:${PORTSDIR}/net/libproxy
+		proxy:${PORTSDIR}/net/libproxy \
+		dvbpsi:${PORTSDIR}/multimedia/libdvbpsi
 BUILD_DEPENDS=	ffmpeg${FFMPEG_SUFFIX}>=1.0:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
 RUN_DEPENDS=	ffmpeg${FFMPEG_SUFFIX}>=1.0:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
 
@@ -583,8 +584,7 @@ CONFIGURE_ARGS+=--disable-upnp
 .endif
 
 .if ${PORT_OPTIONS:MV4L} || ${PORT_OPTIONS:MDVB}
-LIB_DEPENDS+=	v4l1:${PORTSDIR}/multimedia/libv4l \
-		dvbpsi:${PORTSDIR}/multimedia/libdvbpsi
+LIB_DEPENDS+=	v4l1:${PORTSDIR}/multimedia/libv4l
 CONFIGURE_ARGS+=--enable-v4l2
 .else
 CONFIGURE_ARGS+=--disable-v4l2
@@ -679,9 +679,16 @@ IGNORE=		base clang version too old, set
 CONFIGURE_ARGS+=--enable-altivec # VLC's config script doesn't know to do this
 .endif
 
+# prefer clang on 9.1+
+.if (${OSVERSION} >= 901000) && exists(${DESTDIR}/usr/bin/clang)
+CC=	clang
+CXX=	clang++
+CPP=	clang-cpp
+.else
 .if ${ARCH} == "i386"
 USE_GCC?=	4.6+ # sse/3dnow detection on i386 needs newer gcc
 .endif
+.endif
 
 # End OS specific hacks