summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-01-21 18:19:33 +0000
committergjb <gjb@FreeBSD.org>2016-01-21 18:19:33 +0000
commit3d734e058354008f679d1e871ad09d4ded6716b7 (patch)
tree45ad64baf52534bd4eb3065ee8ed5a7a88673fa7
parent00d9a083c4deb8bce5aee0ce7ce12b013abb2236 (diff)
downloadFreeBSD-src-3d734e058354008f679d1e871ad09d4ded6716b7.zip
FreeBSD-src-3d734e058354008f679d1e871ad09d4ded6716b7.tar.gz
Create a package for amd(8) and related tools.
While here, fix accounting rc script installation. Sponsored by: The FreeBSD Foundation
-rw-r--r--etc/rc.d/Makefile14
-rw-r--r--release/packages/amd-debug.ucl13
-rw-r--r--release/packages/amd.ucl13
-rw-r--r--usr.sbin/amd/Makefile.inc2
4 files changed, 40 insertions, 2 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 2163118..1f658aa 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 0000000..a2cfafd
--- /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 0000000..107319e
--- /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 8c397cf..1b19acd 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)
OpenPOWER on IntegriCloud