From owner-svn-ports-head@freebsd.org  Sat Jan 14 14:51:56 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D006ECAED41;
 Sat, 14 Jan 2017 14:51:56 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A01D01F6A;
 Sat, 14 Jan 2017 14:51:56 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0EEptPt010088;
 Sat, 14 Jan 2017 14:51:55 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0EEptOb010087;
 Sat, 14 Jan 2017 14:51:55 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <201701141451.v0EEptOb010087@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gerald set sender to
 gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sat, 14 Jan 2017 14:51:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r431468 - head/emulators/wine-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Jan 2017 14:51:56 -0000

Author: gerald
Date: Sat Jan 14 14:51:55 2017
New Revision: 431468
URL: https://svnweb.freebsd.org/changeset/ports/431468

Log:
  Remove a hack against CHOSEN_COMPILER_TYPE actually referring to a
  different compiler (the system compiler), in particular leading to
  a GCC vs clang confusion on FreeBSD 9.  With FreeBSD 9 gone now,
  this is no longer needed.
  
  (A slightly different hack was in emulators/wine and got removed via
  one of the "FreeBSD 9 gone" sweeps.  With this commit, both ports are
  now in sync again.)

Modified:
  head/emulators/wine-devel/Makefile

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Sat Jan 14 14:01:59 2017	(r431467)
+++ head/emulators/wine-devel/Makefile	Sat Jan 14 14:51:55 2017	(r431468)
@@ -123,10 +123,7 @@ X11_LIB_DEPENDS=	libfontconfig.so:x11-fo
 CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
 PLIST_SUB+=		WINE32="@comment " WINE64=""
 
-# On FreeBSD 9.x, even when CHOSEN_COMPILER_TYPE from Mk/Uses/compiler.mk
-# is set to clang, COMPILER_VERSION is still at 42 from the system compiler
-# that is GCC 4.2.  Hack around this a bit.
-.if ${CHOSEN_COMPILER_TYPE} == clang && ( ${COMPILER_VERSION} < 38 || ${COMPILER_VERSION} == 42 )
+.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38
 CPPFLAGS+=		-D__builtin_ms_va_list=__builtin_va_list \
 			-D__builtin_ms_va_start=__builtin_va_start \
 			-D__builtin_ms_va_end=__builtin_va_end \