Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Nov 2013 00:24:38 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332566 - head/graphics/openshadinglanguage
Message-ID:  <201311030024.rA30Ochx012755@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
 
-BUILD_DEPENDS+=	clang32:${PORTSDIR}/lang/clang32
+.if ${OSVERSION} < 900000
+BUILD_DEPENDS+=	clang:${PORTSDIR}/lang/clang
+.endif
 
 .if ${ARCH} == i386
 CFLAGS+=	-march=i586



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311030024.rA30Ochx012755>