Index: Makefile
===================================================================
--- Makefile	(revision 495005)
+++ Makefile	(working copy)
@@ -48,7 +48,7 @@
 OPTIONS_DEFINE=	EXAMPLES DEBUG DOCS GPL_LIBS DESKTOP NATIVE
 OPTIONS_DEFAULT=	SYSLIBM
 OPTIONS_GROUP=	PRIVATE
-OPTIONS_GROUP_PRIVATE=	ARPACK LLVM
+OPTIONS_GROUP_PRIVATE=	ARPACK
 OPTIONS_SINGLE=	LIBM
 OPTIONS_SINGLE_LIBM=	SYSLIBM OPENLIBM
 OPTIONS_SUB=	yes
@@ -80,13 +80,9 @@
 ARPACK_MAKE_ARGS_OFF=	USE_SYSTEM_ARPACK=1
 ARPACK_LIB_DEPENDS_OFF=	libarpack.so:math/arpack-ng
 
-LLVM_DESC=	Build self-shipped private LLVM
-LLVM_MAKE_ARGS=	USE_SYSTEM_LLVM=0
-LLVM_MAKE_ARGS_OFF=	USE_SYSTEM_LLVM=1 LLVM_CONFIG=llvm-config40
-LLVM_BUILD_DEPENDS=	cmake:devel/cmake
-LLVM_BUILD_DEPENDS_OFF=	llvm-config40:devel/llvm40
-LLVM_LIB_DEPENDS_OFF=	libLLVM-4.0.so:devel/llvm40
-LLVM_USES=	python:build perl5
+MAKE_ARGS+=	USE_SYSTEM_LLVM=0
+BUILD_DEPENDS+=	cmake:devel/cmake
+USES+=	python:build perl5
 
 SYSLIBM_DESC=	Build with system libm
 SYSLIBM_MAKE_ARGS=	USE_SYSTEM_LIBM=1
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 495005)
+++ pkg-plist	(working copy)
@@ -37,9 +37,9 @@
 lib/julia/libopenspecfun.so
 lib/julia/libopenspecfun.so.1
 lib/julia/libopenspecfun.so.1.3
-%%LLVM%%lib/julia/libLLVM.so
-%%LLVM%%lib/julia/libLLVM-3.9.so
-%%LLVM%%lib/julia/libLLVM-3.9.1.so
+lib/julia/libLLVM.so
+lib/julia/libLLVM-3.9.so
+lib/julia/libLLVM-3.9.1.so
 %%GPL_LIBS%%lib/julia/libamd.so
 %%GPL_LIBS%%lib/julia/libcamd.so
 %%GPL_LIBS%%lib/julia/libccolamd.so