Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Jan 2019 06:34:40 +0000 (UTC)
From:      Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r343110 - head/tools/build/mk
Message-ID:  <201901170634.x0H6YeO5003658@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gonzo
Date: Thu Jan 17 06:34:39 2019
New Revision: 343110
URL: https://svnweb.freebsd.org/changeset/base/343110

Log:
  Fix conditional obsolete files entry for WITHOUT_EXAMPLES
  
  Add all the files under /usr/share/examples to the MK_EXAMPLES
  section. OLD_DIRS entries are not removed if they're not empty so
  prior to this change WITHOUT_EXAMPLES didn't have significant effect
  on the updated system.
  
  PR:		228484
  Submitted by:	Dmitry Wagin <dmitry.wagin@ya.ru> (original patch)
  MFC after:	1 week

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jan 17 06:22:14 2019	(r343109)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jan 17 06:34:39 2019	(r343110)
@@ -2303,22 +2303,274 @@ OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
 .endif
 
 .if ${MK_EXAMPLES} == no
+OLD_FILES+=usr/share/examples/BSD_daemon/FreeBSD.pfa
+OLD_FILES+=usr/share/examples/BSD_daemon/README
+OLD_FILES+=usr/share/examples/BSD_daemon/beastie.eps
+OLD_FILES+=usr/share/examples/BSD_daemon/beastie.fig
+OLD_FILES+=usr/share/examples/BSD_daemon/eps.patch
+OLD_FILES+=usr/share/examples/BSD_daemon/poster.sh
+OLD_FILES+=usr/share/examples/FreeBSD_version/FreeBSD_version.c
+OLD_FILES+=usr/share/examples/FreeBSD_version/Makefile
+OLD_FILES+=usr/share/examples/FreeBSD_version/README
+OLD_FILES+=usr/share/examples/IPv6/USAGE
+OLD_FILES+=usr/share/examples/bhyve/vmrun.sh
+OLD_FILES+=usr/share/examples/bootforth/README
+OLD_FILES+=usr/share/examples/bootforth/boot.4th
+OLD_FILES+=usr/share/examples/bootforth/frames.4th
+OLD_FILES+=usr/share/examples/bootforth/loader.rc
+OLD_FILES+=usr/share/examples/bootforth/menu.4th
+OLD_FILES+=usr/share/examples/bootforth/menuconf.4th
+OLD_FILES+=usr/share/examples/bootforth/screen.4th
+OLD_FILES+=usr/share/examples/bsdconfig/add_some_packages.sh
+OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_http.sh
+OLD_FILES+=usr/share/examples/bsdconfig/bsdconfigrc
+OLD_FILES+=usr/share/examples/csh/dot.cshrc
+OLD_FILES+=usr/share/examples/diskless/ME
+OLD_FILES+=usr/share/examples/diskless/README.BOOTP
+OLD_FILES+=usr/share/examples/diskless/README.TEMPLATING
+OLD_FILES+=usr/share/examples/diskless/clone_root
+OLD_FILES+=usr/share/examples/dma/mailer.conf
+OLD_FILES+=usr/share/examples/drivers/README
+OLD_FILES+=usr/share/examples/drivers/make_device_driver.sh
+OLD_FILES+=usr/share/examples/drivers/make_pseudo_driver.sh
+OLD_FILES+=usr/share/examples/dwatch/profile_template
+OLD_FILES+=usr/share/examples/etc/README.examples
+OLD_FILES+=usr/share/examples/etc/bsd-style-copyright
+OLD_FILES+=usr/share/examples/etc/group
+OLD_FILES+=usr/share/examples/etc/login.access
+OLD_FILES+=usr/share/examples/etc/make.conf
+OLD_FILES+=usr/share/examples/etc/rc.bsdextended
+OLD_FILES+=usr/share/examples/etc/rc.firewall
+OLD_FILES+=usr/share/examples/etc/rc.sendmail
+OLD_FILES+=usr/share/examples/etc/termcap.small
+OLD_FILES+=usr/share/examples/etc/wpa_supplicant.conf
+OLD_FILES+=usr/share/examples/find_interface/Makefile
+OLD_FILES+=usr/share/examples/find_interface/README
+OLD_FILES+=usr/share/examples/find_interface/find_interface.c
+OLD_FILES+=usr/share/examples/hast/ucarp.sh
+OLD_FILES+=usr/share/examples/hast/ucarp_down.sh
+OLD_FILES+=usr/share/examples/hast/ucarp_up.sh
+OLD_FILES+=usr/share/examples/hast/vip-down.sh
+OLD_FILES+=usr/share/examples/hast/vip-up.sh
+OLD_FILES+=usr/share/examples/hostapd/hostapd.conf
+OLD_FILES+=usr/share/examples/hostapd/hostapd.eap_user
+OLD_FILES+=usr/share/examples/hostapd/hostapd.wpa_psk
+OLD_FILES+=usr/share/examples/indent/indent.pro
+OLD_FILES+=usr/share/examples/ipfilter/BASIC.NAT
+OLD_FILES+=usr/share/examples/ipfilter/BASIC_1.FW
+OLD_FILES+=usr/share/examples/ipfilter/BASIC_2.FW
+OLD_FILES+=usr/share/examples/ipfilter/README
+OLD_FILES+=usr/share/examples/ipfilter/example.1
+OLD_FILES+=usr/share/examples/ipfilter/example.10
+OLD_FILES+=usr/share/examples/ipfilter/example.11
+OLD_FILES+=usr/share/examples/ipfilter/example.12
+OLD_FILES+=usr/share/examples/ipfilter/example.13
+OLD_FILES+=usr/share/examples/ipfilter/example.14
+OLD_FILES+=usr/share/examples/ipfilter/example.2
+OLD_FILES+=usr/share/examples/ipfilter/example.3
+OLD_FILES+=usr/share/examples/ipfilter/example.4
+OLD_FILES+=usr/share/examples/ipfilter/example.5
+OLD_FILES+=usr/share/examples/ipfilter/example.6
+OLD_FILES+=usr/share/examples/ipfilter/example.7
+OLD_FILES+=usr/share/examples/ipfilter/example.8
+OLD_FILES+=usr/share/examples/ipfilter/example.9
+OLD_FILES+=usr/share/examples/ipfilter/example.sr
+OLD_FILES+=usr/share/examples/ipfilter/examples.txt
+OLD_FILES+=usr/share/examples/ipfilter/firewall
+OLD_FILES+=usr/share/examples/ipfilter/firewall.1
+OLD_FILES+=usr/share/examples/ipfilter/firewall.2
+OLD_FILES+=usr/share/examples/ipfilter/ftp-proxy
+OLD_FILES+=usr/share/examples/ipfilter/ftppxy
+OLD_FILES+=usr/share/examples/ipfilter/ipf-howto.txt
+OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.permissive
+OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.restrictive
+OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.sample
+OLD_FILES+=usr/share/examples/ipfilter/ipnat.conf.sample
+OLD_FILES+=usr/share/examples/ipfilter/mkfilters
+OLD_FILES+=usr/share/examples/ipfilter/nat-setup
+OLD_FILES+=usr/share/examples/ipfilter/nat.eg
+OLD_FILES+=usr/share/examples/ipfilter/rules.txt
+OLD_FILES+=usr/share/examples/ipfilter/server
+OLD_FILES+=usr/share/examples/ipfilter/tcpstate
+OLD_FILES+=usr/share/examples/ipfw/change_rules.sh
+OLD_FILES+=usr/share/examples/jails/README
+OLD_FILES+=usr/share/examples/jails/VIMAGE
+OLD_FILES+=usr/share/examples/jails/jail.xxx.conf
+OLD_FILES+=usr/share/examples/jails/jib
+OLD_FILES+=usr/share/examples/jails/jng
+OLD_FILES+=usr/share/examples/jails/rc.conf.jails
+OLD_FILES+=usr/share/examples/jails/rcjail.xxx.conf
+OLD_FILES+=usr/share/examples/kld/Makefile
+OLD_FILES+=usr/share/examples/kld/cdev/Makefile
+OLD_FILES+=usr/share/examples/kld/cdev/README
+OLD_FILES+=usr/share/examples/kld/cdev/module/Makefile
+OLD_FILES+=usr/share/examples/kld/cdev/module/cdev.c
+OLD_FILES+=usr/share/examples/kld/cdev/module/cdev.h
+OLD_FILES+=usr/share/examples/kld/cdev/module/cdevmod.c
+OLD_FILES+=usr/share/examples/kld/cdev/test/Makefile
+OLD_FILES+=usr/share/examples/kld/cdev/test/testcdev.c
+OLD_FILES+=usr/share/examples/kld/dyn_sysctl/Makefile
+OLD_FILES+=usr/share/examples/kld/dyn_sysctl/README
+OLD_FILES+=usr/share/examples/kld/dyn_sysctl/dyn_sysctl.c
+OLD_FILES+=usr/share/examples/kld/firmware/Makefile
+OLD_FILES+=usr/share/examples/kld/firmware/README
+OLD_FILES+=usr/share/examples/kld/firmware/fwconsumer/Makefile
+OLD_FILES+=usr/share/examples/kld/firmware/fwconsumer/fw_consumer.c
+OLD_FILES+=usr/share/examples/kld/firmware/fwimage/Makefile
+OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img.uu
+OLD_FILES+=usr/share/examples/kld/khelp/Makefile
+OLD_FILES+=usr/share/examples/kld/khelp/README
+OLD_FILES+=usr/share/examples/kld/khelp/h_example.c
+OLD_FILES+=usr/share/examples/kld/syscall/Makefile
+OLD_FILES+=usr/share/examples/kld/syscall/module/Makefile
+OLD_FILES+=usr/share/examples/kld/syscall/module/syscall.c
+OLD_FILES+=usr/share/examples/kld/syscall/test/Makefile
+OLD_FILES+=usr/share/examples/kld/syscall/test/call.c
+OLD_FILES+=usr/share/examples/libusb20/Makefile
+OLD_FILES+=usr/share/examples/libusb20/README
+OLD_FILES+=usr/share/examples/libusb20/bulk.c
+OLD_FILES+=usr/share/examples/libusb20/control.c
+OLD_FILES+=usr/share/examples/libusb20/util.c
+OLD_FILES+=usr/share/examples/libusb20/util.h
+OLD_FILES+=usr/share/examples/libvgl/Makefile
+OLD_FILES+=usr/share/examples/libvgl/demo.c
+OLD_FILES+=usr/share/examples/mdoc/POSIX-copyright
+OLD_FILES+=usr/share/examples/mdoc/deshallify.sh
+OLD_FILES+=usr/share/examples/mdoc/example.1
+OLD_FILES+=usr/share/examples/mdoc/example.3
+OLD_FILES+=usr/share/examples/mdoc/example.4
+OLD_FILES+=usr/share/examples/mdoc/example.9
+OLD_FILES+=usr/share/examples/netgraph/ether.bridge
+OLD_FILES+=usr/share/examples/netgraph/frame_relay
+OLD_FILES+=usr/share/examples/netgraph/ngctl
+OLD_FILES+=usr/share/examples/netgraph/raw
+OLD_FILES+=usr/share/examples/netgraph/udp.tunnel
+OLD_FILES+=usr/share/examples/netgraph/virtual.chain
+OLD_FILES+=usr/share/examples/netgraph/virtual.lan
+OLD_FILES+=usr/share/examples/pc-sysinstall/README
+OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs
+OLD_FILES+=usr/share/examples/perfmon/Makefile
+OLD_FILES+=usr/share/examples/perfmon/README
+OLD_FILES+=usr/share/examples/perfmon/perfmon.c
+OLD_FILES+=usr/share/examples/pf/ackpri
+OLD_FILES+=usr/share/examples/pf/faq-example1
+OLD_FILES+=usr/share/examples/pf/faq-example2
+OLD_FILES+=usr/share/examples/pf/faq-example3
+OLD_FILES+=usr/share/examples/pf/pf.conf
+OLD_FILES+=usr/share/examples/pf/queue1
+OLD_FILES+=usr/share/examples/pf/queue2
+OLD_FILES+=usr/share/examples/pf/queue3
+OLD_FILES+=usr/share/examples/pf/queue4
+OLD_FILES+=usr/share/examples/pf/spamd
+OLD_FILES+=usr/share/examples/ppi/Makefile
+OLD_FILES+=usr/share/examples/ppi/ppilcd.c
+OLD_FILES+=usr/share/examples/ppp/chap-auth
+OLD_FILES+=usr/share/examples/ppp/login-auth
+OLD_FILES+=usr/share/examples/ppp/ppp.conf.sample
+OLD_FILES+=usr/share/examples/ppp/ppp.conf.span-isp
+OLD_FILES+=usr/share/examples/ppp/ppp.conf.span-isp.working
+OLD_FILES+=usr/share/examples/ppp/ppp.linkdown.sample
+OLD_FILES+=usr/share/examples/ppp/ppp.linkdown.span-isp
+OLD_FILES+=usr/share/examples/ppp/ppp.linkdown.span-isp.working
+OLD_FILES+=usr/share/examples/ppp/ppp.linkup.sample
+OLD_FILES+=usr/share/examples/ppp/ppp.linkup.span-isp
+OLD_FILES+=usr/share/examples/ppp/ppp.linkup.span-isp.working
+OLD_FILES+=usr/share/examples/ppp/ppp.secret.sample
+OLD_FILES+=usr/share/examples/ppp/ppp.secret.span-isp
+OLD_FILES+=usr/share/examples/ppp/ppp.secret.span-isp.working
+OLD_FILES+=usr/share/examples/printing/diablo-if-net
+OLD_FILES+=usr/share/examples/printing/hpdf
+OLD_FILES+=usr/share/examples/printing/hpif
+OLD_FILES+=usr/share/examples/printing/hpof
+OLD_FILES+=usr/share/examples/printing/hprf
+OLD_FILES+=usr/share/examples/printing/hpvf
+OLD_FILES+=usr/share/examples/printing/if-simple
+OLD_FILES+=usr/share/examples/printing/if-simpleX
+OLD_FILES+=usr/share/examples/printing/ifhp
+OLD_FILES+=usr/share/examples/printing/make-ps-header
+OLD_FILES+=usr/share/examples/printing/netprint
+OLD_FILES+=usr/share/examples/printing/psdf
+OLD_FILES+=usr/share/examples/printing/psdfX
+OLD_FILES+=usr/share/examples/printing/psif
+OLD_FILES+=usr/share/examples/printing/pstf
+OLD_FILES+=usr/share/examples/printing/pstfX
+OLD_FILES+=usr/share/examples/scsi_target/Makefile
+OLD_FILES+=usr/share/examples/scsi_target/scsi_cmds.c
+OLD_FILES+=usr/share/examples/scsi_target/scsi_target.8
+OLD_FILES+=usr/share/examples/scsi_target/scsi_target.c
+OLD_FILES+=usr/share/examples/scsi_target/scsi_target.h
+OLD_FILES+=usr/share/examples/ses/Makefile
+OLD_FILES+=usr/share/examples/ses/Makefile.inc
+OLD_FILES+=usr/share/examples/ses/getencstat/Makefile
+OLD_FILES+=usr/share/examples/ses/getencstat/getencstat.0
+OLD_FILES+=usr/share/examples/ses/sesd/Makefile
+OLD_FILES+=usr/share/examples/ses/sesd/sesd.0
+OLD_FILES+=usr/share/examples/ses/setencstat/Makefile
+OLD_FILES+=usr/share/examples/ses/setencstat/setencstat.0
+OLD_FILES+=usr/share/examples/ses/setobjstat/Makefile
+OLD_FILES+=usr/share/examples/ses/setobjstat/setobjstat.0
+OLD_FILES+=usr/share/examples/ses/srcs/chpmon.c
+OLD_FILES+=usr/share/examples/ses/srcs/eltsub.c
+OLD_FILES+=usr/share/examples/ses/srcs/eltsub.h
+OLD_FILES+=usr/share/examples/ses/srcs/getencstat.c
+OLD_FILES+=usr/share/examples/ses/srcs/getnobj.c
+OLD_FILES+=usr/share/examples/ses/srcs/getobjmap.c
+OLD_FILES+=usr/share/examples/ses/srcs/getobjstat.c
+OLD_FILES+=usr/share/examples/ses/srcs/inienc.c
+OLD_FILES+=usr/share/examples/ses/srcs/sesd.c
+OLD_FILES+=usr/share/examples/ses/srcs/setencstat.c
+OLD_FILES+=usr/share/examples/ses/srcs/setobjstat.c
+OLD_FILES+=usr/share/examples/smbfs/dot.nsmbrc
+OLD_FILES+=usr/share/examples/smbfs/print/lj6l
+OLD_FILES+=usr/share/examples/smbfs/print/ljspool
+OLD_FILES+=usr/share/examples/smbfs/print/printcap.sample
+OLD_FILES+=usr/share/examples/smbfs/print/tolj
+OLD_FILES+=usr/share/examples/sunrpc/Makefile
+OLD_FILES+=usr/share/examples/sunrpc/dir/Makefile
+OLD_FILES+=usr/share/examples/sunrpc/dir/dir.x
+OLD_FILES+=usr/share/examples/sunrpc/dir/dir_proc.c
+OLD_FILES+=usr/share/examples/sunrpc/dir/rls.c
+OLD_FILES+=usr/share/examples/sunrpc/msg/Makefile
+OLD_FILES+=usr/share/examples/sunrpc/msg/msg.x
+OLD_FILES+=usr/share/examples/sunrpc/msg/msg_proc.c
+OLD_FILES+=usr/share/examples/sunrpc/msg/printmsg.c
+OLD_FILES+=usr/share/examples/sunrpc/msg/rprintmsg.c
+OLD_FILES+=usr/share/examples/sunrpc/sort/Makefile
+OLD_FILES+=usr/share/examples/sunrpc/sort/rsort.c
+OLD_FILES+=usr/share/examples/sunrpc/sort/sort.x
+OLD_FILES+=usr/share/examples/sunrpc/sort/sort_proc.c
+OLD_FILES+=usr/share/examples/tcsh/complete.tcsh
+OLD_FILES+=usr/share/examples/tcsh/csh-mode.el
+OLD_FILES+=usr/share/examples/uefisign/uefikeys
+OLD_FILES+=usr/share/examples/ypldap/ypldap.conf
 OLD_DIRS+=usr/share/examples
 OLD_DIRS+=usr/share/examples/BSD_daemon
 OLD_DIRS+=usr/share/examples/FreeBSD_version
 OLD_DIRS+=usr/share/examples/IPv6
+OLD_DIRS+=usr/share/examples/bhyve
 OLD_DIRS+=usr/share/examples/bootforth
 OLD_DIRS+=usr/share/examples/bsdconfig
 OLD_DIRS+=usr/share/examples/csh
 OLD_DIRS+=usr/share/examples/diskless
 OLD_DIRS+=usr/share/examples/dma
 OLD_DIRS+=usr/share/examples/drivers
+OLD_DIRS+=usr/share/examples/dwatch
 OLD_DIRS+=usr/share/examples/etc
 OLD_DIRS+=usr/share/examples/etc/defaults
 OLD_DIRS+=usr/share/examples/find_interface
 OLD_DIRS+=usr/share/examples/hast
 OLD_DIRS+=usr/share/examples/ibcs2
+OLD_DIRS+=usr/share/examples/hostapd
 OLD_DIRS+=usr/share/examples/indent
+OLD_DIRS+=usr/share/examples/ipfilter
 OLD_DIRS+=usr/share/examples/ipfw
 OLD_DIRS+=usr/share/examples/jails
 OLD_DIRS+=usr/share/examples/kld
@@ -2337,7 +2589,9 @@ OLD_DIRS+=usr/share/examples/libusb20
 OLD_DIRS+=usr/share/examples/libvgl
 OLD_DIRS+=usr/share/examples/mdoc
 OLD_DIRS+=usr/share/examples/netgraph
+OLD_DIRS+=usr/share/examples/pc-sysinstall
 OLD_DIRS+=usr/share/examples/perfmon
+OLD_DIRS+=usr/share/examples/pf
 OLD_DIRS+=usr/share/examples/ppi
 OLD_DIRS+=usr/share/examples/ppp
 OLD_DIRS+=usr/share/examples/printing



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901170634.x0H6YeO5003658>