diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man4/Makefile | 9 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/Makefile | 8 | ||||
| -rw-r--r-- | share/mk/bsd.README | 8 | ||||
| -rw-r--r-- | share/mk/bsd.man.mk | 99 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 10 |
5 files changed, 34 insertions, 100 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 76d36eff516..f3297ff7f5e 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.525 2011/06/17 08:39:38 pirofti Exp $ +# $OpenBSD: Makefile,v 1.526 2011/06/23 22:46:12 schwarze Exp $ MAN= aac.4 ac97.4 acphy.4 \ acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \ @@ -66,7 +66,7 @@ MAN= aac.4 ac97.4 acphy.4 \ viapm.4 viasio.4 vic.4 video.4 vlan.4 vmt.4 vnd.4 vr.4 \ vscsi.4 vte.4 \ watchdog.4 wb.4 wbenv.4 wbng.4 wbsd.4 wbsio.4 wd.4 wdc.4 we.4 \ - wi.4tbl wpi.4 wscons.4 wsdisplay.4 wskbd.4 wsmouse.4 wsmux.4 \ + wi.4 wpi.4 wscons.4 wsdisplay.4 wskbd.4 wsmouse.4 wsmux.4 \ xe.4 xf86.4 xge.4 xl.4 xmphy.4 yds.4 ym.4 zero.4 zyd.4 MLINKS+=adv.4 advansys.4 adv.4 adw.4 @@ -98,4 +98,9 @@ SUBDIR= man4.alpha man4.amd64 man4.armish man4.aviion man4.hp300 \ man4.mac68k man4.macppc man4.mvme68k man4.mvme88k \ man4.sgi man4.socppc man4.sparc man4.sparc64 man4.vax man4.zaurus +CLEANFILES+= wi.4 + +wi.4: wi.4tbl + cp ${.ALLSRC} ${.TARGET} + .include <bsd.prog.mk> diff --git a/share/man/man4/man4.hppa/Makefile b/share/man/man4/man4.hppa/Makefile index 71d2e7fd4f4..f0b03760afc 100644 --- a/share/man/man4/man4.hppa/Makefile +++ b/share/man/man4/man4.hppa/Makefile @@ -1,11 +1,15 @@ -# $OpenBSD: Makefile,v 1.27 2008/07/16 16:32:08 miod Exp $ +# $OpenBSD: Makefile,v 1.28 2011/06/23 22:46:12 schwarze Exp $ -MAN= asp.4 astro.4 cpu.4tbl dino.4 elroy.4 +MAN= asp.4 astro.4 cpu.4 dino.4 elroy.4 MAN+= gecko.4 gsc.4 gsckbc.4 MAN+= harmony.4 ie.4 intro.4 io.4 lasi.4 lcd.4 mem.4 mongoose.4 pdc.4 MAN+= phantomas.4 power.4 runway.4 ssio.4 uturn.4 wax.4 # tir.4 xbar.4 mcx.4 MLINKS+= mem.4 kmem.4 MANSUBDIR=hppa +CLEANFILES+= cpu.4 + +cpu.4: cpu.4tbl + cp ${.ALLSRC} ${.TARGET} .include <bsd.prog.mk> diff --git a/share/mk/bsd.README b/share/mk/bsd.README index f095ef30769..9f10b0e782c 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.README,v 1.44 2011/04/22 21:11:50 jmc Exp $ +# $OpenBSD: bsd.README,v 1.45 2011/06/23 22:46:12 schwarze Exp $ # $NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $ # @(#)bsd.README 5.1 (Berkeley) 5/11/90 @@ -165,7 +165,7 @@ NONBINMODE Mode for non-executable files. [444] DIRMODE Mode for new directories. [755] -MANDIR Base path for manual installation. [/usr/share/man/cat] +MANDIR Base path for manual installation. [/usr/share/man/man] MANGRP Manual group. [bin] @@ -227,10 +227,6 @@ SKEY Compile in support for S/key authentication. [yes, set KERBEROS5 Compile in support for Kerberos 5 authentication. -MANZ Compress manual pages at installation time. - -MANPS Define to have PostScript manual pages generated. - SYS_INCLUDE Copy or symlink kernel include files into /usr/include. Possible values are "symlinks" or "copies" (which is the same as the variable being unset). diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index a956073abed..3f44192d709 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -1,10 +1,7 @@ -# $OpenBSD: bsd.man.mk,v 1.32 2010/10/17 22:47:08 schwarze Exp $ +# $OpenBSD: bsd.man.mk,v 1.33 2011/06/23 22:46:12 schwarze Exp $ # $NetBSD: bsd.man.mk,v 1.23 1996/02/10 07:49:33 jtc Exp $ # @(#)bsd.man.mk 5.2 (Berkeley) 5/11/90 -MANTARGET?= cat -MANDOC?= mandoc - .if !target(.MAIN) . if exists(${.CURDIR}/../Makefile.inc) . include "${.CURDIR}/../Makefile.inc" @@ -13,44 +10,6 @@ MANDOC?= mandoc .MAIN: all .endif -.SUFFIXES: .1 .2 .3 .3p .4 .5 .6 .7 .8 .9 \ - .1tbl .2tbl .3tbl .4tbl .5tbl .6tbl .7tbl .8tbl .9tbl \ - .cat1 .cat2 .cat3 .cat3p .cat4 .cat5 .cat6 .cat7 .cat8 .cat9 \ - .ps1 .ps2 .ps3 .ps3p .ps4 .ps5 .ps6 .ps7 .ps8 .ps9 - -.9.cat9 .8.cat8 .7.cat7 .6.cat6 .5.cat5 \ -.4.cat4 .3p.cat3p .3.cat3 .2.cat2 .1.cat1 \ -.9tbl.cat9 .8tbl.cat8 .7tbl.cat7 .6tbl.cat6 .5tbl.cat5 \ -.4tbl.cat4 .3tbl.cat3 .2tbl.cat2 .1tbl.cat1: - @echo "${MANDOC} ${.IMPSRC} > ${.TARGET}" - @${MANDOC} ${.IMPSRC} > ${.TARGET} || (rm -f ${.TARGET}; false) - -.9.ps9 .8.ps8 .7.ps7 .6.ps6 .5.ps5 .4.ps4 .3p.ps3p .3.ps3 .2.ps2 .1.ps1 \ -.9tbl.ps9 .8tbl.ps8 .7tbl.ps7 .6tbl.ps6 .5tbl.ps5 .4tbl.ps4 .3tbl.ps3 \ -.2tbl.ps2 .1tbl.ps1: - @echo "${MANDOC} -Tps ${.IMPSRC} > ${.TARGET}" - @${MANDOC} -Tps ${.IMPSRC} > ${.TARGET} || (rm -f ${.TARGET}; false) - -.if defined(MAN) && !empty(MAN) && !defined(MANALL) -. for v s in MANALL .cat PS2ALL .ps - -$v= ${MAN:S/.1$/$s1/g:S/.2$/$s2/g:S/.3$/$s3/g:S/.3p$/$s3p/g:S/.4$/$s4/g:S/.5$/$s5/g:S/.6$/$s6/g:S/.7$/$s7/g:S/.8$/$s8/g:S/.9$/$s9/g:S/.1tbl$/$s1/g:S/.2tbl$/$s2/g:S/.3tbl$/$s3/g:S/.4tbl$/$s4/g:S/.5tbl$/$s5/g:S/.6tbl$/$s6/g:S/.7tbl$/$s7/g:S/.8tbl$/$s8/g:S/.9tbl$/$s9/g} - -. endfor - -. if defined(MANPS) -PSALL=${PS2ALL} -. endif - -.endif - -MINSTALL= ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} -.if defined(MANZ) -# chown and chmod are done afterward automatically -MCOMPRESS= gzip -cf -MCOMPRESSSUFFIX= .gz -.endif - .if defined(MANSUBDIR) # Add / so that we don't have to specify it. Better arch -> MANSUBDIR mapping MANSUBDIR:=${MANSUBDIR:S,^,/,} @@ -59,58 +18,34 @@ MANSUBDIR:=${MANSUBDIR:S,^,/,} MANSUBDIR='' .endif -.if !defined(MCOMPRESS) || empty(MCOMPRESS) -install_manpage_fragment= \ - echo ${MINSTALL} $$page $$instpage; \ - ${MINSTALL} $$page $$instpage -.else -install_manpage_fragment= \ - rm -f $$instpage; \ - echo ${MCOMPRESS} $$page \> $$instpage; \ - ${MCOMPRESS} $$page > $$instpage; \ - chown ${MANOWN}:${MANGRP} $$instpage; \ - chmod ${MANMODE} $$instpage +manlint: ${MAN} +.if defined(MAN) && !empty(MAN) + mandoc -Tlint -Wfatal ${.ALLSRC} .endif -maninstall: -.for v d s t in MANALL ${MANDIR} .cat .0 PSALL ${PSDIR} .ps .ps -. if defined($v) - @for page in ${$v}; do \ - set -- ${MANSUBDIR}; \ - subdir=$$1; \ - dir=${DESTDIR}$d$${page##*$s}; \ - base=$${page##*/}; \ - instpage=$${dir}$${subdir}/$${base%.*}$t${MCOMPRESSSUFFIX}; \ - ${install_manpage_fragment}; \ - while test $$# -ge 2; do \ - shift; \ - extra=$${dir}$$1/$${base%.*}$t${MCOMPRESSSUFFIX}; \ - echo $$extra -\> $$instpage; \ - ln -f $$instpage $$extra; \ - done; \ - done -. endif +.for page in ${MAN} +. for sub in ${MANSUBDIR} +${DESTDIR}${MANDIR}${page:E}${sub}/${page:T}: ${page} + ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ + ${.ALLSRC} ${.TARGET} + +maninstall: ${DESTDIR}${MANDIR}${page:E}${sub}/${page:T} +. endfor .endfor +maninstall: .if defined(MLINKS) && !empty(MLINKS) . for sub in ${MANSUBDIR} . for lnk file in ${MLINKS} - @l=${DESTDIR}${MANDIR}${lnk:E}${sub}/${lnk:R}.0${MCOMPRESSSUFFIX}; \ - t=${DESTDIR}${MANDIR}${file:E}${sub}/${file:R}.0${MCOMPRESSSUFFIX}; \ + @l=${DESTDIR}${MANDIR}${lnk:E}${sub}/${lnk}; \ + t=${DESTDIR}${MANDIR}${file:E}${sub}/${file}; \ echo $$t -\> $$l; \ rm -f $$t; ln $$l $$t; . endfor . endfor .endif -.if (defined(MANALL) || defined(PSALL)) && !defined(MANLOCALBUILD) -all: ${MANALL} ${PSALL} - BEFOREMAN?= -${MANALL} ${PSALL}: ${BEFOREMAN} - +all: ${BEFOREMAN} ${MAN} manlint -cleandir: cleanman -cleanman: - rm -f ${MANALL} ${PS2ALL} -.endif +.PHONY: manlint diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 2e024803006..5f5508e3dac 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.104 2010/09/24 14:04:06 miod Exp $ +# $OpenBSD: bsd.own.mk,v 1.105 2011/06/23 22:46:12 schwarze Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -56,18 +56,12 @@ BINMODE?= 555 NONBINMODE?= 444 DIRMODE?= 755 -# Define MANZ to have the man pages compressed (gzip) -#MANZ= 1 - -# Define MANPS to have PostScript manual pages generated -#MANPS= 1 - SHAREDIR?= /usr/share SHAREGRP?= bin SHAREOWN?= root SHAREMODE?= ${NONBINMODE} -MANDIR?= /usr/share/man/cat +MANDIR?= /usr/share/man/man MANGRP?= bin MANOWN?= root MANMODE?= ${NONBINMODE} |