Index: Makefile
===================================================================
--- Makefile	(revision 522467)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	x265
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/multicoreware/x265/downloads/ \
 		https://downloads.videolan.org/pub/videolan/x265/ \
@@ -17,7 +18,9 @@
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC:H}/COPYING
 
-BUILD_DEPENDS=	nasm:devel/nasm
+BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
+BUILD_DEPENDS_amd64=	nasm:devel/nasm
+BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USES=		cmake compiler:c++14-lang pathfix
 
@@ -26,11 +29,12 @@
 
 DEBUG_PREVENTS=		OPTIMIZED_FLAGS
 DEBUG_PREVENTS_MSG=	Optimizations are incompatible with debugging code
-DEBUG_VARS_OFF=		CFLAGS+=-DNDEBUG CPPFLAGS+=-DNDEBUG 
-HI10P_CMAKE_BOOL=	HIGH_BIT_DEPTH
-HI12P_CMAKE_BOOL=	MAIN12
+DEBUG_VARS_OFF=		CFLAGS+=-DNDEBUG
+HI12P_CMAKE_BOOL=	LINKED_12BIT
+HI10P_CMAKE_BOOL=	LINKED_10BIT ENABLE_HDR10_PLUS
+HI10P_CMAKE_ARGS=	EXTRA_LINK_FLAGS=${EXTRA_LINK_FLAGS:Q}
 HI12P_IMPLIES=		HI10P
-OPTIMIZED_FLAGS_VARS=	CFLAGS+=-O3 CXXFLAGS+=-O3
+OPTIMIZED_FLAGS_VARS=	CFLAGS+=-O3
 SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
 SVTHEVC_CMAKE_BOOL=	ENABLE_SVT_HEVC
 SVTHEVC_CMAKE_ON=	-DSVT_HEVC_INCLUDE_DIR:PATH="${LOCALBASE}/include/svt-hevc"
@@ -45,14 +49,31 @@
 SVTHEVC_DESC=	HEVC encoding via SVT-HEVC
 VMAF_DESC=	Per frame and aggregate VMAF score
 
+OPTIONS_SUB=	yes
 USE_LDCONFIG=	yes
-CMAKE_ARGS=	-DENABLE_PIC=on -DENABLE_TESTS=on
+CMAKE_ARGS=	-DENABLE_PIC=on -DENABLE_TESTS=on -DENABLE_SHARED:BOOL=true
 LDFLAGS_i386=	-Wl,-znotext
 EXTRACT_AFTER_ARGS+=	--exclude compat
 PATCH_WRKSRC=	${WRKSRC:H}
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/source
 
+.include <bsd.port.options.mk>
+
+.for b in ${PORT_OPTIONS:MHI1?P:C/HI([0-9]+)P/\1/}
+EXTRA_LINK_FLAGS+=${WRKSRC:H}/$bbit/libx265.a
+pre-build::
+	${MKDIR} ${WRKSRC:H}/$bbit
+	${CMAKE_BIN} -S ${WRKSRC} -B ${WRKSRC:H}/$bbit \
+		${CMAKE_ARGS}	\
+		-DHIGH_BIT_DEPTH=true -DMAIN$b=true \
+		-DEXPORT_C_API=false -DENABLE_CLI=false \
+		-DENABLE_SHARED:BOOL=false -DENABLE_TESTS=false \
+		-DLINKED_10BIT=false -DLINKED_12BIT=false \
+		-DENABLE_HDR10_PLUS=false
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC:H}/$bbit ${MAKE_ARGS}
+.endfor
+
 do-test:
-	${WRKSRC}/test/TestBench
+	${WRKDIR}/.build/test/TestBench
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 522467)
+++ pkg-plist	(working copy)
@@ -1,7 +1,10 @@
 bin/x265
 include/x265.h
 include/x265_config.h
+%%HI10P%%include/hdr10plus.h
 lib/libx265.a
+%%HI10P%%lib/libhdr10plus.a
+%%HI10P%%lib/libhdr10plus.so
 lib/libx265.so
 lib/libx265.so.179
 libdata/pkgconfig/x265.pc