diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 9a04400e2924..da72474d8b82 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -1,365 +1,367 @@ .include CONFDIR= /etc/rc.d CONFGROUPS= CONFS CONFSPACKAGE= rc CONFS= DAEMON \ FILESYSTEMS \ LOGIN \ NETWORKING \ SERVERS \ adjkerntz \ bgfsck \ ${_blacklistd} \ bridge \ cfumass \ cleanvar \ cleartmp \ ctld \ ddb \ defaultroute \ devfs \ dmesg \ dumpon \ fsck \ gbde \ geli \ geli2 \ gptboot \ growfs \ growfs_fstab \ hostid \ hostid_save \ hostname \ iovctl \ ip6addrctl \ ipsec \ ${_kadmind} \ ${_kdc} \ ${_kfd} \ kld \ kldxref \ ${_kpasswdd} \ ldconfig \ linux \ local \ localpkg \ lockd \ mixer \ motd \ mountcritlocal \ mountcritremote \ mountlate \ mdconfig \ mdconfig2 \ mountd \ msgs \ natd \ netif \ netoptions \ netwait \ newsyslog \ nfsclient \ nfscbd \ nfsd \ nfsuserd \ nisdomain \ ${_nscd} \ - ntpdate \ ${_opensm} \ os-release \ pf \ pflog \ pfsync \ powerd \ ppp \ pppoed \ pwcheck \ quota \ random \ rarpd \ rctl \ root \ route6d \ routing \ rpcbind \ rtadvd \ rtsold \ rwho \ savecore \ securelevel \ serial \ statd \ static_arp \ static_ndp \ stf \ swap \ swaplate \ sysctl \ sysctl_lastload \ syslogd \ sysvipc \ tmp \ ugidfw \ ${_utx} \ var \ var_run \ watchdogd CONFGROUPS+= DEVD DEVD= devd DEVDPACKAGE= devd CONFGROUPS+= DEVMATCH DEVMATCH= devmatch DEVMATCHPACKAGE= devmatch CONFGROUPS+= DHCLIENT DHCLIENT= dhclient DHCLIENTPACKAGE= dhclient CONFGROUPS+= GGATED GGATED= ggated GGATEDPACKAGE= ggate CONFGROUPS+= RESOLVCONF RESOLVCONF= resolv RESOLVCONFPACKAGE= resolvconf CONFGROUPS+= CRON CRON+= cron CRONPACKAGE= cron .if ${MK_NIS} != "no" CONFS+= ypbind \ ypldap \ yppasswdd \ ypserv \ ypset \ ypupdated \ ypxfrd .endif .if ${MK_ACCT} != "no" CONFGROUPS+= ACCT ACCT+= accounting ACCTPACKAGE= acct .endif .if ${MK_ACPI} != "no" CONFGROUPS+= ACPI ACPI= power_profile ACPIPACKAGE= acpi .endif .if ${MK_APM} != "no" CONFGROUPS+= APM APM+= apm .if ${MACHINE} == "i386" APM+= apmd .endif APMPACKAGE= apm .endif .if ${MK_AUDIT} != "no" CONFGROUPS+= AUDIT AUDIT+= auditd AUDIT+= auditdistd AUDITPACKAGE= audit .endif .if ${MK_AUTOFS} != "no" CONFS+= automount CONFS+= automountd CONFS+= autounmountd .endif .if ${MK_BLACKLIST} != "no" _blacklistd+= blacklistd .endif .if ${MK_BLUETOOTH} != "no" CONFGROUPS+= BLUETOOTH BLUETOOTH+= bluetooth \ bthidd \ hcsecd \ rfcomm_pppd_server \ sdpd \ ubthidhci BLUETOOTHPACKAGE= bluetooth .endif .if ${MK_BOOTPARAMD} != "no" CONFS+= bootparams .endif .if ${MK_BSNMP} != "no" CONFGROUPS+= BSNMP BSNMP+= bsnmpd BSNMPPACKAGE= bsnmp .endif .if ${MK_CCD} != "no" CONFS+= ccd .endif .if ${MK_FTP} != "no" CONFS+= ftpd .endif .if ${MK_GSSAPI} != "no" CONFGROUPS+= GSSD GSSD= gssd GSSDPACKAGE= kerberos .endif .if ${MK_HAST} != "no" CONFGROUPS+= HAST HAST= hastd HASTPACKAGE= hast .endif .if ${MK_INETD} != "no" CONFS+= inetd .endif .if ${MK_IPFILTER} != "no" CONFS+= ipfilter \ ipfs \ ipmon \ ipnat \ ippool .endif .if ${MK_IPFW} != "no" CONFS+= ipfw \ dnctl .if ${MK_NETGRAPH} != "no" CONFS+= ipfw_netflow .endif .endif .if ${MK_ISCSI} != "no" CONFS+= iscsictl CONFS+= iscsid .endif .if ${MK_JAIL} != "no" CONFGROUPS+= JAIL JAIL+= jail JAILPACKAGE= jail .endif .if ${MK_LEGACY_CONSOLE} != "no" CONFGROUPS+= CONSOLE CONSOLE+= moused CONSOLE+= syscons CONSOLEPACKAGE= console-tools .endif .if ${MK_LPR} != "no" CONFGROUPS+= LP LP+= lpd LPPACKAGE= lp .endif .if ${MK_KERBEROS} != "no" CONFS+= ipropd_master CONFS+= ipropd_slave _kadmind= kadmind _kdc= kdc _kfd= kfd _kpasswdd= kpasswdd DIRS+= VAR_HEMIDAL VAR_HEMIDAL= /var/heimdal VAR_HEMIDAL_MODE= 700 .endif .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif .if ${MK_NTP} != "no" -CONFS+= ntpd +CONFGROUPS+= NTP +NTP+= ntpd \ + ntpdate +NTPPACKAGE= ntp .endif .if ${MK_OFED} != "no" _opensm= opensm .endif .if ${MK_OPENSSL} != "no" CONFS+= keyserv .if ${MK_OPENSSL_KTLS} != "no" CONFS+= tlsclntd \ tlsservd .endif .endif .if ${MK_OPENSSH} != "no" CONFGROUPS+= SSH SSH= sshd SSHPACKAGE= ssh .endif .if ${MK_PF} != "no" CONFS+= ftp-proxy .endif .if ${MK_ROUTED} != "no" CONFS+= routed .endif .if ${MK_SENDMAIL} != "no" CONFGROUPS+= SMRCD SMRCD= sendmail SMRCDPACKAGE= sendmail .endif .if ${MK_NUAGEINIT} != "no" CONFGROUPS+= NIUAGEINIT NIUAGEINIT= nuageinit NIUAGEINITPACKAGE= nuageinit .endif .if ${MK_UNBOUND} != "no" CONFGROUPS+= UNBOUND UNBOUND+= local_unbound UNBOUNDPACKAGE= unbound .endif .if ${MK_UTMPX} != "no" _utx= utx .endif .if ${MK_VI} != "no" CONFGROUPS+= VI VI+= virecover VIPACKAGE= vi .endif .if ${MK_WIRELESS} != "no" CONFS+= hostapd CONFS+= wpa_supplicant .endif .if ${MK_ZFS} != "no" CONFGROUPS+= ZFS ZFS+= zfs ZFS+= zfsbe ZFS+= zfsd ZFS+= zfskeys ZFS+= zpool ZFS+= zpoolreguid ZFS+= zpoolupgrade ZFS+= zvol ZFSPACKAGE= rc .endif .for fg in ${CONFGROUPS} ${fg}MODE?= ${BINMODE} .endfor .include diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index aed7746e690f..87585f7eac38 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -1,185 +1,187 @@ # # acct_COMMENT= System Accounting Utilities acct_DESC= System Accounting Utilities acpi_COMMENT= ACPI Utilities acpi_DESC= ACPI Utilities amd_COMMENT= AMD Utilities amd_DESC= AMD Utilities apm_COMMENT= APM Utilities apm_DESC= APM Utilities at_COMMENT= AT Utilities at_DESC= AT Utilities audit_COMMENT= OpenBSM auditing utilities audit_DESC= OpenBSM auditing utilities autofs_COMMENT= Autofs Utilities autofs_DESC= Autofs Utilities bhyve_COMMENT= Bhyve Utilities bhyve_DESC= Bhyve Utilities binutils_COMMENT= Binutils binutils_DESC= Binutils blocklist_COMMENT= Blocklist Utilities blocklist_DESC= Blocklist Utilities bluetooth_COMMENT= Bluetooth Utilities bluetooth_DESC= Bluetooth Utilities bootloader_COMMENT= Bootloader bootloader_DESC= Bootloader and configuration files bsdinstall_COMMENT= BSDInstall Utilities bsdinstall_DESC= BSDInstall Utilities bsnmp_COMMENT= BSNMP Utilities bsnmp_DESC= BSNMP Utilities caroot_COMMENT= SSL Certificates caroot_DESC= SSL Certificates clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries certctl_COMMENT= SSL Certificate Utility certctl_DESC= SSL Certificate Utility console-tools_COMMENT= Console Utilities console-tools_DESC= Console Utilities cron_COMMENT= cron(8) and crontab(1) cron_DESC= cron(8) and crontab(1) csh_COMMENT= C Shell csh_DESC= C Shell ctf-tools_COMMENT= CTF Utilities ctf-tools_DESC= CTF Utilities cxgbe-tools_COMMENT= Chelsio cxbge Utilities cxgbe-tools_DESC= Chelsio cxbge Utilities devd_COMMENT= Devd Utility and scripts devd_DESC= Devd Utility and scripts devmatch_COMMENT= Devmatch Utility devmatch_DESC= Devmatch Utility dhclient_COMMENT= DHCP Client dhclient_DESC= DHCP Client dma_COMMENT= DMA Mail Agent Utilities dma_DESC= DMA Mail Agent Utilities docs_COMMENT= Documentation docs_DESC= Documentation dtrace_COMMENT= Dtrace Utilities dtrace_DESC= Dtrace Utilities dwatch_COMMENT= Dwatch Utilities dwatch_DESC= Dwatch Utilities ee_COMMENT= Easy Editor Utilities ee_DESC= Easy Editor Utilities efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities elftoolchain_COMMENT= ElfToolchain programs and libraries elftoolchain_DESC= ElfToolchain programs and libraries examples_COMMENT= Examples in /usr/share/examples examples_DESC= Examples in /usr/share/examples fetch_COMMENT= Fetch Utility fetch_DESC= Fetch Utility ftp_COMMENT= FTP Utilities ftp_DESC= FTP Utilities ftpd_COMMENT= FTP Daemon ftpd_DESC= FTP Daemon fwget_COMMENT= FWGET Utility fwget_DESC= FWGET Utility games_COMMENT= Games games_DESC= Games geom_COMMENT= GEOM Utilitites geom_DESC= GEOM Utilitites ggate_COMMENT= GEOM Gate Utilities ggate_DESC= GEOM Gate Utilities hast_COMMENT= Highly Available Storage daemon hast_DESC= Highly Available Storage daemon hostapd_COMMENT= 802.11 Access Point Daemon an Utilities hostapd_DESC= 802.11 Access Point Daemon an Utilities hyperv-tools_COMMENT= Microsoft HyperV Utilities hyperv-tools_DESC= Microsoft HyperV Utilities inetd_COMMENT= Internet super-server inetd_DESC= Internet super-server jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities jail-debug_DESCR= Debugging Symbols jail-development_DESCR=Development Files jail-profile_DESCR= Profiling Libraries jail-lib32_DESCR= 32-bit Libraries jail-lib32-debug_DESCR=32-bit Debugging Symbols jail-lib32-development_DESCR=32-bit Development Files jail-lib32-profile_DESCR=32-bit Profiling Libraries kerberos_COMMENT= Kerberos Utilities kerberos_DESC= Kerberos Utilities kerberos-lib_COMMENT= Kerberos Libraries kerberos-lib_DESC= Kerberos Libraries kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel lp_COMMENT= Printer subsystem lp_DESC= Printer subsystem manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages mlx-tools_COMMENT= Mellanox Utilities mlx-tools_DESC= Mellanox Utilities mtree_COMMENT= MTREE Files mtree_DESC= MTREE Files netmap_COMMENT= Netmap Library and Utilities netmap_DESC= Netmap Library and Utilities newsyslog_COMMENT= Newsyslog Utility newsyslog_DESC= Newsyslog Utility nfs_COMMENT= NFS Utilities nfs_DESC= NFS Utilities +ntp_COMMENT= Network Time Protocol server and client +ntp_DESC= Network Time Protocol server and client nuageinit_COMMENT= CloudInit support scripts nuageinit_DESC= CloudInit support scripts nvme-tools_COMMENT= NVME Utilities nvme-tools_DESC= NVME Utilities openssl_COMMENT= OpenSSL Utility openssl_DESC= OpenSSL Utility openssl-lib_COMMENT= OpenSSL Libraries openssl-lib_DESC= OpenSSL Libraries pkg-bootstrap_COMMENT= pkg bootstrap Utility pkg-bootstrap_DESC= pkg bootstrap Utility periodic_COMMENT= Periodic Utility periodic_DESC= Periodic Utility rc_COMMENT= RC Scripts rc_DESC= RC Scripts rcmds_COMMENT= Remote Command Utilities rcmds_DESC= Remote Command Utilities rdma_COMMENT= RDMA Utilities rdma_DESC= RDMA Utilities rescue_COMMENT= Rescue Utilities rescue_DESC= Rescue Utilities resolvconf_COMMENT= Resolvconf Utility and scripts resolvconf_DESC= Resolvconf Utility and scripts runtime_COMMENT= FreeBSD Base System runtime_DESC= FreeBSD Base System runtime-debug_DESCR= Debugging Symbols runtime-development_DESCR=Development Files runtime-profile_DESCR= Profiling Libraries runtime-lib32_DESCR= 32-bit Libraries runtime-lib32-debug_DESCR=32-bit Debugging Symbols runtime-lib32-development_DESCR=32-bit Development Files runtime-lib32-profile_DESCR=32-bit Profiling Libraries sendmail_COMMENT= Sendmail Utilities sendmail_DESC= Sendmail Utilities smbutils_COMMENT= SMB Utilities smbutils_DESC= SMB Utilities ssh_COMMENT= Secure Shell Utilities ssh_DESC= Secure Shell Utilities syscons_COMMENT= Syscons Console syscons_DESC= Syscons Console syslogd_COMMENT= Syslog Daemon syslogd_DESC= Syslog Daemon tcpd_COMMENT= TCP Wrapper utilities tcpd_DESC= TCP Wrapper utilities telnet_COMMENT= Telnet client telnet_DESC= Telnet client tests_COMMENT= Test Suite tests_DESC= Test Suite ufs_COMMENT= UFS Libraries and Utilities ufs_DESC= UFS Libraries and Utilities unbound_COMMENT= Unbound DNS Resolver unbound_DESC= Unbound DNS Resolver utilities_COMMENT= Non-vital programs and libraries utilities_DESC= Non-vital programs and libraries vi_COMMENT= Vi Editor vi_DESC= Vi Editor vt_COMMENT= VT fonts and keyboard files vt_DESC= VT fonts and keyboard files wpa_COMMENT= 802.11 Supplicant wpa_DESC= 802.11 Supplicant yp_COMMENT= Yellow Pages programs yp_DESC= Yellow Pages programs zfs_COMMENT= ZFS Libraries and Utilities zfs_DESC= ZFS Libraries and Utilities diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile index 345e75d54679..e87f4f734343 100644 --- a/usr.sbin/ntp/doc/Makefile +++ b/usr.sbin/ntp/doc/Makefile @@ -1,32 +1,33 @@ .include +PACKAGE=ntp SUBDIR= drivers hints icons pic scripts FILESDIR= ${SHAREDIR}/doc/ntp .if ${MK_HTML} != "no" FILES= access.html accopt.html assoc.html audio.html authentic.html \ authopt.html autokey.html bugs.html build.html clock.html \ clockopt.html cluster.html comdex.html config.html confopt.html \ copyright.html debug.html decode.html discipline.html discover.html \ extern.html filter.html hints.html history.html howto.html \ huffpuff.html index.html kern.html kernpps.html keygen.html leap.html \ miscopt.html monopt.html msyslog.html ntp-keygen.html ntp-wait.html \ ntp.conf.html ntp.keys.html ntp_conf.html ntpd.html ntpdate.html \ ntpdc.html ntpdsim.html ntpdsim_new.html ntpq.html ntpsnmpd.html \ ntptime.html ntptrace.html orphan.html parsedata.html \ parsenew.html poll.html pps.html prefer.html quick.html rate.html \ rdebug.html refclock.html release.html select.html sitemap.html \ sntp.html stats.html tickadj.html warp.html xleave.html .endif MAN= ntp.conf.5 ntp.keys.5 MAN+= ntp-keygen.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 sntp.8 .PATH: ${SRCTOP}/contrib/ntp/html \ ${SRCTOP}/contrib/ntp/util \ ${SRCTOP}/contrib/ntp/ntpd \ ${SRCTOP}/contrib/ntp/ntpsnmpd .include diff --git a/usr.sbin/ntp/doc/drivers/Makefile b/usr.sbin/ntp/doc/drivers/Makefile index 580a62a7a9ed..304d212b116b 100644 --- a/usr.sbin/ntp/doc/drivers/Makefile +++ b/usr.sbin/ntp/doc/drivers/Makefile @@ -1,20 +1,21 @@ .include +PACKAGE= ntp SUBDIR= icons scripts FILESDIR= ${SHAREDIR}/doc/ntp/drivers .if ${MK_HTML} != "no" FILES= driver1.html driver10.html driver11.html driver12.html driver16.html \ driver18.html driver19.html driver20.html driver22.html driver26.html \ driver27.html driver28.html driver29.html driver3.html driver30.html \ driver31.html driver32.html driver33.html driver34.html driver35.html \ driver36.html driver37.html driver38.html driver39.html driver4.html \ driver40.html driver42.html driver43.html driver44.html driver45.html \ driver46.html driver5.html driver6.html driver7.html driver8.html \ driver9.html mx4200data.html oncore-shmem.html tf582_4.html .endif .PATH: ${SRCTOP}/contrib/ntp/html/drivers .include diff --git a/usr.sbin/ntp/doc/drivers/icons/Makefile b/usr.sbin/ntp/doc/drivers/icons/Makefile index eda2a743078d..6c78893bfb58 100644 --- a/usr.sbin/ntp/doc/drivers/icons/Makefile +++ b/usr.sbin/ntp/doc/drivers/icons/Makefile @@ -1,12 +1,13 @@ .include +PACKAGE= ntp FILESDIR= ${SHAREDIR}/doc/ntp/drivers/icons .if ${MK_HTML} != "no" FILES= home.gif mail2.gif .endif .PATH: ${SRCTOP}/contrib/ntp/html/drivers/icons .include diff --git a/usr.sbin/ntp/doc/drivers/scripts/Makefile b/usr.sbin/ntp/doc/drivers/scripts/Makefile index 16b896553114..633c90fdc3e1 100644 --- a/usr.sbin/ntp/doc/drivers/scripts/Makefile +++ b/usr.sbin/ntp/doc/drivers/scripts/Makefile @@ -1,12 +1,13 @@ .include +PACKAGE= ntp FILESDIR= ${SHAREDIR}/doc/ntp/drivers/scripts .if ${MK_HTML} != "no" FILES= footer.txt style.css .endif .PATH: ${SRCTOP}/contrib/ntp/html/drivers/scripts .include diff --git a/usr.sbin/ntp/doc/hints/Makefile b/usr.sbin/ntp/doc/hints/Makefile index 899e8adaea0f..aa3f25a5a268 100644 --- a/usr.sbin/ntp/doc/hints/Makefile +++ b/usr.sbin/ntp/doc/hints/Makefile @@ -1,16 +1,17 @@ .include +PACKAGE= ntp FILESDIR= ${SHAREDIR}/doc/ntp/hints .if ${MK_HTML} != "no" FILES= a-ux aix bsdi changes decosf1 decosf2 freebsd hpux linux mpeix \ notes-xntp-v3 parse refclocks rs6000 sco.html sgi \ solaris-dosynctodr.html solaris.html solaris.xtra.4023118 \ solaris.xtra.4095849 solaris.xtra.S99ntpd solaris.xtra.patchfreq \ sun4 svr4-dell svr4_package todo vxworks.html winnt.html .endif .PATH: ${SRCTOP}/contrib/ntp/html/hints .include diff --git a/usr.sbin/ntp/doc/icons/Makefile b/usr.sbin/ntp/doc/icons/Makefile index b9608cc2f82e..d6c026341e09 100644 --- a/usr.sbin/ntp/doc/icons/Makefile +++ b/usr.sbin/ntp/doc/icons/Makefile @@ -1,12 +1,13 @@ .include +PACKAGE= ntp FILESDIR= ${SHAREDIR}/doc/ntp/icons .if ${MK_HTML} != "no" FILES= home.gif mail2.gif sitemap.png .endif .PATH: ${SRCTOP}/contrib/ntp/html/icons .include diff --git a/usr.sbin/ntp/doc/pic/Makefile b/usr.sbin/ntp/doc/pic/Makefile index 23cf769892da..1c1ede47ac04 100644 --- a/usr.sbin/ntp/doc/pic/Makefile +++ b/usr.sbin/ntp/doc/pic/Makefile @@ -1,26 +1,27 @@ .include +PACKAGE= ntp FILESDIR= ${SHAREDIR}/doc/ntp/pic .if ${MK_HTML} != "no" FILES= 9400n.jpg alice11.gif alice13.gif alice15.gif alice23.gif \ alice31.gif alice32.gif alice35.gif alice38.gif alice44.gif \ alice47.gif alice51.gif alice61.gif barnstable.gif beaver.gif \ boom3.gif boom3a.gif boom4.gif broad.gif bustardfly.gif c51.jpg \ description.jpg discipline.gif dogsnake.gif driver29.gif \ driver43_1.gif driver43_2.jpg fg6021.gif fg6039.jpg fig_3_1.gif \ flatheads.gif flt1.gif flt2.gif flt3.gif flt4.gif flt5.gif flt6.gif \ flt7.gif flt8.gif flt9.gif freq1211.gif gadget.jpg gps167.jpg \ group.gif hornraba.gif igclock.gif neoclock4x.gif offset1211.gif \ oncore_evalbig.gif oncore_remoteant.jpg oncore_utplusbig.gif oz2.gif \ panda.gif pd_om006.gif pd_om011.gif peer.gif pogo.gif pogo1a.gif \ pogo3a.gif pogo4.gif pogo5.gif pogo6.gif pogo7.gif pogo8.gif \ pzf509.jpg pzf511.jpg rabbit.gif radio2.jpg sheepb.jpg stack1a.jpg \ stats.gif sx5.gif thunderbolt.jpg time1.gif tonea.gif tribeb.gif \ wingdorothy.gif .endif .PATH: ${SRCTOP}/contrib/ntp/html/pic .include diff --git a/usr.sbin/ntp/doc/scripts/Makefile b/usr.sbin/ntp/doc/scripts/Makefile index 7b8255a02423..c0f57e97a164 100644 --- a/usr.sbin/ntp/doc/scripts/Makefile +++ b/usr.sbin/ntp/doc/scripts/Makefile @@ -1,14 +1,15 @@ .include +PACKAGE= ntp FILESDIR= ${SHAREDIR}/doc/ntp/scripts .if ${MK_HTML} != "no" FILES= accopt.txt audio.txt authopt.txt clockopt.txt command.txt config.txt \ confopt.txt external.txt footer.txt hand.txt install.txt manual.txt \ misc.txt miscopt.txt monopt.txt refclock.txt special.txt style.css .endif .PATH: ${SRCTOP}/contrib/ntp/html/scripts .include diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile index 7cf4a33b8c6d..e08f6d3b4659 100644 --- a/usr.sbin/ntp/libntp/Makefile +++ b/usr.sbin/ntp/libntp/Makefile @@ -1,96 +1,97 @@ .PATH: ${SRCTOP}/contrib/ntp/libntp \ ${SRCTOP}/contrib/ntp/libntp/lib/isc \ ${SRCTOP}/contrib/ntp/libntp/lib/isc/nls \ ${SRCTOP}/contrib/ntp/libntp/lib/isc/pthreads \ ${SRCTOP}/contrib/ntp/libntp/lib/isc/unix \ +PACKAGE= ntp LIB= ntp INTERNALLIB= NTP_SRCS= systime.c a_md5encrypt.c adjtime.c atoint.c \ atolfp.c atouint.c audio.c authkeys.c \ authreadkeys.c authusekey.c bsd_strerror.c buftvtots.c \ caljulian.c caltontp.c calyearstart.c clocktime.c \ clocktypes.c decodenetnum.c dofptoa.c dolfptoa.c \ emalloc.c findconfig.c getopt.c hextoint.c \ hextolfp.c humandate.c icom.c iosignal.c \ is_ip_address.c \ lib_strbuf.c \ libssl_compat.c \ machines.c mktime.c modetoa.c \ mstolfp.c msyslog.c netof.c ntp_calendar.c \ ntp_calgps.c \ ntp_crypto_rnd.c ntp_intres.c ntp_libopts.c \ ntp_lineedit.c ntp_random.c ntp_rfc2553.c ntp_realpath.c \ ntp_worker.c \ numtoa.c numtohost.c octtoint.c prettydate.c \ recvbuff.c refidsmear.c \ refnumtoa.c snprintf.c socket.c \ socktoa.c socktohost.c ssl_init.c statestr.c \ strdup.c strl_obsd.c syssignal.c timespecops.c \ timetoa.c \ timevalops.c timexsup.c \ uglydate.c vint64ops.c work_fork.c \ work_thread.c xsbprintf.c ymd2yd.c ISC_PTHREADS_SRCS= condition.c \ thread.c \ mutex.c ISC_UNIX_SRCS= dir.c \ errno2result.c \ file.c \ interfaceiter.c \ net.c \ stdio.c \ stdtime.c \ strerror.c \ time.c \ tsmemcmp.c ISC_NLS_SRCS= msgcat.c ISC_SRCS= assertions.c \ buffer.c \ backtrace-emptytbl.c \ backtrace.c \ error.c \ event.c \ inet_ntop.c \ inet_pton.c \ lib.c \ log.c \ md5.c \ netaddr.c \ netscope.c \ ondestroy.c \ random.c \ result.c \ task.c \ sha1.c \ sockaddr.c \ ${ISC_NLS_SRCS} \ ${ISC_PTHREADS_SRCS} \ ${ISC_UNIX_SRCS} SRCS= ${NTP_SRCS} ${ISC_SRCS} version.c CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/unix/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/pthreads/include \ -I${SRCTOP}/contrib/ntp/sntp/libopts \ -I${SRCTOP}/lib/libc/${MACHINE_ARCH} \ -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit \ -I${.CURDIR:H} \ -I${.CURDIR}/ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H -DHAVE_CLOSEFROM CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR:H}/scripts/mkver ntpd .include diff --git a/usr.sbin/ntp/libntpevent/Makefile b/usr.sbin/ntp/libntpevent/Makefile index 0c04dae95d47..e36b2f51e497 100644 --- a/usr.sbin/ntp/libntpevent/Makefile +++ b/usr.sbin/ntp/libntpevent/Makefile @@ -1,35 +1,36 @@ .include .PATH: ${SRCTOP}/contrib/libevent +PACKAGE= ntp LIB= ntpevent INTERNALLIB= SRCS= buffer.c bufferevent.c bufferevent_filter.c \ bufferevent_pair.c epoll.c evdns.c event.c event_tagging.c \ evmap.c evport.c evrpc.c evthread.c evthread_pthread.c evutil.c \ evutil_rand.c evutil_time.c http.c kqueue.c listener.c log.c poll.c \ select.c signal.c strlcpy.c .if ${MK_OPENSSL} != "no" SRCS+= bufferevent_openssl.c .endif .if ${MACHINE_ARCH} == "i386" NTP_ATOMIC=x86_32 .elif ${MACHINE_ARCH} == "amd64" NTP_ATOMIC=x86_64 .elif ${MACHINE_ARCH} == "powerpc64" NTP_ATOMIC=powerpc .else NTP_ATOMIC=noatomic .endif CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/libevent/include \ -I${.CURDIR}/ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H .include diff --git a/usr.sbin/ntp/libopts/Makefile b/usr.sbin/ntp/libopts/Makefile index 170ff6db61da..97ae9fc4635b 100644 --- a/usr.sbin/ntp/libopts/Makefile +++ b/usr.sbin/ntp/libopts/Makefile @@ -1,16 +1,17 @@ .PATH: ${SRCTOP}/contrib/ntp/sntp/libopts +PACKAGE=ntp LIB= opts INTERNALLIB= # XXX libopts uses generated format string tables containing embedded NULs. NO_WFORMAT= SRCS= libopts.c CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/sntp/libopts \ -I${.CURDIR:H} .include diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index e6c0bbb269cc..f79e2c761840 100644 --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -1,18 +1,19 @@ .PATH: ${SRCTOP}/contrib/ntp/libparse +PACKAGE=ntp LIB= parse INTERNALLIB= SRCS= binio.c clk_computime.c clk_dcf7000.c clk_hopf6021.c \ clk_meinberg.c clk_rawdcf.c clk_rcc8000.c clk_schmid.c \ clk_sel240x.c clk_trimtaip.c clk_trimtsip.c clk_varitext.c \ clk_wharton.c data_mbg.c gpstolfp.c ieee754io.c \ info_trimble.c mfp_mul.c parse.c parse_conf.c \ trim_info.c CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/unix/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/include -I${.CURDIR:H} .include diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile index 71df31a475a7..a667e218a211 100644 --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -1,28 +1,29 @@ MAN= .include .PATH: ${SRCTOP}/contrib/ntp/util \ ${SRCTOP}/contrib/ntp/ntpd +PACKAGE=ntp PROG= ntp-keygen SRCS= ntp-keygen.c ntp-keygen-opts.c CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/unix/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/pthreads/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/${NTP_ATOMIC}/include \ -I${SRCTOP}/contrib/ntp/sntp/libopts \ -I${.CURDIR}/lib/libc/${MACHINE_ARCH} \ -I${.CURDIR:H} LIBADD+= m ntp opts pthread .if ${MK_OPENSSL} != "no" LIBADD+= crypto .endif .include diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index d7b5010227f5..83f63ef02f7b 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -1,61 +1,62 @@ MAN= .include .PATH: ${SRCTOP}/contrib/ntp/ntpd \ ${.OBJDIR} +PACKAGE= ntp DIRS= ETC_NTP ETC_NTP= /etc/ntp ETC_NTP_MODE= 0700 CONFS= ntp.conf FILES= leap-seconds FILESDIR= ETC_NTP FILESMODE= 644 PROG= ntpd SRCS= cmd_args.c \ ntp_clockdev.c \ ntp_config.c ntp_control.c ntp_crypto.c ntp_filegen.c \ ntp_io.c ntp_leapsec.c ntp_loopfilter.c ntp_monitor.c ntp_parser.c \ ntp_peer.c ntp_proto.c ntp_refclock.c ntp_request.c ntp_restrict.c \ ntp_ppsdev.c \ ntp_scanner.c ntp_signd.c ntp_timer.c ntp_util.c ntpd-opts.c ntpd.c \ rc_cmdlength.c \ refclock_acts.c refclock_arbiter.c refclock_arc.c refclock_as2201.c \ refclock_atom.c refclock_bancomm.c refclock_chronolog.c \ refclock_chu.c refclock_conf.c refclock_datum.c refclock_dumbclock.c \ refclock_fg.c refclock_gpsdjson.c refclock_gpsvme.c refclock_heath.c \ refclock_hopfpci.c refclock_hopfser.c refclock_hpgps.c \ refclock_irig.c refclock_jjy.c refclock_jupiter.c refclock_leitch.c \ refclock_local.c refclock_nmea.c refclock_neoclock4x.c \ refclock_oncore.c refclock_palisade.c \ refclock_parse.c refclock_pcf.c refclock_pst.c refclock_ripencc.c \ refclock_shm.c refclock_tpro.c refclock_true.c refclock_tsyncpci.c \ refclock_tt560.c refclock_ulink.c refclock_wwv.c refclock_wwvb.c \ refclock_zyfer.c version.c CFLAGS+= -I${SRCTOP}/contrib/ntp/ntpd \ -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/pthreads/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/unix/include \ -I${SRCTOP}/contrib/ntp/sntp/libopts \ -I${.CURDIR:H} \ -I${.CURDIR} LIBADD= parse ntp m opts pthread .if ${MK_OPENSSL} != "no" LIBADD+= crypto .else LIBADD+= md .endif CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR:H}/scripts/mkver ntpd .include diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile index 03afbb5d708b..fa8000be2f19 100644 --- a/usr.sbin/ntp/ntpdate/Makefile +++ b/usr.sbin/ntp/ntpdate/Makefile @@ -1,29 +1,30 @@ .include .PATH: ${SRCTOP}/contrib/ntp/ntpdate +PACKAGE=ntp PROG= ntpdate MAN= SRCS= ntpdate.c version.c CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/include/ \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/unix/include/ \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/pthreads/include \ -I${.CURDIR:H} LIBADD= ntp m pthread .if ${MK_OPENSSL} != "no" LIBADD+= crypto .else LIBADD+= md .endif CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR:H}/scripts/mkver ntpdate .include diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index 8502b7c1b503..d0d61941ac63 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -1,32 +1,33 @@ MAN= .include .PATH: ${SRCTOP}/contrib/ntp/ntpdc +PACKAGE=ntp PROG= ntpdc SRCS= ntpdc.c ntpdc_ops.c ntpdc-opts.c version.c CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/unix/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/pthreads/include \ -I${SRCTOP}/contrib/ntp/sntp/libopts \ -I${.CURDIR}/lib/libc/${MACHINE_ARCH} \ -I${.CURDIR:H} -I${.CURDIR} LIBADD= edit ntp m opts pthread .if ${MK_OPENSSL} != "no" LIBADD+= crypto .else LIBADD+= md .endif CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR:H}/scripts/mkver ntpdc .include diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index be1e9c9034ff..50cccba36a21 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -1,35 +1,36 @@ MAN= .include .PATH: ${SRCTOP}/contrib/ntp/ntpq BINDIR= /usr/bin +PACKAGE=ntp PROG= ntpq SRCS= ntpq.c ntpq-opts.c ntpq-subs.c version.c CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/unix/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/pthreads/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/${NTP_ATOMIC}/include \ -I${SRCTOP}/contrib/ntp/sntp/libopts \ -I${.CURDIR:H} LIBADD+= edit ntp opts m pthread .if ${MK_OPENSSL} != "no" LIBADD+= crypto .else LIBADD+= md .endif CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR:H}/scripts/mkver ntpq .include diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile index 027021aa1b16..821e4e5d5cc3 100644 --- a/usr.sbin/ntp/ntptime/Makefile +++ b/usr.sbin/ntp/ntptime/Makefile @@ -1,15 +1,16 @@ .PATH: ${SRCTOP}/contrib/ntp/util +PACKAGE=ntp PROG= ntptime MAN= CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/include/ \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/unix/include/ \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/pthreads/include \ -I${.CURDIR:H} LIBADD= m ntp pthread .include diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile index ebbfb77b4fab..15d1d7aeffdc 100644 --- a/usr.sbin/ntp/sntp/Makefile +++ b/usr.sbin/ntp/sntp/Makefile @@ -1,30 +1,31 @@ .include .PATH: ${SRCTOP}/contrib/ntp/sntp +PACKAGE=ntp PROG= sntp MAN= SRCS= crypto.c kod_management.c log.c main.c networking.c \ sntp-opts.c sntp.c utilities.c CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/unix/include \ -I${SRCTOP}/contrib/ntp/libntp/lib/isc/pthreads/include \ -I${SRCTOP}/contrib/ntp/sntp \ -I${SRCTOP}/contrib/ntp/sntp/libopts \ -I${SRCTOP}/contrib/ntp/sntp/libevent/include \ -I${.CURDIR:H}/libntpevent \ -I${.CURDIR:H} LIBADD= m opts ntp ntpevent pthread .if ${MK_OPENSSL} != "no" LIBADD+= crypto .else LIBADD+= md .endif .include diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile index 3bf4601f5145..fa3291d097ff 100644 --- a/usr.sbin/periodic/etc/daily/Makefile +++ b/usr.sbin/periodic/etc/daily/Makefile @@ -1,67 +1,70 @@ .include PACKAGE= periodic CONFGROUPS= CONFS CONFS= 100.clean-disks \ 110.clean-tmps \ 120.clean-preserve \ 140.clean-rwho \ 200.backup-passwd \ 210.backup-aliases \ 221.backup-gpart \ 222.backup-gmirror \ 400.status-disks \ 401.status-graid \ 406.status-gmirror \ 407.status-graid3 \ 408.status-gstripe \ 409.status-gconcat \ 410.status-mfi \ 420.status-network \ 430.status-uptime \ 450.status-security \ 510.status-world-kernel \ 999.local # NB: keep these sorted by MK_* knobs .if ${MK_ACCT} != "no" CONFGROUPS+= ACCT ACCT+= 310.accounting ACCTMODE= ${BINMODE} ACCTPACKAGE= acct .endif .if ${MK_CALENDAR} != "no" CONFS+= 300.calendar .endif .if ${MK_MAIL} != "no" CONFS+= 130.clean-msgs .endif .if ${MK_NTP} != "no" -CONFS+= 480.status-ntpd \ - 480.leapfile-ntpd +CONFGROUPS+= NTP +NTP+= 480.status-ntpd \ + 480.leapfile-ntpd +NTPMODE= ${BINMODE} +NTPPACKAGE= ntp .endif .if ${MK_SENDMAIL} != "no" CONFGROUPS+= SENDMAIL SENDMAIL+= 150.clean-hoststat \ 440.status-mailq \ 460.status-mail-rejects \ 500.queuerun SENDMAILPACKAGE= sendmail .endif .if ${MK_ZFS} != "no" CONFS+= 223.backup-zfs \ 404.status-zfs \ 800.scrub-zfs \ 801.trim-zfs .endif .include