Index: head/mail/avenger/Makefile
===================================================================
--- head/mail/avenger/Makefile	(revision 395548)
+++ head/mail/avenger/Makefile	(revision 395549)
@@ -1,53 +1,55 @@
 # Created by: dm
 # $FreeBSD$
 
 PORTNAME=	avenger
 PORTVERSION=	0.8.4
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Anti-spam SMTP server
 
+LICENSE=	GPLv2 # or later (though COPYING is GPLv3)
+
 USE_BDB=	42+
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
 PORTDOCS=	INSTALL INSTALL.html README NEWS
 SUB_FILES=	pkg-message
 
 CONFIGURE_ENV=	WFLAGS='-Wall'
 CONFIGURE_ARGS=	--enable-ssl=${OPENSSLBASE} \
 		--with-db=${LOCALBASE} \
 		--with-etcdir=${ETCDIR}
 
 OPTIONS_DEFINE=	SASL DOCS
 
 SASL_CONFIGURE_ON=	--enable-sasl
 SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/for vers in/s|5.*;|${BDB_LIB_NAME:S,db-,,};|' \
 		${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/asmtpd.conf \
 		${STAGEDIR}${ETCDIR}/asmtpd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/unknown \
 		${STAGEDIR}${ETCDIR}/unknown.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/pf.os ${STAGEDIR}${PREFIX}/share
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/smtp-filter.pf ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/avsendmail.m4 ${STAGEDIR}${DATADIR}
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/mail/avenger/pkg-plist
===================================================================
--- head/mail/avenger/pkg-plist	(revision 395548)
+++ head/mail/avenger/pkg-plist	(revision 395549)
@@ -1,39 +1,35 @@
 bin/aliascheck
 bin/dbutil
 bin/deliver
 bin/dotlock
 bin/edinplace
 bin/escape
 bin/macutil
 bin/mailexec
 bin/match
 bin/sendmac
 bin/smtpdcheck
 bin/synos
-@unexec if cmp -s %D/etc/avenger/asmtpd.conf.sample %D/etc/avenger/asmtpd.conf; then rm -f %D/etc/avenger/asmtpd.conf; fi
-%%ETCDIR%%/asmtpd.conf.sample
-@exec if [ ! -f %D/etc/avenger/asmtpd.conf ] ; then cp -p %D/%F %B/asmtpd.conf; fi
-@unexec if cmp -s %D/etc/avenger/unknown.sample %D/etc/avenger/unknown; then rm -f %D/etc/avenger/unknown; fi
-%%ETCDIR%%/unknown.sample
-@exec if [ ! -f %D/etc/avenger/unknown ] ; then cp -p %D/%F %B/unknown; fi
+@sample %%ETCDIR%%/asmtpd.conf.sample
+@sample %%ETCDIR%%/unknown.sample
 libexec/avenger
 libexec/avenger.local
 man/man1/aliascheck.1.gz
 man/man1/avenger.1.gz
 man/man1/dbutil.1.gz
 man/man1/deliver.1.gz
 man/man1/dotlock.1.gz
 man/man1/edinplace.1.gz
 man/man1/escape.1.gz
 man/man1/macutil.1.gz
 man/man1/mailexec.1.gz
 man/man1/match.1.gz
 man/man1/smtpdcheck.1.gz
 man/man1/synos.1.gz
 man/man5/asmtpd.conf.5.gz
 man/man8/asmtpd.8.gz
 man/man8/avenger.local.8.gz
 sbin/asmtpd
 %%DATADIR%%/avsendmail.m4
 %%DATADIR%%/smtp-filter.pf
 share/pf.os