Index: head/news/hellanzb/Makefile
===================================================================
--- head/news/hellanzb/Makefile	(revision 395484)
+++ head/news/hellanzb/Makefile	(revision 395485)
@@ -1,44 +1,43 @@
 # Created by: Philip Jenvey <pjenvey@groovie.org>
 # $FreeBSD$
 
 PORTNAME=	hellanzb
 PORTVERSION=	0.13
 PORTREVISION=	2
 CATEGORIES=	news
 MASTER_SITES=	http://www.hellanzb.com/distfiles/
 
 MAINTAINER=	pjenvey@groovie.org
 COMMENT=	Nzb downloader and post processor
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	par2:${PORTSDIR}/archivers/par2cmdline \
 		flac:${PORTSDIR}/audio/flac \
 		shorten:${PORTSDIR}/audio/shorten \
 		${PYTHON_PKGNAMEPREFIX}yenc>=0:${PORTSDIR}/news/py-yenc \
 		mac:${PORTSDIR}/audio/mac
 
 USE_PYTHON=	distutils
 USES=		python:2 twisted:run,web
 PORTDOCS=	CHANGELOG CREDITS README
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 # more fully-featured rar needs i386
 .if ${ARCH} == "i386"
 RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
 .else
 RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
Index: head/news/hellanzb/pkg-plist
===================================================================
--- head/news/hellanzb/pkg-plist	(revision 395484)
+++ head/news/hellanzb/pkg-plist	(revision 395485)
@@ -1,99 +1,92 @@
 bin/hellanzb.py
-@unexec if cmp -s %D/etc/hellanzb.conf.sample %D/etc/hellanzb.conf; then rm -f %D/etc/hellanzb.conf; fi
-etc/hellanzb.conf.sample
-@exec if [ ! -f %D/etc/hellanzb.conf ] ; then cp -p %D/%F %B/hellanzb.conf; fi
+@sample etc/hellanzb.conf.sample
 %%PYTHON_SITELIBDIR%%/Hellanzb/Core.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/Core.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/Core.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/Daemon.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/Daemon.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/Daemon.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/Elite.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/Elite.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/Elite.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/Growl.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/Growl.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/Growl.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaReactor.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaReactor.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaReactor.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/Log.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/Log.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/Log.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/Logging.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/Logging.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/Logging.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBQueue.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBQueue.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBQueue.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NewzbinDownloader.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NewzbinDownloader.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NewzbinDownloader.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBDownloader.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBDownloader.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBDownloader.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/PostProcessor.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/PostProcessor.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/PostProcessor.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/PostProcessorUtil.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/PostProcessorUtil.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/PostProcessorUtil.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/SmartPar.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/SmartPar.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/SmartPar.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/Util.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/Util.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/Util.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/__init__.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/__init__.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC/HtPasswdAuth.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC/HtPasswdAuth.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC/HtPasswdAuth.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC/__init__.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC/__init__.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC/xmlrpc.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC/xmlrpc.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC/xmlrpc.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/ArticleDecoder.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/ArticleDecoder.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/ArticleDecoder.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/DupeHandler.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/DupeHandler.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/DupeHandler.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBLeecherUtil.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBLeecherUtil.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBLeecherUtil.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBModel.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBModel.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBModel.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBParser.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBParser.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBParser.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBSegmentQueue.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBSegmentQueue.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/NZBSegmentQueue.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/Protocol.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/Protocol.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/Protocol.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/__init__.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/__init__.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/nntp.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/nntp.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher/nntp.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/external/__init__.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/external/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/external/__init__.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/external/elementtree/__init__.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/external/elementtree/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/external/elementtree/__init__.pyo
 %%PYTHON_SITELIBDIR%%/Hellanzb/external/elementtree/SimpleXMLWriter.py
 %%PYTHON_SITELIBDIR%%/Hellanzb/external/elementtree/SimpleXMLWriter.pyc
 %%PYTHON_SITELIBDIR%%/Hellanzb/external/elementtree/SimpleXMLWriter.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/Hellanzb/HellaXMLRPC
-@dirrm %%PYTHON_SITELIBDIR%%/Hellanzb/NZBLeecher
-@dirrm %%PYTHON_SITELIBDIR%%/Hellanzb/external/elementtree
-@dirrm %%PYTHON_SITELIBDIR%%/Hellanzb/external
-@dirrm %%PYTHON_SITELIBDIR%%/Hellanzb