lz4: updated to 1.8.2

v1.8.2
perf: *much* faster dictionary compression on small files
perf: improved decompression speed and binary size
perf: slightly faster HC compression and decompression speed
perf: very small compression ratio improvement
fix : compression compatible with low memory addresses (< 0xFFFF)
fix : decompression segfault when provided with NULL input
cli : new command --favor-decSpeed
cli : benchmark mode more accurate for small inputs
fullbench : can bench _destSize() variants
doc : clarified block format parsing restrictions

5 files changed, 80 insertions, 84 deletions

diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile
index 1e6daec514c..1b5760e81bc 100644
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.12 2018/01/16 08:13:01 adam Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/10 13:16:27 adam Exp $
 
-DISTNAME=	lz4-1.8.1.2
+DISTNAME=	lz4-1.8.2
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lz4/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	filip@joyent.com
 HOMEPAGE=	http://lz4.github.io/lz4/
 COMMENT=	Extremely Fast Compression algorithm
 LICENSE=	2-clause-bsd
 
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
 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 08c3ccf283e..58272480c4a 100644
--- a/archivers/lz4/PLIST
+++ b/archivers/lz4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2018/01/16 12:38:35 abs Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/05/10 13:16:27 adam Exp $
 bin/lz4
 bin/lz4c
 bin/lz4cat
@@ -8,9 +8,9 @@ include/lz4frame.h
 include/lz4frame_static.h
 include/lz4hc.h
 lib/liblz4.a
+lib/liblz4.so.${PKGVERSION}
 lib/liblz4.so
 lib/liblz4.so.1
-lib/liblz4.so.1.8.1
 lib/pkgconfig/liblz4.pc
 man/man1/lz4.1
 man/man1/lz4c.1
diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo
index f9b097e8dba..efff93f6bf6 100644
--- a/archivers/lz4/distinfo
+++ b/archivers/lz4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2018/01/16 08:13:01 adam Exp $
+$NetBSD: distinfo,v 1.15 2018/05/10 13:16:27 adam Exp $
 
-SHA1 (lz4-1.8.1.2.tar.gz) = d16dd5062b98a715d18e2b0f7d8e1a595272b8d6
-RMD160 (lz4-1.8.1.2.tar.gz) = a1bf8a38af473547ba84c5d59eed3ca1c754e274
-SHA512 (lz4-1.8.1.2.tar.gz) = f4ed450bc05477cc6c2b42e6fe1fbb1fb0907f1d05b68b1d69d975b555ddb385550f204258e6d91642e14ce373815141dc218cda03b711793935d5458bc45c7f
-Size (lz4-1.8.1.2.tar.gz) = 228640 bytes
+SHA1 (lz4-1.8.2.tar.gz) = dc24ee207db0b4481ff5e74b608c1af1c18c5a7c
+RMD160 (lz4-1.8.2.tar.gz) = 649f51b1951a5a41a4d2ee79af1dbcfc5b917c8a
+SHA512 (lz4-1.8.2.tar.gz) = 5fadc79334d37739c947d6dfc24f48ce82989fc5ee4f2bb8201ccf7ee3230b9e6e7c8488beb64050a035369f4247161d258bdb539578bec224ccebfef1b8a763
+Size (lz4-1.8.2.tar.gz) = 320742 bytes
 SHA1 (patch-Makefile) = 5fe6f084b772e139469817b20187c99f4f64160d
-SHA1 (patch-lib_Makefile) = 34794c9c2f9f81bebe64a6518fad97d6f4514c54
-SHA1 (patch-programs_Makefile) = f53cb9beec84f363b05c62cf28b1bac608e2f5c0
+SHA1 (patch-lib_Makefile) = 2c413d93a8cc66d0a61b701269a9cdc6da3a72c6
+SHA1 (patch-programs_Makefile) = e3260da1758999d1e7c20ff7e7bae92575d1fa1e
diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile
index 9b7d4fb68eb..2898a5d55b5 100644
--- a/archivers/lz4/patches/patch-lib_Makefile
+++ b/archivers/lz4/patches/patch-lib_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_Makefile,v 1.7 2018/01/13 19:00:09 adam Exp $
+$NetBSD: patch-lib_Makefile,v 1.8 2018/05/10 13:16:27 adam Exp $
 
 Make portable. Unlock install target. Use pkgsrc install scripts.
 
---- lib/Makefile.orig	2017-08-17 17:55:30.000000000 +0000
+--- lib/Makefile.orig	2018-05-07 21:38:45.000000000 +0000
 +++ lib/Makefile
 @@ -33,9 +33,9 @@
  # ################################################################
@@ -17,69 +17,72 @@ 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))
-@@ -113,7 +113,6 @@ clean:
+@@ -123,7 +123,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))
  
- DESTDIR     ?=
- # directory variables : GNU conventions prefer lowercase
-@@ -126,11 +125,7 @@ LIBDIR      ?= $(libdir)
- includedir  ?= $(PREFIX)/include
- INCLUDEDIR  ?= $(includedir)
+ .PHONY: listL120
+ listL120:  # extract lines >= 120 characters in *.{c,h}, by Takayuki Matsuoka (note : $$, for Makefile compatibility)
+@@ -142,12 +141,7 @@ libdir      ?= $(LIBDIR)
+ INCLUDEDIR  ?= $(prefix)/include
+ includedir  ?= $(INCLUDEDIR)
  
 -ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly))
--PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
+-PKGCONFIGDIR ?= $(prefix)/libdata/pkgconfig
 -else
--PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
+-PKGCONFIGDIR ?= $(libdir)/pkgconfig
 -endif
-+PKGCONFIGDIR ?= $(PREFIX)/lib/pkgconfig
+-pkgconfigdir ?= $(PKGCONFIGDIR)
++pkgconfigdir ?= $(prefix)/lib/pkgconfig
  
  ifneq (,$(filter $(shell uname),SunOS))
  INSTALL ?= ginstall
-@@ -143,27 +138,27 @@ INSTALL_DATA    ?= $(INSTALL) -m 644
+@@ -160,29 +154,29 @@ INSTALL_DATA    ?= $(INSTALL) -m 644
  
  liblz4.pc: liblz4.pc.in Makefile
  	@echo creating pkgconfig
--	@sed -e 's|@PREFIX@|$(PREFIX)|' \
--         -e 's|@LIBDIR@|$(LIBDIR)|' \
--         -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
+-	$(Q)sed -e 's|@PREFIX@|$(prefix)|' \
+-         -e 's|@LIBDIR@|$(libdir)|' \
+-         -e 's|@INCLUDEDIR@|$(includedir)|' \
 -         -e 's|@VERSION@|$(LIBVER)|' \
-+	@sed -e 's|@PREFIX@|$(PREFIX)|g' \
-+         -e 's|@LIBDIR@|$(LIBDIR)|g' \
-+         -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|g' \
++	$(Q)sed -e 's|@PREFIX@|$(prefix)|g' \
++         -e 's|@LIBDIR@|$(libdir)|g' \
++         -e 's|@INCLUDEDIR@|$(includedir)|g' \
 +         -e 's|@VERSION@|$(LIBVER)|g' \
            $< >$@
  
  install: lib liblz4.pc
--	@$(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)/ $(DESTDIR)$(LIBDIR)/
-+	@$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/
+-	$(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/
+-	$(Q)$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/
++	$(Q)$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/
++	$(Q)$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/
  	@echo Installing libraries
  ifeq ($(BUILD_STATIC),yes)
--	@$(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
+-	$(Q)$(INSTALL_DATA) liblz4.a $(DESTDIR)$(libdir)/liblz4.a
+-	$(Q)$(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h
++	$(Q)$(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(libdir)/liblz4.a
++	$(Q)$(BSD_INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h
  endif
--	@$(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 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
+ ifeq ($(BUILD_SHARED),yes)
+-	$(Q)$(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)
++	$(Q)$(BSD_INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)
+ 	$(Q)ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR)
+ 	$(Q)ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT)
+ endif
+ 	@echo Installing headers in $(includedir)
+-	$(Q)$(INSTALL_DATA) lz4.h $(DESTDIR)$(includedir)/lz4.h
+-	$(Q)$(INSTALL_DATA) lz4hc.h $(DESTDIR)$(includedir)/lz4hc.h
+-	$(Q)$(INSTALL_DATA) lz4frame.h $(DESTDIR)$(includedir)/lz4frame.h
++	$(Q)$(BSD_INSTALL_DATA) lz4.h $(DESTDIR)$(includedir)/lz4.h
++	$(Q)$(BSD_INSTALL_DATA) lz4hc.h $(DESTDIR)$(includedir)/lz4hc.h
++	$(Q)$(BSD_INSTALL_DATA) lz4frame.h $(DESTDIR)$(includedir)/lz4frame.h
  	@echo lz4 libraries installed
  
  uninstall:
-@@ -177,4 +172,3 @@ uninstall:
- 	@$(RM) $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
+@@ -197,4 +191,3 @@ uninstall:
+ 	$(Q)$(RM) $(DESTDIR)$(includedir)/lz4frame_static.h
  	@echo lz4 libraries successfully uninstalled
  
 -endif
diff --git a/archivers/lz4/patches/patch-programs_Makefile b/archivers/lz4/patches/patch-programs_Makefile
index 7f4a6049ff4..f9bcd42c4f0 100644
--- a/archivers/lz4/patches/patch-programs_Makefile
+++ b/archivers/lz4/patches/patch-programs_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-programs_Makefile,v 1.9 2018/01/13 19:00:09 adam Exp $
+$NetBSD: patch-programs_Makefile,v 1.10 2018/05/10 13:16:27 adam Exp $
 
 Unlock install target. Use pkgsrc install scripts.
 
---- programs/Makefile.orig	2018-01-12 22:36:10.000000000 +0000
+--- programs/Makefile.orig	2018-05-07 21:38:45.000000000 +0000
 +++ programs/Makefile
 @@ -106,11 +106,6 @@ clean:
  	@echo Cleaning completed
@@ -16,38 +16,34 @@ Unlock install target. Use pkgsrc install scripts.
  unlz4: lz4
  	ln -s lz4 unlz4
  
-@@ -130,11 +125,7 @@ datarootdir ?= $(PREFIX)/share
- mandir      ?= $(datarootdir)/man
- man1dir     ?= $(mandir)/man1
- 
--ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
--MANDIR  ?= $(PREFIX)/man/man1
--else
--MANDIR  ?= $(man1dir)
--endif
-+MANDIR  ?= $(PREFIX)/$(PKGMANDIR)/man1
- 
- ifneq (,$(filter $(shell uname),SunOS))
- INSTALL ?= ginstall
-@@ -148,13 +139,13 @@ INSTALL_DATA    ?= $(INSTALL) -m 644
+@@ -129,7 +124,7 @@ BINDIR      ?= $(exec_prefix)/bin
+ bindir      ?= $(BINDIR)
+ DATAROOTDIR ?= $(prefix)/share
+ datarootdir ?= $(DATAROOTDIR)
+-MANDIR      ?= $(datarootdir)/man
++MANDIR      ?= $(PREFIX)/$(PKGMANDIR)
+ mandir      ?= $(MANDIR)
+ MAN1DIR     ?= $(mandir)/man1
+ man1dir     ?= $(MAN1DIR)
+@@ -146,13 +141,13 @@ INSTALL_DATA    ?= $(INSTALL) -m 644
  
  install: lz4
  	@echo Installing binaries
--	@$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
--	@$(INSTALL_PROGRAM) lz4 $(DESTDIR)$(BINDIR)/lz4
-+	@$(BSD_INSTALL_PROGRAM_DIR) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
-+	@$(BSD_INSTALL_PROGRAM) lz4 $(DESTDIR)$(BINDIR)/lz4
- 	@ln -sf lz4 $(DESTDIR)$(BINDIR)/lz4c
- 	@ln -sf lz4 $(DESTDIR)$(BINDIR)/lz4cat
- 	@ln -sf lz4 $(DESTDIR)$(BINDIR)/unlz4
+-	@$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
+-	@$(INSTALL_PROGRAM) lz4 $(DESTDIR)$(bindir)/lz4
++	@$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
++	@$(BSD_INSTALL_PROGRAM) lz4 $(DESTDIR)$(bindir)/lz4
+ 	@ln -sf lz4 $(DESTDIR)$(bindir)/lz4c
+ 	@ln -sf lz4 $(DESTDIR)$(bindir)/lz4cat
+ 	@ln -sf lz4 $(DESTDIR)$(bindir)/unlz4
  	@echo Installing man pages
--	@$(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
-@@ -171,4 +162,3 @@ uninstall:
- 	@$(RM) $(DESTDIR)$(MANDIR)/unlz4.1
+-	@$(INSTALL_DATA) lz4.1 $(DESTDIR)$(man1dir)/lz4.1
++	@$(BSD_INSTALL_MAN) lz4.1 $(DESTDIR)$(man1dir)/lz4.1
+ 	@ln -sf lz4.1 $(DESTDIR)$(man1dir)/lz4c.1
+ 	@ln -sf lz4.1 $(DESTDIR)$(man1dir)/lz4cat.1
+ 	@ln -sf lz4.1 $(DESTDIR)$(man1dir)/unlz4.1
+@@ -169,4 +164,3 @@ uninstall:
+ 	@$(RM) $(DESTDIR)$(man1dir)/unlz4.1
  	@echo lz4 programs successfully uninstalled
  
 -endif