From owner-svn-ports-head@FreeBSD.ORG Sun Nov 3 00:24:38 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 59CC35E6; Sun, 3 Nov 2013 00:24:38 +0000 (UTC) (envelope-from brooks@FreeBSD.org) 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 473B02136; Sun, 3 Nov 2013 00:24:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA30OcC9012756; Sun, 3 Nov 2013 00:24:38 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA30Ochx012755; Sun, 3 Nov 2013 00:24:38 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201311030024.rA30Ochx012755@svn.freebsd.org> From: Brooks Davis Date: Sun, 3 Nov 2013 00:24:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332566 - head/graphics/openshadinglanguage 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: Sun, 03 Nov 2013 00:24:38 -0000 Author: brooks Date: Sun Nov 3 00:24:37 2013 New Revision: 332566 URL: http://svnweb.freebsd.org/changeset/ports/332566 Log: Revert r332565, I ment to put that in my redports tree. Modified: head/graphics/openshadinglanguage/Makefile Modified: head/graphics/openshadinglanguage/Makefile ============================================================================== --- head/graphics/openshadinglanguage/Makefile Sun Nov 3 00:23:29 2013 (r332565) +++ head/graphics/openshadinglanguage/Makefile Sun Nov 3 00:24:37 2013 (r332566) @@ -11,12 +11,12 @@ COMMENT= Advanced shading language for p LICENSE= BSD -BUILD_DEPENDS= llvm-config32:${PORTSDIR}/devel/llvm32 \ +BUILD_DEPENDS= llvm>=3.1:${PORTSDIR}/devel/llvm \ flex>=2.5.37:${PORTSDIR}/textproc/flex LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ IlmImf:${PORTSDIR}/graphics/OpenEXR \ OpenImageIO:${PORTSDIR}/graphics/openimageio -RUN_DEPENDS= llvm-config32:${PORTSDIR}/devel/llvm32 +RUN_DEPENDS= llvm>=3.1:${PORTSDIR}/devel/llvm USE_GITHUB= yes GH_ACCOUNT= imageworks @@ -27,7 +27,6 @@ GH_COMMIT= 18671dc WRKSRC= ${WRKDIR}/imageworks-OpenShadingLanguage-${GH_COMMIT}/src CMAKE_ARGS= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex \ - -DLLVM_CONFIG:STRING=${LOCALBASE}/bin/llvm-config32 \ -DUSE_TBB:BOOL=OFF CXXFLAGS+= -I${LOCALBASE}/include/flex USE_LDCONFIG= yes @@ -36,7 +35,9 @@ USES= bison cmake:outsource NO_STAGE= yes .include -BUILD_DEPENDS+= clang32:${PORTSDIR}/lang/clang32 +.if ${OSVERSION} < 900000 +BUILD_DEPENDS+= clang:${PORTSDIR}/lang/clang +.endif .if ${ARCH} == i386 CFLAGS+= -march=i586