Update archivers/lz4 to 1.7.4.2.

Changes since release 131:

v1.7.4.2
- fix : Makefile : release build compatible with PIE and customized
  compilation directives provided through environment variables (#274,
  reported by Antoine Martin)

v1.7.4
- Improved : much better speed in -mx32 mode
- cli : fix : Large file support in 32-bits mode on Mac OS-X
- fix : compilation on gcc 4.4 (#272), reported by Antoine Martin

v1.7.3
- Changed : moved to versioning; package, cli and library have same
  version number
- Improved: Small decompression speed boost
- Improved: Small compression speed improvement on 64-bits systems
- Improved: Small compression ratio and speed improvement on small files
- Improved: Significant speed boost on ARMv6 and ARMv7
- Fix : better ratio on 64-bits big-endian targets
- Improved cmake build script, by Evan Nemerson
- New liblz4-dll project, by Przemyslaw Skibinki
- Makefile: Generates object files (*.o) for faster (re)compilation on
  low power systems
- cli : new : --rm and --help commands
- cli : new : preserved file attributes, by Przemyslaw Skibinki
- cli : fix : crash on some invalid inputs
- cli : fix : -t correctly validates lz4-compressed files, by Nick
  Terrell
- cli : fix : detects and reports fread() errors, thanks to Hiroshi
  Fujishima report #243
- cli : bench : new : -r recursive mode
- lz4cat : can cat multiple files in a single command line (#184)
- Added : doc/lz4_manual.html, by Przemyslaw Skibinski
- Added : dictionary compression and frame decompression examples, by
  Nick Terrell
- Added : Debianization, by Evgeniy Polyakov

7 files changed, 105 insertions, 100 deletions

diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile
index 2dd560a98bf..43f9d7a8408 100644
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,23 +1,19 @@
-# $NetBSD: Makefile,v 1.7 2015/11/26 10:40:48 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/12/07 21:34:58 fhajny Exp $
 
-DISTNAME=	lz4-r131
-PKGNAME=	${DISTNAME:S/-r/-/}
-PKGREVISION=	1
+DISTNAME=	lz4-1.7.4.2
 CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_GITHUB:=Cyan4973/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=lz4/}
 
 MAINTAINER=	filip@joyent.com
-HOMEPAGE=	http://github.com/Cyan4973/lz4/
+HOMEPAGE=	http://lz4.github.io/lz4/
 COMMENT=	Extremely Fast Compression algorithm
 LICENSE=	2-clause-bsd
 
-GITHUB_TAG=	r${PKGVERSION_NOREV}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 USE_LANGUAGES=	c c99
 USE_TOOLS+=	gmake pkg-config
 
-CPPFLAGS.SunOS+=	-D_XOPEN_SOURCE=600
-
 PKGCONFIG_OVERRIDE+=	lib/liblz4.pc.in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/lz4/PLIST b/archivers/lz4/PLIST
index 05d4eec2b54..3184baa5221 100644
--- a/archivers/lz4/PLIST
+++ b/archivers/lz4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2015/08/24 16:28:32 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/12/07 21:34:58 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.1
+lib/liblz4.so.1.7.4
 lib/pkgconfig/liblz4.pc
 man/man1/lz4.1
 man/man1/lz4c.1
diff --git a/archivers/lz4/buildlink3.mk b/archivers/lz4/buildlink3.mk
index 5241c7ad1a3..09227369d9d 100644
--- a/archivers/lz4/buildlink3.mk
+++ b/archivers/lz4/buildlink3.mk
@@ -1,12 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/06/09 12:04:19 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2016/12/07 21:34:58 fhajny Exp $
 
 BUILDLINK_TREE+=	lz4
 
 .if !defined(LZ4_BUILDLINK3_MK)
 LZ4_BUILDLINK3_MK:=
 
-BUILDLINK_ABI_DEPENDS.lz4+=	lz4>=130
-BUILDLINK_API_DEPENDS.lz4+=	lz4>=130
+# Set upper limit to force update from the previous version
+# scheme that generated technically higher version numbers
+BUILDLINK_API_DEPENDS.lz4+=	lz4>=1.7.3<100
+BUILDLINK_ABI_DEPENDS.lz4+=	lz4>=1.7.3
 BUILDLINK_PKGSRCDIR.lz4?=	../../archivers/lz4
 .endif # LZ4_BUILDLINK3_MK
 
diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo
index cc22f2c5a71..c7f8f04ccb2 100644
--- a/archivers/lz4/distinfo
+++ b/archivers/lz4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 00:56:23 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/12/07 21:34:58 fhajny Exp $
 
-SHA1 (lz4-r131.tar.gz) = b6eab6461977dca11e7efc4ed79d59924b216c7e
-RMD160 (lz4-r131.tar.gz) = 4a76a20739a4842bbbc6435c460e52b0a32f0540
-SHA512 (lz4-r131.tar.gz) = 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
-Size (lz4-r131.tar.gz) = 133784 bytes
-SHA1 (patch-Makefile) = c6e5cd7c375aea8d37704f307bd6488f80a208bf
-SHA1 (patch-lib_Makefile) = 30caae8b487ceedb378c7d4c264cacbfaf3df3e9
-SHA1 (patch-programs_Makefile) = 9211e3718b52834fe461dc57ca486113659bbf8d
+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 (patch-Makefile) = 8519985405e6f2c0ef63cc39129b00c9867382f9
+SHA1 (patch-lib_Makefile) = a1de969ed0beb64859937c375ba6f2111d055fb6
+SHA1 (patch-programs_Makefile) = 67bc0a21bb24d8ab86b5c060e3f9311c556fe228
diff --git a/archivers/lz4/patches/patch-Makefile b/archivers/lz4/patches/patch-Makefile
index 808e5d111e1..10ef468ce35 100644
--- a/archivers/lz4/patches/patch-Makefile
+++ b/archivers/lz4/patches/patch-Makefile
@@ -1,21 +1,25 @@
-$NetBSD: patch-Makefile,v 1.5 2015/06/09 12:04:19 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.6 2016/12/07 21:34:58 fhajny Exp $
 
-Make portable, use pkgsrc install scripts.
---- Makefile.orig	2015-05-26 01:13:50.000000000 +0000
+Unlock install target.
+
+--- Makefile.orig	2016-11-22 20:34:17.000000000 +0000
 +++ Makefile
-@@ -75,10 +75,6 @@ clean:
+@@ -81,10 +81,6 @@ clean:
  	@echo Cleaning completed
  
  
 -#------------------------------------------------------------------------
--#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
--
+-#make install is validated only for Linux, OSX, kFreeBSD, Hurd and
+-#FreeBSD targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD))
+ HOST_OS = POSIX
+ 
  install:
- 	@cd $(LZ4DIR); $(MAKE) -e install
- 	@cd $(PRGDIR); $(MAKE) -e install
-@@ -123,4 +119,3 @@ streaming-examples:
- prg-travis:
- 	@cd $(PRGDIR); $(MAKE) -e test-travis
+@@ -138,7 +134,6 @@ examples:
+ 	$(MAKE) -C $(PRGDIR) lz4
+ 	$(MAKE) -C examples test
  
 -endif
+ 
+ 
+ ifneq (,$(filter MSYS%,$(shell uname)))
diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile
index 1c6527ab3ff..3d38feea674 100644
--- a/archivers/lz4/patches/patch-lib_Makefile
+++ b/archivers/lz4/patches/patch-lib_Makefile
@@ -1,66 +1,67 @@
-$NetBSD: patch-lib_Makefile,v 1.2 2015/06/09 12:04:19 fhajny Exp $
+$NetBSD: patch-lib_Makefile,v 1.3 2016/12/07 21:34:58 fhajny Exp $
 
-Make portable, use pkgsrc install scripts.
---- lib/Makefile.orig	2015-05-26 01:13:50.000000000 +0000
+Make portable. Unlock install target. Use pkgsrc install scripts.
+
+--- lib/Makefile.orig	2016-11-22 20:34:17.000000000 +0000
 +++ lib/Makefile
-@@ -32,9 +32,9 @@
+@@ -31,9 +31,9 @@
+ # ################################################################
  
  # Version numbers
- VERSION ?= 129
--LIBVER_MAJOR=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
--LIBVER_MINOR=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
--LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
-+LIBVER_MAJOR=`awk '$$2=="LZ4_VERSION_MAJOR" {print $$3}' < lz4.h`
-+LIBVER_MINOR=`awk '$$2=="LZ4_VERSION_MINOR" {print $$3}' < lz4.h`
-+LIBVER_PATCH=`awk '$$2=="LZ4_VERSION_RELEASE" {print $$3}' < lz4.h`
- LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
- 
- DESTDIR?=
-@@ -79,28 +79,24 @@ clean:
+-LIBVER_MAJOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
+-LIBVER_MINOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
+-LIBVER_PATCH_SCRIPT:=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
++LIBVER_MAJOR_SCRIPT:=`awk '$$2=="LZ4_VERSION_MAJOR" {print $$3}' < lz4.h`
++LIBVER_MINOR_SCRIPT:=`awk '$$2=="LZ4_VERSION_MINOR" {print $$3}' < lz4.h`
++LIBVER_PATCH_SCRIPT:=`awk '$$2=="LZ4_VERSION_RELEASE" {print $$3}' < lz4.h`
+ 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:
  	@echo Cleaning library completed
  
  
 -#------------------------------------------------------------------------
--#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
--
+-#make install is validated only for Linux, OSX, kFreeBSD, Hurd and
+-#FreeBSD targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD))
+ 
  liblz4.pc: liblz4.pc.in Makefile
  	@echo creating pkgconfig
 -	@sed -e 's|@PREFIX@|$(PREFIX)|' \
--            -e 's|@LIBDIR@|$(LIBDIR)|' \
--            -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
--            -e 's|@VERSION@|$(VERSION)|' \
+-         -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' \
-+            -e 's|@VERSION@|$(VERSION)|g' \
-              $< >$@
++         -e 's|@LIBDIR@|$(LIBDIR)|g' \
++         -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|g' \
++         -e 's|@VERSION@|$(LIBVER)|g' \
+           $< >$@
  
- install: liblz4 liblz4.pc
+ install: lib liblz4.pc
 -	@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
--	@install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER)
--	@cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
--	@cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
--	@cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
+-	@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/
+ ifeq ($(BUILD_STATIC),yes)
 -	@install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
++	$(BSD_INSTALL_DATA) -m 644 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_DIR) -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-+	$(BSD_INSTALL_LIB) -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER)
-+	@ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR)
-+	@ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT)
-+	$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+	$(BSD_INSTALL_LIB) -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
 +	$(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
- 	@echo lz4 static and shared library installed
+ 	@echo lz4 static and shared libraries installed
  
  uninstall:
-@@ -113,5 +109,3 @@ uninstall:
- 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
- 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
+@@ -145,4 +141,3 @@ uninstall:
+ 	@$(RM) $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
  	@echo lz4 libraries successfully uninstalled
--
+ 
 -endif
diff --git a/archivers/lz4/patches/patch-programs_Makefile b/archivers/lz4/patches/patch-programs_Makefile
index f255ef055f6..c4022e0b5c0 100644
--- a/archivers/lz4/patches/patch-programs_Makefile
+++ b/archivers/lz4/patches/patch-programs_Makefile
@@ -1,43 +1,45 @@
-$NetBSD: patch-programs_Makefile,v 1.5 2015/06/09 12:04:19 fhajny Exp $
+$NetBSD: patch-programs_Makefile,v 1.6 2016/12/07 21:34:58 fhajny Exp $
 
-Make portable, use pkgsrc install scripts.
---- programs/Makefile.orig	2015-05-26 01:13:50.000000000 +0000
+Unlock install target. Use pkgsrc install scripts.
+
+--- programs/Makefile.orig	2016-11-22 20:34:17.000000000 +0000
 +++ programs/Makefile
-@@ -43,7 +43,7 @@ CFLAGS += -std=c99 -Wall -Wextra -Wundef
- FLAGS  := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
- 
- BINDIR := $(PREFIX)/bin
--MANDIR := $(PREFIX)/share/man/man1
-+MANDIR := $(PREFIX)/$(PKGMANDIR)/man1
- LZ4DIR := ../lib
+@@ -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
  
- 
-@@ -112,19 +112,15 @@ clean:
+@@ -80,20 +80,16 @@ clean:
  	@echo Cleaning completed
  
  
 -#------------------------------------------------------------------------
--#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
--
- install: lz4 lz4c
+-#make install is validated only for Linux, OSX, kFreeBSD, Hurd and
+-#FreeBSD targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD))
+ 
+ install: lz4$(EXT) lz4c$(EXT)
  	@echo Installing binaries
 -	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
--	@install -m 755 lz4 $(DESTDIR)$(BINDIR)/lz4
+-	@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 $(DESTDIR)$(BINDIR)/lz4
- 	@ln -sf lz4 $(DESTDIR)$(BINDIR)/lz4cat
- 	@ln -sf lz4 $(DESTDIR)$(BINDIR)/unlz4
--	@install -m 755 lz4c $(DESTDIR)$(BINDIR)/lz4c
-+	$(BSD_INSTALL_PROGRAM) -m 755 lz4c $(DESTDIR)$(BINDIR)/lz4c
++	$(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)
  	@echo Installing man pages
 -	@install -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
-@@ -308,4 +304,3 @@ test-mem: lz4 datagen fuzzer frametest f
- test-mem32: lz4c32 datagen
- # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system...
+@@ -110,4 +106,3 @@ uninstall:
+ 	@$(RM) $(DESTDIR)$(MANDIR)/unlz4.1
+ 	@echo lz4 programs successfully uninstalled
  
 -endif