From owner-svn-ports-head@FreeBSD.ORG Tue Oct 30 08:47:54 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5C37A8A7; Tue, 30 Oct 2012 08:47:54 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 240238FC0A; Tue, 30 Oct 2012 08:47:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9U8lrFZ054200; Tue, 30 Oct 2012 08:47:53 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9U8lrtj054197; Tue, 30 Oct 2012 08:47:53 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201210300847.q9U8lrtj054197@svn.freebsd.org> From: Guido Falsi Date: Tue, 30 Oct 2012 08:47:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306664 - in head/emulators: mame mess 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2012 08:47:54 -0000 Author: madpilot Date: Tue Oct 30 08:47:53 2012 New Revision: 306664 URL: http://svn.freebsd.org/changeset/ports/306664 Log: Move OSVERSION check after bsd.port.pre.mk. Submitted by: KATO Tsuguru Feature safe: yes Modified: head/emulators/mame/Makefile head/emulators/mess/Makefile Modified: head/emulators/mame/Makefile ============================================================================== --- head/emulators/mame/Makefile Tue Oct 30 08:20:46 2012 (r306663) +++ head/emulators/mame/Makefile Tue Oct 30 08:47:53 2012 (r306664) @@ -51,14 +51,6 @@ UPDATE_PATCHES!= /usr/bin/jot -s " " \ .include -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 -CC= /usr/bin/clang -CPP= /usr/bin/clang-cpp -CXX= /usr/bin/clang++ -.else -USE_GCC= 4.6+ -.endif - .if ${PORT_OPTIONS:MBUILTIN_DEBUGGER} USE_GNOME= gtk20 gconf2 MAKE_ENV+= GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \ @@ -77,6 +69,14 @@ MAKE_ENV+= DEBUG=1 .include +.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 +CC= /usr/bin/clang +CPP= /usr/bin/clang-cpp +CXX= /usr/bin/clang++ +.else +USE_GCC= 4.6+ +.endif + .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not install on ia64, powerpc, or sparc64 .endif Modified: head/emulators/mess/Makefile ============================================================================== --- head/emulators/mess/Makefile Tue Oct 30 08:20:46 2012 (r306663) +++ head/emulators/mess/Makefile Tue Oct 30 08:47:53 2012 (r306664) @@ -51,14 +51,6 @@ UPDATE_PATCHES!= /usr/bin/jot -s " " \ .include -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 -CC= /usr/bin/clang -CPP= /usr/bin/clang-cpp -CXX= /usr/bin/clang++ -.else -USE_GCC= 4.6+ -.endif - .if ${PORT_OPTIONS:MBUILTIN_DEBUGGER} USE_GNOME= gtk20 gconf2 MAKE_ENV+= GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \ @@ -77,6 +69,14 @@ MAKE_ENV+= DEBUG=1 .include +.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 +CC= /usr/bin/clang +CPP= /usr/bin/clang-cpp +CXX= /usr/bin/clang++ +.else +USE_GCC= 4.6+ +.endif + .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not install on ia64, powerpc, or sparc64 .endif