From owner-svn-ports-head@FreeBSD.ORG  Wed Apr  1 18:37:30 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE670AD1;
 Wed,  1 Apr 2015 18:37:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 B913F7DA;
 Wed,  1 Apr 2015 18:37:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t31IbUXo030541;
 Wed, 1 Apr 2015 18:37:30 GMT (envelope-from dbn@FreeBSD.org)
Received: (from dbn@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t31IbUAX030540;
 Wed, 1 Apr 2015 18:37:30 GMT (envelope-from dbn@FreeBSD.org)
Message-Id: <201504011837.t31IbUAX030540@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dbn set sender to dbn@FreeBSD.org
 using -f
From: David Naylor <dbn@FreeBSD.org>
Date: Wed, 1 Apr 2015 18:37:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r382937 - 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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Apr 2015 18:37:30 -0000

Author: dbn
Date: Wed Apr  1 18:37:29 2015
New Revision: 382937
URL: https://svnweb.freebsd.org/changeset/ports/382937

Log:
  emulators/wine-devel: unbreak build.
  
  Changes:
   * Add CPPBIN="${CPP}" to CONFIGURE_ENV as Wine uses $CPPBIN, instead of
     $CPP, in ./configure
   * Use CHOSEN_COMPILER_TYPE instead of COMPILER_TYPE.  The later is what
     the base compiler is whereas the former to what is chosen to satisfy
     USES=compiler:c11
  
  PR:		199098
  Reported by:	pkg-fallout, gerald@

Modified:
  head/emulators/wine-devel/Makefile

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Wed Apr  1 18:31:10 2015	(r382936)
+++ head/emulators/wine-devel/Makefile	Wed Apr  1 18:37:29 2015	(r382937)
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--verbose --disable-test
 		--without-sane \
 		--without-tiff \
 		--without-xinerama
-CONFIGURE_ENV=	FLEX="${LOCALBASE}/bin/flex"
+CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR?=	${PREFIX}/lib
 .if !defined(USE_LDCONFIG32)
 USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
@@ -120,7 +120,7 @@ X11_LIB_DEPENDS=	libfontconfig.so:${PORT
 CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
 PLIST_SUB+=		WINE32="@comment " WINE64=""
 
-.if ${COMPILER_TYPE} == clang
+.if ${CHOSEN_COMPILER_TYPE} == clang
 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 \