Index: head/net/rwhoisd/Makefile
===================================================================
--- head/net/rwhoisd/Makefile	(revision 429190)
+++ head/net/rwhoisd/Makefile	(revision 429191)
@@ -1,55 +1,58 @@
 # Created by: James FitzGibbon <jfitz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	rwhoisd
 PORTVERSION=	1.5.9.6
 PORTREVISION=	3
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://projects.arin.net/rwhois/ftp/ \
 		http://www.rwhois.net/ftp/ \
 		http://www.rwhois.net/ftp/older_releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Internic referral whois server
 
+DEPRECATED=	No more public distfiles
+EXPIRATION_DATE=	2017-01-22
+
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
 
 USE_RC_SUBR=	rwhoisd
 
 BINOWN=		bin
 BINGRP=		bin
 
 PORTDOCS=	INSTALL.html TODO UPGRADE operations_guide.html \
 		operations_guide.txt rfc2167.txt security.html security.txt
 
 ETCFILES=	rwhoisd.allow rwhoisd.auth_area rwhoisd.conf rwhoisd.deny \
 		rwhoisd.dir rwhoisd.root rwhoisd.x.dir
 PLIST_SUB+=	ETCFILES="${ETCFILES}"
 
 OPTIONS_DEFINE=	IPV6 DOCS
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,userid: rwhoisd,userid: nobody,' \
 			  -e 's,pid-file: rwhoisd.pid,pid-file: /var/run/rwhoisd/rwhoisd.pid,' \
 		${WRKSRC}/sample.data/rwhoisd.conf
 	@${REINPLACE_CMD} -E 's,"(.*\.log)","/var/log/rwhoisd/\1",g' \
 		${WRKSRC}/common/conf.h
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
 	${INSTALL_MAN} ${WRKSRC}/doc/rwhois_indexer.8 ${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/doc/rwhoisd.8 ${STAGEDIR}${PREFIX}/man/man8
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/net/rwhoisd/pkg-plist
===================================================================
--- head/net/rwhoisd/pkg-plist	(revision 429190)
+++ head/net/rwhoisd/pkg-plist	(revision 429191)
@@ -1,50 +1,49 @@
 bin/rwhois_deleter
 bin/rwhois_indexer
 bin/rwhois_repack
 man/man8/rwhois_indexer.8.gz
 man/man8/rwhoisd.8.gz
 sbin/rwhoisd
 %%ETCDIR%%/samples/a.com/attribute_defs/asn.tmpl
 %%ETCDIR%%/samples/a.com/attribute_defs/contact.tmpl
 %%ETCDIR%%/samples/a.com/attribute_defs/domain.tmpl
 %%ETCDIR%%/samples/a.com/attribute_defs/guardian.tmpl
 %%ETCDIR%%/samples/a.com/attribute_defs/host.tmpl
 %%ETCDIR%%/samples/a.com/attribute_defs/org.tmpl
 %%ETCDIR%%/samples/a.com/attribute_defs/referral.tmpl
 %%ETCDIR%%/samples/a.com/data/asn/asn.txt
 %%ETCDIR%%/samples/a.com/data/contact/contact.txt
 %%ETCDIR%%/samples/a.com/data/domain/domain.txt
 %%ETCDIR%%/samples/a.com/data/guardian/guardian.txt
 %%ETCDIR%%/samples/a.com/data/host/host.txt
 %%ETCDIR%%/samples/a.com/data/org/org.txt
 %%ETCDIR%%/samples/a.com/data/referral/referral.txt
 %%ETCDIR%%/samples/a.com/schema
 %%ETCDIR%%/samples/a.com/soa
 %%ETCDIR%%/samples/net-10.0.0.0-8/attribute_defs/contact.tmpl
 %%ETCDIR%%/samples/net-10.0.0.0-8/attribute_defs/guardian.tmpl
 %%ETCDIR%%/samples/net-10.0.0.0-8/attribute_defs/host.tmpl
 %%ETCDIR%%/samples/net-10.0.0.0-8/attribute_defs/network.tmpl
 %%ETCDIR%%/samples/net-10.0.0.0-8/attribute_defs/referral.tmpl
 %%ETCDIR%%/samples/net-10.0.0.0-8/data/network/network.txt
 %%ETCDIR%%/samples/net-10.0.0.0-8/data/referral/referral.txt
 %%ETCDIR%%/samples/net-10.0.0.0-8/schema
 %%ETCDIR%%/samples/net-10.0.0.0-8/soa
 %%ETCDIR%%/samples/net-fd00:1234::-32/attribute_defs/host.tmpl
 %%ETCDIR%%/samples/net-fd00:1234::-32/attribute_defs/referral.tmpl
 %%ETCDIR%%/samples/net-fd00:1234::-32/attribute_defs/contact.tmpl
 %%ETCDIR%%/samples/net-fd00:1234::-32/attribute_defs/guardian.tmpl
 %%ETCDIR%%/samples/net-fd00:1234::-32/attribute_defs/network.tmpl
 %%ETCDIR%%/samples/net-fd00:1234::-32/data/referral/referral.txt
 %%ETCDIR%%/samples/net-fd00:1234::-32/data/network/network.txt
 %%ETCDIR%%/samples/net-fd00:1234::-32/soa
 %%ETCDIR%%/samples/net-fd00:1234::-32/schema
-%%ETCDIR%%/samples/rwhoisd.allow
-%%ETCDIR%%/samples/rwhoisd.auth_area
-%%ETCDIR%%/samples/rwhoisd.conf
-%%ETCDIR%%/samples/rwhoisd.deny
-%%ETCDIR%%/samples/rwhoisd.dir
-%%ETCDIR%%/samples/rwhoisd.root
-%%ETCDIR%%/samples/rwhoisd.x.dir
-@exec install -d -o nobody /var/log/rwhoisd /var/run/rwhoisd
-@exec for f in %%ETCFILES%%; do [ -f %D/%%ETCDIR%%/$f ] || cp -p %D/%%ETCDIR%%/samples/$f %D/%%ETCDIR%%/$f; done
-@unexec for f in %%ETCFILES%%; do cmp -s %D/%%ETCDIR%%/$f %D/%%ETCDIR%%/samples/$f && rm -f %D/%%ETCDIR%%/$f || true; done
+@sample %%ETCDIR%%/samples/rwhoisd.allow %%ETCDIR%%/rwhoisd.allow
+@sample %%ETCDIR%%/samples/rwhoisd.auth_area %%ETCDIR%%/rwhoisd.auth_area
+@sample %%ETCDIR%%/samples/rwhoisd.conf %%ETCDIR%%/rwhoisd.conf
+@sample %%ETCDIR%%/samples/rwhoisd.deny %%ETCDIR%%/rwhoisd.deny
+@sample %%ETCDIR%%/samples/rwhoisd.dir %%ETCDIR%%/rwhoisd.dir
+@sample %%ETCDIR%%/samples/rwhoisd.root %%ETCDIR%%/rwhoisd.root
+@sample %%ETCDIR%%/samples/rwhoisd.x.dir %%ETCDIR%%/rwhoisd.x.dir
+@dir(nobody,,) /var/log/rwhoisd
+@dir(nobody,,) /var/run/rwhoisd