Index: head/libexec/rc/rc.d/Makefile =================================================================== --- head/libexec/rc/rc.d/Makefile (revision 350131) +++ head/libexec/rc/rc.d/Makefile (revision 350132) @@ -1,336 +1,334 @@ # $FreeBSD$ .include CONFDIR= /etc/rc.d CONFGROUPS= CONFS #PACKAGE=rc CONFS= DAEMON \ FILESYSTEMS \ LOGIN \ NETWORKING \ SERVERS \ abi \ addswap \ adjkerntz \ archdep \ bgfsck \ ${_blacklistd} \ - ${_bluetooth} \ bridge \ - ${_bthidd} \ cfumass \ cleanvar \ cleartmp \ cron \ ctld \ ddb \ defaultroute \ devd \ devfs \ devmatch \ dhclient \ dmesg \ dumpon \ fsck \ gbde \ geli \ geli2 \ gptboot \ growfs \ gssd \ - ${_hcsecd} \ hostid \ hostid_save \ hostname \ iovctl \ ip6addrctl \ ipsec \ ${_kadmind} \ ${_kdc} \ ${_kfd} \ kld \ kldxref \ ${_kpasswdd} \ ldconfig \ local \ localpkg \ lockd \ mixer \ motd \ mountcritlocal \ mountcritremote \ mountlate \ mdconfig \ mdconfig2 \ mountd \ 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 \ root \ route6d \ routing \ rpcbind \ rtadvd \ rtsold \ rwho \ savecore \ securelevel \ serial \ sppp \ statd \ static_arp \ static_ndp \ stf \ swap \ swaplate \ sysctl \ syslogd \ tmp \ - ${_ubthidhci} \ ugidfw \ ${_utx} \ var \ watchdogd .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_ACPI} != "no" || ${MK_APM} != "no" CONFS+= powerd .endif .if ${MK_AMD} != "no" CONFGROUPS+= AMD AMD+= amd AMDPACKAGE= amd .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 .endif .if ${MK_AUTOFS} != "no" CONFS+= automount CONFS+= automountd CONFS+= autounmountd .endif .if ${MK_BLACKLIST} != "no" _blacklistd+= blacklistd .endif .if ${MK_BLUETOOTH} != "no" -_bluetooth= bluetooth -_bthidd= bthidd -_hcsecd= hcsecd -CONFS+= rfcomm_pppd_server -CONFS+= sdpd -_ubthidhci= ubthidhci +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_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 .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" CONFS+= moused CONFS+= syscons .endif .if ${MK_LPR} != "no" CONFS+= lpd .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_MAIL} != "no" CONFS+= othermta .endif .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif .if ${MK_NTP} != "no" CONFS+= ntpd .endif .if ${MK_OFED} != "no" _opensm= opensm .endif .if ${MK_OPENSSL} != "no" CONFS+= keyserv .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_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+= zvol ZFSPACKAGE= zfs .endif .for fg in ${CONFGROUPS} ${fg}MODE?= ${BINMODE} .endfor .include Index: head/release/packages/Makefile.package =================================================================== --- head/release/packages/Makefile.package (revision 350131) +++ head/release/packages/Makefile.package (revision 350132) @@ -1,84 +1,86 @@ # # $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 +bluetooth_COMMENT= Bluetooth Utilities +bluetooth_DESC= Bluetooth Utilities 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 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 hostapd_COMMENT= 802.11 Access Point Daemon an Utilities hostapd_DESC= 802.11 Access Point Daemon an Utilities 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 kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages 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 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 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 wpa_COMMENT= 802.11 Supplicant wpa_DESC= 802.11 Supplicant Index: head/release/packages/bluetooth.ucl =================================================================== --- head/release/packages/bluetooth.ucl (nonexistent) +++ head/release/packages/bluetooth.ucl (revision 350132) @@ -0,0 +1,24 @@ +# +# $FreeBSD$ +# + +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "%COMMENT%" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < Index: head/usr.bin/bluetooth/btsockstat/Makefile =================================================================== --- head/usr.bin/bluetooth/btsockstat/Makefile (revision 350131) +++ head/usr.bin/bluetooth/btsockstat/Makefile (revision 350132) @@ -1,11 +1,12 @@ # $Id: Makefile,v 1.7 2003/08/14 20:07:14 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= btsockstat WARNS?= 2 BINGRP= kmem BINMODE= 2555 LIBADD= bluetooth kvm .include Index: head/usr.bin/bluetooth/rfcomm_sppd/Makefile =================================================================== --- head/usr.bin/bluetooth/rfcomm_sppd/Makefile (revision 350131) +++ head/usr.bin/bluetooth/rfcomm_sppd/Makefile (revision 350132) @@ -1,10 +1,11 @@ # $Id: Makefile,v 1.7 2003/09/07 18:15:55 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= rfcomm_sppd SRCS= rfcomm_sppd.c rfcomm_sdp.c WARNS?= 2 LIBADD= bluetooth sdp util .include Index: head/usr.sbin/bluetooth/ath3kfw/Makefile =================================================================== --- head/usr.sbin/bluetooth/ath3kfw/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/ath3kfw/Makefile (revision 350132) @@ -1,8 +1,9 @@ # $FreeBSD$ +PACKAGE= bluetooth PROG= ath3kfw MAN= ath3kfw.8 LIBADD+= usb SRCS= main.c ath3k_fw.c ath3k_hw.c .include Index: head/usr.sbin/bluetooth/bcmfw/Makefile =================================================================== --- head/usr.sbin/bluetooth/bcmfw/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/bcmfw/Makefile (revision 350132) @@ -1,8 +1,9 @@ # $Id: Makefile,v 1.6 2003/08/14 20:05:58 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= bcmfw MAN= bcmfw.8 WARNS?= 2 .include Index: head/usr.sbin/bluetooth/bluetooth-config/Makefile =================================================================== --- head/usr.sbin/bluetooth/bluetooth-config/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/bluetooth-config/Makefile (revision 350132) @@ -1,6 +1,7 @@ # $FreeBSD$ +PACKAGE= bluetooth SCRIPTS=bluetooth-config.sh MAN= bluetooth-config.8 .include Index: head/usr.sbin/bluetooth/bt3cfw/Makefile =================================================================== --- head/usr.sbin/bluetooth/bt3cfw/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/bt3cfw/Makefile (revision 350132) @@ -1,10 +1,11 @@ # $Id: Makefile,v 1.5 2003/08/14 20:06:00 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= bt3cfw MAN= bt3cfw.8 WARNS?= 2 LIBADD+= netgraph .include Index: head/usr.sbin/bluetooth/bthidcontrol/Makefile =================================================================== --- head/usr.sbin/bluetooth/bthidcontrol/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/bthidcontrol/Makefile (revision 350132) @@ -1,15 +1,16 @@ # $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $ # $FreeBSD$ .PATH: ${.CURDIR:H}/bthidd +PACKAGE= bluetooth PROG= bthidcontrol MAN= bthidcontrol.8 SRCS= bthidcontrol.c hid.c lexer.l parser.y sdp.c WARNS?= 1 CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR:H}/bthidd -I${SRCTOP}/lib/libsdp \ -I${SRCTOP}/lib/libbluetooth LIBADD+= bluetooth sdp usbhid .include Index: head/usr.sbin/bluetooth/bthidd/Makefile =================================================================== --- head/usr.sbin/bluetooth/bthidd/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/bthidd/Makefile (revision 350132) @@ -1,16 +1,17 @@ # $Id: Makefile,v 1.6 2006/09/07 21:36:55 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= bthidd MAN= bthidd.8 # bthidd.conf.5 SRCS= bthidd.c btuinput.c client.c hid.c kbd.c lexer.l parser.y \ server.c session.c CFLAGS+= -I${.CURDIR} LIBADD+= bluetooth usbhid NO_WMISSING_VARIABLE_DECLARATIONS= .include Index: head/usr.sbin/bluetooth/btpand/Makefile =================================================================== --- head/usr.sbin/bluetooth/btpand/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/btpand/Makefile (revision 350132) @@ -1,12 +1,13 @@ # $NetBSD: Makefile,v 1.2 2008/08/18 08:25:32 plunky Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= btpand MAN= btpand.8 SRCS= btpand.c bnep.c channel.c client.c event.c packet.c server.c sdp.c tap.c WARNS?= 3 LIBADD= bluetooth sdp util .include Index: head/usr.sbin/bluetooth/hccontrol/Makefile =================================================================== --- head/usr.sbin/bluetooth/hccontrol/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/hccontrol/Makefile (revision 350132) @@ -1,15 +1,16 @@ # $Id: Makefile,v 1.7 2003/08/14 20:06:17 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth CONFS= bluetooth.device.conf CONFSDIR= /etc/defaults PROG= hccontrol MAN= hccontrol.8 SRCS= send_recv.c link_policy.c link_control.c le.c\ host_controller_baseband.c info.c status.c node.c hccontrol.c \ util.c WARNS?= 2 LIBADD= bluetooth .include Index: head/usr.sbin/bluetooth/hcsecd/Makefile =================================================================== --- head/usr.sbin/bluetooth/hcsecd/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/hcsecd/Makefile (revision 350132) @@ -1,15 +1,16 @@ # $Id: Makefile,v 1.8 2003/08/14 20:06:20 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth CONFS= hcsecd.conf CONFSDIR= /etc/bluetooth CONFSMODE_hcsecd.conf= 600 PROG= hcsecd MAN= hcsecd.8 hcsecd.conf.5 SRCS= hcsecd.c lexer.l parser.y WARNS?= 2 CFLAGS+= -I${.CURDIR} LIBADD= bluetooth .include Index: head/usr.sbin/bluetooth/hcseriald/Makefile =================================================================== --- head/usr.sbin/bluetooth/hcseriald/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/hcseriald/Makefile (revision 350132) @@ -1,10 +1,11 @@ # $Id: Makefile,v 1.5 2003/08/14 20:06:21 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= hcseriald MAN= hcseriald.8 WARNS?= 2 LIBADD= netgraph .include Index: head/usr.sbin/bluetooth/l2control/Makefile =================================================================== --- head/usr.sbin/bluetooth/l2control/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/l2control/Makefile (revision 350132) @@ -1,11 +1,12 @@ # $Id: Makefile,v 1.7 2003/08/14 20:06:22 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= l2control MAN= l2control.8 SRCS= l2cap.c l2control.c WARNS?= 2 LIBADD= bluetooth .include Index: head/usr.sbin/bluetooth/l2ping/Makefile =================================================================== --- head/usr.sbin/bluetooth/l2ping/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/l2ping/Makefile (revision 350132) @@ -1,10 +1,11 @@ # $Id: Makefile,v 1.6 2003/08/14 20:06:24 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= l2ping MAN= l2ping.8 WARNS?= 2 LIBADD= bluetooth .include Index: head/usr.sbin/bluetooth/rfcomm_pppd/Makefile =================================================================== --- head/usr.sbin/bluetooth/rfcomm_pppd/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/rfcomm_pppd/Makefile (revision 350132) @@ -1,13 +1,14 @@ # $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $ # $FreeBSD$ .PATH: ${SRCTOP}/usr.bin/bluetooth/rfcomm_sppd +PACKAGE= bluetooth PROG= rfcomm_pppd MAN= rfcomm_pppd.8 SRCS= rfcomm_pppd.c rfcomm_sdp.c WARNS?= 2 LIBADD= bluetooth sdp .include Index: head/usr.sbin/bluetooth/sdpcontrol/Makefile =================================================================== --- head/usr.sbin/bluetooth/sdpcontrol/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/sdpcontrol/Makefile (revision 350132) @@ -1,11 +1,12 @@ # $Id: Makefile,v 1.1 2003/09/08 02:27:27 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= sdpcontrol MAN= sdpcontrol.8 SRCS= sdpcontrol.c search.c WARNS?= 2 LIBADD= bluetooth sdp .include Index: head/usr.sbin/bluetooth/sdpd/Makefile =================================================================== --- head/usr.sbin/bluetooth/sdpd/Makefile (revision 350131) +++ head/usr.sbin/bluetooth/sdpd/Makefile (revision 350132) @@ -1,14 +1,15 @@ # $Id: Makefile,v 1.1 2004/01/20 21:27:55 max Exp $ # $FreeBSD$ +PACKAGE= bluetooth PROG= sdpd MAN= sdpd.8 SRCS= audio_sink.c audio_source.c \ bgd.c dun.c ftrn.c gn.c irmc.c irmc_command.c lan.c log.c \ main.c nap.c opush.c panu.c profile.c provider.c sar.c scr.c \ sd.c server.c sp.c srr.c ssar.c ssr.c sur.c uuid.c CFLAGS+= -I${.CURDIR} WARNS?= 2 .include