6 files changed, 56 insertions, 7 deletions

diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index c5f7e582fc6b..0e27d2768540 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openshadinglanguage
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 
 MAINTAINER=	FreeBSD@Shaneware.biz
@@ -19,12 +19,12 @@ LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 RUN_DEPENDS=	llvm>=3.1:${PORTSDIR}/devel/llvm
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	sambler
+GH_ACCOUNT=	imageworks
 GH_PROJECT=	OpenShadingLanguage
-GH_TAGNAME=	osl-20130106
-GH_COMMIT=	3c69652
+GH_TAGNAME=	Release-${PORTVERSION}
+GH_COMMIT=	d722707
 
-WRKSRC+=	${WRKDIR}/sambler-OpenShadingLanguage-${GH_COMMIT}/src
+WRKSRC=		${WRKDIR}/imageworks-OpenShadingLanguage-${GH_COMMIT}/src
 
 USE_CMAKE=	yes
 CMAKE_VERBOSE=	yes
diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo
index 5481649dd417..a3edd2ba643a 100644
--- a/graphics/openshadinglanguage/distinfo
+++ b/graphics/openshadinglanguage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openshadinglanguage-1.3.0.tar.gz) = 3c19c3b0ac6d8e7d260d1fe0c738b8d6a9014dd5ee186aba74db3f1197e16a81
-SIZE (openshadinglanguage-1.3.0.tar.gz) = 10310632
+SHA256 (openshadinglanguage-1.3.0.tar.gz) = a84e97535e9fa15aa02b68a7894046b36cad0964de21e9f1a8709852a8aa0d89
+SIZE (openshadinglanguage-1.3.0.tar.gz) = 10315983
diff --git a/graphics/openshadinglanguage/files/patch-doc__CMakeLists.txt b/graphics/openshadinglanguage/files/patch-doc__CMakeLists.txt
new file mode 100644
index 000000000000..2de9a82bae5e
--- /dev/null
+++ b/graphics/openshadinglanguage/files/patch-doc__CMakeLists.txt
@@ -0,0 +1,16 @@
+--- ./doc/CMakeLists.txt.orig	2013-02-15 11:22:42.000000000 +1030
++++ ./doc/CMakeLists.txt	2013-02-17 07:11:28.270631151 +1030
+@@ -1,11 +1,11 @@
+ set (public_docs osl-languagespec.pdf)
+ # Some day: CLA-INDIVIDUAL CLA-CORPORATE
+ 
+-install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
++install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage COMPONENT documentation)
+ 
+ install ( FILES ${PROJECT_SOURCE_DIR}/../LICENSE
+                 ${PROJECT_SOURCE_DIR}/../INSTALL
+                 ${PROJECT_SOURCE_DIR}/../CHANGES
+                 ${PROJECT_SOURCE_DIR}/../README.md
+-          DESTINATION . )
++          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage )
+ 
diff --git a/graphics/openshadinglanguage/files/patch-liboslexec__CMakeLists.txt b/graphics/openshadinglanguage/files/patch-liboslexec__CMakeLists.txt
new file mode 100644
index 000000000000..a836cccb81ae
--- /dev/null
+++ b/graphics/openshadinglanguage/files/patch-liboslexec__CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./liboslexec/CMakeLists.txt.orig	2013-02-15 11:22:42.000000000 +1030
++++ ./liboslexec/CMakeLists.txt	2013-02-17 07:11:28.388647893 +1030
+@@ -95,7 +95,7 @@
+       -I${Boost_INCLUDE_DIRS} -I${TBB_INCLUDES} -O3 -S -emit-llvm -o ${llvm_asm} ${llvm_src}
+ 
+       COMMAND ${LLVM_DIRECTORY}/bin/llvm-as -f -o ${llvm_bc} ${llvm_asm}
+-      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.bash ${llvm_bc} ${llvm_bc_cpp}
++      COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.bash ${llvm_bc} ${llvm_bc_cpp}
+       MAIN_DEPENDENCY ${llvm_src}
+       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.bash
+       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
diff --git a/graphics/openshadinglanguage/files/patch-liboslexec__llvm_ops.cpp b/graphics/openshadinglanguage/files/patch-liboslexec__llvm_ops.cpp
new file mode 100644
index 000000000000..d5d1ea974f91
--- /dev/null
+++ b/graphics/openshadinglanguage/files/patch-liboslexec__llvm_ops.cpp
@@ -0,0 +1,13 @@
+--- ./liboslexec/llvm_ops.cpp.orig	2013-02-17 07:12:22.136610427 +1030
++++ ./liboslexec/llvm_ops.cpp	2013-02-17 07:13:26.175610292 +1030
+@@ -127,8 +127,8 @@
+ 
+ #if defined(__FreeBSD__)
+ #include <sys/param.h>
+-#if __FreeBSD_version < 803000
+-// freebsd before 8.3 doesn't have log2f - use OIIO lib replacement
++#if __FreeBSD_version < 802502
++// freebsd before 8.2-STABLE doesn't have log2f - use OIIO lib replacement
+ using OIIO::log2f;
+ #endif
+ #endif
diff --git a/graphics/openshadinglanguage/files/patch-shaders__CMakeLists.txt b/graphics/openshadinglanguage/files/patch-shaders__CMakeLists.txt
new file mode 100644
index 000000000000..d59a214ad597
--- /dev/null
+++ b/graphics/openshadinglanguage/files/patch-shaders__CMakeLists.txt
@@ -0,0 +1,9 @@
+--- ./shaders/CMakeLists.txt.orig	2013-02-15 11:22:42.000000000 +1030
++++ ./shaders/CMakeLists.txt	2013-02-17 07:11:28.389609929 +1030
+@@ -42,5 +42,5 @@
+                    SOURCES ${shader_source} ${shader_headers})
+ 
+ install (FILES ${shader_headers} ${shader_source} ${shader_objs}
+-         DESTINATION shaders)
++         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage/shaders)
+