From 43682290a52f95652c89ae0f724ba29f0d1ccb36 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Fri, 23 Jan 2015 06:01:34 +0000
Subject: [PATCH 1/3] Remove the duplicate zzz entry

---
 usr.sbin/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index da16ba25c00f..edb3a16c3791 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -88,7 +88,6 @@ SUBDIR+=	sa
 
 .if ${MK_ACPI} != "no" || ${MK_APM} != "no"
 SUBDIR+=	powerd
-SUBDIR+=	zzz
 .endif
 
 .if ${MK_AMD} != "no"

From 6251a2629c2004292366779ce83a3a8d0ea29c37 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sun, 25 Jan 2015 02:30:44 +0000
Subject: [PATCH 2/3] Sort #include order

---
 sbin/rcorder/rcorder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 8c46b4fd1def..1371e37504cb 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
-#include <stdio.h>
 #include <libutil.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

From 9a1f476703f5ad42eb7bb8ef2a7a07c0034b0f74 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sun, 25 Jan 2015 03:02:29 +0000
Subject: [PATCH 3/3] - Revert r277670 (#include order is required for
 fparseln) - Remove unnecessary CFLAGS+= -I now that make is no longer
 required to make   rcorder build

---
 sbin/rcorder/Makefile  | 3 ---
 sbin/rcorder/rcorder.c | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 038bc35acee2..2f1bbac1fa8f 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -10,8 +10,5 @@ LIBADD=	util
 CFLAGS+= -DORDER
 
 #CFLAGS+= -DDEBUG
-.if ${CFLAGS:M-DDEBUG}
-CFLAGS+= -I${.CURDIR}/../../usr.bin/make
-.endif
 
 .include <bsd.prog.mk>
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 1371e37504cb..8c46b4fd1def 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
-#include <libutil.h>
 #include <stdio.h>
+#include <libutil.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>