Index: head/mail/automx/Makefile
===================================================================
--- head/mail/automx/Makefile	(revision 395914)
+++ head/mail/automx/Makefile	(revision 395915)
@@ -1,50 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	automx
 PORTVERSION=	0.10.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Handles mail account profile requests from mail clients
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3 # or later
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
 		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}m2crypto>=0:${PORTSDIR}/security/py-m2crypto \
 		wget:${PORTSDIR}/ftp/wget \
 		dig:${PORTSDIR}/dns/bind-tools
 
 GH_ACCOUNT=	sys4
 
 USES=		python
 USE_GITHUB=	yes
 NO_BUILD=	yes
+NO_ARCH=	yes
 PORTDATA=	*
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	MEMCACHE
 MEMCACHE_DESC=	Add memcache support
 MEMCACHE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}memcached>=0:${PORTSDIR}/databases/py-memcached
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/src && \
 	    ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR})
 	${INSTALL_DATA} ${WRKSRC}/src/automx_wsgi.py ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/src/automx-test ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/conf/automx.conf \
 		${STAGEDIR}${PREFIX}/etc/automx.conf.sample
 .for s in 1 5
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man$s/* ${STAGEDIR}${PREFIX}/man/man$s/
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "[^m]*" ${STAGEDIR}${DOCSDIR})
-	${INSTALL_MAN} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/BASIC_CONFIGURATION_README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/BASIC_CONFIGURATION_README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/mail/automx/pkg-plist
===================================================================
--- head/mail/automx/pkg-plist	(revision 395914)
+++ head/mail/automx/pkg-plist	(revision 395915)
@@ -1,13 +1,11 @@
 bin/automx-test
-@unexec cmp -s %D/etc/automx.conf %D/etc/automx.conf.sample && rm -f %D/etc/automx.conf || true
-etc/automx.conf.sample
-@exec cp -np %D/%F %B/automx.conf
+@sample etc/automx.conf.sample
 man/man1/automx-test.1.gz
 man/man5/automx.conf.5.gz
 man/man5/automx_ldap.5.gz
 man/man5/automx_sql.5.gz
 man/man5/automx_script.5.gz
 %%PYTHON_SITELIBDIR%%/automx/__init__.py
 %%PYTHON_SITELIBDIR%%/automx/config.py
 %%PYTHON_SITELIBDIR%%/automx/ordereddict.py
 %%PYTHON_SITELIBDIR%%/automx/view.py