Index: branches/2017Q1/audio/wavpack/Makefile
===================================================================
--- branches/2017Q1/audio/wavpack/Makefile	(revision 434396)
+++ branches/2017Q1/audio/wavpack/Makefile	(revision 434397)
@@ -1,27 +1,38 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	wavpack
-PORTVERSION=	4.60.1
-PORTREVISION=	3
+PORTVERSION=	5.1.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.wavpack.com/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Audio codec for lossless, lossy, and hybrid compression
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/license.txt
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		iconv libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-.if ${MACHINE_CPU:Mmmx}
-CONFIGURE_ARGS=	--enable-mmx
+OPTIONS_DEFINE=	ASM
+OPTIONS_DEFAULT_amd64=	ASM
+OPTIONS_DEFAULT_armv6=	ASM
+
+ASM_CONFIGURE_OFF=	--disable-asm
+ASM_DESC=	Optimized assembler routines (requires MMX on x86)
+
+.include <bsd.port.options.mk>
+
+# ASM needs clang 3.8+
+# depend on llvm39 since it's more likely to be installed already than 3.8
+.if ${OSVERSION} < 1100101 && ${PORT_OPTIONS:MASM}
+BUILD_DEPENDS+=	clang39:devel/llvm39
+CC=		clang39
 .endif
 
 .include <bsd.port.mk>
Index: branches/2017Q1/audio/wavpack/distinfo
===================================================================
--- branches/2017Q1/audio/wavpack/distinfo	(revision 434396)
+++ branches/2017Q1/audio/wavpack/distinfo	(revision 434397)
@@ -1,2 +1,3 @@
-SHA256 (wavpack-4.60.1.tar.bz2) = 175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5
-SIZE (wavpack-4.60.1.tar.bz2) = 394434
+TIMESTAMP = 1486392068
+SHA256 (wavpack-5.1.0.tar.bz2) = 1939627d5358d1da62bc6158d63f7ed12905552f3a799c799ee90296a7612944
+SIZE (wavpack-5.1.0.tar.bz2) = 824331
Index: branches/2017Q1/audio/wavpack/files/patch-src_wavpack__local.h
===================================================================
--- branches/2017Q1/audio/wavpack/files/patch-src_wavpack__local.h	(revision 434396)
+++ branches/2017Q1/audio/wavpack/files/patch-src_wavpack__local.h	(nonexistent)
@@ -1,22 +0,0 @@
---- src/wavpack_local.h.orig	2009-12-01 04:24:50 UTC
-+++ src/wavpack_local.h
-@@ -11,6 +11,10 @@
- #ifndef WAVPACK_LOCAL_H
- #define WAVPACK_LOCAL_H
- 
-+#ifndef __has_builtin
-+#define __has_builtin(x) 0
-+#endif
-+
- #if defined(WIN32)
- #define FASTCALL __fastcall
- #else
-@@ -768,7 +772,7 @@ typedef short __m64_16 __attribute__ ((_
- #define _m_paddd(m1, m2) __builtin_ia32_paddd (m1, m2)
- #define _m_pcmpeqd(m1, m2) __builtin_ia32_pcmpeqd (m1, m2)
- 
--#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4
-+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4 || __has_builtin(__builtin_ia32_pslldi)
- #	define _m_pslldi(m1, m2) __builtin_ia32_pslldi ((__m64)m1, m2)
- #	define _m_psradi(m1, m2) __builtin_ia32_psradi ((__m64)m1, m2)
- #	define _m_psrldi(m1, m2) __builtin_ia32_psrldi ((__m64)m1, m2)

Property changes on: branches/2017Q1/audio/wavpack/files/patch-src_wavpack__local.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2017Q1/audio/wavpack/files/patch-configure
===================================================================
--- branches/2017Q1/audio/wavpack/files/patch-configure	(nonexistent)
+++ branches/2017Q1/audio/wavpack/files/patch-configure	(revision 434397)
@@ -0,0 +1,11 @@
+--- configure.orig	2017-01-17 04:32:28 UTC
++++ configure
+@@ -13715,7 +13715,7 @@ $as_echo_n "checking if assembly optimiz
+   i386|i486|i586|i686|i786) :
+     $as_echo "#define OPT_ASM_X86 1" >>confdefs.h
+  asm_selected=x86 ;; #(
+-  x86_64) :
++  x86_64|amd64) :
+     $as_echo "#define OPT_ASM_X64 1" >>confdefs.h
+  asm_selected=x64 ;; #(
+   arm*) :

Property changes on: branches/2017Q1/audio/wavpack/files/patch-configure
___________________________________________________________________
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
Index: branches/2017Q1/audio/wavpack/pkg-plist
===================================================================
--- branches/2017Q1/audio/wavpack/pkg-plist	(revision 434396)
+++ branches/2017Q1/audio/wavpack/pkg-plist	(revision 434397)
@@ -1,12 +1,14 @@
 bin/wavpack
 bin/wvgain
+bin/wvtag
 bin/wvunpack
 include/wavpack/wavpack.h
 lib/libwavpack.a
 lib/libwavpack.so
 lib/libwavpack.so.1
-lib/libwavpack.so.1.1.4
+lib/libwavpack.so.1.2.0
 libdata/pkgconfig/wavpack.pc
 man/man1/wavpack.1.gz
 man/man1/wvgain.1.gz
+man/man1/wvtag.1.gz
 man/man1/wvunpack.1.gz
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 434396)
+++ branches/2017Q1	(revision 434397)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r434356