svn commit: r382937 - head/emulators/wine-devel

[David Naylor]

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 \