Index: head/sysutils/b2sum/Makefile
===================================================================
--- head/sysutils/b2sum/Makefile	(revision 507403)
+++ head/sysutils/b2sum/Makefile	(revision 507404)
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	b2sum
-PORTVERSION=	0.0.d${B2VERSION}
-PORTREVISION=	6
+PORTVERSION=	0.0.20160619
 CATEGORIES=	sysutils security
-MASTER_SITES=	http://blake2.net/
-DISTNAME=	blake2_code_${B2VERSION}${EXTRACT_SUFFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast secure hashing
 
 LICENSE=	CC0-1.0
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
-B2VERSION=	20150531
-
-USES=		zip
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}"
+MAKEFILE=	makefile
 USE_CSTD=	c99
 WRKSRC_SUBDIR=	b2sum
-MAKEFILE=	makefile
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}"
+
 PLIST_FILES=	bin/b2sum
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	BLAKE2
+GH_PROJECT=	BLAKE2
+GH_TAGNAME=	${PORTVERSION:E}
+
 OPTIONS_DEFINE=	OPENMP OPTIMIZED_CFLAGS SSE
-OPTIONS_DEFAULT_amd64=SSE
+OPTIONS_DEFAULT_amd64=	SSE
 SSE_DESC=	Use SSE2, SSSE3, SSE4.1, AVX or XOP instructions
 
 OPENMP_USES+=	compiler:openmp
 OPENMP_CFLAGS+=	-fopenmp
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3
 .if !${CFLAGS:M-march=*}
 CFLAGS+=	-march=native
 .endif
 .endif
 
 .if (${PORT_OPTIONS:MSSE} && (${ARCH} == "i386" || ${ARCH} == "amd64"))
 CFLAGS+=	-I../sse -flax-vector-conversions
 .else
 CFLAGS+=	-I../ref
-EXTRA_PATCHES=	${PATCHDIR}/use_ref.patch
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-makefile
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/sysutils/b2sum/distinfo
===================================================================
--- head/sysutils/b2sum/distinfo	(revision 507403)
+++ head/sysutils/b2sum/distinfo	(revision 507404)
@@ -1,2 +1,3 @@
-SHA256 (blake2_code_20150531.zip) = 37168711cddb349e7462bcc4874992a8e1c66de2318a20507b498be2d7c7d1e7
-SIZE (blake2_code_20150531.zip) = 461445
+TIMESTAMP = 1549358972
+SHA256 (BLAKE2-BLAKE2-0.0.20160619-20160619_GH0.tar.gz) = cbac833ccae56b5c6173dbeaf871aa99b32745cf7a994c7451d4533ecda55633
+SIZE (BLAKE2-BLAKE2-0.0.20160619-20160619_GH0.tar.gz) = 462704
Index: head/sysutils/b2sum/files/patch-blake2.h
===================================================================
--- head/sysutils/b2sum/files/patch-blake2.h	(revision 507403)
+++ head/sysutils/b2sum/files/patch-blake2.h	(nonexistent)
@@ -1,22 +0,0 @@
---- ../ref/blake2.h.orig	2015-06-01 01:10:19 UTC
-+++ ../ref/blake2.h
-@@ -19,6 +19,8 @@
- 
- #if defined(_MSC_VER)
- #define ALIGN(x) __declspec(align(x))
-+#elif defined(__clang__)
-+#define ALIGN(x) /* unaligned access in b2*p at -O >0 */
- #else
- #define ALIGN(x) __attribute__((aligned(x)))
- #endif
---- ../sse/blake2.h.orig	2015-05-29 08:02:54 UTC
-+++ ../sse/blake2.h
-@@ -19,6 +19,8 @@
- 
- #if defined(_MSC_VER)
- #define ALIGN(x) __declspec(align(x))
-+#elif defined(__clang__)
-+#define ALIGN(x) /* unaligned access in b2*p at -O >0 */
- #else
- #define ALIGN(x) __attribute__ ((__aligned__(x)))
- #endif

Property changes on: head/sysutils/b2sum/files/patch-blake2.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/sysutils/b2sum/files/use_ref.patch
===================================================================
--- head/sysutils/b2sum/files/use_ref.patch	(revision 507403)
+++ head/sysutils/b2sum/files/use_ref.patch	(nonexistent)
@@ -1,13 +0,0 @@
---- makefile.orig	2015-05-31 23:30:20 UTC
-+++ makefile
-@@ -1,8 +1,8 @@
- CC=gcc
- CFLAGS=-std=c99 -O3 -march=native -I../sse -static -fopenmp 
- LIBS=
--#FILES=blake2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c 
--FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c 
-+FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c 
-+#FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c 
- all: $(FILES)
- 	$(CC) $(FILES) $(CFLAGS) $(LIBS) -o b2sum 
- 

Property changes on: head/sysutils/b2sum/files/use_ref.patch
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/sysutils/b2sum/files/extra-patch-makefile
===================================================================
--- head/sysutils/b2sum/files/extra-patch-makefile	(nonexistent)
+++ head/sysutils/b2sum/files/extra-patch-makefile	(revision 507404)
@@ -0,0 +1,13 @@
+--- makefile.orig	2016-06-19 16:55:55 UTC
++++ makefile
+@@ -9,8 +9,8 @@ CFLAGS?=-O3 -march=native -Werror=declar
+ CFLAGS+=-std=c99 -I../sse
+ CFLAGS+=$(NO_OPENMP_$(NO_OPENMP))
+ LIBS=
+-#FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c 
+-FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c 
++FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c 
++#FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c 
+ all: $(FILES)
+ 	$(CC) $(FILES) $(CFLAGS) $(LIBS) -o $(PROG)
+ 

Property changes on: head/sysutils/b2sum/files/extra-patch-makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property