Compress man pages

46 files changed, 125 insertions, 89 deletions

diff --git a/ninja.rc b/ninja.rc
index 7e9278ec..d9deee54 100644
--- a/ninja.rc
+++ b/ninja.rc
@@ -197,6 +197,37 @@ fn sym {
 	status=()
 }
 
+fn man {
+	srcdir='$srcdir'
+	outdir='$outdir'
+	if(~ $1 -d) {
+		if(~ $2 '$'*) {
+			srcdir=$2
+			outdir=$2
+		}
+		if not {
+			srcdir='$srcdir'/$2
+			outdir='$outdir'/$2
+		}
+		shift 2
+	}
+	mandir=share/man
+	for(src) {
+		if(~ $src [1-9])
+			mandir=share/man/man$src
+		if not {
+			if(~ $src *.gz)
+				gz=$srcdir/$src
+			if not {
+				build $outdir/$src.gz gzip $srcdir/$src
+				src=$src.gz
+				gz=$outdir/$src
+			}
+			file $mandir/$src $outdir/$src 644
+		}
+	}
+}
+
 fn fetch {
 	# Use a phony rule and stamp file to prevent ninja from making parent
 	# directories.
diff --git a/pkg/alsa-utils/gen.rc b/pkg/alsa-utils/gen.rc
index 957ef4f6..d22563c0 100644
--- a/pkg/alsa-utils/gen.rc
+++ b/pkg/alsa-utils/gen.rc
@@ -10,12 +10,12 @@ fn x {
 	exe bin/$name -d pkg/alsa-lib/headers $*\
 		'$builddir'/pkg/alsa-lib/libasound.a
 	file bin/$name '$outdir'/bin/$name 755
-	file share/man/man1/$name.1 '$srcdir'/$name/$name.1 644
+	man -d $name 1 $name.1
 }
 
 x amixer amixer/amixer.c alsamixer/volume_mapping.c
 x aplay aplay/aplay.c
 sym bin/arecord aplay
-sym share/man/man1/arecord.1 aplay.1
+sym share/man/man1/arecord.1.gz aplay.1.gz
 
 fetch git
diff --git a/pkg/awk/gen.rc b/pkg/awk/gen.rc
index 21468882..319ddc1c 100644
--- a/pkg/awk/gen.rc
+++ b/pkg/awk/gen.rc
@@ -20,6 +20,6 @@ exe awk -d '$outdir'/ytab.h\
 	b.c main.c parse.c tran.c lib.c run.c lex.c\
 	'$outdir'/^(gram.tab.c proctab.c)
 file bin/awk '$outdir'/awk 755
-file share/man/man1/awk.1 '$srcdir'/awk.1 644
+man 1 awk.1
 
 fetch git
diff --git a/pkg/bc/gen.rc b/pkg/bc/gen.rc
index c75aff92..2e651cf9 100644
--- a/pkg/bc/gen.rc
+++ b/pkg/bc/gen.rc
@@ -7,6 +7,6 @@ cflags\
 lib libbc.a lib/number.c
 exe bin/bc bc/^(main.c bc.c scan.c execute.c load.c storage.c util.c global.c warranty.c) libbc.a
 file bin/bc '$outdir'/bin/bc 755
-file share/man/man1/bc.1 '$srcdir'/doc/bc.1 644
+man -d doc 1 bc.1
 
 fetch curl
diff --git a/pkg/bzip2/gen.rc b/pkg/bzip2/gen.rc
index 5cd9c64c..21a2b968 100644
--- a/pkg/bzip2/gen.rc
+++ b/pkg/bzip2/gen.rc
@@ -6,7 +6,7 @@ lib libbz2.a blocksort.c huffman.c crctable.c randtable.c compress.c decompress.
 exe bzip2 bzip2.c libbz2.a
 
 file bin/bzip2 '$outdir'/bzip2 755
-file share/man/man1/bzip2.1  '$srcdir'/bzip2.1 644
+man 1 bzip2.1
 sym bin/bzcat bzip2
 
 fetch curl
diff --git a/pkg/curl/gen.rc b/pkg/curl/gen.rc
index 2300073a..657e46c8 100644
--- a/pkg/curl/gen.rc
+++ b/pkg/curl/gen.rc
@@ -101,6 +101,6 @@ exe curl -d '$dir'/deps\
 	libcurl.a.d
 
 file bin/curl '$outdir'/curl 755
-file share/man/man1/curl.1 '$srcdir'/docs/curl.1 644
+man -d docs 1 curl.1
 
 fetch git
diff --git a/pkg/dmenu/gen.rc b/pkg/dmenu/gen.rc
index 5f681433..2275a31c 100644
--- a/pkg/dmenu/gen.rc
+++ b/pkg/dmenu/gen.rc
@@ -20,11 +20,11 @@ exe dmenu -d '$dir'/deps dmenu.c drw.c util.c '$builddir'/pkg/^(\
 	wayland/libwayland-client.a.d\
 )
 file bin/dmenu '$outdir'/dmenu 755
-file share/man/man1/dmenu.1 '$srcdir'/dmenu.1 644
+man 1 dmenu.1
 
 exe stest stest.c
 file bin/stest '$outdir'/stest 755
-file share/man/man1/stest.1 '$srcdir'/stest.1 644
+man 1 stest.1
 
 for(f in dmenu_path dmenu_run)
 	file bin/$f '$srcdir'/$f 755
diff --git a/pkg/e2fsprogs/gen.rc b/pkg/e2fsprogs/gen.rc
index 15cf40c7..4ab2dc7e 100644
--- a/pkg/e2fsprogs/gen.rc
+++ b/pkg/e2fsprogs/gen.rc
@@ -26,12 +26,13 @@ fn subst {
 	build '$outdir'/$1 sed '$srcdir'/$2 ; with expr '$subst'
 }
 
-fn man {
-	src=$1
-	base=`{basename $src}
+fn substman {
+	subdir=$1
+	src=$2
+	base=`{basename $src .in}
 	sec=`{printf $base | tail -c 1}
-	subst $base $1
-	file share/man/man$sec/$base '$outdir'/$base 644
+	subst $subdir/$base $subdir/$src
+	man -d '$outdir'/$subdir $sec $base
 }
 
 subst ext2_err.et lib/ext2fs/ext2_err.et.in
@@ -183,14 +184,14 @@ exe bin/e2fsck -d '$dir'/headers e2fsck/^(\
 	extents.c\
 ) $libs
 file bin/e2fsck '$outdir'/bin/e2fsck 755
-man e2fsck/e2fsck.8.in
-man e2fsck/e2fsck.conf.5.in
+substman e2fsck e2fsck.8.in
+substman e2fsck e2fsck.conf.5.in
 
 exe bin/resize2fs -d '$dir'/headers resize/^(\
 	extent.c resize2fs.c main.c online.c resource_track.c\
 	sim_progress.c\
 ) $libs
 file bin/resize2fs '$outdir'/bin/resize2fs 755
-man resize/resize2fs.8.in
+substman resize resize2fs.8.in
 
 fetch git
diff --git a/pkg/efibootmgr/gen.rc b/pkg/efibootmgr/gen.rc
index 25feac5b..22793a71 100644
--- a/pkg/efibootmgr/gen.rc
+++ b/pkg/efibootmgr/gen.rc
@@ -6,6 +6,6 @@ exe efibootmgr -d pkg/efivar/headers\
 	src/^(efibootmgr/efibootmgr.c lib/^(efi.c unparse_path.c))\
 	'$builddir'/pkg/efivar/^(libefiboot.a libefivar.a)
 file bin/efibootmgr '$outdir'/efibootmgr 755
-file share/man/man8/efibootmgr.8 '$srcdir'/src/man/man8/efibootmgr.8 644
+man -d src/man man8/efibootmgr.8
 
 fetch git
diff --git a/pkg/file/gen.rc b/pkg/file/gen.rc
index 005f28cc..8afdb9db 100644
--- a/pkg/file/gen.rc
+++ b/pkg/file/gen.rc
@@ -45,7 +45,7 @@ lib libmagic.a -d '$dir'/deps src/^(\
 
 exe file -d '$dir'/headers src/file.c libmagic.a '$builddir/pkg/zlib/libz.a'
 file bin/file '$outdir'/file 755
-file share/man/man1/file.1 '$outdir'/file.1 644
+man -d '$outdir' 1 file.1
 
 srcs=`{grep -v '^#' magic.txt}
 for(src in $srcs) build '$outdir'/magic/$src copy '$srcdir'/magic/Magdir/$src
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
index fd6918da..4e2e55f0 100644
--- a/pkg/git/.gitignore
+++ b/pkg/git/.gitignore
@@ -1,2 +1,3 @@
 /git-manpages-2.11.0.tar.xz
 /man
+/man.ninja
diff --git a/pkg/git/fetch.rc b/pkg/git/fetch.rc
index 9d830d08..bec188d5 100644
--- a/pkg/git/fetch.rc
+++ b/pkg/git/fetch.rc
@@ -5,8 +5,8 @@ flag e +
 cd $1
 shift
 
-if([ -e man ])
-	rm -rf man
+if([ -e src/man ])
+	rm -rf src/man
 
 if(! sha256sum -c sha256 >[2]/dev/null) {
 	curl -L -O -K url
@@ -14,4 +14,4 @@ if(! sha256sum -c sha256 >[2]/dev/null) {
 }
 
 archive=`{awk '{print $2}' sha256}
-xzcat $archive | pax -r -s '/^\./man/'
+xzcat $archive | pax -r -s ',^\.,src/man,'
diff --git a/pkg/git/gen.rc b/pkg/git/gen.rc
index dba3a0d3..210389d9 100644
--- a/pkg/git/gen.rc
+++ b/pkg/git/gen.rc
@@ -376,10 +376,8 @@ file share/git-core/templates/info/exclude '$srcdir'/templates/info--exclude 644
 # Skip the sample hooks and install an empty directory instead.
 dir share/git-core/templates/hooks 755
 
-man=`{grep -v '^#' man.txt}
+srcs=`{grep -v '^#' man.txt}
 checkstatus
-for(f in $man)
-	file share/man/$f '$dir'/man/$f 644
-allsrcs=($allsrcs '$dir'/man/$man)
+man -d man $srcs
 
 fetch local
diff --git a/pkg/ii/gen.rc b/pkg/ii/gen.rc
index 9b8f8e56..84424e7c 100644
--- a/pkg/ii/gen.rc
+++ b/pkg/ii/gen.rc
@@ -4,6 +4,6 @@ cflags\
 
 exe ii ii.c
 file bin/ii '$outdir'/ii 755
-file share/man/man1/ii.1 '$srcdir'/ii.1 644
+man 1 ii.1
 
 fetch git
diff --git a/pkg/iproute2/gen.rc b/pkg/iproute2/gen.rc
index 2b27d2f5..1b2f2f20 100644
--- a/pkg/iproute2/gen.rc
+++ b/pkg/iproute2/gen.rc
@@ -42,11 +42,11 @@ man=(\
                 addrlabel fou gue l2tp macsec maddress monitor mroute neighbour\
                 netconf netns ntable rule tcp_metrics token tunnel xfrm\
 	)\
-) for(man in man/man8/$man.8) file share/$man '$srcdir'/$man 644
+) man -d man man8/$man.8
 for(man in ip-address ip-link ip-route) {
 	build '$outdir'/$man.8 sed '$srcdir'/man/man8/$man.8.in ; with\
 		expr s,@SYSCONFDIR@,/etc,g
-	file share/man/man8/$man.8 '$outdir'/$man.8 644
+	man -d '$outdir' 8 $man.8
 }
 
 fetch git
diff --git a/pkg/kbd/gen.rc b/pkg/kbd/gen.rc
index fd2c3578..75a6b465 100644
--- a/pkg/kbd/gen.rc
+++ b/pkg/kbd/gen.rc
@@ -41,10 +41,11 @@ fn x {
 		sect=`{printf %s $sect | cut -c -1}
 		build '$outdir'/$exe.$sect sed '$srcdir'/docs/man/man$sect/$exe.$sect.in ; with\
 			expr s,@DATADIR@,/share/kbd,g
-		man='$outdir'/$exe.$sect
+		subdir='$outdir'
 	}
-	if not man='$srcdir'/docs/man/man$sect/$exe.$sect
-	if(~ $sect [18]) file share/man/man$sect/$exe.$sect $man 644
+	if not subdir=docs/man/man$sect
+	if(~ $sect [18])
+		man -d $subdir $sect $exe.$sect
 	status=()
 }
 
diff --git a/pkg/less/gen.rc b/pkg/less/gen.rc
index ee0d16b4..e32ae77e 100644
--- a/pkg/less/gen.rc
+++ b/pkg/less/gen.rc
@@ -12,6 +12,6 @@ exe less -d pkg/ncurses/headers\
 	tags.c ttyin.c version.c\
 	'$builddir'/pkg/ncurses/libncurses.a
 file bin/less '$outdir'/less 755
-file share/man/man1/less.1 '$srcdir'/less.nro 644
+man 1 less.nro
 
 fetch curl
diff --git a/pkg/libfuse/gen.rc b/pkg/libfuse/gen.rc
index 096ac3e0..472d50a5 100644
--- a/pkg/libfuse/gen.rc
+++ b/pkg/libfuse/gen.rc
@@ -10,7 +10,7 @@ cc lib/mount_util.c
 
 exe fusermount util/fusermount.c lib/mount_util.c.o
 file bin/fusermount '$outdir'/fusermount 4755
-file share/man/man1/fusermount.1 '$srcdir'/doc/fusermount.1 644
+man -d doc 1 fusermount.1
 
 lib libfuse.a lib/^(\
 	fuse.c\
diff --git a/pkg/libressl/gen.rc b/pkg/libressl/gen.rc
index f2ba83f3..16283672 100644
--- a/pkg/libressl/gen.rc
+++ b/pkg/libressl/gen.rc
@@ -300,7 +300,7 @@ exe openssl src/usr.bin/openssl/^(\
 	verify.c version.c x509.c\
 ) libssl.a.d libcrypto.a.d
 file bin/openssl '$outdir'/openssl 755
-file share/man/man1/openssl.1 '$srcdir'/src/usr.bin/openssl/openssl.1 644
+man -d src/usr.bin/openssl 1 openssl.1
 
 file share/libressl/cert.pem '$srcdir'/src/lib/libcrypto/cert.pem 644
 
diff --git a/pkg/loksh/gen.rc b/pkg/loksh/gen.rc
index 3f6f28fc..f806af7c 100644
--- a/pkg/loksh/gen.rc
+++ b/pkg/loksh/gen.rc
@@ -34,6 +34,6 @@ exe ksh\
 	vi.c
 file bin/ksh '$outdir'/ksh 755
 sym bin/sh ksh
-for(name in ksh sh) file share/man/man1/$name.1 '$srcdir'/$name.1 644
+man 1 ksh.1 sh.1
 
 fetch git
diff --git a/pkg/lua/gen.rc b/pkg/lua/gen.rc
index e596c832..f9b6855c 100644
--- a/pkg/lua/gen.rc
+++ b/pkg/lua/gen.rc
@@ -13,6 +13,6 @@ lib liblua.a src/^(\
 
 exe lua src/lua.c liblua.a
 file bin/lua '$outdir'/lua 755
-file share/man/man1/lua.1 '$srcdir'/doc/lua.1 644
+man -d doc 1 lua.1
 
 fetch curl
diff --git a/pkg/make/gen.rc b/pkg/make/gen.rc
index 1c46aa90..2ddbabcd 100644
--- a/pkg/make/gen.rc
+++ b/pkg/make/gen.rc
@@ -15,6 +15,6 @@ exe make\
 	hash.c remote-stub.c\
 	libglob.a
 file bin/make '$outdir'/make 755
-file share/man/man1/make.1 '$srcdir'/make.1 644
+man 1 make.1
 
 fetch git
diff --git a/pkg/man-pages-posix/gen.rc b/pkg/man-pages-posix/gen.rc
index 55892923..fe97395a 100644
--- a/pkg/man-pages-posix/gen.rc
+++ b/pkg/man-pages-posix/gen.rc
@@ -1,4 +1,4 @@
-rule manpages 'rc ./$dir/manpages.rc $builddir/$repo.git $out $srcdir' ; with\
+rule manpages 'rc ./$dir/manpages.rc $builddir/$repo.git $out $srcdir $outdir' ; with\
 	deps gcc\
 	depfile '$out.d'
 build '$outdir'/manpages.index manpages '|' '$dir'/manpages.rc config.rc '||' '$outdir'/fetch.stamp
diff --git a/pkg/man-pages-posix/manpages.rc b/pkg/man-pages-posix/manpages.rc
index dbdf782f..efcb823e 100644
--- a/pkg/man-pages-posix/manpages.rc
+++ b/pkg/man-pages-posix/manpages.rc
@@ -6,10 +6,11 @@ flag e +
 
 ifs='
 '
+~ $#* 4
 repo=$1
 out=$2
 dir=$3
-shift 2
+outdir=$4
 
 fn checkstatus {}
 
@@ -19,8 +20,13 @@ checkstatus
 cd $dir
 pages=man?p/*
 pages=()
-for(f in man?p/*) if(fs extra/man-pages-posix $f)
-	pages=($pages $f)
+for(d in man?p) {
+	mkdir -p $wd/$outdir/$d
+	for(f in $d/*) if(fs man-pages-posix share/man/$f.gz) {
+		gzip -c -9 -n $f > $wd/$outdir/$f.gz
+		pages=($pages $f)
+	}
+}
 cd $wd
 
 if(~ $#pages 0) {
@@ -29,11 +35,12 @@ if(~ $#pages 0) {
 	exit
 }
 
-hashes=`{git -C $repo hash-object -w --no-filters -- $wd/$dir/$pages}
+hashes=`{git -C $repo hash-object -w --no-filters -- $wd/$outdir/$pages.gz}
 checkstatus
+rm $outdir/$pages.gz
 
 ~ $#pages $#hashes
-printf '100644 %s\n' $hashes'	share/man/'$pages >$out.tmp
+printf '100644 %s\n' $hashes'	share/man/'$pages.gz >$out.tmp
 mv $out.tmp $out
 
 echo $out: $dir/$pages >$out.d.tmp
diff --git a/pkg/mc/gen.rc b/pkg/mc/gen.rc
index a5276dec..f4e7d594 100644
--- a/pkg/mc/gen.rc
+++ b/pkg/mc/gen.rc
@@ -39,11 +39,11 @@ exe bin/6m 6/^(\
 	typeinfo.c\
 ) libmi.a libparse.a libutil.a
 file bin/6m '$outdir'/bin/6m 755
-file share/man/man1/mc.1 '$srcdir'/doc/mc.1 644
 
 exe bin/muse muse/muse.c libparse.a libutil.a
 file bin/muse '$outdir'/bin/muse 755
-file share/man/man1/muse.1 '$srcdir'/doc/muse.1 644
+
+man -d doc 1 mc.1 muse.1
 
 build '$outdir'/_myrrt.s cat '$srcdir'/rt/^(start-linux.s common.s abort-linux.s)
 build '$outdir'/_myrrt.o as '$outdir'/_myrrt.s
diff --git a/pkg/mdocml/gen.rc b/pkg/mdocml/gen.rc
index 4629a870..e71d3784 100644
--- a/pkg/mdocml/gen.rc
+++ b/pkg/mdocml/gen.rc
@@ -65,9 +65,10 @@ exe demandoc demandoc.c libmandoc.a '$builddir'/pkg/^(openbsd/libbsd.a zlib/libz
 
 for(exe in mandoc demandoc) file bin/$exe '$outdir'/$exe 755
 sym bin/man mandoc
-for(man in mandoc.1 demandoc.1 man.1 mandoc.3 man.conf.5 man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7) {
-	sect=`{printf %s $man | tail -c 1}
-	file share/man/man$sect/$man '$srcdir'/$man 644
-}
+man\
+	1 mandoc.1 demandoc.1 man.1\
+	3 mandoc.3\
+	5 man.conf.5\
+	7 man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7
 
 fetch curl
diff --git a/pkg/mpv/gen.rc b/pkg/mpv/gen.rc
index 6c939975..55771b2a 100644
--- a/pkg/mpv/gen.rc
+++ b/pkg/mpv/gen.rc
@@ -77,7 +77,7 @@ phony deps $deps
 
 exe mpv -d '$dir'/deps $srcs '$builddir'/pkg/$libs
 file bin/mpv '$outdir'/mpv 755
-file share/man/man1/mpv.1 '$srcdir'/DOCS/man/mpv.1 644
+man -d DOCS/man 1 mpv.1
 
 gen_inputs='$dir'/^(sources.awk sources.txt config.h)
 fetch git
diff --git a/pkg/msmtp/gen.rc b/pkg/msmtp/gen.rc
index 03fd38dc..ff306d00 100644
--- a/pkg/msmtp/gen.rc
+++ b/pkg/msmtp/gen.rc
@@ -24,6 +24,6 @@ exe msmtp -d pkg/libressl/headers src/^(\
 ) '$builddir'/pkg/libressl/^(libssl.a.d libcrypto.a.d)
 
 file bin/msmtp '$outdir'/msmtp 755
-file share/man/man1/msmtp.1 '$srcdir'/doc/msmtp.1 644
+man -d doc 1 msmtp.1
 
 fetch git
diff --git a/pkg/nasm/gen.rc b/pkg/nasm/gen.rc
index c5f94191..aa057f8a 100644
--- a/pkg/nasm/gen.rc
+++ b/pkg/nasm/gen.rc
@@ -29,6 +29,6 @@ exe nasm\
 	iflag.c
 
 file bin/nasm '$outdir'/nasm 755
-file share/man/man1/nasm.1 '$srcdir'/nasm.1 644
+man 1 nasm.1
 
 fetch curl
diff --git a/pkg/ncurses/gen.rc b/pkg/ncurses/gen.rc
index 2b72ef68..336d7cdd 100644
--- a/pkg/ncurses/gen.rc
+++ b/pkg/ncurses/gen.rc
@@ -106,9 +106,9 @@ sym bin/reset tset
 for(m in tic.1m tset.1) {
 	build '$outdir'/$m sed '$srcdir'/man/$m '|' '$dir'/subst.sed ; with\
 		expr '-f $dir/subst.sed'
-	file share/man/man1/$m '$outdir'/$m 644
+	man -d '$outdir' 1 $m
 }
-sym share/man/man1/reset.1 tset.1
+sym share/man/man1/reset.1.gz tset.1.gz
 
 terms=(dumb linux tmux tmux-256color xterm xterm-256color)
 terminfo=`{printf %s\n $terms | awk '{print substr($0, 1, 1) "/" $0}'}
diff --git a/pkg/openbsd/gen.rc b/pkg/openbsd/gen.rc
index 9c740e99..5d7997f6 100644
--- a/pkg/openbsd/gen.rc
+++ b/pkg/openbsd/gen.rc
@@ -24,17 +24,17 @@ lib libbsd.a -d pkg/libressl/headers\
 # diff
 exe diff usr.bin/diff/^(diff.c diffdir.c diffreg.c xmalloc.c) libbsd.a
 file bin/diff '$outdir'/diff 755
-file share/man/man1/diff.1 '$srcdir'/usr.bin/diff/diff.1 644
+man -d usr.bin/diff 1 diff.1
 
 # fmt
 exe fmt usr.bin/fmt/fmt.c
 file bin/fmt '$outdir'/fmt 755
-file share/man/man1/fmt.1 '$srcdir'/usr.bin/fmt/fmt.1 644
+man -d usr.bin/fmt 1 fmt.1
 
 # patch
 exe patch usr.bin/patch/^(patch.c pch.c inp.c util.c backupfile.c mkpath.c ed.c) libbsd.a
 file bin/patch '$outdir'/patch 755
-file share/man/man1/patch.1 '$srcdir'/usr.bin/patch/patch.1 644
+man -d usr.bin/patch 1 patch.1
 
 # pax
 exe pax bin/pax/^(\
@@ -44,7 +44,7 @@ exe pax bin/pax/^(\
 ) libbsd.a
 file bin/pax '$outdir'/pax 755
 for(alias in tar cpio) sym bin/$alias pax
-for(man in pax tar cpio) file share/man/man1/$man.1 '$srcdir'/bin/pax/$man.1 644
+man -d bin/pax 1 pax.1 tar.1 cpio.1
 
 # yacc
 exe yacc usr.bin/yacc/^(\
@@ -52,7 +52,7 @@ exe yacc usr.bin/yacc/^(\
 	skeleton.c symtab.c verbose.c warshall.c\
 ) libbsd.a
 file bin/yacc '$outdir'/yacc 755
-file share/man/man1/yacc.1 '$srcdir'/usr.bin/yacc/yacc.1 644
+man -d usr.bin/yacc 1 yacc.1
 
 srcpats=./^(\
 	bin/pax\
diff --git a/pkg/openssh/gen.rc b/pkg/openssh/gen.rc
index 3ba9d002..9c33f111 100644
--- a/pkg/openssh/gen.rc
+++ b/pkg/openssh/gen.rc
@@ -74,7 +74,6 @@ exe ssh\
 	sshconnect.c sshconnect1.c sshconnect2.c mux.c\
 	libssh.a.d
 file bin/ssh '$outdir'/ssh 755
-file share/man/man1/ssh.1 '$srcdir'/ssh.1 644
 
 cc sftp-server.c
 cc sftp-common.c
@@ -96,26 +95,24 @@ exe sshd -d '$dir'/deps\
 	sandbox-solaris.c\
 	libssh.a.d
 file bin/sshd '$outdir'/sshd 755
-file share/man/man8/sshd.8 '$srcdir'/sshd.8 644
 
 exe scp scp.c libssh.a.d
 file bin/scp '$outdir'/scp 755
-file share/man/man1/scp.1 '$srcdir'/scp.1 644
 
 exe ssh-add ssh-add.c libssh.a.d
 file bin/ssh-add '$outdir'/ssh-add 755
-file share/man/man1/ssh-add.1 '$srcdir'/ssh-add.1 644
 
 exe ssh-agent ssh-agent.c ssh-pkcs11-client.c libssh.a.d
 file bin/ssh-agent '$outdir'/ssh-agent 755
-file share/man/man1/ssh-agent.1 '$srcdir'/ssh-agent.1 644
 
 exe ssh-keygen ssh-keygen.c libssh.a.d
 file bin/ssh-keygen '$outdir'/ssh-keygen 755
-file share/man/man1/ssh-keygen.1 '$srcdir'/ssh-keygen.1 644
 
 exe sftp-server sftp-common.c.o sftp-server.c.o sftp-server-main.c libssh.a.d
 file libexec/sftp-server '$outdir'/sftp-server 755
-file share/man/man8/sftp-server.8 '$srcdir'/sftp-server.8 644
+
+man\
+	1 ssh.1 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1\
+	8 sshd.8 sftp-server.8
 
 fetch git
diff --git a/pkg/perp/gen.rc b/pkg/perp/gen.rc
index f58e904d..df8647a6 100644
--- a/pkg/perp/gen.rc
+++ b/pkg/perp/gen.rc
@@ -63,7 +63,7 @@ fn x {
 	shift 2
 	exe $exe $subdir/$* libasagna.a
 	if(! ~ $exe cat*)
-		file share/man/man8/$exe.8 '$srcdir'/$subdir/man/$exe.8 644
+		man -d $subdir/man 8 $exe.8
 	file bin/$exe '$outdir'/$exe 755
 }
 
@@ -79,8 +79,7 @@ tools=(\
 	cat^(args env limits uid)\
 ) for(exe in $tools) x runtools $exe $exe.c
 
-file share/man/man5/perpetrate.5 '$srcdir'/perp/man/perpetrate.5 644
-file share/man/man8/perp_intro.8 '$srcdir'/perp/man/perp_intro.8 644
-file share/man/man5/runtools_intro.8 '$srcdir'/runtools/man/runtools_intro.8 644
+man -d perp/man 5 perpetrate.5 8 perp_intro.8
+man -d runtools/man 8 runtools_intro.8
 
 fetch curl
diff --git a/pkg/plan9port/gen.rc b/pkg/plan9port/gen.rc
index 92415e0e..057890b4 100644
--- a/pkg/plan9port/gen.rc
+++ b/pkg/plan9port/gen.rc
@@ -377,6 +377,7 @@ exe bin/rc -d '$outdir'/rc/x.tab.h '$outdir'/rc/syn.c src/cmd/rc/^(\
 	unixcrap.c\
 	var.c\
 ) lib9.a
+file bin/rc '$outdir'/bin/rc 755
 
 # src/src/cmd/sam/mkfile:/^OFILES
 exe bin/sam src/cmd/sam/^(\
@@ -401,11 +402,9 @@ exe bin/sam src/cmd/sam/^(\
 	util.c\
 	xec.c\
 ) libplumb.a lib9.a
+file bin/sam '$outdir'/bin/sam 755
 
-for(exe in rc sam) {
-	file bin/$exe '$outdir'/bin/$exe 755
-	file share/man/man1/$exe.1 '$srcdir'/man/man1/$exe.1 644
-}
+man -d man man1/^(rc.1 sam.1)
 
 file lib/rcmain '$srcdir'/rcmain 644
 
diff --git a/pkg/sbase/gen.rc b/pkg/sbase/gen.rc
index fb77593b..7758d219 100644
--- a/pkg/sbase/gen.rc
+++ b/pkg/sbase/gen.rc
@@ -87,7 +87,8 @@ fn x {
 	link $exe $src.c.o libutil.a libutf.a
 
 	file bin/$exe '$outdir'/$exe 755
-	file share/man/man1/$exe.1 '$srcdir'/$src.1 644
+	build '$outdir'/$exe.1.gz gzip '$srcdir'/$src.1
+	man -d '$outdir' 1 $exe.1.gz
 }
 
 x basename
diff --git a/pkg/sdhcp/gen.rc b/pkg/sdhcp/gen.rc
index ca1a180f..3d86432e 100644
--- a/pkg/sdhcp/gen.rc
+++ b/pkg/sdhcp/gen.rc
@@ -4,6 +4,6 @@ cflags\
 
 exe sdhcp sdhcp.c util/eprintf.c
 file bin/sdhcp '$outdir'/sdhcp 755
-file share/man/man1/sdhcp.1 '$srcdir'/sdhcp.1 644
+man 1 sdhcp.1
 
 fetch git
diff --git a/pkg/sinit/gen.rc b/pkg/sinit/gen.rc
index d45f6720..a97161dd 100644
--- a/pkg/sinit/gen.rc
+++ b/pkg/sinit/gen.rc
@@ -2,7 +2,6 @@ cflags -Wall -Wextra -I '$dir'
 
 exe sinit sinit.c
 file bin/sinit '$outdir'/sinit 755
-file share/man/man8/sinit.8 '$srcdir'/sinit.8 644
-
+man 8 sinit.8
 
 fetch git
diff --git a/pkg/sshfs/gen.rc b/pkg/sshfs/gen.rc
index 5ed57782..41839ce6 100644
--- a/pkg/sshfs/gen.rc
+++ b/pkg/sshfs/gen.rc
@@ -10,6 +10,6 @@ build '$outdir'/sshfs.1 sed '$srcdir'/sshfs.1.in ; with\
 exe sshfs -d '$builddir'/pkg/libfuse/fetch.stamp\
 	sshfs.c nocache.c '$builddir'/pkg/libfuse/libfuse.a
 file bin/sshfs '$outdir'/sshfs 755
-file share/man/man1/sshfs.1 '$outdir'/sshfs.1 644
+man -d '$outdir' 1 sshfs.1
 
 fetch git
diff --git a/pkg/st/gen.rc b/pkg/st/gen.rc
index d8119df4..b44a733d 100644
--- a/pkg/st/gen.rc
+++ b/pkg/st/gen.rc
@@ -20,7 +20,7 @@ exe st -d '$dir'/deps st.c '$builddir'/^(\
 	pkg/wld/libwld.a.d\
 )
 file bin/st '$outdir'/st 755
-file share/man/man1/st.1 '$srcdir'/st.1 644
+man 1 st.1
 
 terminfo=s/^(st st-256color)
 terminfo_outs='$outdir'/$terminfo
diff --git a/pkg/the_silver_searcher/gen.rc b/pkg/the_silver_searcher/gen.rc
index 6ec53b9c..5887abf5 100644
--- a/pkg/the_silver_searcher/gen.rc
+++ b/pkg/the_silver_searcher/gen.rc
@@ -9,6 +9,6 @@ exe ag -d pkg/pcre/headers src/^(\
         util.c decompress.c main.c\
 ) '$builddir'/pkg/pcre/libpcre.a
 file bin/ag '$outdir'/ag 755
-file share/man/man1/ag.1 '$srcdir'/doc/ag.1 644
+man -d doc 1 ag.1
 
 fetch git
diff --git a/pkg/transmission/gen.rc b/pkg/transmission/gen.rc
index 196394ee..d795a51e 100644
--- a/pkg/transmission/gen.rc
+++ b/pkg/transmission/gen.rc
@@ -137,16 +137,16 @@ lib libdht.a third-party/dht/dht.c
 
 exe transmission-daemon -d '$dir'/deps daemon/^(daemon.c daemon-posix.c) libtransmission.a.d
 file bin/transmission-daemon '$outdir'/transmission-daemon 755
-file share/man/man1/transmission-daemon.1 '$srcdir'/daemon/transmission-daemon.1 644
+man -d daemon 1 transmission-daemon.1
 
 exe transmission-remote -d '$dir'/deps daemon/remote.c libtransmission.a.d
 file bin/transmission-remote '$outdir'/transmission-remote 755
-file share/man/man1/transmission-remote.1 '$srcdir'/daemon/transmission-remote.1 644
+man -d daemon 1 transmission-remote.1
 
 for(tool in create edit show) {
 	exe transmission-$tool -d '$dir'/deps utils/$tool.c libtransmission.a.d
 	file bin/transmission-$tool '$outdir'/transmission-$tool 755
-	file share/man/man1/transmission-$tool.1 '$srcdir'/utils/transmission-$tool.1 644
+	man -d utils 1 transmission-$tool.1
 }
 
 fetch curl
diff --git a/pkg/ubase/gen.rc b/pkg/ubase/gen.rc
index 94c2b2e9..d309f10c 100644
--- a/pkg/ubase/gen.rc
+++ b/pkg/ubase/gen.rc
@@ -36,7 +36,8 @@ fn x {
 	shift
 	exe $exe $exe.c libutil.a
 	file bin/$exe '$outdir'/$exe $mode
-	if(~ $#* 1) file share/man/man$1/$exe.$1 '$srcdir'/$exe.$1 644
+	if(~ $#* 1)
+		man $1 $exe.$1
 	status=()
 }
 
diff --git a/pkg/unzip/gen.rc b/pkg/unzip/gen.rc
index 36e9a53e..07fb8e3c 100644
--- a/pkg/unzip/gen.rc
+++ b/pkg/unzip/gen.rc
@@ -10,6 +10,6 @@ exe unzip -d '$builddir'/pkg/bzip2/fetch.stamp\
 	unix/unix.c\
 	'$builddir'/pkg/bzip2/libbz2.a
 file bin/unzip '$outdir'/unzip 755
-file share/man/man1/unzip.1 '$srcdir'/man/unzip.1 644
+man -d man 1 unzip.1
 
 fetch curl
diff --git a/pkg/util-linux/gen.rc b/pkg/util-linux/gen.rc
index 98f29302..0c729967 100644
--- a/pkg/util-linux/gen.rc
+++ b/pkg/util-linux/gen.rc
@@ -102,6 +102,6 @@ exe fdisk -d '$dir'/deps\
 	disk-utils/^(fdisk.c fdisk-menu.c fdisk-list.c)\
 	libfdisk.a.d libsmartcols.a libtcolors.a
 file bin/fdisk '$outdir'/fdisk 755
-file share/man/man8/fdisk.8 '$srcdir'/disk-utils/fdisk.8 644
+man -d disk-utils 8 fdisk.8
 
 fetch git
diff --git a/pkg/vis/gen.rc b/pkg/vis/gen.rc
index 774ed726..7c799b72 100644
--- a/pkg/vis/gen.rc
+++ b/pkg/vis/gen.rc
@@ -41,7 +41,7 @@ file bin/vis-open '$srcdir'/vis-open 755
 for(f in vis.1 vis-menu.1 vis-open.1) {
 	build '$outdir'/$f sed '$srcdir'/man/$f ; with\
 		expr s,VERSION,$version,
-	file share/man/man1/$f '$outdir'/$f 644
+	man -d '$outdir' 1 $f
 }
 
 # <cd src/lua/lexers && printf '\t%s\\\n' *.lua | sort
diff --git a/pkg/xz/gen.rc b/pkg/xz/gen.rc
index 1bf8f5c5..9b67b592 100644
--- a/pkg/xz/gen.rc
+++ b/pkg/xz/gen.rc
@@ -134,7 +134,7 @@ exe xz src/^(\
 ) liblzma.a
 
 file bin/xz '$outdir'/xz 755
-file share/man/man1/xz.1 '$srcdir'/src/xz/xz.1 644
+man -d src/xz 1 xz.1
 for(alias in unxz xzcat) sym bin/$alias xz
 
 fetch git