From owner-svn-ports-all@FreeBSD.ORG  Mon Feb  3 10:34:09 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 776EF2FA;
 Mon,  3 Feb 2014 10:34:09 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 63FB81729;
 Mon,  3 Feb 2014 10:34:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13AY9gd028789;
 Mon, 3 Feb 2014 10:34:09 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13AY9S9028788;
 Mon, 3 Feb 2014 10:34:09 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201402031034.s13AY9S9028788@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 3 Feb 2014 10:34:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r342413 - head/lang/libobjc2
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.17
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: Mon, 03 Feb 2014 10:34:09 -0000

Author: bapt
Date: Mon Feb  3 10:34:08 2014
New Revision: 342413
URL: http://svnweb.freebsd.org/changeset/ports/342413
QAT: https://qat.redports.org/buildarchive/r342413/

Log:
  Use regular CC and CXX instead of custom CLANGXX/CLANG
  That fixes build after .pre.mk removal as well as simplify the makefile
  
  Reported by:	tijl

Modified:
  head/lang/libobjc2/Makefile

Modified: head/lang/libobjc2/Makefile
==============================================================================
--- head/lang/libobjc2/Makefile	Mon Feb  3 10:18:19 2014	(r342412)
+++ head/lang/libobjc2/Makefile	Mon Feb  3 10:34:08 2014	(r342413)
@@ -22,11 +22,11 @@ _CLANG!=	if [ -f /usr/bin/clang ] ; then
 
 .if ${_CLANG} < 33
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
-CLANG=		${LOCALBASE}/bin/clang33
-CLANGXX=	${LOCALBASE}/bin/clang++33
+CC=		${LOCALBASE}/bin/clang33
+CXX=	${LOCALBASE}/bin/clang++33
 .else
-CLANG=		/usr/bin/clang
-CLANGXX=	/usr/bin/clang++
+CC=		/usr/bin/clang
+CXX=	/usr/bin/clang++
 .endif
 
 SHLIB_MAJOR=	4
@@ -42,8 +42,7 @@ PLIST_SUB+=	WITH_SEPARATECXX=""
 PLIST_SUB+=	WITH_SEPARATECXX="@comment "
 .endif
 
-CMAKE_ARGS+=	-DLIB_INSTALL_PATH=lib -DCMAKE_ASM_COMPILER=${CLANG}
-CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CLANG} -DCMAKE_CXX_COMPILER=${CLANGXX}
+CMAKE_ARGS+=	-DLIB_INSTALL_PATH=lib
 CMAKE_ARGS+=	-DTESTS=OFF
 # This shouldn't be needed, but our llvm port installs llvm-config with a silly
 # name...