Index: head/sysutils/am-utils/Makefile
===================================================================
--- head/sysutils/am-utils/Makefile	(revision 518100)
+++ head/sysutils/am-utils/Makefile	(revision 518101)
@@ -1,56 +1,57 @@
 # Created by: Jon Wilson <jon@phuq.co.uk>
 # $FreeBSD$
 
 PORTNAME=	am-utils
 PORTVERSION=	6.2
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/ \
 		ftp://ftp.cs.umn.edu/pub/am-utils/ \
 		ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Berkeley Automounter Suite of Utilities
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	OPENLDAP DOCS RC
+OPTIONS_DEFINE=	OPENLDAP DOCS
 OPTIONS_DEFAULT=OPENLDAP
 OPENLDAP_DESC=	OpenLDAP support
-RC_DESC=	Use the rc script in this port
 
 USES=		autoreconf:build bison libtool makeinfo perl5
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 # Enable some filesystems which are not auto-detected with GENERIC kernel.
 CONFIGURE_ARGS+=	ac_cv_fs_mfs=yes ac_cv_mnttab_type_nullfs='"mfs"' ac_cv_mount_type_nullfs='"mfs"' \
 			ac_cv_fs_nullfs=yes ac_cv_mnttab_type_nullfs='"nullfs"' ac_cv_mount_type_nullfs='"nullfs"' \
 			ac_cv_fs_udf=yes ac_cv_mnttab_type_udf='"udf"' ac_cv_mount_type_udf='"udf"' \
 			ac_cv_fs_tmpfs=yes ac_cv_mnttab_type_tmpfs='"tmpfs"' ac_cv_mount_type_tmpfs='"tmpfs"'
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
 INSTALL_TARGET=	install-strip
 
 INFO=		am-utils
 PORTDOCS=	AUTHORS BUGS FAQ NEWS README.attrcache
 
 OPENLDAP_USES=			localbase:ldflags
 OPENLDAP_USE=			OPENLDAP=yes
 OPENLDAP_CONFIGURE_WITH=	ldap
 OPENLDAP_PORTDOCS=		README.ldap ldap-id.txt ldap.schema
 
 OPTIONS_SUB=	yes
 
-RC_USE_RC_SUBR=	amd
+.if !exists(/etc/rc.d/amd)
+USE_RC_SUBR=	amd
+.endif
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/am-utils.info*
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/am-utils/files/amd.in
===================================================================
--- head/sysutils/am-utils/files/amd.in	(revision 518100)
+++ head/sysutils/am-utils/files/amd.in	(revision 518101)
@@ -1,50 +1,50 @@
 #!/bin/sh
 #
 # $FreeBSD$
 # Obtained from: FreeBSD: head/libexec/rc/rc.d/amd 298514 2016-04-23 16:10:54Z lme
 #
 
 # PROVIDE: amd
 # REQUIRE: rpcbind ypset nfsclient FILESYSTEMS ldconfig
 # BEFORE: DAEMON
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 
 name="amd"
 desc="Automatically mount filesystems"
 rcvar="amd_enable"
-command="/usr/sbin/${name}"
+command=%%PREFIX%%/sbin/${name}
 start_precmd="amd_precmd"
 command_args="&"
 extra_commands="reload"
 
 amd_precmd()
 {
 	force_depend nfsclient nfs_client || return 1
 	force_depend rpcbind || return 1
 
 	case ${amd_map_program} in
 	[Nn][Oo] | '')
 		;;
 	*)
 		rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
 		;;
 	esac
 
 	case "${amd_flags}" in
 	'')
 		if [ ! -r /etc/amd.conf ]; then
 			warn 'amd will not load without arguments'
 			return 1
 		fi
 		;;
 	*)
 		rc_flags="-p ${rc_flags}"
 		command_args="> /var/run/amd.pid 2> /dev/null"
 		;;
 	esac
 }
 
 load_rc_config $name
 run_rc_command "$1"