Update archivers/lz4 to 1.7.5.

- lz4hc : new high compression mode : levels 10-12 compress more and slower
- lz4cat : fix : works with relative path (#284) and stdin (#285)
- cli : fix minor notification when using -r recursive mode
- API : lz4frame : LZ4F_frameBound(0) gives upper bound of *flush() and *End() operations
- doc : markdown version of man page
- build : Makefile : fix make -jX lib+exe concurrency
- build : cmake : improvements by Michal Gorny

5 files changed, 78 insertions, 62 deletions

diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile
index 43f9d7a8408..2b61956d50b 100644
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2016/12/07 21:34:58 fhajny Exp $
+# $NetBSD: Makefile,v 1.9 2017/01/04 15:43:51 fhajny Exp $
 
-DISTNAME=	lz4-1.7.4.2
+DISTNAME=	lz4-1.7.5
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lz4/}
 
diff --git a/archivers/lz4/PLIST b/archivers/lz4/PLIST
index 3184baa5221..f7c02f72729 100644
--- a/archivers/lz4/PLIST
+++ b/archivers/lz4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2016/12/07 21:34:58 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/01/04 15:43:51 fhajny Exp $
 bin/lz4
 bin/lz4c
 bin/lz4cat
@@ -9,7 +9,7 @@ include/lz4hc.h
 lib/liblz4.a
 lib/liblz4.so
 lib/liblz4.so.1
-lib/liblz4.so.1.7.4
+lib/liblz4.so.${PKGVERSION}
 lib/pkgconfig/liblz4.pc
 man/man1/lz4.1
 man/man1/lz4c.1
diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo
index c7f8f04ccb2..1818fcfcae2 100644
--- a/archivers/lz4/distinfo
+++ b/archivers/lz4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2016/12/07 21:34:58 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2017/01/04 15:43:51 fhajny Exp $
 
-SHA1 (lz4-1.7.4.2.tar.gz) = ce5fdcb24016312d8932b78f91dc857da9433272
-RMD160 (lz4-1.7.4.2.tar.gz) = 6a3c781f094f99adc5a11542ff0f2b75ab63c579
-SHA512 (lz4-1.7.4.2.tar.gz) = 24fc8615767bc9d3e11f9dbe4e6d6d63bf7e9c8fb782e1d58063df221b6e6fe3a6ea4cc49a25d9500d35f2dd9c5a80ea3f352c52282aa0e1a373e277d2a00072
-Size (lz4-1.7.4.2.tar.gz) = 200956 bytes
+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) = a1de969ed0beb64859937c375ba6f2111d055fb6
-SHA1 (patch-programs_Makefile) = 67bc0a21bb24d8ab86b5c060e3f9311c556fe228
+SHA1 (patch-lib_Makefile) = 016fbc604e6c121fd2eb9d3aba5be40373c6de60
+SHA1 (patch-programs_Makefile) = 1bf3864515a1276cbad516ebd519caa918b847b2
diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile
index 3d38feea674..09ddfd26a7b 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.3 2016/12/07 21:34:58 fhajny Exp $
+$NetBSD: patch-lib_Makefile,v 1.4 2017/01/04 15:43:51 fhajny Exp $
 
 Make portable. Unlock install target. Use pkgsrc install scripts.
 
---- lib/Makefile.orig	2016-11-22 20:34:17.000000000 +0000
+--- lib/Makefile.orig	2017-01-03 05:09:52.000000000 +0000
 +++ lib/Makefile
 @@ -31,9 +31,9 @@
  # ################################################################
@@ -17,14 +17,19 @@ 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,31 +107,27 @@ clean:
+@@ -107,11 +107,6 @@ clean:
  	@echo Cleaning library completed
  
  
--#------------------------------------------------------------------------
--#make install is validated only for Linux, OSX, kFreeBSD, Hurd and
--#FreeBSD targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD))
+-#-----------------------------------------------------------------------------
+-# 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
+@@ -134,26 +129,26 @@ INSTALL_DATA ?= $(INSTALL) -m 644
  
  liblz4.pc: liblz4.pc.in Makefile
  	@echo creating pkgconfig
@@ -39,28 +44,30 @@ Make portable. Unlock install target. Use pkgsrc install scripts.
            $< >$@
  
  install: lib liblz4.pc
--	@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
--	@install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
-+	$(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-+	$(BSD_INSTALL_LIB) -m 755 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)
--	@install -m 644 liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+	$(BSD_INSTALL_DATA) -m 644 liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
+-	@$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/
+-	@$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/
++	@$(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/
++	@$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/
+ 	@echo Installing libraries
  ifeq ($(BUILD_STATIC),yes)
--	@install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
-+	$(BSD_INSTALL_DATA) -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
+-	@$(INSTALL_LIB) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
++	@$(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
  endif
--	@install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
--	@install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
--	@install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
-+	$(BSD_INSTALL_DATA) -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
-+	$(BSD_INSTALL_DATA) -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
-+	$(BSD_INSTALL_DATA) -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
+-	@$(INSTALL_LIB) 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
+-	@$(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
  
  uninstall:
-@@ -145,4 +141,3 @@ uninstall:
+@@ -167,4 +162,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 c4022e0b5c0..7b6ca0db8a9 100644
--- a/archivers/lz4/patches/patch-programs_Makefile
+++ b/archivers/lz4/patches/patch-programs_Makefile
@@ -1,44 +1,53 @@
-$NetBSD: patch-programs_Makefile,v 1.6 2016/12/07 21:34:58 fhajny Exp $
+$NetBSD: patch-programs_Makefile,v 1.7 2017/01/04 15:43:51 fhajny Exp $
 
 Unlock install target. Use pkgsrc install scripts.
 
---- programs/Makefile.orig	2016-11-22 20:34:17.000000000 +0000
+--- programs/Makefile.orig	2017-01-03 05:09:52.000000000 +0000
 +++ programs/Makefile
-@@ -30,7 +30,7 @@
- DESTDIR ?=
- PREFIX  ?= /usr/local
- BINDIR  := $(PREFIX)/bin
--MANDIR  := $(PREFIX)/share/man/man1
-+MANDIR  := $(PREFIX)/$(PKGMANDIR)/man1
- LZ4DIR  := ../lib
- VOID    := /dev/null
+@@ -108,11 +108,6 @@ preview-man: clean-man man
+ 	man ./lz4.1
+ 
  
-@@ -80,20 +80,16 @@ clean:
- 	@echo Cleaning completed
+-#-----------------------------------------------------------------------------
+-# 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))
+-
+ unlz4: lz4
+ 	ln -s lz4 unlz4
  
+@@ -130,11 +125,7 @@ PREFIX  ?= /usr/local
+ DESTDIR ?=
+ BINDIR  ?= $(PREFIX)/bin
+ 
+-ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly SunOS))
+-MANDIR  ?= $(PREFIX)/man/man1
+-else
+-MANDIR  ?= $(PREFIX)/share/man/man1
+-endif
++MANDIR  ?= $(PREFIX)/$(PKGMANDIR)/man1
  
--#------------------------------------------------------------------------
--#make install is validated only for Linux, OSX, kFreeBSD, Hurd and
--#FreeBSD targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD))
+ INSTALL_PROGRAM ?= $(INSTALL) -m 755
+ INSTALL_SCRIPT  ?= $(INSTALL) -m 755
+@@ -143,13 +134,13 @@ INSTALL_MAN     ?= $(INSTALL) -m 644
  
  install: lz4$(EXT) lz4c$(EXT)
  	@echo Installing binaries
--	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
--	@install -m 755 lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4$(EXT)
-+	$(BSD_INSTALL_PROGRAM_DIR) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
-+	$(BSD_INSTALL_PROGRAM) -m 755 lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4$(EXT)
- 	@ln -sf lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4cat$(EXT)
- 	@ln -sf lz4$(EXT) $(DESTDIR)$(BINDIR)/unlz4$(EXT)
--	@install -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT)
-+	$(BSD_INSTALL_PROGRAM) -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT)
+-	@$(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)/lz4cat
+ 	@ln -sf lz4 $(DESTDIR)$(BINDIR)/unlz4
+-	@$(INSTALL_PROGRAM) lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c
++	@$(BSD_INSTALL_PROGRAM) lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c
  	@echo Installing man pages
--	@install -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
-+	$(BSD_INSTALL_MAN) -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
+-	@$(INSTALL_MAN) -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
++	@$(BSD_INSTALL_MAN) -m 644 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
-@@ -110,4 +106,3 @@ uninstall:
+@@ -166,4 +157,3 @@ uninstall:
  	@$(RM) $(DESTDIR)$(MANDIR)/unlz4.1
  	@echo lz4 programs successfully uninstalled