diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index ac54a2eb9dc9..2cfe5c5db514 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -1,83 +1,76 @@
 PORTNAME=	openshadinglanguage
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.12.6.2
-PORTREVISION=	4
+DISTVERSION=	1.12.11.0
 CATEGORIES?=	graphics devel
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT?=	Advanced shading language for production GI renderers
 WWW=		https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
 
-PATCH_SITES=	https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/
-PATCHFILES=	41cc6d78dba4115b7d4adcae7e4759ffa43c3833.patch:-p1
-
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: llvm_ops.cpp:101:10: fatal error: 'iostream' file not found
 BROKEN_riscv64=		fails to build: /usr/include/c++/v1/__threading_support:135:3: Unsupported architecture
 
-BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libImath.so:math/Imath \
 		libOpenEXR.so:graphics/openexr \
 		libOpenImageIO.so:graphics/openimageio \
 		libpugixml.so:textproc/pugixml
-RUN_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 
-USES=		bison cmake compiler:c++14-lang localbase ncurses qt:5
+USES=		bison cmake compiler:c++14-lang llvm:lib localbase ncurses qt:5
 
 USE_QT=		buildtools:build qmake:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AcademySoftwareFoundation
 GH_PROJECT=	OpenShadingLanguage
 
 CMAKE_ON=	ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS
-CMAKE_OFF=	USE_BOOST_WAVE
-CMAKE_ARGS+=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}" \
+CMAKE_ARGS+=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \
 		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} -DCMAKE_CXX_STANDARD=14
 
 OPTIONS_DEFINE=		OSLTOY
 OPTIONS_SUB=		yes
 
 OSLTOY_DESC=		Interactive shader edit and visualize tool
 OSLTOY_CMAKE_BOOL=	USE_QT
 OSLTOY_USE=		QT=buildtools:build,core,gui,qmake:build,widgets
 
 #CXXFLAGS+=	-I${STAGEDIR}/include
 
 # DISTVERSION has an extra digit which isn't in the lib name
 # for LIBVERS we want the first three digits
 PLIST_SUB=	SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R}
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
 		-e 's,%%PYCMD%%,${PYTHON_CMD},' \
 		${WRKSRC}/src/shaders/CMakeLists.txt \
 		${WRKSRC}/src/doc/CMakeLists.txt \
 		${WRKSRC}/src/liboslexec/CMakeLists.txt
 
 .if ${SLAVE_PORT} == yes
 BUILD_DEPENDS+=	${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11
 LIB_DEPENDS+=	liboslquery.so:graphics/openshadinglanguage
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openimageio>0:graphics/py-openimageio@${PY_FLAVOR}
 PLIST=		${PKGDIR}/pkg-plist-pybind
 USES+=		python
 USE_PYTHON=	flavors
 CMAKE_ON+=	USE_PYTHON
 CMAKE_ARGS+=	-DPYTHON_VERSION=${PYTHON_VER}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/oslquery.so ${STAGEDIR}${PYTHON_SITELIBDIR}
 .else # SLAVE_PORT != yes
 USES+=		python:build
 BINARY_ALIAS+=	python=${PYTHON_CMD}
 CMAKE_OFF+=	USE_PYTHON
 USE_LDCONFIG=	yes
 .endif # SLAVE_PORT
 
 .include <bsd.port.mk>
diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo
index 22cff8541707..f4a116ded8fb 100644
--- a/graphics/openshadinglanguage/distinfo
+++ b/graphics/openshadinglanguage/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1670254834
-SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.6.2_GH0.tar.gz) = 0115a0a09ac9ef0ade88f2434e1472323b335c3f0ddcca0ffd062f9cc822e629
-SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.6.2_GH0.tar.gz) = 20247666
-SHA256 (41cc6d78dba4115b7d4adcae7e4759ffa43c3833.patch) = e14769a4baf170e5af02b4f8ef3e26522ef4d9e120142f43fc7c8b175fc57e14
-SIZE (41cc6d78dba4115b7d4adcae7e4759ffa43c3833.patch) = 1382
+TIMESTAMP = 1681123465
+SHA256 (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.11.0_GH0.tar.gz) = 760dc4df5c23867e92f58080e9d907da137325099d1a8bf95063785d63e550d5
+SIZE (AcademySoftwareFoundation-OpenShadingLanguage-v1.12.11.0_GH0.tar.gz) = 20287156
diff --git a/graphics/py-openshadinglanguage/Makefile b/graphics/py-openshadinglanguage/Makefile
index e70c8bb37bdc..1fa4e38214f8 100644
--- a/graphics/py-openshadinglanguage/Makefile
+++ b/graphics/py-openshadinglanguage/Makefile
@@ -1,12 +1,12 @@
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	graphics multimedia python
 # Note this port shares its PORTREVISION with graphics/openshadinglanguage!
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	OpenShadingLanguage python bindings
 
 MASTERDIR=	${.CURDIR}/../openshadinglanguage
 
 OPTIONS_EXCLUDE=	MATERIALX OSLTOY
 
 .include "${MASTERDIR}/Makefile"