zstd: Update to 1.4.9

Changelog:
    bug: Use umask() to Constrain Created File Permissions (#2495, @felixhandte)
    bug: Make Simple Single-Pass Functions Ignore Advanced Parameters (#2498, @terrelln)
    api: Add (De)Compression Tracing Functionality (#2482, @terrelln)
    api: Support References to Multiple DDicts (#2446, @senhuang42)
    api: Add Function to Generate Skippable Frame (#2439, @senhuang42)
    perf: New Algorithms for the Long Distance Matcher (#2483, @mpu)
    perf: Performance Improvements for Long Distance Matcher (#2464, @mpu)
    perf: Don't Shrink Window Log when Streaming with a Dictionary (#2451, @terrelln)
    cli: Fix --output-dir-mirror's Rejection of ..-Containing Paths (#2512, @felixhandte)
    cli: Allow Input From Console When -f/--force is Passed (#2466, @felixhandte)
    cli: Improve Help Message (#2500, @senhuang42)
    tests: Avoid Using stat -c on NetBSD (#2513, @felixhandte)
    tests: Correctly Invoke md5 Utility on NetBSD (#2492, @niacat)
    tests: Remove Flaky Tests (#2455, #2486, #2445, @Cyan4973)
    build: Zstd CLI Can Now be Linked to Dynamic libzstd (#2457, #2454 @Cyan4973)
    build: Avoid Using Static-Only Symbols (#2504, @skitt)
    build: Fix Fuzzer Compiler Detection & Update UBSAN Flags (#2503, @terrelln)
    build: Explicitly Hide Static Symbols (#2501, @skitt)
    build: CMake: Enable Only C for lib/ and programs/ Projects (#2498, @concatime)
    build: CMake: Use configure_file() to Create the .pc File (#2462, @lazka)
    build: Add Guards for _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE (#2444, @indygreg)
    build: Improve zlibwrapper Makefile (#2437, @Cyan4973)
    contrib: Add recover_directory Program (#2473, @terrelln)
    doc: Change License Year to 2021 (#2452 & #2465, @terrelln & @senhuang42)
    doc: Fix Typos (#2459, @ThomasWaldmann)

5 files changed, 20 insertions, 53 deletions

diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
index 8ac88fe7461..59df22a2822 100644
--- a/archivers/zstd/Makefile
+++ b/archivers/zstd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2021/03/31 13:26:06 nros Exp $
+# $NetBSD: Makefile,v 1.40 2021/04/05 10:12:38 ryoon Exp $
 
-DISTNAME=	zstd-1.4.8
+DISTNAME=	zstd-1.4.9
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=facebook/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -20,7 +20,7 @@ CHECK_PORTABILITY_SKIP+=	tests/playTests.sh
 # ld: ../lib/libzstd.a: error adding symbols: file format not recognized
 # reported as
 # https://github.com/facebook/zstd/issues/2453
-MAKE_JOBS_SAFE=		no
+#MAKE_JOBS_SAFE=		no
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/archivers/zstd/distinfo b/archivers/zstd/distinfo
index c1053d75f16..137416d21c5 100644
--- a/archivers/zstd/distinfo
+++ b/archivers/zstd/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.27 2021/02/27 16:40:59 wiz Exp $
+$NetBSD: distinfo,v 1.28 2021/04/05 10:12:38 ryoon Exp $
 
-SHA1 (zstd-1.4.8.tar.gz) = e3027d788b964429c773fab05e000061dc6eb3f6
-RMD160 (zstd-1.4.8.tar.gz) = 94aa90fff2a52a5c0314a19d2a59903ac760eada
-SHA512 (zstd-1.4.8.tar.gz) = 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a
-Size (zstd-1.4.8.tar.gz) = 1816546 bytes
+SHA1 (zstd-1.4.9.tar.gz) = 28f82bf3e258c7eeacfa105d0af354140d0df059
+RMD160 (zstd-1.4.9.tar.gz) = c6fc59c14f83439d1ef0ab8255d370172ae5dae5
+SHA512 (zstd-1.4.9.tar.gz) = f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
+Size (zstd-1.4.9.tar.gz) = 1834843 bytes
 SHA1 (patch-Makefile) = e1e702cd3b461d432e25909fdcf01cc51c769a8a
-SHA1 (patch-lib_Makefile) = 8d31689c4bf9dd97b82f01396ef6b58cb29fd80e
-SHA1 (patch-programs_Makefile) = 9d57ba124fc2b243d6fcb8bfb744c2d39ac89e0e
+SHA1 (patch-lib_Makefile) = 1f1497becc67d59069875460b8d0dd049f23037f
 SHA1 (patch-tests_Makefile) = b83de10222859d656468463071dbce70adcc22b1
-SHA1 (patch-tests_playTests.sh) = 0441092d88e650bce21f5728a9984da71bdbf5d9
+SHA1 (patch-tests_playTests.sh) = 349f8e400f46b5914add4aee955a040045f62779
 SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec
diff --git a/archivers/zstd/patches/patch-lib_Makefile b/archivers/zstd/patches/patch-lib_Makefile
index dd4b7137710..f3987b90d53 100644
--- a/archivers/zstd/patches/patch-lib_Makefile
+++ b/archivers/zstd/patches/patch-lib_Makefile
@@ -1,13 +1,13 @@
-$NetBSD: patch-lib_Makefile,v 1.11 2021/01/03 14:55:50 adam Exp $
+$NetBSD: patch-lib_Makefile,v 1.12 2021/04/05 10:12:38 ryoon Exp $
 
 Detect and use third-party libraries (taken from programs/Makefile).
 -fvisibility=hidden makes error when linking.
 Enable the "install" target on all OS.
 Fix pkgconfig installation path.
 
---- lib/Makefile.orig	2020-12-19 00:39:42.000000000 +0000
+--- lib/Makefile.orig	2021-03-02 22:20:57.000000000 +0000
 +++ lib/Makefile
-@@ -193,6 +193,43 @@ endif
+@@ -195,6 +195,43 @@ endif
  endif # BUILD_DIR
  
  
@@ -51,11 +51,11 @@ Fix pkgconfig installation path.
  # macOS linker doesn't support -soname, and use different extension
  # see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
  ifeq ($(UNAME), Darwin)
-@@ -259,7 +296,8 @@ else  # not Windows
+@@ -258,7 +295,8 @@ else  # not Windows
  LIBZSTD = libzstd.$(SHARED_EXT_VER)
  .PHONY: $(LIBZSTD)  # must be run every time
- $(LIBZSTD): CFLAGS += -fPIC
--$(LIBZSTD): LDFLAGS += -shared -fvisibility=hidden
+ $(LIBZSTD): CFLAGS += -fPIC -fvisibility=hidden
+-$(LIBZSTD): LDFLAGS += -shared
 +$(LIBZSTD): CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
 +$(LIBZSTD): LDFLAGS += -shared $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
  
@@ -81,7 +81,7 @@ Fix pkgconfig installation path.
  
  ifneq (,$(filter $(UNAME),SunOS))
    INSTALL ?= ginstall
-@@ -448,4 +481,3 @@ uninstall:
+@@ -450,4 +483,3 @@ uninstall:
  	$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
  	@echo zstd libraries successfully uninstalled
  
diff --git a/archivers/zstd/patches/patch-programs_Makefile b/archivers/zstd/patches/patch-programs_Makefile
deleted file mode 100644
index 722cc238a13..00000000000
--- a/archivers/zstd/patches/patch-programs_Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-programs_Makefile,v 1.8 2021/01/03 14:55:50 adam Exp $
-
-Use zstd shared library.
-
---- programs/Makefile.orig	2020-12-19 00:39:42.000000000 +0000
-+++ programs/Makefile
-@@ -222,14 +222,14 @@ zstd:
- else
- # BUILD_DIR is defined
- 
--ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ))
-+ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_CLI_OBJ))
- $(BUILD_DIR)/zstd : $(ZSTD_OBJ)
- 	@echo "$(THREAD_MSG)"
- 	@echo "$(ZLIB_MSG)"
- 	@echo "$(LZMA_MSG)"
- 	@echo "$(LZ4_MSG)"
- 	@echo LINK $@
--	$(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS)
-+	$(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS) -L$(ZSTDDIR) -lzstd
- 
- ifeq ($(HAVE_HASH),1)
- SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ")
diff --git a/archivers/zstd/patches/patch-tests_playTests.sh b/archivers/zstd/patches/patch-tests_playTests.sh
index 709292e41d0..4bc89c34c16 100644
--- a/archivers/zstd/patches/patch-tests_playTests.sh
+++ b/archivers/zstd/patches/patch-tests_playTests.sh
@@ -1,10 +1,10 @@
-$NetBSD: patch-tests_playTests.sh,v 1.1 2021/02/27 16:40:59 wiz Exp $
+$NetBSD: patch-tests_playTests.sh,v 1.2 2021/04/05 10:12:38 ryoon Exp $
 
 Fix md5 call on NetBSD.
 Fix stat arguments on NetBSD.
 https://github.com/facebook/zstd/issues/2493
 
---- tests/playTests.sh.orig	2020-12-19 00:39:42.000000000 +0000
+--- tests/playTests.sh.orig	2021-03-02 22:20:57.000000000 +0000
 +++ tests/playTests.sh
 @@ -113,6 +113,7 @@ esac
  
@@ -12,14 +12,5 @@ https://github.com/facebook/zstd/issues/2493
    Darwin) MD5SUM="md5 -r" ;;
 +  NetBSD) MD5SUM="md5 -n" ;;
    FreeBSD) MD5SUM="gmd5sum" ;;
+   NetBSD) MD5SUM="md5 -n" ;;
    OpenBSD) MD5SUM="md5" ;;
-   *) MD5SUM="md5sum" ;;
-@@ -120,7 +121,7 @@ esac
- 
- MTIME="stat -c %Y"
- case "$UNAME" in
--    Darwin | FreeBSD | OpenBSD) MTIME="stat -f %m" ;;
-+    Darwin | FreeBSD | OpenBSD | NetBSD) MTIME="stat -f %m" ;;
- esac
- 
- DIFF="diff"