Update archivers/lz4 to 130.

LZ4 r130
Fixed : incompatibility sparse mode vs console
Fixed : LZ4IO exits too early when frame crc not present
Fixed : incompatibility sparse mode vs append mode
Performance fix : big compression speed boost for clang (+30%)
New : cross-version test, by Takayuki Matsuoka

LZ4 r129
New : LZ4_compress_fast()
Changed: New lz4 and lz4hc compression API. Previous function
  prototypes still supported.
Changed: Sparse file support enabled by default
New : LZ4 CLI improved performance compressing/decompressing multiple file
Added : LZ4_compress_destSize()
Fixed : GCC 4.9+ vector optimization
Changed: Enums converted to LZ4F_ namespace convention
Added : AppVeyor CI environment, for Visual tests
Modified:Obsolete functions generate warnings
Fixed : Bug #75 (unfinished stream)
Updated: Documentation converted to MarkDown format

LZ4 r128
New : lz4cli sparse file support
New : command -m, to compress multiple files in a single command
Fixed : Restored lz4hc compression ratio (slightly lower since r124)
New : lz4 cli supports long commands
New : lz4frame & lz4cli frame content size support
New : lz4frame supports skippable frames
Changed: Default "make install" directory is /usr/local
New : lz4 cli supports "pass-through" mode
New : datagen can generate sparse files
New : scan-build tests
New : g++ compatibility tests
New : arm cross-compilation test
Fixed : Fuzzer + frametest compatibility with NetBSD
Added : Visual project directory
Updated: Man page & Specification

9 files changed, 49 insertions, 147 deletions

diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile
index 11537d61186..54e3bc99d00 100644
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2015/03/23 22:24:11 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2015/06/09 12:04:19 fhajny Exp $
 
-DISTNAME=	lz4-r127
+DISTNAME=	lz4-r130
 PKGNAME=	${DISTNAME:S/-r/-/}
 CATEGORIES=	archivers
-MASTER_SITES=	-https://github.com/Cyan4973/lz4/archive/${DISTNAME:S/lz4-//}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=Cyan4973/}
 
 MAINTAINER=	filip@joyent.com
 HOMEPAGE=	http://code.google.com/p/lz4/
 COMMENT=	Extremely Fast Compression algorithm
 LICENSE=	2-clause-bsd
 
+GITHUB_TAG=	r${PKGVERSION_NOREV}
+
 USE_LANGUAGES=	c c99
 USE_TOOLS+=	gmake pkg-config
 
diff --git a/archivers/lz4/PLIST b/archivers/lz4/PLIST
index 01fd398aa33..7b945f2c96e 100644
--- a/archivers/lz4/PLIST
+++ b/archivers/lz4/PLIST
@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2015/03/23 22:24:11 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/06/09 12:04:19 fhajny Exp $
 bin/lz4
 bin/lz4c
 bin/lz4cat
+bin/unlz4
 include/lz4.h
 include/lz4frame.h
 include/lz4hc.h
 lib/liblz4.a
 lib/liblz4.so
 lib/liblz4.so.1
-lib/liblz4.so.1.5.0
+lib/liblz4.so.1.7.0
 lib/pkgconfig/liblz4.pc
 man/man1/lz4.1
 man/man1/lz4c.1
 man/man1/lz4cat.1
+man/man1/unlz4.1
diff --git a/archivers/lz4/buildlink3.mk b/archivers/lz4/buildlink3.mk
index 85349b73c3d..5241c7ad1a3 100644
--- a/archivers/lz4/buildlink3.mk
+++ b/archivers/lz4/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/03/23 22:24:11 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2015/06/09 12:04:19 fhajny Exp $
 
 BUILDLINK_TREE+=	lz4
 
 .if !defined(LZ4_BUILDLINK3_MK)
 LZ4_BUILDLINK3_MK:=
 
-BUILDLINK_ABI_DEPENDS.lz4+=	lz4>=126
-BUILDLINK_API_DEPENDS.lz4+=	lz4>=126
+BUILDLINK_ABI_DEPENDS.lz4+=	lz4>=130
+BUILDLINK_API_DEPENDS.lz4+=	lz4>=130
 BUILDLINK_PKGSRCDIR.lz4?=	../../archivers/lz4
 .endif # LZ4_BUILDLINK3_MK
 
diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo
index 605634a7453..de97d39bbdc 100644
--- a/archivers/lz4/distinfo
+++ b/archivers/lz4/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/03/23 22:24:11 fhajny Exp $
+$NetBSD: distinfo,v 1.6 2015/06/09 12:04:19 fhajny Exp $
 
-SHA1 (lz4-r127.tar.gz) = 1aa7d4bb62eb79f88b33f86f9890dc9f96797af5
-RMD160 (lz4-r127.tar.gz) = 1f68ce2228d4d0c19c8ca72c7d2d08c45049e963
-Size (lz4-r127.tar.gz) = 139066 bytes
-SHA1 (patch-Makefile) = 93fd35f5d79431f9ebe3ba1344fd1d7e94a55075
-SHA1 (patch-lib_Makefile) = 7a30b62b8a1507e2c62503e73413a795717e089a
-SHA1 (patch-programs_Makefile) = 4f852a496b1acebfebce36f426c394702c5680d0
-SHA1 (patch-programs_frametest.c) = 0d25ab96df4b615a3e04abed116b6ec16de400df
-SHA1 (patch-programs_fuzzer.c) = 02598b7836b73467ce98d9de6bcf9eadc3fa14ce
+SHA1 (lz4-r130.tar.gz) = 5e1167e578639cb75e4103933dbf68e193a4d4c4
+RMD160 (lz4-r130.tar.gz) = c02f1852e17fea7f88f23cca5ca36a694b857d98
+Size (lz4-r130.tar.gz) = 129154 bytes
+SHA1 (patch-Makefile) = c6e5cd7c375aea8d37704f307bd6488f80a208bf
+SHA1 (patch-lib_Makefile) = 30caae8b487ceedb378c7d4c264cacbfaf3df3e9
+SHA1 (patch-programs_Makefile) = 9211e3718b52834fe461dc57ca486113659bbf8d
diff --git a/archivers/lz4/patches/patch-Makefile b/archivers/lz4/patches/patch-Makefile
index 345f241ad71..808e5d111e1 100644
--- a/archivers/lz4/patches/patch-Makefile
+++ b/archivers/lz4/patches/patch-Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.4 2015/03/23 22:24:11 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.5 2015/06/09 12:04:19 fhajny Exp $
 
 Make portable, use pkgsrc install scripts.
---- Makefile.orig	2014-12-19 08:51:32.000000000 +0000
+--- Makefile.orig	2015-05-26 01:13:50.000000000 +0000
 +++ Makefile
-@@ -86,10 +86,6 @@ clean:
+@@ -75,10 +75,6 @@ clean:
  	@echo Cleaning completed
  
  
@@ -14,7 +14,7 @@ Make portable, use pkgsrc install scripts.
  install:
  	@cd $(LZ4DIR); $(MAKE) -e install
  	@cd $(PRGDIR); $(MAKE) -e install
-@@ -133,4 +129,3 @@ streaming-examples:
+@@ -123,4 +119,3 @@ streaming-examples:
  prg-travis:
  	@cd $(PRGDIR); $(MAKE) -e test-travis
  
diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile
index 9e1f855546d..1c6527ab3ff 100644
--- a/archivers/lz4/patches/patch-lib_Makefile
+++ b/archivers/lz4/patches/patch-lib_Makefile
@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_Makefile,v 1.1 2015/03/23 22:24:11 fhajny Exp $
+$NetBSD: patch-lib_Makefile,v 1.2 2015/06/09 12:04:19 fhajny Exp $
 
 Make portable, use pkgsrc install scripts.
---- lib/Makefile.orig	2014-12-19 08:51:32.000000000 +0000
+--- lib/Makefile.orig	2015-05-26 01:13:50.000000000 +0000
 +++ lib/Makefile
-@@ -33,9 +33,9 @@
+@@ -32,9 +32,9 @@
  
  # Version numbers
- VERSION ?= 126
+ 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`
@@ -16,7 +16,7 @@ Make portable, use pkgsrc install scripts.
  LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
  
  DESTDIR?=
-@@ -80,28 +80,24 @@ clean:
+@@ -79,28 +79,24 @@ clean:
  	@echo Cleaning library completed
  
  
@@ -59,8 +59,8 @@ Make portable, use pkgsrc install scripts.
  
  uninstall:
 @@ -113,5 +109,3 @@ uninstall:
- 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4.h
  	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
+ 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(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 486b92a7d9c..f255ef055f6 100644
--- a/archivers/lz4/patches/patch-programs_Makefile
+++ b/archivers/lz4/patches/patch-programs_Makefile
@@ -1,18 +1,18 @@
-$NetBSD: patch-programs_Makefile,v 1.4 2015/03/23 22:24:11 fhajny Exp $
+$NetBSD: patch-programs_Makefile,v 1.5 2015/06/09 12:04:19 fhajny Exp $
 
 Make portable, use pkgsrc install scripts.
---- programs/Makefile.orig	2014-12-19 08:51:32.000000000 +0000
+--- programs/Makefile.orig	2015-05-26 01:13:50.000000000 +0000
 +++ programs/Makefile
-@@ -40,7 +40,7 @@ CFLAGS += -std=c99 -Wall -Wextra -Wundef
- FLAGS   = -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+@@ -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
+ BINDIR := $(PREFIX)/bin
+-MANDIR := $(PREFIX)/share/man/man1
++MANDIR := $(PREFIX)/$(PKGMANDIR)/man1
+ LZ4DIR := ../lib
  
- TEST_FILES = COPYING
-@@ -106,20 +106,16 @@ clean:
+ 
+@@ -112,19 +112,15 @@ clean:
  	@echo Cleaning completed
  
  
@@ -23,23 +23,20 @@ Make portable, use pkgsrc install scripts.
  install: lz4 lz4c
  	@echo Installing binaries
 -	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
--	@install -m 755 lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4$(EXT)
+-	@install -m 755 lz4 $(DESTDIR)$(BINDIR)/lz4
 +	$(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
--	@install -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT)
-+	$(BSD_INSTALL_PROGRAM) -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT)
++	$(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
  	@echo Installing man pages
 -	@install -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
--	@install -m 644 lz4c.1 $(DESTDIR)$(MANDIR)/lz4c.1
--	@install -m 644 lz4cat.1 $(DESTDIR)$(MANDIR)/lz4cat.1
 +	$(BSD_INSTALL_MAN) -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
-+	$(BSD_INSTALL_MAN) -m 644 lz4c.1 $(DESTDIR)$(MANDIR)/lz4c.1
-+	$(BSD_INSTALL_MAN) -m 644 lz4cat.1 $(DESTDIR)$(MANDIR)/lz4cat.1
- 	@echo lz4 installation completed
- 
- uninstall:
-@@ -203,4 +199,3 @@ test-mem: lz4 datagen fuzzer frametest
+ 	@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...
  
diff --git a/archivers/lz4/patches/patch-programs_frametest.c b/archivers/lz4/patches/patch-programs_frametest.c
deleted file mode 100644
index 5d83e62a7d7..00000000000
--- a/archivers/lz4/patches/patch-programs_frametest.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-programs_frametest.c,v 1.3 2015/03/23 22:24:11 fhajny Exp $
-
-Make portable.
---- programs/frametest.c.orig	2014-12-19 08:51:32.000000000 +0000
-+++ programs/frametest.c
-@@ -42,7 +42,7 @@
- **************************************/
- #include <stdlib.h>     // free
- #include <stdio.h>      // fgets, sscanf
--#include <sys/timeb.h>  // timeb
-+#include <sys/time.h>  // timeb
- #include <string.h>     // strcmp
- #include "lz4frame_static.h"
- #include "xxhash.h"     // XXH64
-@@ -113,11 +113,9 @@ static U32 pause = 0;
- *********************************************************/
- static U32 FUZ_GetMilliStart(void)
- {
--    struct timeb tb;
--    U32 nCount;
--    ftime( &tb );
--    nCount = (U32) (((tb.time & 0xFFFFF) * 1000) +  tb.millitm);
--    return nCount;
-+    struct timeval tv;
-+    gettimeofday(&tv, NULL);
-+    return (tv.tv_usec/1000 + (tv.tv_sec & 0xfffff) * 1000);
- }
- 
- 
diff --git a/archivers/lz4/patches/patch-programs_fuzzer.c b/archivers/lz4/patches/patch-programs_fuzzer.c
deleted file mode 100644
index 908ac20c894..00000000000
--- a/archivers/lz4/patches/patch-programs_fuzzer.c
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-programs_fuzzer.c,v 1.4 2015/03/23 22:24:11 fhajny Exp $
-
-Add portable code for ftime for NetBSD.
-
-Based on https://code.google.com/p/lz4/source/detail?r=81.
---- programs/fuzzer.c.orig	2014-12-19 08:51:32.000000000 +0000
-+++ programs/fuzzer.c
-@@ -32,6 +32,7 @@
- #  pragma warning(disable : 4127)    /* disable: C4127: conditional expression is constant */
- #  pragma warning(disable : 4146)    /* disable: C4146: minus unsigned expression */
- #  pragma warning(disable : 4310)    /* disable: C4310: constant char value > 127 */
-+#  define BMK_LEGACY_TIMER 1
- #endif
- 
- 
-@@ -40,12 +41,17 @@
- **************************************/
- #include <stdlib.h>
- #include <stdio.h>      /* fgets, sscanf */
--#include <sys/timeb.h>  /* timeb */
- #include <string.h>     /* strcmp */
- #include "lz4.h"
- #include "lz4hc.h"
- #include "xxhash.h"
- 
-+// Use ftime() if gettimeofday() is not available on your target
-+#if defined(BMK_LEGACY_TIMER)
-+#  include <sys/timeb.h>   // timeb, ftime
-+#else
-+#  include <sys/time.h>    // gettimeofday
-+#endif
- 
- /**************************************
- * Basic Types
-@@ -100,8 +106,11 @@ static U32 g_time = 0;
- /*********************************************************
-   Fuzzer functions
- *********************************************************/
-+#if defined(BMK_LEGACY_TIMER)
-+
- static U32 FUZ_GetMilliStart(void)
- {
-+    // Based on Legacy ftime()
-     struct timeb tb;
-     U32 nCount;
-     ftime( &tb );
-@@ -109,6 +118,21 @@ static U32 FUZ_GetMilliStart(void)
-     return nCount;
- }
- 
-+#else
-+
-+static int FUZ_GetMilliStart()
-+{
-+  // Based on newer gettimeofday()
-+  // Use GetMilliSpan to correct for rollover
-+  struct timeval tv;
-+  int nCount;
-+  gettimeofday(&tv, NULL);
-+  nCount = (int) (tv.tv_usec/1000 + (tv.tv_sec & 0xfffff) * 1000);
-+  return nCount;
-+}
-+
-+#endif
-+
- static U32 FUZ_GetMilliSpan(U32 nTimeStart)
- {
-     U32 nCurrent = FUZ_GetMilliStart();