[src/trunk]: src Update pigz to 2.3.1

[tls <tls%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2b749c5849d1
branches:  trunk
changeset: 329966:2b749c5849d1
user:      tls <tls%NetBSD.org@localhost>
date:      Sun Jun 15 17:53:19 2014 +0000

description:
Update pigz to 2.3.1

diffstat:

 doc/3RDPARTY                         |    6 +-
 external/zlib/pigz/bin/pigz/Makefile |   10 +-
 external/zlib/pigz/dist/pigz.1       |   23 ++-
 external/zlib/pigz/dist/pigz.ps      |  379 -----------------------------------
 4 files changed, 32 insertions(+), 386 deletions(-)

diffs (truncated from 496 to 300 lines):

diff -r 34771c15b055 -r 2b749c5849d1 doc/3RDPARTY
--- a/doc/3RDPARTY      Sun Jun 15 17:37:20 2014 +0000
+++ b/doc/3RDPARTY      Sun Jun 15 17:53:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: 3RDPARTY,v 1.1122 2014/06/14 21:01:39 roy Exp $
+#      $NetBSD: 3RDPARTY,v 1.1123 2014/06/15 17:55:43 tls Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1357,13 +1357,13 @@
      implementation.
 
 Package:       pigz
-Version:       2.1.6
+Version:       2.3.1
 Current Vers:  2.3.1
 Maintainer:    Mark Adler <madler%alumni.caltech.edu@localhost>
 Archive Site:  http://zlib.net/pigz/
 Home Page:     http://zlib.net/pigz/
 Mailing List:  http://mail.zlib.net/mailman/listinfo/pigz-announce_zlib.net
-Responsible:   mrg
+Responsible:   mrg, tls
 License:       zlib
 Location:      external/zlib/pigz/dist
 Notes:
diff -r 34771c15b055 -r 2b749c5849d1 external/zlib/pigz/bin/pigz/Makefile
--- a/external/zlib/pigz/bin/pigz/Makefile      Sun Jun 15 17:37:20 2014 +0000
+++ b/external/zlib/pigz/bin/pigz/Makefile      Sun Jun 15 17:53:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2011/05/26 12:56:27 joerg Exp $
+#      $NetBSD: Makefile,v 1.8 2014/06/15 17:54:55 tls Exp $
 
 .include <bsd.own.mk>
 
@@ -12,10 +12,14 @@
 SRCS=          pigz.c yarn.c
 MAN=           pigz.1
 
+# pigz 2.3.1 brings zopfli support
+SRCS+=         deflate.c blocksplitter.c tree.c lz77.c cache.c hash.c util.c \
+               squeeze.c katajainen.c
+
 .if !defined(HOSTPROG)
 DPADD=         ${LIBM} ${LIBPTHREAD}
 .endif
-LDADD=         -lz -lpthread
+LDADD=         -lm -lz -lpthread
 
 .if ${MKPIGZGZIP} != "no"
 # these ones are from mrg's gzip
@@ -43,7 +47,7 @@
 .include <bsd.prog.mk>
 
 DIST=          ${NETBSDSRCDIR}/external/zlib/pigz/dist
-.PATH: ${DIST}
+.PATH: ${DIST} ${DIST}/zopfli
 
 .if ${MKPIGZGZIP} != "no"
 GZIPDIST=      ${NETBSDSRCDIR}/usr.bin/gzip
diff -r 34771c15b055 -r 2b749c5849d1 external/zlib/pigz/dist/pigz.1
--- a/external/zlib/pigz/dist/pigz.1    Sun Jun 15 17:37:20 2014 +0000
+++ b/external/zlib/pigz/dist/pigz.1    Sun Jun 15 17:53:19 2014 +0000
@@ -11,6 +11,11 @@
 .Op Fl b Ar blocksize
 .Op Fl p Ar threads
 .Op Fl S Ar suffix
+.Op Fl 11
+.Op Fl F
+.Op Fl I Ar iterations
+.Op Fl M Ar maxsplits
+.Op Fl O
 .Op Ar
 .Nm unpigz
 .Op Fl cfhiKkLlNnqRrTtz
@@ -96,7 +101,12 @@
 or
 .Fl Fl best
 indicates the slowest compression method (best compression).
-Level 0 is no compression.
+.Fl 0
+is no compression.
+.Fl 11
+gives a few percent better compression at a severe cost in execution time.
+The default is
+.Fl 6 .
 .It Fl b, Fl Fl blocksize Ar mmm
 Set compression block size to
 .Ar mmm
@@ -131,6 +141,8 @@
 Print no messages, even on error.
 .It Fl r, Fl Fl recursive
 Process the contents of all subdirectories.
+.It Fl R, Fl Fl rsyncable
+Input-determined block locations for rsync.
 .It Fl S, Fl Fl suffix Ar .sss
 Use suffix
 .Ar .sss
@@ -149,6 +161,15 @@
 Compress to zlib
 .Pq Pa .zz
 instead of gzip format.
+.It Fl F, Fl Fl first
+If compressing at level 11, do iterations first, before block split (default is last).
+.It Fl I, Fl Fl iterations Ar n
+If compressing at level 11, number of iterations for optimization (default 15).
+.It Fl M, Fl Fl maxsplits Ar n
+If compressing at level 11, maximum number of split blocks (default 15).
+.It Fl O, Fl Fl oneblock
+If compressing at level 11, do not split into smaller blocks (default is
+block splitting).
 .El
 .Sh COPYRIGHT NOTICE
 This software is provided 'as-is', without any express or implied
diff -r 34771c15b055 -r 2b749c5849d1 external/zlib/pigz/dist/pigz.ps
--- a/external/zlib/pigz/dist/pigz.ps   Sun Jun 15 17:37:20 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,379 +0,0 @@
-%!PS-Adobe-3.0
-%%Creator: groff version 1.19.2
-%%CreationDate: Sun Jan 17 12:33:29 2010
-%%DocumentNeededResources: font Helvetica
-%%+ font Helvetica-Bold
-%%+ font Helvetica-Oblique
-%%DocumentSuppliedResources: procset grops 1.19 2
-%%Pages: 2
-%%PageOrder: Ascend
-%%DocumentMedia: Default 595 842 0 () ()
-%%Orientation: Portrait
-%%EndComments
-%%BeginDefaults
-%%PageMedia: Default
-%%EndDefaults
-%%BeginProlog
-%%BeginResource: procset grops 1.19 2
-%!PS-Adobe-3.0 Resource-ProcSet
-/setpacking where{
-pop
-currentpacking
-true setpacking
-}if
-/grops 120 dict dup begin
-/SC 32 def
-/A/show load def
-/B{0 SC 3 -1 roll widthshow}bind def
-/C{0 exch ashow}bind def
-/D{0 exch 0 SC 5 2 roll awidthshow}bind def
-/E{0 rmoveto show}bind def
-/F{0 rmoveto 0 SC 3 -1 roll widthshow}bind def
-/G{0 rmoveto 0 exch ashow}bind def
-/H{0 rmoveto 0 exch 0 SC 5 2 roll awidthshow}bind def
-/I{0 exch rmoveto show}bind def
-/J{0 exch rmoveto 0 SC 3 -1 roll widthshow}bind def
-/K{0 exch rmoveto 0 exch ashow}bind def
-/L{0 exch rmoveto 0 exch 0 SC 5 2 roll awidthshow}bind def
-/M{rmoveto show}bind def
-/N{rmoveto 0 SC 3 -1 roll widthshow}bind def
-/O{rmoveto 0 exch ashow}bind def
-/P{rmoveto 0 exch 0 SC 5 2 roll awidthshow}bind def
-/Q{moveto show}bind def
-/R{moveto 0 SC 3 -1 roll widthshow}bind def
-/S{moveto 0 exch ashow}bind def
-/T{moveto 0 exch 0 SC 5 2 roll awidthshow}bind def
-/SF{
-findfont exch
-[exch dup 0 exch 0 exch neg 0 0]makefont
-dup setfont
-[exch/setfont cvx]cvx bind def
-}bind def
-/MF{
-findfont
-[5 2 roll
-0 3 1 roll
-neg 0 0]makefont
-dup setfont
-[exch/setfont cvx]cvx bind def
-}bind def
-/level0 0 def
-/RES 0 def
-/PL 0 def
-/LS 0 def
-/MANUAL{
-statusdict begin/manualfeed true store end
-}bind def
-/PLG{
-gsave newpath clippath pathbbox grestore
-exch pop add exch pop
-}bind def
-/BP{
-/level0 save def
-1 setlinecap
-1 setlinejoin
-72 RES div dup scale
-LS{
-90 rotate
-}{
-0 PL translate
-}ifelse
-1 -1 scale
-}bind def
-/EP{
-level0 restore
-showpage
-}def
-/DA{
-newpath arcn stroke
-}bind def
-/SN{
-transform
-.25 sub exch .25 sub exch
-round .25 add exch round .25 add exch
-itransform
-}bind def
-/DL{
-SN
-moveto
-SN
-lineto stroke
-}bind def
-/DC{
-newpath 0 360 arc closepath
-}bind def
-/TM matrix def
-/DE{
-TM currentmatrix pop
-translate scale newpath 0 0 .5 0 360 arc closepath
-TM setmatrix
-}bind def
-/RC/rcurveto load def
-/RL/rlineto load def
-/ST/stroke load def
-/MT/moveto load def
-/CL/closepath load def
-/Fr{
-setrgbcolor fill
-}bind def
-/setcmykcolor where{
-pop
-/Fk{
-setcmykcolor fill
-}bind def
-}if
-/Fg{
-setgray fill
-}bind def
-/FL/fill load def
-/LW/setlinewidth load def
-/Cr/setrgbcolor load def
-/setcmykcolor where{
-pop
-/Ck/setcmykcolor load def
-}if
-/Cg/setgray load def
-/RE{
-findfont
-dup maxlength 1 index/FontName known not{1 add}if dict begin
-{
-1 index/FID ne{def}{pop pop}ifelse
-}forall
-/Encoding exch def
-dup/FontName exch def
-currentdict end definefont pop
-}bind def
-/DEFS 0 def
-/EBEGIN{
-moveto
-DEFS begin
-}bind def
-/EEND/end load def
-/CNT 0 def
-/level1 0 def
-/PBEGIN{
-/level1 save def
-translate
-div 3 1 roll div exch scale
-neg exch neg exch translate
-0 setgray
-0 setlinecap
-1 setlinewidth
-0 setlinejoin
-10 setmiterlimit
-[]0 setdash
-/setstrokeadjust where{
-pop
-false setstrokeadjust
-}if
-/setoverprint where{
-pop
-false setoverprint
-}if
-newpath
-/CNT countdictstack def
-userdict begin
-/showpage{}def
-/setpagedevice{}def
-}bind def
-/PEND{
-countdictstack CNT sub{end}repeat
-level1 restore
-}bind def
-end def