Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -38,6 +38,9 @@
 #   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
Index: etc/Makefile
===================================================================
--- etc/Makefile
+++ etc/Makefile
@@ -76,10 +76,6 @@
 BIN1+= amd.map
 .endif
 
-.if ${MK_APM} != "no"
-BIN1+= apmd.conf
-.endif
-
 .if ${MK_AUTOFS} != "no"
 BIN1+=	auto_master
 .endif
Index: etc/rc.d/Makefile
===================================================================
--- etc/rc.d/Makefile
+++ etc/rc.d/Makefile
@@ -157,7 +157,6 @@
 .if ${MK_APM} != "no"
 FILESGROUPS+=	APM
 APM+=		apm
-APM+=		apmd
 APMPACKAGE=	apm
 .endif