Module Name: src Committed By: mrg Date: Fri Jun 18 04:21:23 UTC 2010
Modified Files: src/distrib/sets: sets.subr src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/external/zlib/pigz/bin/pigz: Makefile Log Message: add some infrastructure to build pigz instead of gzip. you can test this out if you set MKPIGZ=yes, but you'll end up with a /usr/bin/gzip that doesn't support bzip2, compress or pack. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/distrib/sets/sets.subr cvs rdiff -u -r1.868 -r1.869 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1466 -r1.1467 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1217 -r1.1218 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1 -r1.2 src/external/zlib/pigz/bin/pigz/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/sets.subr diff -u src/distrib/sets/sets.subr:1.122 src/distrib/sets/sets.subr:1.123 --- src/distrib/sets/sets.subr:1.122 Wed Mar 3 16:13:42 2010 +++ src/distrib/sets/sets.subr Fri Jun 18 04:21:21 2010 @@ -1,4 +1,4 @@ -# $NetBSD: sets.subr,v 1.122 2010/03/03 16:13:42 tron Exp $ +# $NetBSD: sets.subr,v 1.123 2010/06/18 04:21:21 mrg Exp $ # # @@ -168,7 +168,7 @@ # In each file, a record consists of a path and a System Package name, # separated by whitespace. E.g., # -# # $NetBSD: sets.subr,v 1.122 2010/03/03 16:13:42 tron Exp $ +# # $NetBSD: sets.subr,v 1.123 2010/06/18 04:21:21 mrg Exp $ # . base-sys-root [keyword[,...]] # ./altroot base-sys-root # ./bin base-sys-root @@ -228,6 +228,7 @@ # pcccmds ${MKPCCCMDS} != no # pf ${MKPF} != no # pic ${MKPIC} != no +# pigz ${MKPIGZ} != no # postfix ${MKPOSTFIX} != no # profile ${MKPROFILE} != no # share ${MKSHARE} != no Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.868 src/distrib/sets/lists/base/mi:1.869 --- src/distrib/sets/lists/base/mi:1.868 Mon Jun 14 15:23:41 2010 +++ src/distrib/sets/lists/base/mi Fri Jun 18 04:21:21 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.868 2010/06/14 15:23:41 pooka Exp $ +# $NetBSD: mi,v 1.869 2010/06/18 04:21:21 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -540,6 +540,7 @@ ./usr/bin/pawd base-amd-bin ./usr/bin/paxctl base-obsolete obsolete ./usr/bin/pgrep base-util-bin +./usr/bin/pigz base-util-bin pigz ./usr/bin/pkill base-util-bin ./usr/bin/pmap base-util-bin ./usr/bin/pr base-util-bin Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1466 src/distrib/sets/lists/comp/mi:1.1467 --- src/distrib/sets/lists/comp/mi:1.1466 Mon Jun 14 14:50:47 2010 +++ src/distrib/sets/lists/comp/mi Fri Jun 18 04:21:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1466 2010/06/14 14:50:47 pooka Exp $ +# $NetBSD: mi,v 1.1467 2010/06/18 04:21:22 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3205,6 +3205,7 @@ ./usr/libdata/debug/usr/bin/paxctl.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/pcc.debug comp-c-debug pcccmds,debug ./usr/libdata/debug/usr/bin/pfbtops.debug comp-groff-debug groff,debug +./usr/libdata/debug/usr/bin/pigz.debug comp-util-debug debug,pigz ./usr/libdata/debug/usr/bin/pic.debug comp-groff-debug groff,debug ./usr/libdata/debug/usr/bin/pkill.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/pmap.debug comp-util-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1217 src/distrib/sets/lists/man/mi:1.1218 --- src/distrib/sets/lists/man/mi:1.1217 Mon Jun 14 05:27:51 2010 +++ src/distrib/sets/lists/man/mi Fri Jun 18 04:21:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1217 2010/06/14 05:27:51 riz Exp $ +# $NetBSD: mi,v 1.1218 2010/06/18 04:21:22 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -376,6 +376,7 @@ ./usr/share/man/cat1/pcc.0 man-util-catman pcccmds,.cat ./usr/share/man/cat1/pcpp.0 man-util-catman pcccmds,.cat ./usr/share/man/cat1/pgrep.0 man-util-catman .cat +./usr/share/man/cat1/pigz.0 man-util-catman .cat,pigz ./usr/share/man/cat1/pim6stat.0 man-obsolete obsolete ./usr/share/man/cat1/pkg_add.0 man-pkgutil-catman .cat ./usr/share/man/cat1/pkg_admin.0 man-pkgutil-catman .cat @@ -3107,6 +3108,7 @@ ./usr/share/man/html1/pcc.html man-util-htmlman pcccmds,html ./usr/share/man/html1/pcpp.html man-util-htmlman pcccmds,html ./usr/share/man/html1/pgrep.html man-util-htmlman html +./usr/share/man/html1/pigz.html man-util-htmlman html,pigz ./usr/share/man/html1/pkg_add.html man-pkgutil-htmlman html ./usr/share/man/html1/pkg_admin.html man-pkgutil-htmlman html ./usr/share/man/html1/pkg_create.html man-pkgutil-htmlman html @@ -5488,6 +5490,7 @@ ./usr/share/man/man1/pcc.1 man-util-man pcccmds,.man ./usr/share/man/man1/pcpp.1 man-util-man pcccmds,.man ./usr/share/man/man1/pgrep.1 man-util-man .man +./usr/share/man/man1/pigz.1 man-util-man .man,pigz ./usr/share/man/man1/pim6stat.1 man-obsolete obsolete ./usr/share/man/man1/pkg_add.1 man-pkgutil-man .man ./usr/share/man/man1/pkg_admin.1 man-pkgutil-man .man Index: src/external/zlib/pigz/bin/pigz/Makefile diff -u src/external/zlib/pigz/bin/pigz/Makefile:1.1 src/external/zlib/pigz/bin/pigz/Makefile:1.2 --- src/external/zlib/pigz/bin/pigz/Makefile:1.1 Thu Jun 17 06:10:44 2010 +++ src/external/zlib/pigz/bin/pigz/Makefile Fri Jun 18 04:21:23 2010 @@ -1,14 +1,39 @@ -# $NetBSD: Makefile,v 1.1 2010/06/17 06:10:44 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/06/18 04:21:23 mrg Exp $ -NOMAN= 1 +BINDIR= /usr/bin -PROG= pigz -SRCS= pigz.c yarn.c +USE_FORT?= yes # data-driven bugs? -LDADD+= -lz -lpthread -DPADD+= ${LIBM} ${LIBPTHREAD} +PROG= pigz +SRCS= pigz.c yarn.c +MAN= pigz.1 +# these ones are from mrg's gzip +MAN+= gzexe.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1 + +DPADD= ${LIBM} ${LIBPTHREAD} +LDADD= -lz -lpthread + +SCRIPTS= gzexe zdiff zforce zgrep zmore znew + +MLINKS+= pigz.1 gzip.1 \ + pigz.1 gunzip.1 \ + pigz.1 gzcat.1 \ + pigz.1 zcat.1 \ + zdiff.1 zcmp.1 \ + zgrep.1 zegrep.1 \ + zgrep.1 zfgrep.1 + +LINKS+= ${BINDIR}/pigz ${BINDIR}/gzip \ + ${BINDIR}/pigz ${BINDIR}/gunzip \ + ${BINDIR}/pigz ${BINDIR}/gzcat \ + ${BINDIR}/pigz ${BINDIR}/zcat \ + ${BINDIR}/zdiff ${BINDIR}/zcmp \ + ${BINDIR}/zgrep ${BINDIR}/zegrep \ + ${BINDIR}/zgrep ${BINDIR}/zfgrep .include <bsd.prog.mk> -DIST= ${NETBSDSRCDIR}/external/zlib/pigz/dist +DIST= ${NETBSDSRCDIR}/external/zlib/pigz/dist .PATH: ${DIST} +GZIPDIST= ${NETBSDSRCDIR}/usr.bin/gzip +.PATH: ${GZIPDIST}