From dadd6466537293dd1209630ad0a11746c2482d55 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot@wolfpond.org>
Date: Tue, 11 Feb 2014 21:17:19 +0100
Subject: [PATCH] uuidgen(1): Move sources to src/bin

The binary was installed into /bin ; keeping its sources into src/usr.bin
was confusing.
---
 bin/Makefile                       | 1 +
 {usr.bin => bin}/uuidgen/Makefile  | 3 ---
 {usr.bin => bin}/uuidgen/uuidgen.1 | 1 -
 {usr.bin => bin}/uuidgen/uuidgen.c | 1 -
 usr.bin/Makefile                   | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)
 rename {usr.bin => bin}/uuidgen/Makefile (54%)
 rename {usr.bin => bin}/uuidgen/uuidgen.1 (97%)
 rename {usr.bin => bin}/uuidgen/uuidgen.c (97%)

diff --git a/bin/Makefile b/bin/Makefile
index 2f7b070070..f8648fe5fb 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -35,6 +35,7 @@ SUBDIR= cat \
 	stty \
 	sync \
 	test \
+	uuidgen \
 	varsym
 
 .if !defined(NO_SENDMAIL)
diff --git a/usr.bin/uuidgen/Makefile b/bin/uuidgen/Makefile
similarity index 54%
rename from usr.bin/uuidgen/Makefile
rename to bin/uuidgen/Makefile
index 2d5441b088..5c9e43655d 100644
--- a/usr.bin/uuidgen/Makefile
+++ b/bin/uuidgen/Makefile
@@ -1,7 +1,4 @@
 # $FreeBSD: src/usr.bin/uuidgen/Makefile,v 1.3 2007/04/09 19:16:48 pjd Exp $
-# $DragonFly: src/usr.bin/uuidgen/Makefile,v 1.2 2007/08/27 16:51:00 pavalos Exp $
-
-BINDIR=	/bin
 
 PROG=	uuidgen
 
diff --git a/usr.bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1
similarity index 97%
rename from usr.bin/uuidgen/uuidgen.1
rename to bin/uuidgen/uuidgen.1
index 49ea69687f..5de7fee051 100644
--- a/usr.bin/uuidgen/uuidgen.1
+++ b/bin/uuidgen/uuidgen.1
@@ -23,7 +23,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.bin/uuidgen/uuidgen.1,v 1.7 2005/09/07 07:49:21 rse Exp $
-.\" $DragonFly: src/usr.bin/uuidgen/uuidgen.1,v 1.1 2007/06/17 05:03:23 dillon Exp $
 .\"
 .Dd September 7, 2005
 .Dt UUIDGEN 1
diff --git a/usr.bin/uuidgen/uuidgen.c b/bin/uuidgen/uuidgen.c
similarity index 97%
rename from usr.bin/uuidgen/uuidgen.c
rename to bin/uuidgen/uuidgen.c
index ec5af24770..6b25c62023 100644
--- a/usr.bin/uuidgen/uuidgen.c
+++ b/bin/uuidgen/uuidgen.c
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/uuidgen/uuidgen.c,v 1.3 2003/03/15 02:27:10 marcel Exp $
- * $DragonFly: src/usr.bin/uuidgen/uuidgen.c,v 1.1 2007/06/17 05:03:23 dillon Exp $
  */
 
 #include <err.h>
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 80e6a8f5ef..89d053938d 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -220,7 +220,6 @@ SUBDIR=	alias \
 	users \
 	uudecode \
 	uuencode \
-	uuidgen \
 	vgrind \
 	vi \
 	vis \
-- 
2.41.0