From 6b5c5d0d9a91d301a21aacb45bdf733e23aaf1a9 Mon Sep 17 00:00:00 2001 From: Hasso Tepper Date: Fri, 8 Feb 2008 14:06:25 +0000 Subject: [PATCH] Mobe btpin(1), rfcomm_sppd(1) and sdpquery(1) where they really should be - into /usr/bin. --- usr.bin/Makefile | 5 ++++- {usr.sbin => usr.bin}/btpin/Makefile | 2 +- {usr.sbin => usr.bin}/btpin/btpin.1 | 2 +- {usr.sbin => usr.bin}/btpin/btpin.c | 2 +- {usr.sbin => usr.bin}/rfcomm_sppd/Makefile | 2 +- {usr.sbin => usr.bin}/rfcomm_sppd/rfcomm_sdp.c | 2 +- {usr.sbin => usr.bin}/rfcomm_sppd/rfcomm_sdp.h | 2 +- {usr.sbin => usr.bin}/rfcomm_sppd/rfcomm_sppd.1 | 2 +- {usr.sbin => usr.bin}/rfcomm_sppd/rfcomm_sppd.c | 2 +- {usr.sbin => usr.bin}/sdpquery/Makefile | 2 +- {usr.sbin => usr.bin}/sdpquery/sdpquery.1 | 2 +- {usr.sbin => usr.bin}/sdpquery/sdpquery.c | 2 +- {usr.sbin => usr.bin}/sdpquery/sdpquery.h | 2 +- {usr.sbin => usr.bin}/sdpquery/search.c | 2 +- usr.sbin/Makefile | 5 +---- 15 files changed, 18 insertions(+), 18 deletions(-) rename {usr.sbin => usr.bin}/btpin/Makefile (71%) rename {usr.sbin => usr.bin}/btpin/btpin.1 (97%) rename {usr.sbin => usr.bin}/btpin/btpin.c (97%) rename {usr.sbin => usr.bin}/rfcomm_sppd/Makefile (71%) rename {usr.sbin => usr.bin}/rfcomm_sppd/rfcomm_sdp.c (98%) rename {usr.sbin => usr.bin}/rfcomm_sppd/rfcomm_sdp.h (94%) rename {usr.sbin => usr.bin}/rfcomm_sppd/rfcomm_sppd.1 (98%) rename {usr.sbin => usr.bin}/rfcomm_sppd/rfcomm_sppd.c (99%) rename {usr.sbin => usr.bin}/sdpquery/Makefile (72%) rename {usr.sbin => usr.bin}/sdpquery/sdpquery.1 (98%) rename {usr.sbin => usr.bin}/sdpquery/sdpquery.c (97%) rename {usr.sbin => usr.bin}/sdpquery/sdpquery.h (95%) rename {usr.sbin => usr.bin}/sdpquery/search.c (99%) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 4b01324ef6..719449e46f 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,6 +1,6 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD: src/usr.bin/Makefile,v 1.144.2.17 2003/01/04 17:17:07 obrien Exp $ -# $DragonFly: src/usr.bin/Makefile,v 1.41 2008/01/05 10:14:26 matthias Exp $ +# $DragonFly: src/usr.bin/Makefile,v 1.42 2008/02/08 14:06:25 hasso Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -17,6 +17,7 @@ SUBDIR= alias \ basename \ biff \ brandelf \ + btpin \ bzip2 \ bzip2recover \ c89 \ @@ -147,6 +148,7 @@ SUBDIR= alias \ relpath \ renice \ rev \ + rfcomm_sppd \ rlogin \ rpcgen \ rpcinfo \ @@ -158,6 +160,7 @@ SUBDIR= alias \ rwall \ rwho \ script \ + sdpquery \ sed \ seq \ shar \ diff --git a/usr.sbin/btpin/Makefile b/usr.bin/btpin/Makefile similarity index 71% rename from usr.sbin/btpin/Makefile rename to usr.bin/btpin/Makefile index 9e3ba9e7a9..a2ab865939 100644 --- a/usr.sbin/btpin/Makefile +++ b/usr.bin/btpin/Makefile @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.2 2006/09/26 19:18:19 plunky Exp $ -# $DragonFly: src/usr.sbin/btpin/Attic/Makefile,v 1.1 2008/01/30 14:10:19 hasso Exp $ +# $DragonFly: src/usr.bin/btpin/Makefile,v 1.1 2008/02/08 14:06:25 hasso Exp $ PROG= btpin SRCS= btpin.c diff --git a/usr.sbin/btpin/btpin.1 b/usr.bin/btpin/btpin.1 similarity index 97% rename from usr.sbin/btpin/btpin.1 rename to usr.bin/btpin/btpin.1 index 5e91c2f473..3b50f4d655 100644 --- a/usr.sbin/btpin/btpin.1 +++ b/usr.bin/btpin/btpin.1 @@ -1,5 +1,5 @@ .\" $NetBSD: btpin.1,v 1.6 2007/09/24 19:29:01 plunky Exp $ -.\" $DragonFly: src/usr.sbin/btpin/Attic/btpin.1,v 1.1 2008/01/30 14:10:19 hasso Exp $ +.\" $DragonFly: src/usr.bin/btpin/btpin.1,v 1.1 2008/02/08 14:06:25 hasso Exp $ .\" .\" Copyright (c) 2006 Itronix Inc. .\" All rights reserved. diff --git a/usr.sbin/btpin/btpin.c b/usr.bin/btpin/btpin.c similarity index 97% rename from usr.sbin/btpin/btpin.c rename to usr.bin/btpin/btpin.c index c0a3ea6ba4..6b35072eed 100644 --- a/usr.sbin/btpin/btpin.c +++ b/usr.bin/btpin/btpin.c @@ -1,5 +1,5 @@ /* $NetBSD: btpin.c,v 1.3 2007/04/14 09:28:39 plunky Exp $ */ -/* $DragonFly: src/usr.sbin/btpin/Attic/btpin.c,v 1.1 2008/01/30 14:10:19 hasso Exp $ */ +/* $DragonFly: src/usr.bin/btpin/btpin.c,v 1.1 2008/02/08 14:06:25 hasso Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. diff --git a/usr.sbin/rfcomm_sppd/Makefile b/usr.bin/rfcomm_sppd/Makefile similarity index 71% rename from usr.sbin/rfcomm_sppd/Makefile rename to usr.bin/rfcomm_sppd/Makefile index 397b5505d9..79357e15cf 100644 --- a/usr.sbin/rfcomm_sppd/Makefile +++ b/usr.bin/rfcomm_sppd/Makefile @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.2 2007/05/28 12:06:29 tls Exp $ -# $DragonFly: src/usr.sbin/rfcomm_sppd/Attic/Makefile,v 1.1 2008/01/30 14:25:35 hasso Exp $ +# $DragonFly: src/usr.bin/rfcomm_sppd/Makefile,v 1.1 2008/02/08 14:06:25 hasso Exp $ PROG= rfcomm_sppd SRCS= rfcomm_sppd.c rfcomm_sdp.c diff --git a/usr.sbin/rfcomm_sppd/rfcomm_sdp.c b/usr.bin/rfcomm_sppd/rfcomm_sdp.c similarity index 98% rename from usr.sbin/rfcomm_sppd/rfcomm_sdp.c rename to usr.bin/rfcomm_sppd/rfcomm_sdp.c index 860425d46f..6a3834b3d8 100644 --- a/usr.sbin/rfcomm_sppd/rfcomm_sdp.c +++ b/usr.bin/rfcomm_sppd/rfcomm_sdp.c @@ -1,5 +1,5 @@ /* $NetBSD: rfcomm_sdp.c,v 1.1 2006/06/19 15:44:56 gdamore Exp $ */ -/* $DragonFly: src/usr.sbin/rfcomm_sppd/Attic/rfcomm_sdp.c,v 1.1 2008/01/30 14:25:35 hasso Exp $ */ +/* $DragonFly: src/usr.bin/rfcomm_sppd/rfcomm_sdp.c,v 1.1 2008/02/08 14:06:25 hasso Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. diff --git a/usr.sbin/rfcomm_sppd/rfcomm_sdp.h b/usr.bin/rfcomm_sppd/rfcomm_sdp.h similarity index 94% rename from usr.sbin/rfcomm_sppd/rfcomm_sdp.h rename to usr.bin/rfcomm_sppd/rfcomm_sdp.h index 7c941a915a..dea37dc8bb 100644 --- a/usr.sbin/rfcomm_sppd/rfcomm_sdp.h +++ b/usr.bin/rfcomm_sppd/rfcomm_sdp.h @@ -1,5 +1,5 @@ /* $NetBSD: rfcomm_sdp.h,v 1.1 2006/06/19 15:44:56 gdamore Exp $ */ -/* $DragonFly: src/usr.sbin/rfcomm_sppd/Attic/rfcomm_sdp.h,v 1.1 2008/01/30 14:25:35 hasso Exp $ */ +/* $DragonFly: src/usr.bin/rfcomm_sppd/rfcomm_sdp.h,v 1.1 2008/02/08 14:06:25 hasso Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. diff --git a/usr.sbin/rfcomm_sppd/rfcomm_sppd.1 b/usr.bin/rfcomm_sppd/rfcomm_sppd.1 similarity index 98% rename from usr.sbin/rfcomm_sppd/rfcomm_sppd.1 rename to usr.bin/rfcomm_sppd/rfcomm_sppd.1 index 51d173451f..3f7a7ece3f 100644 --- a/usr.sbin/rfcomm_sppd/rfcomm_sppd.1 +++ b/usr.bin/rfcomm_sppd/rfcomm_sppd.1 @@ -1,5 +1,5 @@ .\" $NetBSD: rfcomm_sppd.1,v 1.5 2007/04/21 06:15:23 plunky Exp $ -.\" $DragonFly: src/usr.sbin/rfcomm_sppd/Attic/rfcomm_sppd.1,v 1.2 2008/02/01 22:22:24 swildner Exp $ +.\" $DragonFly: src/usr.bin/rfcomm_sppd/rfcomm_sppd.1,v 1.1 2008/02/08 14:06:25 hasso Exp $ .\" .\" Copyright (c) 2006 Itronix Inc. .\" All rights reserved. diff --git a/usr.sbin/rfcomm_sppd/rfcomm_sppd.c b/usr.bin/rfcomm_sppd/rfcomm_sppd.c similarity index 99% rename from usr.sbin/rfcomm_sppd/rfcomm_sppd.c rename to usr.bin/rfcomm_sppd/rfcomm_sppd.c index 2e6e9baa02..3bfd8495af 100644 --- a/usr.sbin/rfcomm_sppd/rfcomm_sppd.c +++ b/usr.bin/rfcomm_sppd/rfcomm_sppd.c @@ -1,5 +1,5 @@ /* $NetBSD: rfcomm_sppd.c,v 1.8 2007/04/21 10:39:30 dsl Exp $ */ -/* $DragonFly: src/usr.sbin/rfcomm_sppd/Attic/rfcomm_sppd.c,v 1.1 2008/01/30 14:25:35 hasso Exp $ */ +/* $DragonFly: src/usr.bin/rfcomm_sppd/rfcomm_sppd.c,v 1.1 2008/02/08 14:06:25 hasso Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. diff --git a/usr.sbin/sdpquery/Makefile b/usr.bin/sdpquery/Makefile similarity index 72% rename from usr.sbin/sdpquery/Makefile rename to usr.bin/sdpquery/Makefile index 2045475225..d138f58dca 100644 --- a/usr.sbin/sdpquery/Makefile +++ b/usr.bin/sdpquery/Makefile @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.3 2007/05/28 12:06:31 tls Exp $ -# $DragonFly: src/usr.sbin/sdpquery/Attic/Makefile,v 1.1 2008/01/06 21:51:30 hasso Exp $ +# $DragonFly: src/usr.bin/sdpquery/Makefile,v 1.1 2008/02/08 14:06:25 hasso Exp $ PROG= sdpquery MAN= sdpquery.1 diff --git a/usr.sbin/sdpquery/sdpquery.1 b/usr.bin/sdpquery/sdpquery.1 similarity index 98% rename from usr.sbin/sdpquery/sdpquery.1 rename to usr.bin/sdpquery/sdpquery.1 index 5a634118d0..eb1635d5fb 100644 --- a/usr.sbin/sdpquery/sdpquery.1 +++ b/usr.bin/sdpquery/sdpquery.1 @@ -1,5 +1,5 @@ .\" $NetBSD: sdpquery.1,v 1.8 2007/02/17 09:39:11 wiz Exp $ -.\" $DragonFly: src/usr.sbin/sdpquery/Attic/sdpquery.1,v 1.1 2008/01/06 21:51:30 hasso Exp $ +.\" $DragonFly: src/usr.bin/sdpquery/sdpquery.1,v 1.1 2008/02/08 14:06:25 hasso Exp $ .\" .\" Copyright (c) 2006 Itronix Inc. .\" All rights reserved. diff --git a/usr.sbin/sdpquery/sdpquery.c b/usr.bin/sdpquery/sdpquery.c similarity index 97% rename from usr.sbin/sdpquery/sdpquery.c rename to usr.bin/sdpquery/sdpquery.c index 5bb7d77c4c..af59c6ac1d 100644 --- a/usr.sbin/sdpquery/sdpquery.c +++ b/usr.bin/sdpquery/sdpquery.c @@ -1,5 +1,5 @@ /* $NetBSD: sdpquery.c,v 1.3 2007/03/30 21:25:00 plunky Exp $ */ -/* $DragonFly: src/usr.sbin/sdpquery/Attic/sdpquery.c,v 1.1 2008/01/06 21:51:30 hasso Exp $ */ +/* $DragonFly: src/usr.bin/sdpquery/sdpquery.c,v 1.1 2008/02/08 14:06:25 hasso Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. diff --git a/usr.sbin/sdpquery/sdpquery.h b/usr.bin/sdpquery/sdpquery.h similarity index 95% rename from usr.sbin/sdpquery/sdpquery.h rename to usr.bin/sdpquery/sdpquery.h index 4b34455e59..61e7121b52 100644 --- a/usr.sbin/sdpquery/sdpquery.h +++ b/usr.bin/sdpquery/sdpquery.h @@ -1,5 +1,5 @@ /* $NetBSD: sdpquery.h,v 1.2 2006/07/26 10:54:49 tron Exp $ */ -/* $DragonFly: src/usr.sbin/sdpquery/Attic/sdpquery.h,v 1.1 2008/01/06 21:51:30 hasso Exp $ */ +/* $DragonFly: src/usr.bin/sdpquery/sdpquery.h,v 1.1 2008/02/08 14:06:25 hasso Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. diff --git a/usr.sbin/sdpquery/search.c b/usr.bin/sdpquery/search.c similarity index 99% rename from usr.sbin/sdpquery/search.c rename to usr.bin/sdpquery/search.c index 767bb15dcb..922970aca3 100644 --- a/usr.sbin/sdpquery/search.c +++ b/usr.bin/sdpquery/search.c @@ -1,5 +1,5 @@ /* $NetBSD: search.c,v 1.6 2007/11/06 21:35:52 plunky Exp $ */ -/* $DragonFly: src/usr.sbin/sdpquery/Attic/search.c,v 1.1 2008/01/06 21:51:30 hasso Exp $ */ +/* $DragonFly: src/usr.bin/sdpquery/search.c,v 1.1 2008/02/08 14:06:25 hasso Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index f26cf1b354..2b5db8b6e0 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,6 +1,6 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 # $FreeBSD: src/usr.sbin/Makefile,v 1.183.2.14 2003/04/16 11:01:51 ru Exp $ -# $DragonFly: src/usr.sbin/Makefile,v 1.43 2008/02/06 08:21:22 sephe Exp $ +# $DragonFly: src/usr.sbin/Makefile,v 1.44 2008/02/08 14:06:25 hasso Exp $ .include "../sys/platform/${MACHINE_PLATFORM}/Makefile.inc" @@ -20,7 +20,6 @@ SUBDIR= 802_11 \ bootparamd \ btconfig \ bthcid \ - btpin \ burncd \ cdcontrol \ chkgrp \ @@ -93,7 +92,6 @@ SUBDIR= 802_11 \ rdate \ repquota \ resident \ - rfcomm_sppd \ rip6query \ rmt \ route6d \ @@ -110,7 +108,6 @@ SUBDIR= 802_11 \ rwhod \ sa \ sdpd \ - sdpquery \ sensorsd \ setkey \ sliplogin \ -- 2.41.0