Update lz4 to 124.

- New : LZ4 HC streaming mode
- Fixed : LZ4F_compressBound() using null preferencesPtr
- Updated : xxHash to r38
- Updated library number, to 1.4.0

7 files changed, 42 insertions, 40 deletions

diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile
index ce332f6843e..1b30a0b3ec7 100644
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/10/02 08:52:41 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/12 11:20:56 fhajny Exp $
 
-DISTNAME=	lz4-r123
+DISTNAME=	lz4-r124
 PKGNAME=	${DISTNAME:S/-r/-/}
 CATEGORIES=	archivers
 MASTER_SITES=	-https://github.com/Cyan4973/lz4/archive/${DISTNAME:S/lz4-//}${EXTRACT_SUFX}
diff --git a/archivers/lz4/PLIST b/archivers/lz4/PLIST
index 53d0c3ffbf2..791d40be69b 100644
--- a/archivers/lz4/PLIST
+++ b/archivers/lz4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/10/02 08:52:41 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/12/12 11:20:56 fhajny Exp $
 bin/lz4
 bin/lz4c
 bin/lz4cat
@@ -7,7 +7,7 @@ include/lz4hc.h
 lib/liblz4.a
 lib/liblz4.so
 lib/liblz4.so.1
-lib/liblz4.so.1.3.1
+lib/liblz4.so.1.4.0
 lib/pkgconfig/liblz4.pc
 man/man1/lz4.1
 man/man1/lz4c.1
diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo
index c4f46cac17a..000fac9b32d 100644
--- a/archivers/lz4/distinfo
+++ b/archivers/lz4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2014/10/15 22:11:24 joerg Exp $
+$NetBSD: distinfo,v 1.4 2014/12/12 11:20:56 fhajny Exp $
 
-SHA1 (lz4-r123.tar.gz) = 588d51ea02a0bc325229601412b1e829a4806413
-RMD160 (lz4-r123.tar.gz) = 2a6c899dee8f84b619f7cdb8ec0cea3ebb273910
-Size (lz4-r123.tar.gz) = 137315 bytes
-SHA1 (patch-Makefile) = 223bf2c60dfd050ef4eb2e03feda988011686cdb
-SHA1 (patch-programs_Makefile) = b248d8967966c482f9d2ee6d51faf245aca3aab1
-SHA1 (patch-programs_frametest.c) = 5966d6a46f4bc1ea6de64234ff162b32d5588b53
-SHA1 (patch-programs_fuzzer.c) = 711c0e37128d983000bde1b42afec6f9ee9f0e85
+SHA1 (lz4-r124.tar.gz) = ee4943e07d08605041c86c2d2c649b375cee6c13
+RMD160 (lz4-r124.tar.gz) = 04db6431fe188684331418881dc5afe7a7180311
+Size (lz4-r124.tar.gz) = 144148 bytes
+SHA1 (patch-Makefile) = fa460a8c7a5bd14986645429680aeb45c5d51509
+SHA1 (patch-programs_Makefile) = 432cf3ed2d7faf66bddbe76cf06b762fd05203cc
+SHA1 (patch-programs_frametest.c) = 583ece19319b2be8798e32ce43929500deb6ed66
+SHA1 (patch-programs_fuzzer.c) = 6a250ea8c08cf9fb1da3a0350f952512ee11002f
diff --git a/archivers/lz4/patches/patch-Makefile b/archivers/lz4/patches/patch-Makefile
index 60a669f41b3..b641a9eff62 100644
--- a/archivers/lz4/patches/patch-Makefile
+++ b/archivers/lz4/patches/patch-Makefile
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile,v 1.2 2014/10/02 08:52:41 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.3 2014/12/12 11:20:56 fhajny Exp $
 
 Make portable, use pkgsrc install scripts.
---- Makefile.orig	2014-09-25 12:03:36.000000000 +0000
+--- Makefile.orig	2014-11-06 18:39:42.000000000 +0000
 +++ Makefile
 @@ -33,9 +33,9 @@
  # Version numbers
- VERSION=123
+ VERSION=124
  export RELEASE=r$(VERSION)
 -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`
@@ -16,7 +16,7 @@ Make portable, use pkgsrc install scripts.
  LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
  
  DESTDIR?=
-@@ -111,27 +111,23 @@ clean:
+@@ -122,27 +122,23 @@ clean:
  	@echo Cleaning completed
  
  
@@ -56,8 +56,8 @@ Make portable, use pkgsrc install scripts.
  	@echo lz4 static and shared library installed
  	@cd $(PRGDIR); $(MAKE) -e install
  
-@@ -166,4 +162,3 @@ test:
- 	@cd examples; $(MAKE) -e $@
- 	@cd $(PRGDIR); $(MAKE) -e $@
+@@ -188,4 +184,3 @@ streaming-examples:
+ prg-travis:
+ 	@cd $(PRGDIR); $(MAKE) -e test-travis
  
 -endif
diff --git a/archivers/lz4/patches/patch-programs_Makefile b/archivers/lz4/patches/patch-programs_Makefile
index eb3badd3074..39492d58878 100644
--- a/archivers/lz4/patches/patch-programs_Makefile
+++ b/archivers/lz4/patches/patch-programs_Makefile
@@ -1,7 +1,7 @@
-$NetBSD: patch-programs_Makefile,v 1.2 2014/10/02 08:52:41 fhajny Exp $
+$NetBSD: patch-programs_Makefile,v 1.3 2014/12/12 11:20:56 fhajny Exp $
 
 Make portable, use pkgsrc install scripts.
---- programs/Makefile.orig	2014-09-25 12:03:36.000000000 +0000
+--- programs/Makefile.orig	2014-11-06 18:39:42.000000000 +0000
 +++ programs/Makefile
 @@ -40,7 +40,7 @@ CFLAGS += -std=c99 -Wall -Wextra -Wundef
  FLAGS   = -I.. $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
@@ -12,7 +12,7 @@ Make portable, use pkgsrc install scripts.
  LZ4DIR=..
  
  TEST_FILES = COPYING
-@@ -107,20 +107,16 @@ clean:
+@@ -106,20 +106,16 @@ clean:
  	@echo Cleaning completed
  
  
@@ -39,7 +39,7 @@ Make portable, use pkgsrc install scripts.
  	@echo lz4 installation completed
  
  uninstall:
-@@ -185,4 +181,3 @@ test-mem: lz4 datagen frametest
+@@ -201,4 +197,3 @@ test-mem: lz4 datagen fuzzer frametest
  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
index a8ea32cba63..4f185842e1c 100644
--- a/archivers/lz4/patches/patch-programs_frametest.c
+++ b/archivers/lz4/patches/patch-programs_frametest.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-programs_frametest.c,v 1.1 2014/10/15 22:11:24 joerg Exp $
+$NetBSD: patch-programs_frametest.c,v 1.2 2014/12/12 11:20:56 fhajny Exp $
 
---- programs/frametest.c.orig	2014-10-15 12:42:00.000000000 +0000
+--- programs/frametest.c.orig	2014-11-06 18:39:42.000000000 +0000
 +++ programs/frametest.c
 @@ -42,7 +42,7 @@
  **************************************/
diff --git a/archivers/lz4/patches/patch-programs_fuzzer.c b/archivers/lz4/patches/patch-programs_fuzzer.c
index da73d9ac3fe..2e1dbd1cecf 100644
--- a/archivers/lz4/patches/patch-programs_fuzzer.c
+++ b/archivers/lz4/patches/patch-programs_fuzzer.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-programs_fuzzer.c,v 1.2 2014/10/02 08:52:41 fhajny Exp $
+$NetBSD: patch-programs_fuzzer.c,v 1.3 2014/12/12 11:20:56 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-09-25 12:03:36.000000000 +0000
+--- programs/fuzzer.c.orig	2014-11-06 18:39:42.000000000 +0000
 +++ programs/fuzzer.c
-@@ -30,6 +30,7 @@
+@@ -30,6 +30,7 @@ Remove Visual warning messages
  #  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 */
@@ -13,7 +13,7 @@ Based on https://code.google.com/p/lz4/source/detail?r=81.
  #endif
  
  
-@@ -38,12 +39,17 @@
+@@ -38,12 +39,18 @@ Includes
  **************************************/
  #include <stdlib.h>
  #include <stdio.h>      // fgets, sscanf
@@ -29,23 +29,24 @@ Based on https://code.google.com/p/lz4/source/detail?r=81.
 +#else
 +#  include <sys/time.h>    // gettimeofday
 +#endif
++
  
  /**************************************
-    Basic Types
-@@ -104,8 +110,11 @@ static int displayLevel = 2;
+ Basic Types
+@@ -99,8 +106,11 @@ static U32 g_time = 0;
  /*********************************************************
    Fuzzer functions
  *********************************************************/
 +#if defined(BMK_LEGACY_TIMER)
 +
- static int FUZ_GetMilliStart(void)
+ static U32 FUZ_GetMilliStart(void)
  {
-+   // Based on Legacy ftime()
-    struct timeb tb;
-    int nCount;
-    ftime( &tb );
-@@ -113,6 +122,20 @@ static int FUZ_GetMilliStart(void)
-    return nCount;
++    // Based on Legacy ftime()
+     struct timeb tb;
+     U32 nCount;
+     ftime( &tb );
+@@ -108,6 +118,21 @@ static U32 FUZ_GetMilliStart(void)
+     return nCount;
  }
  
 +#else
@@ -62,6 +63,7 @@ Based on https://code.google.com/p/lz4/source/detail?r=81.
 +}
 +
 +#endif
- 
- static int FUZ_GetMilliSpan( int nTimeStart )
++
+ static U32 FUZ_GetMilliSpan(U32 nTimeStart)
  {
+     U32 nCurrent = FUZ_GetMilliStart();