--- multimedia/x265/Makefile	(revision 459840)
+++ multimedia/x265/Makefile	(working copy)
@@ -2,11 +2,10 @@ 
 # $FreeBSD$
 
 PORTNAME=	x265
-PORTVERSION=	2.3
+PORTVERSION=	2.6
 CATEGORIES=	multimedia
-MASTER_SITES=	http://bitbucket.org/multicoreware/${PORTNAME}/get/
-DISTNAME=	${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://ftp.videolan.org/pub/videolan/${PORTNAME}/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	H.265/High Efficiency Video Coding (HEVC) format
@@ -16,15 +15,27 @@ 
 
 BUILD_DEPENDS=	yasm:devel/yasm
 
-USES=		cmake pathfix tar:bz2
+USES=		cmake pathfix
+
+OPTIONS_DEFINE=		DEBUG HI10P HI12P OPTIMIZED_FLAGS
+DEBUG_VARS_OFF=		CFLAGS+=-DNDEBUG CPPFLAGS+=-DNDEBUG 
+HI10P_CMAKE_BOOL=	HIGH_BIT_DEPTH
+HI12P_CMAKE_BOOL=	MAIN12
+HI12P_IMPLIES=		HI10P
+OPTIMIZED_FLAGS_VARS=	CFLAGS+=-O3 CPPFLAGS+=-O3
+
+DEBUG_DESC=	Enable debugging
+HI10P_DESC=	Enable HI10P Support (64-bit only)
+HI12P_DESC=	Enable HI12P Support (64-bit only)
+OPTIMIZED_FLAGS_DESC=	Enable O3 optimization
+
 USE_LDCONFIG=	yes
-CMAKE_ARGS=	-DENABLE_PIC=on -DENABLE_TESTS=on -DPLATFORM_LIBS=md
+CMAKE_ARGS=	-DPLATFORM_LIBS=md -DENABLE_TESTS=on
 CFLAGS_mips=	-DNO_ATOMICS # cannot use lang/gcc
 CFLAGS_mips64=	-DNO_ATOMICS # cannot use lang/gcc
 EXTRACT_AFTER_ARGS+=	--exclude "md5*"
+WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION}/source
 
-WRKSRC=		${WRKDIR}/multicoreware-${PORTNAME}-3037c1448549/source
-
 do-test:
 	${WRKSRC}/test/TestBench
 
--- multimedia/x265/distinfo	(revision 459840)
+++ multimedia/x265/distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1487446516
-SHA256 (x265/2.3.tar.bz2) = 890f52a69c52c344d6469969bc9aca86d0294f9590fda0974338ed4184c46e28
-SIZE (x265/2.3.tar.bz2) = 939895
+TIMESTAMP = 1516798519
+SHA256 (x265_2.6.tar.gz) = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf
+SIZE (x265_2.6.tar.gz) = 1271976
--- multimedia/x265/pkg-plist	(revision 459840)
+++ multimedia/x265/pkg-plist	(working copy)
@@ -3,5 +3,5 @@ 
 include/x265_config.h
 lib/libx265.a
 lib/libx265.so
-lib/libx265.so.110
+lib/libx265.so.146
 libdata/pkgconfig/x265.pc