From 6f614cd3f33dbdea3a67ac2fb414b1130674ee04 Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Fri, 17 Feb 2017 12:06:03 -0600
Subject: [PATCH] Move deptree2dot to the support folder

Since deptree2dot and the perl requirement are completely optional, we
can move this tool to the support folder. This gives the user the option
of using it if they have perl installed, and means we do not have an
optional runtime dependency on perl.

Documentation for this tool has also been added to the support folder.

X-Gentoo-Bug: 600742
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600742
---
 NEWS.md                                        |  6 ++++++
 README.md                                      |  1 -
 src/Makefile                                   |  4 ----
 src/tools/Makefile                             |  5 -----
 support/deptree2dot/README.md                  | 11 +++++++++++
 {src/tools => support/deptree2dot}/deptree2dot |  0
 6 files changed, 17 insertions(+), 10 deletions(-)
 delete mode 100644 src/tools/Makefile
 create mode 100644 support/deptree2dot/README.md
 rename {src/tools => support/deptree2dot}/deptree2dot (100%)

diff --git a/NEWS.md b/NEWS.md
index 6027aa08..6e36b2b2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,12 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC-0.24
+
+Since the deptree2dot tool and the perl requirement are completely
+optional, the deptree2dot tool has been moved to the support directory.
+As a result, the MKTOOLS=yes/no switch has been removed from the makefiles.
+
 ## OpenRC-0.23
 
 The tmpfiles.d processing code, which was part of previous versions of
diff --git a/README.md b/README.md
index edf64267..9e61d193 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,6 @@ MKSELINUX=yes
 MKSTATICLIBS=no
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
-MKTOOLS=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
diff --git a/src/Makefile b/src/Makefile
index ffbf8d6e..e3750347 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,9 +3,5 @@
 
 SUBDIR=		test libeinfo librc rc
 
-ifeq (${MKTOOLS},yes)
-SUBDIR+= tools
-endif
-
 MK=		../mk
 include		${MK}/subdir.mk
diff --git a/src/tools/Makefile b/src/tools/Makefile
deleted file mode 100644
index 92ff5063..00000000
--- a/src/tools/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-DIR=	${UPREFIX}/bin
-BIN=	deptree2dot
-
-MK=	../../mk
-include ${MK}/scripts.mk
diff --git a/support/deptree2dot/README.md b/support/deptree2dot/README.md
new file mode 100644
index 00000000..3df9a520
--- /dev/null
+++ b/support/deptree2dot/README.md
@@ -0,0 +1,11 @@
+# deptree2dot - Graph the OpenRC Dependency Tree
+
+This utility can be used to graph the OpenRC dependency tree. It
+requires perl5.x and converts the tree to a .dot file which can be
+processed by graphviz.
+
+Example usage:
+
+$ chmod +x deptree2dot
+$deptree2dot > deptree.dot
+$deptree2dot | dot -Tpng -o deptree.png
diff --git a/src/tools/deptree2dot b/support/deptree2dot/deptree2dot
similarity index 100%
rename from src/tools/deptree2dot
rename to support/deptree2dot/deptree2dot