@@ -, +, @@ 
---
 archivers/zstd/Makefile                      | 29 ++++++++++++--------
 archivers/zstd/distinfo                      |  6 ++--
 archivers/zstd/files/patch-tests_meson.build | 19 +++++++++++++
 archivers/zstd/pkg-plist                     |  2 ++
 4 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 archivers/zstd/files/patch-tests_meson.build
--- b/archivers/zstd/Makefile	
+++ b/archivers/zstd/Makefile	
@@ -3,35 +3,42 @@ 
 
 PORTNAME=	zstd
 PORTVERSION=	1.4.5
-DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	archivers
+MASTER_SITES=	https://github.com/facebook/zstd/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast real-time compression algorithm
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
-LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/../../LICENSE
+LICENSE_FILE_GPLv2=	${WRKSRC}/../../COPYING
 
-OPTIONS_DEFINE=	LZ4
+TEST_DEPENDS=	gmd5sum:sysutils/coreutils
+
+USES=		meson pkgconfig python:3.4+,build shebangfix
+
+SHEBANG_FILES=	GetZstdLibraryVersion.py \
+		InstallSymlink.py \
+
+OPTIONS_DEFINE=	LZ4 OPTIMIZED_CFLAGS TEST
 OPTIONS_DEFAULT=LZ4
 
-USES=		gmake
+MESON_ARGS=	-Ddefault_library=both
 
-ALL_TARGET=	default
-TEST_TARGET=	test
 USE_LDCONFIG=	yes
 
+WRKSRC_SUBDIR=	build/meson
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-GH_ACCOUNT=	facebook
-USE_GITHUB=	yes
+OPTIMIZED_CFLAGS_VARS=	CFLAGS+=-O3
 
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 LZ4_USES=		localbase:ldflags
+LZ4_MESON_ENABLED=	lz4
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|INSTALL_|BSD_&|' ${WRKSRC}/lib/Makefile ${WRKSRC}/programs/Makefile
+TEST_MESON_TRUE=	bin_tests
 
 .include <bsd.port.mk>
--- b/archivers/zstd/distinfo	
+++ b/archivers/zstd/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1590421090
-SHA256 (facebook-zstd-v1.4.5_GH0.tar.gz) = 734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
-SIZE (facebook-zstd-v1.4.5_GH0.tar.gz) = 1987927
+TIMESTAMP = 1596179551
+SHA256 (zstd-1.4.5.tar.gz) = 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e
+SIZE (zstd-1.4.5.tar.gz) = 1973695
--- /dev/null	
+++ b/archivers/zstd/files/patch-tests_meson.build	
@@ -0,0 +1,19 @@ 
+--- tests/meson.build.orig	2020-06-08 14:30:42 UTC
++++ tests/meson.build
+@@ -143,16 +143,6 @@ checkTag = executable('checkTag',
+ # Tests (Use "meson test --list" to list all tests)
+ # =============================================================================
+ 
+-if tests_supported_oses.contains(host_machine_os)
+-  valgrind_prog = find_program('valgrind', ['/usr/bin/valgrind'], required: true)
+-  valgrindTest_py = files('valgrindTest.py')
+-  test('valgrindTest',
+-    valgrindTest_py,
+-    args: [valgrind_prog.path(), zstd, datagen, fuzzer, fullbench],
+-    depends: [zstd, datagen, fuzzer, fullbench],
+-    timeout: 600) # Timeout should work on HDD drive
+-endif
+-
+ if host_machine_os != os_windows
+   playTests_sh = find_program(join_paths(zstd_rootdir, 'tests/playTests.sh'), required: true)
+   test('test-zstd',
--- b/archivers/zstd/pkg-plist	
+++ b/archivers/zstd/pkg-plist	
@@ -1,5 +1,6 @@ 
 bin/unzstd
 bin/zstd
+bin/zstd-frugal
 bin/zstdcat
 bin/zstdgrep
 bin/zstdless
@@ -18,3 +19,4 @@ man/man1/zstd.1.gz
 man/man1/zstdcat.1.gz
 man/man1/zstdgrep.1.gz
 man/man1/zstdless.1.gz
+man/man1/zstdmt.1.gz
--