4 files changed, 34 insertions, 37 deletions
diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
index 981350ad4e3..3f51867e171 100644
--- a/archivers/zstd/Makefile
+++ b/archivers/zstd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2020/03/12 17:34:26 tnn Exp $
+# $NetBSD: Makefile,v 1.29 2020/06/14 13:51:55 adam Exp $
 
-DISTNAME=	zstd-1.4.4
+DISTNAME=	zstd-1.4.5
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=facebook/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/archivers/zstd/distinfo b/archivers/zstd/distinfo
index 0915f4393e1..5ffa4c5db0f 100644
--- a/archivers/zstd/distinfo
+++ b/archivers/zstd/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2019/11/06 17:13:08 adam Exp $
+$NetBSD: distinfo,v 1.24 2020/06/14 13:51:55 adam Exp $
 
-SHA1 (zstd-1.4.4.tar.gz) = 8ec1a47b704001c1804b8670a3c86f4baf035c07
-RMD160 (zstd-1.4.4.tar.gz) = 985ec5b18af21a520bb74df70a0f9e6c1b70b75f
-SHA512 (zstd-1.4.4.tar.gz) = 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
-Size (zstd-1.4.4.tar.gz) = 1962617 bytes
+SHA1 (zstd-1.4.5.tar.gz) = 9c344c2660c990b6d6a9cced73db3a0dfe2b0092
+RMD160 (zstd-1.4.5.tar.gz) = b7b9df3d4293eab050f84d2fc7f0a29c89905e87
+SHA512 (zstd-1.4.5.tar.gz) = b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
+Size (zstd-1.4.5.tar.gz) = 1987927 bytes
 SHA1 (patch-Makefile) = daf9d1946513ee24a4c4c187ec80878e9a578744
-SHA1 (patch-lib_Makefile) = ed367b656573b2ff05c9992f1e80338706aaf81d
-SHA1 (patch-programs_Makefile) = c7e961ce61ee5f0e81f1f31c55e7fb9be5a5b710
+SHA1 (patch-lib_Makefile) = 5005ffd50388520f69bd95012f696274e29fd3a9
+SHA1 (patch-programs_Makefile) = 2500df468c2994f1b33165c5d2774817bdc8addc
 SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec
diff --git a/archivers/zstd/patches/patch-lib_Makefile b/archivers/zstd/patches/patch-lib_Makefile
index 7c660b4aa40..1f270109126 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.8 2018/10/22 15:28:03 adam Exp $
+$NetBSD: patch-lib_Makefile,v 1.9 2020/06/14 13:51:55 adam 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	2018-10-17 03:58:52.000000000 +0000
+--- lib/Makefile.orig	2020-05-22 05:04:00.000000000 +0000
 +++ lib/Makefile
-@@ -82,6 +82,40 @@ CPPFLAGS  += -DZSTD_LEGACY_SUPPORT=$(ZST
+@@ -165,6 +165,40 @@ CPPFLAGS  += -DZSTD_LEGACY_SUPPORT=$(ZST
  
  ZSTD_OBJ   := $(patsubst %.c,%.o,$(ZSTD_FILES))
  
@@ -48,7 +48,7 @@ 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 ($(shell uname), Darwin)
-@@ -122,7 +156,8 @@ $(LIBZSTD): $(ZSTD_FILES)
+@@ -204,7 +238,8 @@ $(LIBZSTD): $(ZSTD_FILES)
  else
  
  LIBZSTD = libzstd.$(SHARED_EXT_VER)
@@ -57,18 +57,18 @@ Fix pkgconfig installation path.
 +$(LIBZSTD): LDFLAGS += -shared -fPIC $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
  $(LIBZSTD): $(ZSTD_FILES)
  	@echo compiling dynamic library $(LIBVER)
- 	@$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
-@@ -166,7 +201,6 @@ clean:
+ 	$(Q)$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
+@@ -251,7 +286,6 @@ clean:
  #-----------------------------------------------------------------------------
- # make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets
+ # make install is validated only for below listed environments
  #-----------------------------------------------------------------------------
 -ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
  
- DESTDIR     ?=
- # directory variables : GNU conventions prefer lowercase
-@@ -180,11 +214,7 @@ LIBDIR      ?= $(libdir)
- includedir  ?= $(PREFIX)/include
- INCLUDEDIR  ?= $(includedir)
+ all: libzstd.pc
+ 
+@@ -287,11 +321,7 @@ $(error configured includedir ($(INCLUDE
+ endif
+ endif
  
 -ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
 -PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
@@ -78,8 +78,8 @@ Fix pkgconfig installation path.
  
  ifneq (,$(filter $(shell uname),SunOS))
  INSTALL ?= ginstall
-@@ -244,4 +274,3 @@ uninstall:
- 	@$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
+@@ -351,4 +381,3 @@ uninstall:
+ 	$(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
  	@echo zstd libraries successfully uninstalled
  
 -endif
diff --git a/archivers/zstd/patches/patch-programs_Makefile b/archivers/zstd/patches/patch-programs_Makefile
index cae968b4450..cc620ed91ca 100644
--- a/archivers/zstd/patches/patch-programs_Makefile
+++ b/archivers/zstd/patches/patch-programs_Makefile
@@ -1,24 +1,21 @@
-$NetBSD: patch-programs_Makefile,v 1.6 2019/05/01 08:24:58 wiz Exp $
+$NetBSD: patch-programs_Makefile,v 1.7 2020/06/14 13:51:55 adam Exp $
 
 Use zstd shared library.
 
---- programs/Makefile.orig	2019-04-16 22:37:24.000000000 +0000
+--- programs/Makefile.orig	2020-05-22 05:04:00.000000000 +0000
 +++ programs/Makefile
-@@ -165,7 +165,7 @@ $(ZSTDDECOMP_O): CFLAGS += $(ALIGN_LOOP)
- zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
- zstd : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD)
- zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
--zstd : $(ZSTDLIB_FILES) zstdcli.o util.o timefn.o fileio.o benchfn.o benchzstd.o datagen.o dibio.o
-+zstd : zstdcli.o util.o timefn.o fileio.o benchfn.o benchzstd.o datagen.o dibio.o
+@@ -172,12 +172,12 @@ zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT
+ ifneq (,$(filter Windows%,$(OS)))
+ zstd : $(RES_FILE)
+ endif
+-zstd : $(ZSTDLIB_FILES) $(ZSTD_CLI_OBJ)
++zstd : $(ZSTD_CLI_OBJ)
  	@echo "$(THREAD_MSG)"
  	@echo "$(ZLIB_MSG)"
  	@echo "$(LZMA_MSG)"
-@@ -173,7 +173,7 @@ zstd : $(ZSTDLIB_FILES) zstdcli.o util.o
- ifneq (,$(filter Windows%,$(OS)))
- 	windres/generate_res.bat
- endif
--	$(CC) $(FLAGS) $^ $(RES_FILE) -o $@$(EXT) $(LDFLAGS)
-+	$(CC) $(FLAGS) $^ $(RES_FILE) -o $@$(EXT) $(LDFLAGS) -L$(ZSTDDIR) -lzstd
+ 	@echo "$(LZ4_MSG)"
+-	$(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS)
++	$(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS) -L$(ZSTDDIR) -lzstd
  
  .PHONY: zstd-release
  zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0