archivers/zstd: Upgrade version 0.7.4 => 0.8.0

6 files changed, 12 insertions, 37 deletions

diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
index cdea4298e528..d2d1f90beffa 100644
--- a/archivers/zstd/Makefile
+++ b/archivers/zstd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zstd
-PORTVERSION=	0.7.4
+PORTVERSION=	0.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers
 
@@ -16,6 +16,7 @@ USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cyan4973
 
+PLIST_SUB=	LIBVER=${PORTVERSION}
 ALL_TARGET=	default
 MAKE_ARGS=	MANDIR="${PREFIX}/man/man1" \
 		LIBDIR="${PREFIX}/lib" \
diff --git a/archivers/zstd/distinfo b/archivers/zstd/distinfo
index bea32ac360d6..e326839289c4 100644
--- a/archivers/zstd/distinfo
+++ b/archivers/zstd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469858423
-SHA256 (Cyan4973-zstd-v0.7.4_GH0.tar.gz) = 35ab3a5084d0194e9ff08e702edb6f507eab1bfb8c09c913639241cec852e2b7
-SIZE (Cyan4973-zstd-v0.7.4_GH0.tar.gz) = 567830
+TIMESTAMP = 1470041319
+SHA256 (Cyan4973-zstd-v0.8.0_GH0.tar.gz) = 297ef978fd956a503de6a303f7d58714de3300f602c7cf5e4b382a82f1483051
+SIZE (Cyan4973-zstd-v0.8.0_GH0.tar.gz) = 596389
diff --git a/archivers/zstd/files/patch-Makefile b/archivers/zstd/files/patch-Makefile
deleted file mode 100644
index d9c8b0844252..000000000000
--- a/archivers/zstd/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2016-07-16 18:17:53 UTC
-+++ Makefile
-@@ -73,7 +73,7 @@ clean:
- #------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
- #------------------------------------------------------------------------
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly))
- HOST_OS = POSIX
- install:
- 	$(MAKE) -C $(ZSTDDIR) $@
diff --git a/archivers/zstd/files/patch-lib_Makefile b/archivers/zstd/files/patch-lib_Makefile
index 35d252521c75..e4c355e1bb47 100644
--- a/archivers/zstd/files/patch-lib_Makefile
+++ b/archivers/zstd/files/patch-lib_Makefile
@@ -1,15 +1,6 @@
---- lib/Makefile.orig	2016-07-16 18:17:53 UTC
+--- lib/Makefile.orig	2016-08-01 07:51:18 UTC
 +++ lib/Makefile
-@@ -99,7 +99,7 @@ clean:
- 
- #------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly))
- 
- libzstd.pc:
- libzstd.pc: libzstd.pc.in
-@@ -111,15 +111,15 @@ libzstd.pc: libzstd.pc.in
+@@ -113,15 +113,15 @@ libzstd.pc: libzstd.pc.in
               $< >$@
  
  install: libzstd libzstd.pc
@@ -19,7 +10,7 @@
 -	@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 common/zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
+-	@install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
 -	@install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
 -	@install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
 +	@install -d -m 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
@@ -28,7 +19,7 @@
 +	@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) common/zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
++	@$(BSD_INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
 +	@$(BSD_INSTALL_DATA) common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
 +	@$(BSD_INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
  	@echo zstd static and shared library installed
diff --git a/archivers/zstd/files/patch-programs_Makefile b/archivers/zstd/files/patch-programs_Makefile
index e09f327ccff8..2aad755fb127 100644
--- a/archivers/zstd/files/patch-programs_Makefile
+++ b/archivers/zstd/files/patch-programs_Makefile
@@ -1,12 +1,6 @@
---- programs/Makefile.orig	2016-07-16 18:17:53 UTC
+--- programs/Makefile.orig	2016-08-01 07:51:18 UTC
 +++ programs/Makefile
-@@ -157,16 +157,16 @@ clean:
- #---------------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD, Hurd and OpenBSD targets
- #---------------------------------------------------------------------------------
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly))
- HOST_OS = POSIX
+@@ -181,11 +181,11 @@ HOST_OS = POSIX
  install: zstd
  	@echo Installing binaries
  	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
diff --git a/archivers/zstd/pkg-plist b/archivers/zstd/pkg-plist
index cad7c7f0bed5..286b3e8a86c9 100644
--- a/archivers/zstd/pkg-plist
+++ b/archivers/zstd/pkg-plist
@@ -7,7 +7,7 @@ include/zstd.h
 lib/libzstd.a
 lib/libzstd.so
 lib/libzstd.so.0
-lib/libzstd.so.0.7.4
+lib/libzstd.so.%%LIBVER%%
 libdata/pkgconfig/libzstd.pc
 man/man1/unzstd.1.gz
 man/man1/zstd.1.gz