Author: manu
Date: Fri Jul 19 15:10:03 2019
New Revision: 350132
URL: https://svnweb.freebsd.org/changeset/base/350132

Log:
  pkgbase: Add a FreeBSD-bluetooth package
  
  Move the bluetooth related files from FreeBSD-runtime to a new package named
  FreeBSD-bluetooth
  The FreeBSD runtime is only intended to have everything for a working
  FreeBSD installation and bluetooth isn't needed for that.
  
  Reviewed by:  bapt, gjb
  Differential Revision:        https://reviews.freebsd.org/D20959

Added:
  head/release/packages/bluetooth.ucl   (contents, props changed)
Modified:
  head/libexec/rc/rc.d/Makefile
  head/release/packages/Makefile.package
  head/usr.bin/bluetooth/bthost/Makefile
  head/usr.bin/bluetooth/btsockstat/Makefile
  head/usr.bin/bluetooth/rfcomm_sppd/Makefile
  head/usr.sbin/bluetooth/ath3kfw/Makefile
  head/usr.sbin/bluetooth/bcmfw/Makefile
  head/usr.sbin/bluetooth/bluetooth-config/Makefile
  head/usr.sbin/bluetooth/bt3cfw/Makefile
  head/usr.sbin/bluetooth/bthidcontrol/Makefile
  head/usr.sbin/bluetooth/bthidd/Makefile
  head/usr.sbin/bluetooth/btpand/Makefile
  head/usr.sbin/bluetooth/hccontrol/Makefile
  head/usr.sbin/bluetooth/hcsecd/Makefile
  head/usr.sbin/bluetooth/hcseriald/Makefile
  head/usr.sbin/bluetooth/l2control/Makefile
  head/usr.sbin/bluetooth/l2ping/Makefile
  head/usr.sbin/bluetooth/rfcomm_pppd/Makefile
  head/usr.sbin/bluetooth/sdpcontrol/Makefile
  head/usr.sbin/bluetooth/sdpd/Makefile

Modified: head/libexec/rc/rc.d/Makefile
==============================================================================
--- head/libexec/rc/rc.d/Makefile       Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/libexec/rc/rc.d/Makefile       Fri Jul 19 15:10:03 2019        
(r350132)
@@ -17,9 +17,7 @@ CONFS=        DAEMON \
        archdep \
        bgfsck \
        ${_blacklistd} \
-       ${_bluetooth} \
        bridge \
-       ${_bthidd} \
        cfumass \
        cleanvar \
        cleartmp \
@@ -40,7 +38,6 @@ CONFS=        DAEMON \
        gptboot \
        growfs \
        gssd \
-       ${_hcsecd} \
        hostid \
        hostid_save \
        hostname \
@@ -111,7 +108,6 @@ CONFS=      DAEMON \
        sysctl \
        syslogd \
        tmp \
-       ${_ubthidhci} \
        ugidfw \
        ${_utx} \
        var \
@@ -175,12 +171,14 @@ _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"

Modified: head/release/packages/Makefile.package
==============================================================================
--- head/release/packages/Makefile.package      Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/release/packages/Makefile.package      Fri Jul 19 15:10:03 2019        
(r350132)
@@ -18,6 +18,8 @@ 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

Added: head/release/packages/bluetooth.ucl
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/release/packages/bluetooth.ucl Fri Jul 19 15:10:03 2019        
(r350132)
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "r...@freebsd.org"
+www = "https://www.FreeBSD.org";
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: head/usr.bin/bluetooth/bthost/Makefile
==============================================================================
--- head/usr.bin/bluetooth/bthost/Makefile      Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.bin/bluetooth/bthost/Makefile      Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,8 @@
 # $Id: Makefile,v 1.4 2003/08/14 20:07:13 max Exp $
 # $FreeBSD$
 
+PACKAGE=       bluetooth
+
 PROG=          bthost
 
 LIBADD=                bluetooth

Modified: head/usr.bin/bluetooth/btsockstat/Makefile
==============================================================================
--- head/usr.bin/bluetooth/btsockstat/Makefile  Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.bin/bluetooth/btsockstat/Makefile  Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $Id: Makefile,v 1.7 2003/08/14 20:07:14 max Exp $
 # $FreeBSD$
 
+PACKAGE=       bluetooth
 PROG=          btsockstat
 WARNS?=                2
 BINGRP=                kmem

Modified: head/usr.bin/bluetooth/rfcomm_sppd/Makefile
==============================================================================
--- head/usr.bin/bluetooth/rfcomm_sppd/Makefile Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.bin/bluetooth/rfcomm_sppd/Makefile Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $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

Modified: head/usr.sbin/bluetooth/ath3kfw/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/ath3kfw/Makefile    Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/ath3kfw/Makefile    Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=       bluetooth
 PROG=          ath3kfw
 MAN=           ath3kfw.8
 LIBADD+=       usb

Modified: head/usr.sbin/bluetooth/bcmfw/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/bcmfw/Makefile      Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/bcmfw/Makefile      Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $Id: Makefile,v 1.6 2003/08/14 20:05:58 max Exp $
 # $FreeBSD$
 
+PACKAGE=       bluetooth
 PROG=          bcmfw
 MAN=           bcmfw.8
 WARNS?=                2

Modified: head/usr.sbin/bluetooth/bluetooth-config/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/bluetooth-config/Makefile   Fri Jul 19 15:09:00 
2019        (r350131)
+++ head/usr.sbin/bluetooth/bluetooth-config/Makefile   Fri Jul 19 15:10:03 
2019        (r350132)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=       bluetooth
 SCRIPTS=bluetooth-config.sh
 MAN=   bluetooth-config.8
 

Modified: head/usr.sbin/bluetooth/bt3cfw/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/bt3cfw/Makefile     Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/bt3cfw/Makefile     Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $Id: Makefile,v 1.5 2003/08/14 20:06:00 max Exp $
 # $FreeBSD$
 
+PACKAGE=       bluetooth
 PROG=          bt3cfw
 MAN=           bt3cfw.8
 WARNS?=                2

Modified: head/usr.sbin/bluetooth/bthidcontrol/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/bthidcontrol/Makefile       Fri Jul 19 15:09:00 
2019        (r350131)
+++ head/usr.sbin/bluetooth/bthidcontrol/Makefile       Fri Jul 19 15:10:03 
2019        (r350132)
@@ -3,6 +3,7 @@
 
 .PATH: ${.CURDIR:H}/bthidd
 
+PACKAGE=       bluetooth
 PROG=          bthidcontrol
 MAN=           bthidcontrol.8
 SRCS=          bthidcontrol.c hid.c lexer.l  parser.y sdp.c

Modified: head/usr.sbin/bluetooth/bthidd/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/bthidd/Makefile     Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/bthidd/Makefile     Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $Id: Makefile,v 1.6 2006/09/07 21:36:55 max Exp $
 # $FreeBSD$
 
+PACKAGE=       bluetooth
 PROG=          bthidd
 MAN=           bthidd.8
 #              bthidd.conf.5

Modified: head/usr.sbin/bluetooth/btpand/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/btpand/Makefile     Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/btpand/Makefile     Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $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

Modified: head/usr.sbin/bluetooth/hccontrol/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/hccontrol/Makefile  Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/hccontrol/Makefile  Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $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

Modified: head/usr.sbin/bluetooth/hcsecd/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/hcsecd/Makefile     Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/hcsecd/Makefile     Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $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

Modified: head/usr.sbin/bluetooth/hcseriald/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/hcseriald/Makefile  Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/hcseriald/Makefile  Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $Id: Makefile,v 1.5 2003/08/14 20:06:21 max Exp $
 # $FreeBSD$
 
+PACKAGE=       bluetooth
 PROG=          hcseriald
 MAN=           hcseriald.8
 WARNS?=                2

Modified: head/usr.sbin/bluetooth/l2control/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/l2control/Makefile  Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/l2control/Makefile  Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $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

Modified: head/usr.sbin/bluetooth/l2ping/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/l2ping/Makefile     Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/l2ping/Makefile     Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $Id: Makefile,v 1.6 2003/08/14 20:06:24 max Exp $
 # $FreeBSD$
 
+PACKAGE=       bluetooth
 PROG=          l2ping
 MAN=           l2ping.8
 WARNS?=                2

Modified: head/usr.sbin/bluetooth/rfcomm_pppd/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/rfcomm_pppd/Makefile        Fri Jul 19 15:09:00 
2019        (r350131)
+++ head/usr.sbin/bluetooth/rfcomm_pppd/Makefile        Fri Jul 19 15:10:03 
2019        (r350132)
@@ -3,6 +3,7 @@
 
 .PATH: ${SRCTOP}/usr.bin/bluetooth/rfcomm_sppd
 
+PACKAGE=       bluetooth
 PROG=          rfcomm_pppd
 MAN=           rfcomm_pppd.8
 SRCS=          rfcomm_pppd.c rfcomm_sdp.c

Modified: head/usr.sbin/bluetooth/sdpcontrol/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/sdpcontrol/Makefile Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/sdpcontrol/Makefile Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $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

Modified: head/usr.sbin/bluetooth/sdpd/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/sdpd/Makefile       Fri Jul 19 15:09:00 2019        
(r350131)
+++ head/usr.sbin/bluetooth/sdpd/Makefile       Fri Jul 19 15:10:03 2019        
(r350132)
@@ -1,6 +1,7 @@
 # $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 \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to