Index: projects/release-pkg/etc/rc.d/Makefile =================================================================== --- projects/release-pkg/etc/rc.d/Makefile (revision 295414) +++ projects/release-pkg/etc/rc.d/Makefile (revision 295415) @@ -1,335 +1,339 @@ # $FreeBSD$ .include FILESGROUPS= FILES FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} FILES= DAEMON \ FILESYSTEMS \ LOGIN \ NETWORKING \ SERVERS \ abi \ addswap \ adjkerntz \ archdep \ atm1 \ atm2 \ atm3 \ auditd \ auditdistd \ bgfsck \ ${_bluetooth} \ bridge \ ${_bthidd} \ cleanvar \ cleartmp \ cron \ ctld \ ddb \ defaultroute \ devd \ devfs \ dhclient \ dmesg \ dumpon \ fsck \ gbde \ geli \ geli2 \ gptboot \ growfs \ gssd \ ${_hcsecd} \ hostid \ hostid_save \ hostname \ iovctl \ ip6addrctl \ ipfilter \ ipfs \ ipfw \ ipmon \ ipnat \ ipsec \ ${_kadmind} \ ${_kdc} \ ${_kfd} \ kld \ kldxref \ ${_kpasswdd} \ ldconfig \ local \ localpkg \ lockd \ mixer \ motd \ mountcritlocal \ mountcritremote \ mountlate \ mdconfig \ mdconfig2 \ mountd \ mroute6d \ msgs \ natd \ netif \ netoptions \ netwait \ newsyslog \ nfsclient \ nfscbd \ nfsd \ nfsuserd \ nisdomain \ ${_nscd} \ nsswitch \ ntpdate \ ${_opensm} \ pf \ pflog \ pfsync \ ppp \ pppoed \ pwcheck \ quota \ random \ rarpd \ rctl \ resolv \ rfcomm_pppd_server \ root \ route6d \ routing \ rpcbind \ rtadvd \ rtsold \ savecore \ sdpd \ securelevel \ serial \ sppp \ statd \ static_arp \ static_ndp \ stf \ swap \ swaplate \ sysctl \ syslogd \ tmp \ ${_ubthidhci} \ ugidfw \ ${_utx} \ var \ watchdogd \ ypbind \ yppasswdd \ ypserv \ ypset \ ypupdated \ ypxfrd \ zfs \ zvol .if ${MK_ACCT} != "no" FILESGROUPS+= ACCT ACCT+= accounting .endif ACCTDIR= /etc/rc.d ACCTMODE= ${BINMODE} ACCTPACKAGE= acct .if ${MK_ACPI} != "no" FILESGROUPS+= ACPI ACPI= power_profile .endif ACPIDIR= /etc/rc.d ACPIMODE= ${BINMODE} ACPIPACKAGE= acpi .if ${MK_ACPI} != "no" || ${MK_APM} != "no" FILES+= powerd .endif .if ${MK_AMD} != "no" FILESGROUPS+= AMD AMD+= amd .endif AMDDIR= /etc/rc.d AMDMODE= ${BINMODE} AMDPACKAGE= amd .if ${MK_APM} != "no" FILESGROUPS+= APM APM+= apm APM+= apmd .endif APMDIR= /etc/rc.d APMMODE= ${BINMODE} APMPACKAGE= apm .if ${MK_AUTOFS} != "no" FILES+= automount FILES+= automountd FILES+= autounmountd .endif .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth _bthidd= bthidd _hcsecd= hcsecd _ubthidhci= ubthidhci .endif .if ${MK_BOOTPARAMD} != "no" FILES+= bootparams .endif .if ${MK_BSNMP} != "no" FILESGROUPS+= BSNMP BSNMP+= bsnmpd .endif BSNMPDIR= /etc/rc.d BSNMPMODE= ${BINMODE} BSNMPPACKAGE= bsnmp .if ${MK_CASPER} != "no" FILESGROUPS+= CASPER CASPER+= casperd .endif CASPERDIR= /etc/rc.d CASPERMODE= ${BINMODE} CASPERPACKAGE= casper .if ${MK_CCD} != "no" FILES+= ccd .endif .if ${MK_FTP} != "no" FILES+= ftpd .endif .if ${MK_HAST} != "no" -FILES+= hastd +FILESGROUPS+= HAST +HAST= hastd .endif +HASTDIR= /etc/rc.d +HASTMODE= ${BINMODE} +HASTPACKAGE= hast .if ${MK_INETD} != "no" FILES+= inetd .endif .if ${MK_ISCSI} != "no" FILES+= iscsictl FILES+= iscsid .endif .if ${MK_JAIL} != "no" FILESGROUPS+= JAIL JAIL+= jail .endif JAILDIR= /etc/rc.d JAILMODE= ${BINMODE} JAILPACKAGE= jail .if ${MK_LEGACY_CONSOLE} != "no" FILES+= moused FILES+= syscons .endif .if ${MK_LPR} != "no" FILES+= lpd .endif .if ${MK_KERBEROS} != "no" FILES+= ipropd_master FILES+= ipropd_slave _kadmind= kadmind _kdc= kdc _kfd= kfd _kpasswdd= kpasswdd .endif .if ${MK_MAIL} != "no" FILES+= othermta .endif .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif .if ${MK_NTP} != "no" FILES+= ntpd .endif .if ${MK_OFED} != "no" _opensm= opensm .endif .if ${MK_OPENSSL} != "no" FILES+= keyserv .endif .if ${MK_OPENSSH} != "no" FILESGROUPS+= SSH SSH= sshd .endif SSHDIR= /etc/rc.d SSHMODE= ${BINMODE} SSHPACKAGE= ssh .if ${MK_PF} != "no" FILES+= ftp-proxy .endif .if ${MK_RCMDS} != "no" FILESGROUPS+= RCMDS RCMDS+= rwho .endif RCMDSDIR= /etc/rc.d RCMDSMODE= ${BINMODE} RCMDSPACKAGE= rcmds .if ${MK_ROUTED} != "no" FILES+= routed .endif .if ${MK_SENDMAIL} != "no" FILESGROUPS+= SMRCD SMRCD= sendmail .endif SMRCDDIR= /etc/rc.d SMRCDDIRMODE= ${BINMODE} SMRCDPACKAGE= sendmail .if ${MK_TIMED} != "no" FILES+= timed .endif .if ${MK_UNBOUND} != "no" FILESGROUPS+= UNBOUND UNBOUND+= local_unbound .endif UNBOUNDDIR= /etc/rc.d UNBOUNDMODE= ${BINMODE} UNBOUNDPACKAGE= unbound .if ${MK_UTMPX} != "no" _utx= utx .endif .if ${MK_VI} != "no" FILESGROUPS+= VI VI+= virecover .endif VIDIR= /etc/rc.d VIMODE= ${BINMODE} VIPACKAGE= vi .if ${MK_WIRELESS} != "no" FILES+= hostapd FILES+= wpa_supplicant .endif .include Index: projects/release-pkg/release/packages/Makefile.package =================================================================== --- projects/release-pkg/release/packages/Makefile.package (revision 295414) +++ projects/release-pkg/release/packages/Makefile.package (revision 295415) @@ -1,72 +1,74 @@ # # $FreeBSD$ # acct_COMMENT= Accounting Utilties acct_DESC= Accounting Utilties 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 autofs_COMMENT= Autofs Utilities autofs_DESC= Autofs Utilities bhyve_COMMENT= Bhyve Utilities bhyve_DESC= Bhyve Utilities binutils_COMMENT= Binutils binutils_DESC= Binutils bsdinstall_COMMENT= BSDInstall Utilities bsdinstall_DESC= BSDInstall Utilities bsnmp_COMMENT= BSNMP Utilities bsnmp_DESC= BSNMP Utilities clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries debug_COMMENT= FreeBSD Base System (Debugging Symbols) debug_DESC= FreeBSD Base System (Debugging Symbols) development_COMMENT= FreeBSD Base System (Development Files) development_DESC= FreeBSD Base System (Development Files) dma_COMMENT= DMA Mail Agent Utilities dma_DESC= DMA Mail Agent Utilities docs_COMMENT= Documentation docs_DESC= Documentation ee_COMMENT= Easy Editor Utilities ee_DESC= Easy Editor Utilities gdb_COMMENT= GDB Utilities gdb_DESC= GDB Utilities groff_COMMENT= Groff Utilities groff_DESC= Groff Utilities +hast_COMMENT= Highly Available Storage daemon +hast_DESC= Highly Available Storage daemon jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel lib32_COMMENT= FreeBSD Base System (32-bit Libraries) lib32_DESC= FreeBSD Base System (32-bit Libraries) manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages profile_COMMENT= FreeBSD Base System (Profiling Libraries) profile_DESC= FreeBSD Base System (Profiling Libraries) rcmds_COMMENT= Remote Command Utilities rcmds_DESC= Remote Command Utilities rescue_COMMENT= Rescue Utilities rescue_DESC= Rescue Utilities runtime_COMMENT= FreeBSD Base System runtime_DESC= FreeBSD Base System sendmail_COMMENT= Sendmail Utilities sendmail_DESC= Sendmail Utilities ssh_COMMENT= Secure Shell Utilities ssh_DESC= Secure Shell Utilities svn_COMMENT= Subversion Version Control System svn_DESC= Subversion Version Control System syscons_COMMENT= Syscons Console syscons_DESC= Syscons Console tests_COMMENT= Test Suite tests_DESC= Test Suite unbound_COMMENT= Unbound DNS Resolver unbound_DESC= Unbound DNS Resolver vi_COMMENT= Vi Editor vi_DESC= Vi Editor Index: projects/release-pkg/sbin/hastctl/Makefile =================================================================== --- projects/release-pkg/sbin/hastctl/Makefile (revision 295414) +++ projects/release-pkg/sbin/hastctl/Makefile (revision 295415) @@ -1,45 +1,46 @@ # $FreeBSD$ .include +PACKAGE=hast .PATH: ${.CURDIR}/../hastd PROG= hastctl SRCS= activemap.c SRCS+= crc32.c SRCS+= ebuf.c SRCS+= hast_checksum.c hast_compression.c hast_proto.c hastctl.c SRCS+= lzf.c SRCS+= metadata.c SRCS+= nv.c SRCS+= parse.y pjdlog.c SRCS+= proto.c proto_common.c proto_uds.c SRCS+= token.l SRCS+= subr.c SRCS+= y.tab.h MAN= hastctl.8 NO_WFORMAT= NO_WCAST_ALIGN= NO_WMISSING_VARIABLE_DECLARATIONS= CFLAGS+=-I${.CURDIR}/../hastd CFLAGS+=-DHAVE_CAPSICUM CFLAGS+=-DINET .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif # This is needed to have WARNS > 1. CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_INPUT LIBADD= util .if ${MK_OPENSSL} != "no" LIBADD+= crypto CFLAGS+=-DHAVE_CRYPTO .endif YFLAGS+=-v CLEANFILES=y.tab.c y.tab.h y.output .include Index: projects/release-pkg/sbin/hastd/Makefile =================================================================== --- projects/release-pkg/sbin/hastd/Makefile (revision 295414) +++ projects/release-pkg/sbin/hastd/Makefile (revision 295415) @@ -1,43 +1,44 @@ # $FreeBSD$ .include +PACKAGE=hast PROG= hastd SRCS= activemap.c SRCS+= control.c crc32.c SRCS+= ebuf.c event.c SRCS+= hast_checksum.c hast_compression.c hast_proto.c hastd.c hooks.c SRCS+= lzf.c SRCS+= metadata.c SRCS+= nv.c SRCS+= secondary.c SRCS+= parse.y pjdlog.c primary.c SRCS+= proto.c proto_common.c proto_socketpair.c proto_tcp.c proto_uds.c SRCS+= rangelock.c SRCS+= subr.c SRCS+= token.l SRCS+= y.tab.h MAN= hastd.8 hast.conf.5 NO_WFORMAT= NO_WCAST_ALIGN= NO_WMISSING_VARIABLE_DECLARATIONS= CFLAGS+=-I${.CURDIR} CFLAGS+=-DHAVE_CAPSICUM CFLAGS+=-DPROTO_TCP_DEFAULT_PORT=8457 CFLAGS+=-DINET .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif LIBADD= geom pthread util .if ${MK_OPENSSL} != "no" LIBADD+= crypto CFLAGS+=-DHAVE_CRYPTO .endif YFLAGS+=-v CLEANFILES=y.tab.c y.tab.h y.output .include