Index: head/archivers/liblz4/files/patch-programs_lz4cli.c =================================================================== --- head/archivers/liblz4/files/patch-programs_lz4cli.c (revision 390874) +++ head/archivers/liblz4/files/patch-programs_lz4cli.c (nonexistent) @@ -1,11 +0,0 @@ ---- programs/lz4cli.c.orig 2015-05-07 11:23:39 UTC -+++ programs/lz4cli.c -@@ -473,7 +473,7 @@ int main(int argc, char** argv) - if (multiple_inputs) input_filename = inFileNames[0], output_filename = (const char*)(inFileNames[0]); - if(!input_filename) { input_filename=stdinmark; } - -- /* Check if input or output are defined as console; trigger an error in this case */ -+ /* Check if input is defined as console; trigger an error in this case */ - if (!strcmp(input_filename, stdinmark) && IS_CONSOLE(stdin) ) badusage(); - - /* Check if benchmark is selected */ Property changes on: head/archivers/liblz4/files/patch-programs_lz4cli.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/liblz4/files/patch-programs_Makefile =================================================================== --- head/archivers/liblz4/files/patch-programs_Makefile (revision 390874) +++ head/archivers/liblz4/files/patch-programs_Makefile (nonexistent) @@ -1,21 +0,0 @@ ---- programs/Makefile.orig 2015-05-07 11:23:39 UTC -+++ programs/Makefile -@@ -150,7 +150,7 @@ test-all: test test32 - test-travis: $(TRAVIS_TARGET) - - test-lz4-sparse: lz4 datagen -- @echo ---- test sparse file support ---- -+ @echo "\n ---- test sparse file support ----" - ./datagen -g5M -P100 > tmpSrc - ./lz4 -B4D tmpSrc | ./lz4 -dv --sparse > tmpB4 - diff -s tmpSrc tmpB4 -@@ -167,6 +167,9 @@ test-lz4-sparse: lz4 datagen - ./datagen -s1 -g1200007 -P100 | diff -s - tmpOdd - ls -ls tmpOdd - @rm tmp* -+ @echo "\n Compatibility with Console :" -+ ./lz4 COPYING | ./lz4 -d -c -+ ./lz4 COPYING | ./lz4 -d | cat - - test-lz4-contentSize: lz4 datagen - @echo ---- test original size support ---- Property changes on: head/archivers/liblz4/files/patch-programs_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/liblz4/files/patch-programs_lz4io.c =================================================================== --- head/archivers/liblz4/files/patch-programs_lz4io.c (revision 390874) +++ head/archivers/liblz4/files/patch-programs_lz4io.c (nonexistent) @@ -1,61 +0,0 @@ ---- programs/lz4io.c.orig 2015-05-07 11:23:39 UTC -+++ programs/lz4io.c -@@ -303,6 +303,12 @@ static int LZ4IO_getFiles(const char* in - - if ( *pfoutput==0) EXM_THROW(13, "Pb opening %s", output_filename); - -+ if (g_sparseFileSupport) -+ { -+ long int ftr = ftell(*pfoutput); -+ if (ftr==-1) g_sparseFileSupport = 0; -+ } -+ - return 0; - } - -@@ -639,7 +645,7 @@ static unsigned LZ4IO_fwriteSparse(FILE* - if (!g_sparseFileSupport) /* normal write */ - { - size_t sizeCheck = fwrite(buffer, 1, bufferSize, file); -- if (sizeCheck != bufferSize) EXM_THROW(68, "Write error : cannot write decoded block"); -+ if (sizeCheck != bufferSize) EXM_THROW(70, "Write error : cannot write decoded block"); - return 0; - } - -@@ -647,7 +653,7 @@ static unsigned LZ4IO_fwriteSparse(FILE* - if (storedSkips > 1 GB) - { - int seekResult = fseek(file, 1 GB, SEEK_CUR); -- if (seekResult != 0) EXM_THROW(68, "1 GB skip error (sparse file support)"); -+ if (seekResult != 0) EXM_THROW(71, "1 GB skip error (sparse file support)"); - storedSkips -= 1 GB; - } - -@@ -667,12 +673,12 @@ static unsigned LZ4IO_fwriteSparse(FILE* - { - size_t sizeCheck; - seekResult = fseek(file, storedSkips, SEEK_CUR); -- if (seekResult) EXM_THROW(68, "Skip error (sparse file)"); -+ if (seekResult) EXM_THROW(72, "Skip error (sparse file)"); - storedSkips = 0; - seg0SizeT -= nb0T; - ptrT += nb0T; - sizeCheck = fwrite(ptrT, sizeT, seg0SizeT, file); -- if (sizeCheck != seg0SizeT) EXM_THROW(68, "Write error : cannot write decoded block"); -+ if (sizeCheck != seg0SizeT) EXM_THROW(73, "Write error : cannot write decoded block"); - } - ptrT += seg0SizeT; - } -@@ -689,10 +695,10 @@ static unsigned LZ4IO_fwriteSparse(FILE* - { - size_t sizeCheck; - int seekResult = fseek(file, storedSkips, SEEK_CUR); -- if (seekResult) EXM_THROW(68, "Skip error (end of block)"); -+ if (seekResult) EXM_THROW(74, "Skip error (end of block)"); - storedSkips = 0; - sizeCheck = fwrite(restPtr, 1, restEnd - restPtr, file); -- if (sizeCheck != (size_t)(restEnd - restPtr)) EXM_THROW(68, "Write error : cannot write decoded end of block"); -+ if (sizeCheck != (size_t)(restEnd - restPtr)) EXM_THROW(75, "Write error : cannot write decoded end of block"); - } - } - Property changes on: head/archivers/liblz4/files/patch-programs_lz4io.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/liblz4/Makefile =================================================================== --- head/archivers/liblz4/Makefile (revision 390874) +++ head/archivers/liblz4/Makefile (revision 390875) @@ -1,44 +1,43 @@ # Created by: adamw # $FreeBSD$ PORTNAME= lz4 -PORTVERSION= 129 +PORTVERSION= 130 DISTVERSIONPREFIX= r -PORTREVISION= 1 CATEGORIES= archivers PKGNAMEPREFIX= lib MAINTAINER= adamw@FreeBSD.org COMMENT= LZ4 compression library, lossless and very fast LICENSE= BSD2CLAUSE GPLv2 LICENSE_COMB= multi USE_GITHUB= yes GH_ACCOUNT= Cyan4973 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION} USES= gmake pkgconfig USE_LDCONFIG= yes ALL_TARGET= default # don't remove this SO_VER= 1.7.0 PLIST_SUB+= SO_VER=${SO_VER} SO_VER_MAJ=${SO_VER:R:R} post-patch: ${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \ -e 's/LIBDIR?=/LOCALLIBDIR=/; s/$$(LIBDIR)/$$(LOCALLIBDIR)/g' \ -e 's|$$(LOCALLIBDIR)/pkgconfig|$$(PREFIX)/libdata/pkgconfig|' \ -e '/^MANDIR :=/s|share/||' \ -e 's/kFreeBSD/& FreeBSD/' \ -e 's|$$(MAKE)|${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}|' ${REINPLACE_CMD} -e '/^all:/s/$$/ liblz4.pc/' \ ${WRKSRC}/lib/Makefile ${REINPLACE_CMD} -e '/^all:/s|fullbench.*||' \ ${WRKSRC}/programs/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lz4* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblz4.so.${SO_VER} .include Index: head/archivers/liblz4/distinfo =================================================================== --- head/archivers/liblz4/distinfo (revision 390874) +++ head/archivers/liblz4/distinfo (revision 390875) @@ -1,2 +1,2 @@ -SHA256 (Cyan4973-lz4-r129_GH0.tar.gz) = f681f5528a6d16b23246db499f30717cda354079a684298375c4d74c6f475a01 -SIZE (Cyan4973-lz4-r129_GH0.tar.gz) = 126744 +SHA256 (Cyan4973-lz4-r130_GH0.tar.gz) = c48450d27524c2e5856997133e059e3cf9909241110a6e21ad278890ac425afc +SIZE (Cyan4973-lz4-r130_GH0.tar.gz) = 129154