Module Name: src Committed By: mrg Date: Sat Jun 19 03:50:31 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 src/share/mk: bsd.README bsd.own.mk src/usr.bin: Makefile Log Message: - always install pigz. hooary! - kill MKPIGZ. - add MKPIGZGZIP. if it is "no", then only install pigz as pigz. if it is not "no", don't install mrgzip, install pigz as gzip. in all cases, the z* scripts. i don't like the name MKPIGZGZIP so if anyone has a better name, feel free to replace it. i don't care enough since killing the ugly name is just more incentive to get pigz doing .bz2, .Z and .z. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/distrib/sets/sets.subr cvs rdiff -u -r1.869 -r1.870 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1469 -r1.1470 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1218 -r1.1219 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.3 -r1.4 src/external/zlib/pigz/bin/pigz/Makefile cvs rdiff -u -r1.271 -r1.272 src/share/mk/bsd.README cvs rdiff -u -r1.630 -r1.631 src/share/mk/bsd.own.mk cvs rdiff -u -r1.188 -r1.189 src/usr.bin/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.123 src/distrib/sets/sets.subr:1.124 --- src/distrib/sets/sets.subr:1.123 Fri Jun 18 04:21:21 2010 +++ src/distrib/sets/sets.subr Sat Jun 19 03:50:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: sets.subr,v 1.123 2010/06/18 04:21:21 mrg Exp $ +# $NetBSD: sets.subr,v 1.124 2010/06/19 03:50:30 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.123 2010/06/18 04:21:21 mrg Exp $ +# # $NetBSD: sets.subr,v 1.124 2010/06/19 03:50:30 mrg Exp $ # . base-sys-root [keyword[,...]] # ./altroot base-sys-root # ./bin base-sys-root @@ -228,7 +228,6 @@ # 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.869 src/distrib/sets/lists/base/mi:1.870 --- src/distrib/sets/lists/base/mi:1.869 Fri Jun 18 04:21:21 2010 +++ src/distrib/sets/lists/base/mi Sat Jun 19 03:50:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.869 2010/06/18 04:21:21 mrg Exp $ +# $NetBSD: mi,v 1.870 2010/06/19 03:50:30 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -540,7 +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/pigz base-util-bin ./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.1469 src/distrib/sets/lists/comp/mi:1.1470 --- src/distrib/sets/lists/comp/mi:1.1469 Fri Jun 18 18:57:27 2010 +++ src/distrib/sets/lists/comp/mi Sat Jun 19 03:50:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1469 2010/06/18 18:57:27 jmcneill Exp $ +# $NetBSD: mi,v 1.1470 2010/06/19 03:50:30 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3206,7 +3206,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/pigz.debug comp-util-debug debug ./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.1218 src/distrib/sets/lists/man/mi:1.1219 --- src/distrib/sets/lists/man/mi:1.1218 Fri Jun 18 04:21:22 2010 +++ src/distrib/sets/lists/man/mi Sat Jun 19 03:50:31 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1218 2010/06/18 04:21:22 mrg Exp $ +# $NetBSD: mi,v 1.1219 2010/06/19 03:50:31 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -376,7 +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/pigz.0 man-util-catman .cat ./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 @@ -3108,7 +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/pigz.html man-util-htmlman html ./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 @@ -5490,7 +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/pigz.1 man-util-man .man ./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.3 src/external/zlib/pigz/bin/pigz/Makefile:1.4 --- src/external/zlib/pigz/bin/pigz/Makefile:1.3 Fri Jun 18 05:26:12 2010 +++ src/external/zlib/pigz/bin/pigz/Makefile Sat Jun 19 03:50:31 2010 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2010/06/18 05:26:12 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/19 03:50:31 mrg Exp $ -.ifdef HOSTPROG +.ifndef HOSTPROG .include <bsd.own.mk> @@ -11,12 +11,14 @@ 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 +.if ${MKPIGZGZIP} != "no" +# these ones are from mrg's gzip +MAN+= gzexe.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1 + SCRIPTS= gzexe zdiff zforce zgrep zmore znew MLINKS+= pigz.1 gzip.1 \ @@ -34,13 +36,16 @@ ${BINDIR}/zdiff ${BINDIR}/zcmp \ ${BINDIR}/zgrep ${BINDIR}/zegrep \ ${BINDIR}/zgrep ${BINDIR}/zfgrep +.endif .include <bsd.prog.mk> DIST= ${NETBSDSRCDIR}/external/zlib/pigz/dist .PATH: ${DIST} +.if ${MKPIGZGZIP} != "no" GZIPDIST= ${NETBSDSRCDIR}/usr.bin/gzip .PATH: ${GZIPDIST} +.endif .else # HOSTPROG Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.271 src/share/mk/bsd.README:1.272 --- src/share/mk/bsd.README:1.271 Thu Jun 17 06:17:02 2010 +++ src/share/mk/bsd.README Sat Jun 19 03:50:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.271 2010/06/17 06:17:02 mrg Exp $ +# $NetBSD: bsd.README,v 1.272 2010/06/19 03:50:30 mrg Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -304,7 +304,7 @@ PIE (Position Independent Executables). Default: no -MKPIGZ If "no", disables building of pigz and uses NetBSD gzip. +MKPIGZGZIP If "no", only install pigz as pigz, not gzip. Default: no MKPOSTFIX If "no", don't build or install postfix(1). Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.630 src/share/mk/bsd.own.mk:1.631 --- src/share/mk/bsd.own.mk:1.630 Thu Jun 17 06:17:02 2010 +++ src/share/mk/bsd.own.mk Sat Jun 19 03:50:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.630 2010/06/17 06:17:02 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.631 2010/06/19 03:50:30 mrg Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -726,7 +726,7 @@ MKDTRACE MKEXTSRC \ MKMANDOC MKMANZ MKOBJDIRS \ MKPCC MKPCCCMDS \ - MKPIGZ \ + MKPIGZGZIP \ MKSOFTFLOAT MKSTRIPIDENT \ MKUNPRIVED MKUPDATE MKX11 MKZFS .for var in ${_MKVARS.no} Index: src/usr.bin/Makefile diff -u src/usr.bin/Makefile:1.188 src/usr.bin/Makefile:1.189 --- src/usr.bin/Makefile:1.188 Fri Jun 18 18:57:27 2010 +++ src/usr.bin/Makefile Sat Jun 19 03:50:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.188 2010/06/18 18:57:27 jmcneill Exp $ +# $NetBSD: Makefile,v 1.189 2010/06/19 03:50:30 mrg Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include <bsd.own.mk> @@ -31,8 +31,10 @@ wall wc what whatis whereis who whois window \ write xargs xinstall xlint xstr yes -.if (${MKPIGZ} != "no") SUBDIR+= ../external/zlib/pigz/bin/pigz + +.if (${MKPIGZGZIP} != "no") +# nothing .else SUBDIR+= gzip .endif