LZ4 v1.8.0

cli : fix : do not modify /dev/null permissions, reported by @Maokaman1
cli : added GNU separator -- specifying that all following arguments are files
cli : restored -BX command enabling block checksum
API : added LZ4_compress_HC_destSize(), by @remittor
API : added LZ4F_resetDecompressionContext()
API : lz4frame : negative compression levels trigger fast acceleration, request by @llchan
API : lz4frame : can control block checksum and dictionary ID
API : fix : expose obsolete decoding functions, reported by @cyfdecyf
API : experimental : lz4frame_static.h : new dictionary compression API
build : fix : static lib installation, by @ido
build : dragonFlyBSD, OpenBSD, NetBSD supported
build : LZ4_MEMORY_USAGE can be modified at compile time, through external define
doc : Updated LZ4 Frame format to v1.6.0, restoring Dictionary-ID field in header
doc : lz4's API manual in .html format, by @inikep

6 files changed, 65 insertions, 66 deletions

diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile
index 2b61956d50b..0bc33fe933f 100644
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2017/01/04 15:43:51 fhajny Exp $
+# $NetBSD: Makefile,v 1.10 2017/08/19 14:54:25 adam Exp $
 
-DISTNAME=	lz4-1.7.5
+DISTNAME=	lz4-1.8.0
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lz4/}
 
@@ -11,9 +11,11 @@ LICENSE=	2-clause-bsd
 
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-USE_LANGUAGES=	c c99
-USE_TOOLS+=	gmake pkg-config
+USE_LANGUAGES=		c99 c++
+USE_TOOLS+=		gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=	lib/liblz4.pc.in
 
+TEST_TARGET=		test
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/lz4/PLIST b/archivers/lz4/PLIST
index f7c02f72729..ae22c108a8d 100644
--- a/archivers/lz4/PLIST
+++ b/archivers/lz4/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2017/01/04 15:43:51 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/08/19 14:54:25 adam Exp $
 bin/lz4
 bin/lz4c
 bin/lz4cat
 bin/unlz4
 include/lz4.h
 include/lz4frame.h
+include/lz4frame_static.h
 include/lz4hc.h
 lib/liblz4.a
 lib/liblz4.so
diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo
index 234368e5c7f..cceb0034b9b 100644
--- a/archivers/lz4/distinfo
+++ b/archivers/lz4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2017/01/05 11:07:55 wiz Exp $
+$NetBSD: distinfo,v 1.12 2017/08/19 14:54:25 adam Exp $
 
-SHA1 (lz4-1.7.5.tar.gz) = a710a7d45beb0951806d2b98f0c1739107e97c14
-RMD160 (lz4-1.7.5.tar.gz) = ff25713033480dead389241f572f327cb6afe175
-SHA512 (lz4-1.7.5.tar.gz) = b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295
-Size (lz4-1.7.5.tar.gz) = 208019 bytes
-SHA1 (patch-Makefile) = 8519985405e6f2c0ef63cc39129b00c9867382f9
-SHA1 (patch-lib_Makefile) = cb2abb05aacc760395ae1d17e0af7ba6fba04419
-SHA1 (patch-programs_Makefile) = 1bf3864515a1276cbad516ebd519caa918b847b2
+SHA1 (lz4-1.8.0.tar.gz) = 3ef95c78f14ac26a806518846e4a24a2b0d825b4
+RMD160 (lz4-1.8.0.tar.gz) = 7754463e2aa30c4f429087368931d297fd4e72ab
+SHA512 (lz4-1.8.0.tar.gz) = aea46d4a900a3ede7dd7b498ee938ecd98397d3277c5b3a85b4236a44777cba85cd68a2f32c993b872afda96c5dafe0cb3dd391101fe8181e17c9f48884c1535
+Size (lz4-1.8.0.tar.gz) = 222840 bytes
+SHA1 (patch-Makefile) = 5fe6f084b772e139469817b20187c99f4f64160d
+SHA1 (patch-lib_Makefile) = e2d252feeeed177baf161d2929e5e0e58b1d10ce
+SHA1 (patch-programs_Makefile) = dbae583a44aa788302ac9320208808ed55944119
diff --git a/archivers/lz4/patches/patch-Makefile b/archivers/lz4/patches/patch-Makefile
index 10ef468ce35..285d0c5639a 100644
--- a/archivers/lz4/patches/patch-Makefile
+++ b/archivers/lz4/patches/patch-Makefile
@@ -1,23 +1,20 @@
-$NetBSD: patch-Makefile,v 1.6 2016/12/07 21:34:58 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.7 2017/08/19 14:54:25 adam Exp $
 
 Unlock install target.
 
---- Makefile.orig	2016-11-22 20:34:17.000000000 +0000
+--- Makefile.orig	2017-08-17 17:55:30.000000000 +0000
 +++ Makefile
-@@ -81,10 +81,6 @@ clean:
- 	@echo Cleaning completed
- 
- 
--#------------------------------------------------------------------------
--#make install is validated only for Linux, OSX, kFreeBSD, Hurd and
--#FreeBSD targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD))
+@@ -90,7 +90,6 @@ clean:
+ #-----------------------------------------------------------------------------
+ # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
+ #-----------------------------------------------------------------------------
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS))
  HOST_OS = POSIX
  
- install:
-@@ -138,7 +134,6 @@ examples:
- 	$(MAKE) -C $(PRGDIR) lz4
- 	$(MAKE) -C examples test
+ .PHONY: install uninstall
+@@ -104,7 +103,6 @@ travis-install:
+ cmake:
+ 	@cd contrib/cmake_unofficial; cmake $(CMAKE_PARAMS) CMakeLists.txt; $(MAKE)
  
 -endif
  
diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile
index 50c4887d6c6..2ad0311a159 100644
--- a/archivers/lz4/patches/patch-lib_Makefile
+++ b/archivers/lz4/patches/patch-lib_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_Makefile,v 1.5 2017/01/05 11:07:55 wiz Exp $
+$NetBSD: patch-lib_Makefile,v 1.6 2017/08/19 14:54:25 adam Exp $
 
 Make portable. Unlock install target. Use pkgsrc install scripts.
 
---- lib/Makefile.orig	2017-01-03 05:09:52.000000000 +0000
+--- lib/Makefile.orig	2017-08-17 17:55:30.000000000 +0000
 +++ lib/Makefile
-@@ -31,9 +31,9 @@
+@@ -33,9 +33,9 @@
  # ################################################################
  
  # Version numbers
@@ -17,21 +17,17 @@ Make portable. Unlock install target. Use pkgsrc install scripts.
  LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT)
  LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT))
  LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT))
-@@ -107,11 +107,6 @@ clean:
- 	@echo Cleaning library completed
- 
- 
--#-----------------------------------------------------------------------------
--# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
--#-----------------------------------------------------------------------------
+@@ -113,7 +113,6 @@ clean:
+ #-----------------------------------------------------------------------------
+ # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
+ #-----------------------------------------------------------------------------
 -ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS))
--
- ifneq (,$(filter $(shell uname),SunOS))
- INSTALL ?= ginstall
- else
-@@ -123,37 +118,33 @@ DESTDIR    ?=
- LIBDIR     ?= $(PREFIX)/lib
- INCLUDEDIR ?= $(PREFIX)/include
+ 
+ DESTDIR     ?=
+ # directory variables : GNU convention prefers lowercase
+@@ -126,11 +125,7 @@ LIBDIR      ?= $(libdir)
+ includedir  ?= $(PREFIX)/include
+ INCLUDEDIR  ?= $(includedir)
  
 -ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly))
 -PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
@@ -40,8 +36,9 @@ Make portable. Unlock install target. Use pkgsrc install scripts.
 -endif
 +PKGCONFIGDIR ?= $(PREFIX)/lib/pkgconfig
  
- INSTALL_LIB  ?= $(INSTALL) -m 755
- INSTALL_DATA ?= $(INSTALL) -m 644
+ ifneq (,$(filter $(shell uname),SunOS))
+ INSTALL ?= ginstall
+@@ -143,27 +138,27 @@ INSTALL_DATA    ?= $(INSTALL) -m 644
  
  liblz4.pc: liblz4.pc.in Makefile
  	@echo creating pkgconfig
@@ -56,30 +53,32 @@ Make portable. Unlock install target. Use pkgsrc install scripts.
            $< >$@
  
  install: lib liblz4.pc
--	@$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/
+-	@$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ $(DESTDIR)$(LIBDIR)/
 -	@$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/
-+	@$(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/
++	@$(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ $(DESTDIR)$(LIBDIR)/
 +	@$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/
  	@echo Installing libraries
  ifeq ($(BUILD_STATIC),yes)
--	@$(INSTALL_LIB) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
+-	@$(INSTALL_DATA) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
+-	@$(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(INCLUDEDIR)/lz4frame_static.h
 +	@$(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
++	@$(BSD_INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(INCLUDEDIR)/lz4frame_static.h
  endif
--	@$(INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
+-	@$(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
 +	@$(BSD_INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
  	@ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR)
  	@ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT)
- 	@echo Installing includes
+ 	@echo Installing headers in $(INCLUDEDIR)
 -	@$(INSTALL_DATA) lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
 -	@$(INSTALL_DATA) lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
 -	@$(INSTALL_DATA) lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
 +	@$(BSD_INSTALL_DATA) lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
 +	@$(BSD_INSTALL_DATA) lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
 +	@$(BSD_INSTALL_DATA) lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
- 	@echo lz4 static and shared libraries installed
+ 	@echo lz4 libraries installed
  
  uninstall:
-@@ -167,4 +158,3 @@ uninstall:
+@@ -177,4 +172,3 @@ uninstall:
  	@$(RM) $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
  	@echo lz4 libraries successfully uninstalled
  
diff --git a/archivers/lz4/patches/patch-programs_Makefile b/archivers/lz4/patches/patch-programs_Makefile
index 7b6ca0db8a9..40bf9168ed8 100644
--- a/archivers/lz4/patches/patch-programs_Makefile
+++ b/archivers/lz4/patches/patch-programs_Makefile
@@ -1,11 +1,11 @@
-$NetBSD: patch-programs_Makefile,v 1.7 2017/01/04 15:43:51 fhajny Exp $
+$NetBSD: patch-programs_Makefile,v 1.8 2017/08/19 14:54:25 adam Exp $
 
 Unlock install target. Use pkgsrc install scripts.
 
---- programs/Makefile.orig	2017-01-03 05:09:52.000000000 +0000
+--- programs/Makefile.orig	2017-08-17 17:55:30.000000000 +0000
 +++ programs/Makefile
-@@ -108,11 +108,6 @@ preview-man: clean-man man
- 	man ./lz4.1
+@@ -106,11 +106,6 @@ clean:
+ 	@echo Cleaning completed
  
  
 -#-----------------------------------------------------------------------------
@@ -16,20 +16,20 @@ Unlock install target. Use pkgsrc install scripts.
  unlz4: lz4
  	ln -s lz4 unlz4
  
-@@ -130,11 +125,7 @@ PREFIX  ?= /usr/local
- DESTDIR ?=
- BINDIR  ?= $(PREFIX)/bin
+@@ -134,11 +129,7 @@ BINDIR      ?= $(bindir)
+ datarootdir ?= $(PREFIX)/share
+ mandir      ?= $(datarootdir)/man
  
 -ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
 -MANDIR  ?= $(PREFIX)/man/man1
 -else
--MANDIR  ?= $(PREFIX)/share/man/man1
+-MANDIR  ?= $(mandir)
 -endif
 +MANDIR  ?= $(PREFIX)/$(PKGMANDIR)/man1
  
  INSTALL_PROGRAM ?= $(INSTALL) -m 755
- INSTALL_SCRIPT  ?= $(INSTALL) -m 755
-@@ -143,13 +134,13 @@ INSTALL_MAN     ?= $(INSTALL) -m 644
+ INSTALL_DATA    ?= $(INSTALL) -m 644
+@@ -146,13 +137,13 @@ INSTALL_DATA    ?= $(INSTALL) -m 644
  
  install: lz4$(EXT) lz4c$(EXT)
  	@echo Installing binaries
@@ -42,12 +42,12 @@ Unlock install target. Use pkgsrc install scripts.
 -	@$(INSTALL_PROGRAM) lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c
 +	@$(BSD_INSTALL_PROGRAM) lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c
  	@echo Installing man pages
--	@$(INSTALL_MAN) -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
-+	@$(BSD_INSTALL_MAN) -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
+-	@$(INSTALL_DATA) lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
++	@$(BSD_INSTALL_MAN) lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
  	@ln -sf lz4.1 $(DESTDIR)$(MANDIR)/lz4c.1
  	@ln -sf lz4.1 $(DESTDIR)$(MANDIR)/lz4cat.1
  	@ln -sf lz4.1 $(DESTDIR)$(MANDIR)/unlz4.1
-@@ -166,4 +157,3 @@ uninstall:
+@@ -169,4 +160,3 @@ uninstall:
  	@$(RM) $(DESTDIR)$(MANDIR)/unlz4.1
  	@echo lz4 programs successfully uninstalled