From 4ffb51fe8909b19fa4010cbafcf90a0ccc6e004b Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 21 Jan 2016 18:19:33 +0000
Subject: [PATCH] Create a package for amd(8) and related tools. While here,
 fix accounting rc script installation.

Sponsored by:	The FreeBSD Foundation
---
 etc/rc.d/Makefile              | 14 ++++++++++++--
 release/packages/amd-debug.ucl | 13 +++++++++++++
 release/packages/amd.ucl       | 13 +++++++++++++
 usr.sbin/amd/Makefile.inc      |  2 ++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 release/packages/amd-debug.ucl
 create mode 100644 release/packages/amd.ucl

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 21631185721..1f658aad875 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -135,7 +135,8 @@ FILES=	DAEMON \
 	zvol
 
 .if ${MK_ACCT} != "no"
-FILES+=		accounting
+FILESGROUPS+=	ACCT
+ACCT+=		accounting
 .endif
 
 .if ${MK_ACPI} != "no"
@@ -148,7 +149,8 @@ FILES+=		powerd
 .endif
 
 .if ${MK_AMD} != "no"
-FILES+=		amd
+FILESGROUPS+=	AMD
+AMD+=		amd
 .endif
 
 .if ${MK_APM} != "no"
@@ -300,6 +302,10 @@ ACPIDIR=	/etc/rc.d
 ACPIMODE=	${BINMODE}
 ACPIPACKAGE=	acpi
 
+AMDDIR=		/etc/rc.d
+AMDMODE=	${BINMODE}
+AMDPACKAGE=	amd
+
 SSHDIR=		/etc/rc.d
 SSHMODE=	${BINMODE}
 SSHPACKAGE=	ssh
@@ -312,4 +318,8 @@ JAILDIR=	/etc/rc.d
 JAILMODE=	${BINMODE}
 JAILPACKAGE=	jail
 
+ACCTDIR=	/etc/rc.d
+ACCTMODE=	${BINMODE}
+ACCTPACKAGE=	acct
+
 .include <bsd.prog.mk>
diff --git a/release/packages/amd-debug.ucl b/release/packages/amd-debug.ucl
new file mode 100644
index 00000000000..a2cfafda184
--- /dev/null
+++ b/release/packages/amd-debug.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "BSD 4.4 Automounter (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/amd.ucl b/release/packages/amd.ucl
new file mode 100644
index 00000000000..107319ec321
--- /dev/null
+++ b/release/packages/amd.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "BSD 4.4 Automounter"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index 8c397cfcc95..1b19acd9041 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -11,6 +11,8 @@
 
 .include <src.opts.mk>
 
+PACKAGE= amd
+
 CFLAGS+= -I. -I${.CURDIR} 
 CFLAGS+= -I${.CURDIR}/../include
 .if exists(${.OBJDIR}/../include)