archivers/zstd: Upgrade version 1.1.1 => 1.1.2

Also revert r425457, since upstream fixed the jobs unsafety.

Approved by:	marino (maintainer)
MFH:		2016Q4

5 files changed, 29 insertions, 24 deletions

diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
index 6e9caf283811..b64c95b7fa34 100644
--- a/archivers/zstd/Makefile
+++ b/archivers/zstd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zstd
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers
 
@@ -23,6 +23,5 @@ MAKE_ARGS=	MANDIR="${PREFIX}/man/man1" \
 		INCLUDEDIR="${PREFIX}/include"
 
 BROKEN_FreeBSD_9=	missing builtin bswap32 and bswap64
-MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/archivers/zstd/distinfo b/archivers/zstd/distinfo
index 6aa0d64ae4c4..f49fd4a61291 100644
--- a/archivers/zstd/distinfo
+++ b/archivers/zstd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478078796
-SHA256 (facebook-zstd-v1.1.1_GH0.tar.gz) = a92965a2480fecc6b7bf491106e93cbf69a298b865b6d623755b3a482d77e614
-SIZE (facebook-zstd-v1.1.1_GH0.tar.gz) = 734872
+TIMESTAMP = 1482085591
+SHA256 (facebook-zstd-v1.1.2_GH0.tar.gz) = 980b8febb0118e22f6ed70d23b5b3e600995dbf7489c1f6d6122c1411cdda8d8
+SIZE (facebook-zstd-v1.1.2_GH0.tar.gz) = 769017
diff --git a/archivers/zstd/files/patch-lib_Makefile b/archivers/zstd/files/patch-lib_Makefile
index 0c8080ba2a4d..59c2e81e306e 100644
--- a/archivers/zstd/files/patch-lib_Makefile
+++ b/archivers/zstd/files/patch-lib_Makefile
@@ -1,29 +1,29 @@
 --- lib/Makefile.orig	2016-11-01 18:13:22 UTC
 +++ lib/Makefile
-@@ -90,16 +90,16 @@ libzstd.pc: libzstd.pc.in
+@@ -106,16 +106,16 @@ libzstd.pc: libzstd.pc.in
               $< >$@
  
- install: libzstd libzstd.pc
+ install: libzstd.a libzstd libzstd.pc
 -	@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
--	@install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+-	@install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
 -	@cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
 -	@cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
 -	@cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
--	@install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
--	@install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
--	@install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
--	@install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h   # Deprecated streaming functions
--	@install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+-	@install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)
+-	@install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)
+-	@install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
+-	@install -m 644 deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
+-	@install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
 +	@install -d -m 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-+	@$(BSD_INSTALL_LIB) libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
++	@$(BSD_INSTALL_LIB) libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
 +	@ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
 +	@ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
 +	@$(BSD_INSTALL_DATA) libzstd.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
-+	@$(BSD_INSTALL_LIB) libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
-+	@$(BSD_INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+	@$(BSD_INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
-+	@$(BSD_INSTALL_DATA) common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h   # Deprecated streaming functions
-+	@$(BSD_INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
++	@$(BSD_INSTALL_LIB) libzstd.a $(DESTDIR)$(LIBDIR)
++	@$(BSD_INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
++	@$(BSD_INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
++	@$(BSD_INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
++	@$(BSD_INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
  	@echo zstd static and shared library installed
  
  uninstall:
diff --git a/archivers/zstd/files/patch-programs_Makefile b/archivers/zstd/files/patch-programs_Makefile
index 5d62a6a2fa03..df38a8533bbe 100644
--- a/archivers/zstd/files/patch-programs_Makefile
+++ b/archivers/zstd/files/patch-programs_Makefile
@@ -1,13 +1,17 @@
 --- programs/Makefile.orig	2016-08-31 16:09:10 UTC
 +++ programs/Makefile
-@@ -129,11 +129,11 @@ ifneq (,$(filter $(shell uname),Linux Da
+@@ -157,13 +157,13 @@ ifneq (,$(filter $(shell uname),Linux Da
  install: zstd
  	@echo Installing binaries
  	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
--	@install -m 755 zstd$(EXT) $(DESTDIR)$(BINDIR)/zstd$(EXT)
-+	@$(BSD_INSTALL_PROGRAM) zstd$(EXT) $(DESTDIR)$(BINDIR)/zstd$(EXT)
- 	@ln -sf zstd$(EXT) $(DESTDIR)$(BINDIR)/zstdcat
- 	@ln -sf zstd$(EXT) $(DESTDIR)$(BINDIR)/unzstd
+-	@install -m 755 zstd $(DESTDIR)$(BINDIR)/zstd
++	@$(BSD_INSTALL_PROGRAM) zstd $(DESTDIR)$(BINDIR)/zstd
+ 	@ln -sf zstd $(DESTDIR)$(BINDIR)/zstdcat
+ 	@ln -sf zstd $(DESTDIR)$(BINDIR)/unzstd
+-	@install -m 755 zstdless $(DESTDIR)$(BINDIR)/zstdless
+-	@install -m 755 zstdgrep $(DESTDIR)$(BINDIR)/zstdgrep
++	@$(BSD_INSTALL_SCRIPT) zstdless $(DESTDIR)$(BINDIR)/zstdless
++	@$(BSD_INSTALL_SCRIPT) zstdgrep $(DESTDIR)$(BINDIR)/zstdgrep
  	@echo Installing man pages
 -	@install -m 644 zstd.1 $(DESTDIR)$(MANDIR)/zstd.1
 +	@$(BSD_INSTALL_MAN) zstd.1 $(DESTDIR)$(MANDIR)/zstd.1
diff --git a/archivers/zstd/pkg-plist b/archivers/zstd/pkg-plist
index 0db2e90f3bc8..15173690184d 100644
--- a/archivers/zstd/pkg-plist
+++ b/archivers/zstd/pkg-plist
@@ -1,6 +1,8 @@
 bin/unzstd
 bin/zstd
 bin/zstdcat
+bin/zstdgrep
+bin/zstdless
 include/zbuff.h
 include/zdict.h
 include/zstd.h