]> Zhao Yanbai Git Server - minix.git/commitdiff
Convert man/ over to new make
authorArun Thomas <arun@minix3.org>
Tue, 16 Mar 2010 00:15:43 +0000 (00:15 +0000)
committerArun Thomas <arun@minix3.org>
Tue, 16 Mar 2010 00:15:43 +0000 (00:15 +0000)
18 files changed:
Makefile
docs/UPDATING
etc/mk/minix.own.mk
etc/mtree/minix.tree
man/Makefile
man/man1/Makefile [new file with mode: 0644]
man/man1/tar.1 [deleted file]
man/man1x/Makefile [new file with mode: 0644]
man/man2/Makefile [new file with mode: 0644]
man/man3/Makefile [new file with mode: 0644]
man/man4/Makefile [new file with mode: 0644]
man/man5/Makefile [new file with mode: 0644]
man/man6/Makefile [new file with mode: 0644]
man/man7/Makefile [new file with mode: 0644]
man/man8/Makefile [new file with mode: 0644]
man/man9/Makefile [new file with mode: 0644]
man/man9/macros.9 [moved from man/macros.9 with 100% similarity]
man/template.1 [deleted file]

index a58c642546fbe19b77937e8ec59f85dfbe7ebf2f..1e9699b5e41b3ed39d2e163e97c8e059896c99d1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,21 +65,19 @@ etcfiles::
 
 all::
        cd boot && $(MAKE) all
-       cd man && $(MAKE) all
        cd commands && $(MAKE) all
        cd tools && $(MAKE) all
        cd servers && $(MAKE) all
 
 install::
        cd boot && $(MAKE) all install
-       cd man && $(MAKE) all install
+       cd man && $(MAKE) all install makedb
        cd commands && $(MAKE) all install
        cd tools && $(MAKE) all install
        cd servers && $(MAKE) all install
 
 clean::
        cd boot && $(MAKE) clean
-       cd man && $(MAKE) clean
        cd commands && $(MAKE) clean
        cd tools && $(MAKE) clean
        cd servers && $(MAKE) clean
index 8c4755cb5e1d81406266694af17a339db21a425a..d7a49f135d08ace1f0d0d9151dc1995d02814fcd 100644 (file)
@@ -1,3 +1,6 @@
+20100316:
+        /usr/include/man9 is required
+       # mkdir /usr/man/man9
 20100308:
         Include directory reorganization:
         # mv /usr/include/ibm /usr/include/i386
index 41f5018911476b67ba257cf1b5ebed21dde15463..f58cb0514a64ded7208662790e759c0823ad3291 100644 (file)
@@ -328,7 +328,8 @@ TOOL_M4=            m4
 TOOL_MACPPCFIXCOFF=    macppc-fixcoff
 TOOL_MAKEFS=           makefs
 TOOL_MAKEINFO=         makeinfo
-TOOL_MAKEWHATIS=       /usr/libexec/makewhatis
+#TOOL_MAKEWHATIS=      /usr/libexec/makewhatis
+TOOL_MAKEWHATIS=       /usr/bin/makewhatis
 TOOL_MDSETIMAGE=       mdsetimage
 TOOL_MENUC=            menuc
 TOOL_MIPSELF2ECOFF=    mips-elf2ecoff
index 80cfb533f9c365a5350b2caa0ab0e831304679d3..a70444777312fe4f3662f87ca07ff2f3e50de135 100644 (file)
@@ -65,6 +65,7 @@
 775  bin     operator  /usr/local/src
 755  bin     operator  /usr/man
 755  bin     operator  /usr/man/man1
+755  bin     operator  /usr/man/man1x
 755  bin     operator  /usr/man/man2
 755  bin     operator  /usr/man/man3
 755  bin     operator  /usr/man/man4
index a44864b57c472df46e103e27f31738d8caf85f9d..6b42eefefe2ace651f3f268224f5e37895294aeb 100644 (file)
@@ -1,17 +1,19 @@
+.include <minix.own.mk>
 
-MAN=/usr/man
+SUBDIR=        man1 man1x man2 man3 man4 man5 man6 man7 man8 man9
 
-all::
+WHATISDBDIR?=  /usr/man
 
-clean::
+makedb:
+       makewhatis ${WHATISDBDIR}
+#      ${TOOL_MAKEWHATIS} ${DESTDIR}${WHATISDBDIR}
+# .if ${MKUNPRIVED} != "no"
+#      echo ".${WHATISDBDIR}/whatis.db type=file mode=0444 uname=${BINOWN} gname=${BINGRP}" \
+#          | ${METALOG.add}
+# .endif
+# .else
+# makedb:
+# .endif
 
-install::
-       -rm -rf $(MAN)
-       -mkdir $(MAN)
-       cpdir . $(MAN)
-       chown -R bin $(MAN)
-       chgrp -R operator $(MAN)
-       @rm -f $(MAN)/Makefile
-       find /usr/man -type f | xargs -n 20 chmod 644
-       find /usr/man -type d | xargs -n 20 chmod 755
-       makewhatis $(MAN)
+.include <minix.subdir.mk>
+.include <minix.sys.mk>
diff --git a/man/man1/Makefile b/man/man1/Makefile
new file mode 100644 (file)
index 0000000..90843e3
--- /dev/null
@@ -0,0 +1,29 @@
+MAN=   acd.1 anm.1 ar.1 ash.1 asize.1 at.1 banner.1 basename.1 \
+       bsfilt.1 bzdiff.1 bzgrep.1 bzip2.1 bzmore.1 cal.1 \
+       calendar.1 cat.1 cawf.1 cc.1 cdiff.1 cgrep.1 chgrp.1 \
+       chmem.1 chmod.1 cksum.1 clear.1 cmp.1 comm.1 compress.1 \
+       cp.1 crc.1 crontab.1 ctags.1 cut.1 date.1 dd.1 dev2name.1 \
+       df.1 dhrystone.1 diff.1 dosdir.1 dosread.1 doswrite.1 du.1 \
+       dumpcore.1 easypack.1 echo.1 ed.1 eject.1 elvis.1 elvrec.1 \
+       env.1 expand.1 expr.1 factor.1 fgrep.1 file.1 find.1 \
+       finger.1 flex.1 flexdoc.1 fmt.1 fold.1 format.1 fortune.1 \
+       fsck.1 ftp.1 grep.1 head.1 host.1 hostaddr.1 id.1 ifdef.1 \
+       install.1 isodir.1 isoinfo.1 isoread.1 join.1 kill.1 \
+       last.1 leave.1 loadfont.1 loadkeys.1 logger.1 login.1 \
+       look.1 lp.1 ls.1 lspci.1 M.1 mail.1 make.1 makewhatis.1 \
+       man.1 mdb.1 mesg.1 mixer.1 mkdep.1 mkdir.1 mkfifo.1 mkfs.1 \
+       mkproto.1 modem.1 mount.1 mt.1 nice.1 nm.1 nohup.1 od.1 \
+       ossinfo.1 ossmix.1 ossplay.1 ossrecord.1 osstest.1 passwd.1 \
+       paste.1 patch.1 ping.1 playwave.1 postmort.1 pr.1 prep.1 \
+       profile.1 ps.1 pwd.1 rcp.1 readall.1 readfs.1 recwave.1 \
+       ref.1 remsync.1 rget.1 rlogin.1 rmdir.1 rsh.1 rz.1 sed.1 \
+       shar.1 size.1 sleep.1 sort.1 soundoff.1 soundon.1 spell.1 \
+       split.1 stat.1 strings.1 strip.1 stty.1 su.1 sum.1 svc.1 \
+       synctree.1 sysenv.1 sz.1 tail.1 tee.1 telnet.1 template.1 \
+       term.1 termcap.1 tget.1 time.1 top.1 touch.1 tr.1 true.1 \
+       truncate.1 tsort.1 tty.1 umount.1 uname.1 unexpand.1 uniq.1 \
+       urlget.1 uud.1 uue.1 vol.1 wc.1 whatis.1 whereis.1 which.1 \
+       who.1 whoami.1 write.1 xargs.1 yacc.1 yap.1 yes.1
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
diff --git a/man/man1/tar.1 b/man/man1/tar.1
deleted file mode 100644 (file)
index 3c32e93..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-.TH TAR 1
-.SH NAME
-tar \- tape archiver
-.SH SYNOPSIS
-\fBtar\fR [\fBFcotvxp\fR]\fR [\fBf\fR] \fItarfile \fIfile ...\fR
-.br
-.de FL
-.TP
-\\fB\\$1\\fR
-\\$2
-..
-.de EX
-.TP 20
-\\fB\\$1\\fR
-# \\$2
-..
-.SH OPTIONS
-.FL "F" "Force tar to continue after an error"
-.FL "c" "Create a new archive; add named files"
-.FL "o" "Set uid/gid to original values on extraction"
-.FL "f" "Next argument is name of tarfile"
-.FL "t" "Print a table listing the archive's contents"
-.FL "v" "Verbose mode-tell what is going on as it happens"
-.FL "x" "The named files are extracted from the archive"
-.FL "p" "Restore file modes, ignore creation mask"
-.FL "D" "Directory only, do not recurse"
-.SH EXAMPLES
-.EX "tar c /dev/fd1 ." "Back up current directory to \fI/dev/fd1\fR"
-.EX "tar xv /dev/fd1 file1 file2" "Extract two files from the archive"
-.EX "tar cf \- . | (cd dest; tar xf \-)" "Copy current directory to \fIdest\fR"
-.SH DESCRIPTION
-.PP
-\fITar\fR is a POSIX-compatible archiver, except that it does not use tape.
-It's primary advantage over
-.I ar
-is that the 
-.I tar
-format is somewhat more standardized than the
-.I ar 
-format, making it theoretically possible to transport 
-\s-1MINIX 3\s-1
-files to another computer, but do not bet on it.
-If the target machine runs
-\&MS-DOS ,
-try
-.I doswrite .
-.SH "SEE ALSO"
-.BR compress (1),
-.BR vol (1).
-.\" minor correction ASW 2005-01-15
diff --git a/man/man1x/Makefile b/man/man1x/Makefile
new file mode 100644 (file)
index 0000000..534bdfc
--- /dev/null
@@ -0,0 +1,5 @@
+MAN=   as.1x awk.1x de.1x dis88.1x elle.1x elvis.1x kermit.1x \
+       m4.1x macros.1x mined.1x
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
diff --git a/man/man2/Makefile b/man/man2/Makefile
new file mode 100644 (file)
index 0000000..fccaacb
--- /dev/null
@@ -0,0 +1,13 @@
+MAN=   access.2 alarm.2 brk.2 chdir.2 chmod.2 chown.2 chroot.2 \
+       close.2 creat.2 dup.2 execve.2 exit.2 fcntl.2 fork.2 \
+       getgid.2 getitimer.2 getpid.2 getpriority.2 gettimeofday.2 \
+       getuid.2 intro.2 ioctl.2 kill.2 link.2 lseek.2 mkdir.2 \
+       mknod.2 mount.2 open.2 pause.2 pipe.2 ptrace.2 read.2 \
+       readlink.2 reboot.2 rename.2 rmdir.2 select.2 setsid.2 \
+       setuid.2 sigaction.2 sigpending.2 sigprocmask.2 \
+       sigsuspend.2 stat.2 svrctl.2 symlink.2 sync.2 time.2 \
+       times.2 truncate.2 umask.2 uname.2 unlink.2 utime.2 \
+       wait.2 write.2
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
diff --git a/man/man3/Makefile b/man/man3/Makefile
new file mode 100644 (file)
index 0000000..ffa68e1
--- /dev/null
@@ -0,0 +1,18 @@
+MAN=   abort.3 abs.3 assert.3 atof.3 bstring.3 configfile.3 \
+       crypt.3 ctime.3 ctype.3 curses.3 directory.3 dirname.3 \
+       editline.3 end.3 execl.3 exit.3 fabs.3 fclose.3 \
+       feholdexcept.3 ferror.3 fesetround.3 fnmatch.3 fopen.3 \
+       fpclassify.3 fread.3 fseek.3 getaddrinfo.3 getc.3 getcwd.3 \
+       getdtablesize.3 getenv.3 getgrent.3 getloadavg.3 getlogin.3 \
+       getopt.3 getopt_long.3 getpass.3 getpwent.3 getrlimit.3 \
+       gets.3 getservent.3 getttyent.3 g_h_b_n.3 hton.3 int64.3 \
+       islessgreater.3 ldexp.3 malloc.3 nearbyint.3 newctime.3 \
+       newstrftime.3 newtzset.3 oneC_sum.3 openpty.3 popen.3 \
+       printf.3 putc.3 puts.3 qsort.3 rand.3 random.3 rcmd.3 \
+       readv.3 realpath.3 regex.3 remainder.3 resolver.3 scanf.3 \
+       servxcheck.3 setbuf.3 setjmp.3 sigset.3 sleep.3 stdarg.3 \
+       stdio.3 string.3 strtol.3 syslog.3 system.3 termcap.3 \
+       termios.3 time2posix.3 ttyname.3 ttyslot.3 ungetc.3
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
diff --git a/man/man4/Makefile b/man/man4/Makefile
new file mode 100644 (file)
index 0000000..5bf17b5
--- /dev/null
@@ -0,0 +1,4 @@
+MAN=   console.4 controller.4 dev.4 fd.4 ip.4 lp.4 mtio.4 tty.4
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
diff --git a/man/man5/Makefile b/man/man5/Makefile
new file mode 100644 (file)
index 0000000..099ca21
--- /dev/null
@@ -0,0 +1,8 @@
+MAN=   configfile.5 crontab.5 dhcp.conf.5 dir.5 ethers.5 \
+       fstab.5 hosts.5 httpd.conf.5 http_status.5 keymap.5 \
+       passwd.5 resolv.conf.5 resolver.5 rhosts.5 serv.access.5 \
+       syslog.conf.5 termcap.5 ttytab.5 TZ.5 tzfile.5 utmp.5 \
+       whatis.5
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
diff --git a/man/man6/Makefile b/man/man6/Makefile
new file mode 100644 (file)
index 0000000..e79941a
--- /dev/null
@@ -0,0 +1,4 @@
+MAN=   advent.6 ttt.6
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
diff --git a/man/man7/Makefile b/man/man7/Makefile
new file mode 100644 (file)
index 0000000..01aeae7
--- /dev/null
@@ -0,0 +1,10 @@
+MAN=   ACK.7 ascii.7 environ.7 hier.7 man.7 oss_atiaudio.7 \
+       oss_audigyls.7 oss_audiopci.7 oss_cmi878x.7 oss_cmpci.7 \
+       osscore.7 oss_cs4281.7 oss_cs461x.7 oss_digi96.7 \
+       oss_emu10k1x.7 oss_envy24.7 oss_envy24ht.7 oss_fmedia.7 \
+       oss_geode.7 oss_hdaudio.7 oss_ich.7 oss_sblive.7 \
+       oss_sbpci.7 oss_sbxfi.7 oss_solo.7 oss_trident.7 \
+       oss_via823x.7 oss_via97.7 oss_ymf7xx.7 re_format.7
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
diff --git a/man/man8/Makefile b/man/man8/Makefile
new file mode 100644 (file)
index 0000000..95e5c3c
--- /dev/null
@@ -0,0 +1,15 @@
+MAN=   add_route.8 adduser.8 backup.8 badblocks.8 boot.8 \
+       cdprobe.8 checkhier.8 chown.8 cleantmp.8 config.8 cron.8 \
+       dhcpd.8 dosminix.8 elvprsv.8 fdisk.8 fingerd.8 ftpd.8 \
+       getty.8 halt.8 hgfs.8 httpd.8 ifconfig.8 inet.8 init.8 \
+       installboot.8 intr.8 irdpd.8 loadramdisk.8 MAKEDEV.8 \
+       mkdist.8 mknod.8 monitor.8 netconf.8 newroot.8 nonamed.8 \
+       ossdevlinks.8 packit.8 packman.8 part.8 partition.8 \
+       poweroff.8 printroot.8 pr_routes.8 pwdauth.8 rarpd.8 \
+       rdate.8 readclock.8 reboot.8 repartition.8 rlogind.8 \
+       rshd.8 savemixer.8 screendump.8 serial-ip.8 service.8 \
+       setup.8 shutdown.8 slip.8 srccrc.8 sync.8 syslogd.8 tcpd.8 \
+       tzselect.8 update.8 usage.8 vmixctl.8 zdump.8 zic.8
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
diff --git a/man/man9/Makefile b/man/man9/Makefile
new file mode 100644 (file)
index 0000000..b4cfdf0
--- /dev/null
@@ -0,0 +1,4 @@
+MAN=   macros.9
+
+.include <minix.man.mk>
+.include <minix.subdir.mk>
similarity index 100%
rename from man/macros.9
rename to man/man9/macros.9
diff --git a/man/template.1 b/man/template.1
deleted file mode 100644 (file)
index 23ac5da..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH TEMPLATE 1
-.SH NAME
-template, blueprint \- a blueprint for making manual pages
-.SH SYNOPSIS
-.B template
-.RB [ \-az ]
-.RI [ arguments " ...]"
-.SH DESCRIPTION
-.de SP
-.if t .sp 0.4
-.if n .sp
-..
-.B Template
-shows what a manual page should look like.  Options for instance:
-.SH OPTIONS
-.TP
-.B \-a
-Use boldface for characters that have to be typed as is.
-.TP
-.B \-z
-Italics for variable
-.IR arguments .
-.SH ENVIRONMENT
-.TP 15n
-.B MANPATH
-The path to knowledge.
-.SH FILES
-.TP 25n
-.B /usr/man/template.1
-This file.
-.SH "SEE ALSO"
-.BR man (7).
-.SH DIAGNOSTICS
-man: No manual on template.
-.SH NOTES
-Use at your own risk.
-.SH BUGS
-A lot.  The
-.BR whatis (5)
-database is usually generated automatically on most
-systems.  This fails if the "NAME" section has more n/troff fluff than just
-an "\e" before the '\-', or is more than one line.  Apply the KISS
-principle, try to use a minimum of smart macros, match your .RS and .RE's,
-etc.
-.SH AUTHOR
-Kees J. Bot <kjb@cs.vu.nl>