Index: head/sysutils/am-utils/Makefile
===================================================================
--- head/sysutils/am-utils/Makefile	(revision 517129)
+++ head/sysutils/am-utils/Makefile	(revision 517130)
@@ -1,59 +1,53 @@
 # Created by: Jon Wilson <jon@phuq.co.uk>
 # $FreeBSD$
 
 PORTNAME=	am-utils
 PORTVERSION=	6.2
 PORTREVISION=	4
 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
 OPTIONS_DEFAULT=OPENLDAP
 OPENLDAP_DESC=	OpenLDAP support
 
 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
-DOCS=		AUTHORS BUGS FAQ NEWS README.attrcache
+PORTDOCS=	AUTHORS BUGS FAQ NEWS README.attrcache
 
 OPENLDAP_USES=			localbase:ldflags
 OPENLDAP_USE=			OPENLDAP=yes
 OPENLDAP_CONFIGURE_WITH=	ldap
-OPENLDAP_CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
-				CPPFLAGS="-I${LOCALBASE}/include"
-OPENLDAP_VARS=			DOCS+="README.ldap ldap-id.txt ldap.schema"
+OPENLDAP_PORTDOCS=		README.ldap ldap-id.txt ldap.schema
 
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${RM} ${WRKSRC}/doc/am-utils.info*
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/am-utils/pkg-plist
===================================================================
--- head/sysutils/am-utils/pkg-plist	(revision 517129)
+++ head/sysutils/am-utils/pkg-plist	(revision 517130)
@@ -1,45 +1,37 @@
 bin/pawd
 etc/amd.conf-sample
 etc/lostaltmail.conf-sample
 lib/libamu.a
 lib/libamu.so
 lib/libamu.so.4
 lib/libamu.so.4.0.0
 man/man1/pawd.1.gz
 man/man5/amd.conf.5.gz
 man/man8/amd.8.gz
 man/man8/amq.8.gz
 man/man8/automount2amd.8.gz
 man/man8/fixmount.8.gz
 man/man8/fsinfo.8.gz
 man/man8/hlfsd.8.gz
 man/man8/mk-amd-map.8.gz
 man/man8/sun2amd.8.gz
 man/man8/wire-test.8.gz
 sbin/am-eject
 sbin/amd
 sbin/amd2ldif
 sbin/amd2sun
 sbin/amq
 sbin/automount2amd
 sbin/ctl-amd
 sbin/ctl-hlfsd
 sbin/fix-amd-map
 sbin/fixmount
 sbin/fixrmtab
 sbin/fsinfo
 sbin/hlfsd
 sbin/lostaltmail
 sbin/mk-amd-map
 sbin/sun2amd
 sbin/wait4amd
 sbin/wait4amd2die
 sbin/wire-test
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README.attrcache
-%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
-%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt
-%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema