Revert r336572 and wrap them in machine checks so they are only installed on

i386.

Approved by:	allanjude (mentor), imp
Differential Revision:	https://reviews.freebsd.org/D16380

ObsoleteFiles.inc

@@ -38,9 +38,6 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 20180721: Purge some old forgotten apmd files
-OLD_FILES+=etc/apmd.conf
-OLD_FILES+=etc/rc.d/apmd
 # 20180721: move of libmlx5.so.1 and libibverbs.so.1
 OLD_LIBS+=usr/lib/libmlx5.so.1
 OLD_LIBS+=usr/lib/libibverbs.so.1

etc/Makefile

@@ -76,6 +76,12 @@ BSM_ETC_DIR=			${DESTDIR}/etc/security
 BIN1+= amd.map
 .endif
 
+.if ${MACHINE} == "i386"
+.if ${MK_APM} != "no"
+BIN1+= apmd.conf
+.endif
+.endif
+
 .if ${MK_AUTOFS} != "no"
 BIN1+=	auto_master
 .endif

etc/rc.d/Makefile

@@ -157,6 +157,9 @@ AMDPACKAGE=	amd
 .if ${MK_APM} != "no"
 FILESGROUPS+=	APM
 APM+=		apm
+.if ${MACHINE} == "i386"
+APM+=		apmd
+.endif
 APMPACKAGE=	apm
 .endif