Date: Wed, 28 Dec 2016 09:32:02 +0000 (UTC) From: Andriy Voskoboinyk <avos@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r310676 - in head: share/man/man4 tools/build/mk Message-ID: <201612280932.uBS9W20h015892@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avos Date: Wed Dec 28 09:32:02 2016 New Revision: 310676 URL: https://svnweb.freebsd.org/changeset/base/310676 Log: rum.4, run.4, runfw.4, zyd.4: do not install when MK_USB == no. While here, add missing if_rtwn_usb.4.gz symlink into OptionalObsoleteFiles.inc Modified: head/share/man/man4/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Wed Dec 28 08:11:41 2016 (r310675) +++ head/share/man/man4/Makefile Wed Dec 28 09:32:02 2016 (r310676) @@ -438,9 +438,6 @@ MAN= aac.4 \ rtwnfw.4 \ rtwn_pci.4 \ rue.4 \ - rum.4 \ - run.4 \ - runfw.4 \ sa.4 \ safe.4 \ sbp.4 \ @@ -574,8 +571,7 @@ MAN= aac.4 \ xl.4 \ ${_xnb.4} \ xpt.4 \ - zero.4 \ - zyd.4 + zero.4 MLINKS= ae.4 if_ae.4 MLINKS+=age.4 if_age.4 @@ -710,8 +706,6 @@ MLINKS+=rl.4 if_rl.4 MLINKS+=rtwn.4 if_rtwn.4 MLINKS+=rtwn_pci.4 if_rtwn_pci.4 MLINKS+=rue.4 if_rue.4 -MLINKS+=rum.4 if_rum.4 -MLINKS+=run.4 if_run.4 MLINKS+=scsi.4 CAM.4 \ scsi.4 cam.4 \ scsi.4 scbus.4 \ @@ -756,7 +750,6 @@ MLINKS+=wi.4 if_wi.4 MLINKS+=${_wpi.4} ${_if_wpi.4} MLINKS+=xe.4 if_xe.4 MLINKS+=xl.4 if_xl.4 -MLINKS+=zyd.4 if_zyd.4 .if ${MACHINE_CPUARCH} == "aarch64" _armv8crypto.4= armv8crypto.4 @@ -915,6 +908,9 @@ MAN+= \ rsu.4 \ rsufw.4 \ rtwn_usb.4 \ + rum.4 \ + run.4 \ + runfw.4 \ u3g.4 \ uark.4 \ uart.4 \ @@ -965,10 +961,13 @@ MAN+= \ utopia.4 \ uvisor.4 \ uvscom.4 \ + zyd.4 MLINKS+=otus.4 if_otus.4 MLINKS+=rsu.4 if_rsu.4 MLINKS+=rtwn_usb.4 if_rtwn_usb.4 +MLINKS+=rum.4 if_rum.4 +MLINKS+=run.4 if_run.4 MLINKS+=u3g.4 u3gstub.4 MLINKS+=uath.4 if_uath.4 MLINKS+=udav.4 if_udav.4 @@ -976,6 +975,7 @@ MLINKS+=upgt.4 if_upgt.4 MLINKS+=ural.4 if_ural.4 MLINKS+=urndis.4 if_urndis.4 MLINKS+=${_urtw.4} ${_if_urtw.4} +MLINKS+=zyd.4 if_zyd.4 .endif .include <bsd.prog.mk> Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Dec 28 08:11:41 2016 (r310675) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Dec 28 09:32:02 2016 (r310676) @@ -8870,11 +8870,18 @@ OLD_FILES+=usr/share/man/man3/usb_strerr OLD_FILES+=usr/share/man/man3/usbhid.3.gz OLD_FILES+=usr/share/man/man4/if_otus.4.gz OLD_FILES+=usr/share/man/man4/if_rsu.4.gz +OLD_FILES+=usr/share/man/man4/if_rtwn_usb.4.gz +OLD_FILES+=usr/share/man/man4/if_rum.4.gz +OLD_FILES+=usr/share/man/man4/if_run.4.gz +OLD_FILES+=usr/share/man/man4/if_zyd.4.gz OLD_FILES+=usr/share/man/man4/otus.4.gz OLD_FILES+=usr/share/man/man4/otusfw.4.gz OLD_FILES+=usr/share/man/man4/rsu.4.gz OLD_FILES+=usr/share/man/man4/rsufw.4.gz OLD_FILES+=usr/share/man/man4/rtwn_usb.4.gz +OLD_FILES+=usr/share/man/man4/rum.4.gz +OLD_FILES+=usr/share/man/man4/run.4.gz +OLD_FILES+=usr/share/man/man4/runfw.4.gz OLD_FILES+=usr/share/man/man4/u3g.4.gz OLD_FILES+=usr/share/man/man4/u3gstub.4.gz OLD_FILES+=usr/share/man/man4/uark.4.gz @@ -8924,6 +8931,7 @@ OLD_FILES+=usr/share/man/man4/uslcom.4.g OLD_FILES+=usr/share/man/man4/utopia.4.gz OLD_FILES+=usr/share/man/man4/uvisor.4.gz OLD_FILES+=usr/share/man/man4/uvscom.4.gz +OLD_FILES+=usr/share/man/man4/zyd.4.gz OLD_FILES+=usr/share/man/man8/uathload.8.gz OLD_FILES+=usr/share/man/man8/usbconfig.8.gz OLD_FILES+=usr/share/man/man8/usbdump.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612280932.uBS9W20h015892>