Enclosed diff brings zstd to 1.3.8, which introduces a couple of new
features. Changelog can be found at
https://raw.githubusercontent.com/facebook/zstd/master/CHANGELOG
Major of SHARED_LIBS has been bumped as symbols have been removed. A
patch has been dropped as issue has been addressed upstream.
Build tested the consumers, and run tested in combination with
libarchive and borgbackup. 'make test' runs successfully.
OK?
Index: zstd/Makefile
===================================================================
RCS file: /cvs/ports/archivers/zstd/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- zstd/Makefile 24 Oct 2018 04:58:20 -0000 1.21
+++ zstd/Makefile 28 Dec 2018 18:49:48 -0000
@@ -2,10 +2,10 @@
COMMENT = zstandard fast real-time compression algorithm
-V = 1.3.7
+V = 1.3.8
DISTNAME = zstd-${V}
-SHARED_LIBS = zstd 1.2 # 1.3.6
+SHARED_LIBS = zstd 2.0 # 1.3.8
CATEGORIES = archivers
Index: zstd/distinfo
===================================================================
RCS file: /cvs/ports/archivers/zstd/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- zstd/distinfo 24 Oct 2018 04:58:20 -0000 1.13
+++ zstd/distinfo 28 Dec 2018 18:49:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.3.7.tar.gz) = MnfyNt8Mpu2uAa6E6GVHAADFo0hFiP1bw9hph3/TVz0=
-SIZE (zstd-1.3.7.tar.gz) = 1813285
+SHA256 (zstd-1.3.8.tar.gz) = KT+gBN+s++kLQmYMR0kg/ycJPj+2yZ97duYIOyHW1I4=
+SIZE (zstd-1.3.8.tar.gz) = 1862954
Index: zstd/patches/patch-lib_Makefile
===================================================================
RCS file: /cvs/ports/archivers/zstd/patches/patch-lib_Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_Makefile
--- zstd/patches/patch-lib_Makefile 16 Oct 2018 14:56:34 -0000 1.3
+++ zstd/patches/patch-lib_Makefile 28 Dec 2018 18:49:48 -0000
@@ -3,16 +3,7 @@ $OpenBSD: patch-lib_Makefile,v 1.3 2018/
Index: lib/Makefile
--- lib/Makefile.orig
+++ lib/Makefile
-@@ -31,7 +31,7 @@ DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Ws
- CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
- FLAGS = $(CPPFLAGS) $(CFLAGS)
-
--GREP = grep --color=never
-+GREP = grep
-
- ZSTDCOMMON_FILES := $(sort $(wildcard common/*.c))
- ZSTDCOMP_FILES := $(sort $(wildcard compress/*.c))
-@@ -90,10 +90,10 @@ ifeq ($(shell uname), Darwin)
+@@ -125,10 +125,10 @@ ifeq ($(shell uname), Darwin)
SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
SONAME_FLAGS = -install_name $(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
-compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
else
@@ -25,7 +16,7 @@ Index: lib/Makefile
endif
-@@ -106,7 +106,7 @@ all: lib
+@@ -141,7 +141,7 @@ all: lib
libzstd.a: ARFLAGS = rcs
libzstd.a: $(ZSTD_OBJ)
@echo compiling static library
@@ -34,7 +25,7 @@ Index: lib/Makefile
libzstd.a-mt: CPPFLAGS += -DZSTD_MULTITHREAD
libzstd.a-mt: libzstd.a
-@@ -125,7 +125,7 @@ LIBZSTD = libzstd.$(SHARED_EXT_VER)
+@@ -160,7 +160,7 @@ LIBZSTD = libzstd.$(SHARED_EXT_VER)
$(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
$(LIBZSTD): $(ZSTD_FILES)
@echo compiling dynamic library $(LIBVER)
@@ -43,7 +34,7 @@ Index: lib/Makefile
@echo creating versioned links
@ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
@ln -sf $@ libzstd.$(SHARED_EXT)
-@@ -221,8 +221,6 @@ install-shared: libzstd
+@@ -256,8 +256,6 @@ install-shared: libzstd
@echo Installing shared library
@$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
@$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
Index: zstd/patches/patch-programs_Makefile
===================================================================
RCS file: zstd/patches/patch-programs_Makefile
diff -N zstd/patches/patch-programs_Makefile
--- zstd/patches/patch-programs_Makefile 16 Oct 2018 14:56:34 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-programs_Makefile,v 1.1 2018/10/16 14:56:34 bket Exp $
-
-Index: programs/Makefile
---- programs/Makefile.orig
-+++ programs/Makefile
-@@ -29,7 +29,7 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT))
-
- ZSTD_VERSION = $(LIBVER)
-
--GREP = grep --color=never
-+GREP = grep
-
- ifeq ($(shell $(CC) -v 2>&1 | $(GREP) -c "gcc version "), 1)
- ALIGN_LOOP = -falign-loops=32
