Add stage support to news, and improve correctness.

I am not touching the husky ports with a 10 foot pole.

atp:
	stage, improve pkg-message
crashmail:
	stage
diablo:
	too wacky to stage, but convert WITH_* to OPTIONS, unmute
	commands that shouldn't be muted, use :MDOCS
fidogate-ds:
	stage, OPTIONS, treat examples as EXAMPLES, not DOCS, handle
	/var/* in the plist properly
golded+:
	stage, OPTIONS, protect examples behind %%PORTEXAMPLES%%
nntpbtr:
	this was an unbelievably PITA
	stage, add missing prototypes, add missing return types,
	rename patch files to what they actually patch
nntpcache:
	stage support, required lots of Makefile.in patching,
	call submakes correctly, handle config files properly
nzbperl:
	stage, use OPTIONS, remove obsolete pkg-message
papercut:
	stage, handle config file properly
py-pynzb:
	stage, use OPTIONS helper to avoid bsd.port.options.mk inclusion
s-news:
	stage
slrnconf:
	stage
slrnface:
	stage, install required files to datadir, not examplesdir,
	generate proper pkg-message
sn:
	stage

39 files changed, 869 insertions, 678 deletions

diff --git a/news/atp/Makefile b/news/atp/Makefile
index 4099193..6bd770e 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -15,16 +15,14 @@ COMMENT=	A QWK message packet reader and composer for FreeBSD
 RUN_DEPENDS=		zip:${PORTSDIR}/archivers/zip \
 			unzip:${PORTSDIR}/archivers/unzip
 
-USE_GMAKE=		YES
+USES=	gmake
 GNU_CONFIGURE=		YES
+SUB_FILES=	pkg-message
 
-MAN1=			atp.1 \
-			atpdiag.1 \
-			rot13.1
-MAN3=			editline.3
-
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
+post-patch:
+.for i in atphome bindir mandir
+	${REINPLACE_CMD} -e 's,$$($i),$$(DESTDIR)&,g' \
+		${WRKSRC}/Makefile.in
+.endfor
 
 .include <bsd.port.mk>
diff --git a/news/atp/pkg-message b/news/atp/files/pkg-message.in
index 2806c4c..7fd5040 100644
--- a/news/atp/pkg-message
+++ b/news/atp/files/pkg-message.in
@@ -5,7 +5,7 @@ Each user who wishes to use ATP must do the following:
 
 2.  create the directory named above
 
-3.  copy the files in ${PREFIX}/share/atp into it
+3.  copy the files in %%PREFIX%%/share/atp into it
 
 4.  edit the atprc and taglines.atp file to contain whatever
     data you want.
diff --git a/news/atp/pkg-plist b/news/atp/pkg-plist
index cc9a297..a8a5be8 100644
--- a/news/atp/pkg-plist
+++ b/news/atp/pkg-plist
@@ -1,6 +1,10 @@
 bin/atp
 bin/atpdiag
 bin/rot13
-share/atp/atprc
-share/atp/taglines.atp
-@dirrm share/atp
+%%DATADIR%%/atprc
+%%DATADIR%%/taglines.atp
+man/man1/atp.1.gz
+man/man1/atpdiag.1.gz
+man/man1/rot13.1.gz
+man/man3/editline.3.gz
+@dirrm %%DATADIR%%
diff --git a/news/crashmail/Makefile b/news/crashmail/Makefile
index 63cb176..4ed1cf8 100644
--- a/news/crashmail/Makefile
+++ b/news/crashmail/Makefile
@@ -17,23 +17,22 @@ ALL_TARGET=	linux
 
 USES=		gmake zip
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} \
 	  -e 's^"crashmail.prefs"^"${PREFIX}/etc/crashmail/crashmail.prefs"^' \
 	  ${WRKSRC}/src/oslib_linux/os_linux.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashexport ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashgetnode ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashlist ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashmail ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashmaint ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashstats ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashwrite ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/etc/crashmail
-	${INSTALL_DATA} ${WRKSRC}/doc/example.prefs ${PREFIX}/etc/crashmail
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashexport ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashgetnode ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashlist ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashmail ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashmaint ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashstats ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/crashwrite ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example.prefs ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/AreafixHelp.txt \
-		${PREFIX}/etc/crashmail/areafix.help
+		${STAGEDIR}${ETCDIR}/areafix.help
 
 .include <bsd.port.mk>
diff --git a/news/crashmail/pkg-plist b/news/crashmail/pkg-plist
index 40bbad3..f3b16d9 100644
--- a/news/crashmail/pkg-plist
+++ b/news/crashmail/pkg-plist
@@ -5,6 +5,6 @@ bin/crashmail
 bin/crashmaint
 bin/crashstats
 bin/crashwrite
-etc/crashmail/example.prefs
-etc/crashmail/areafix.help
-@dirrm etc/crashmail
+%%ETCDIR%%/example.prefs
+%%ETCDIR%%/areafix.help
+@dirrm %%ETCDIR%%
diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index 0439ba8..448e621 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -22,29 +22,33 @@ MAN8=		dicmd.8 didump.8 dexpireover.8 dfeedinfo.8 dgrpctl.8 \
 PORTDOCS=	COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DES DOCS
+DES_DESC=	DES encryption support
+
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${CP} ${SCRIPTDIR}/diablo.sh-sample ${WRKDIR}
-	@${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g ;\
+	${CP} ${SCRIPTDIR}/diablo.sh-sample ${WRKDIR}
+	${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g ;\
 		s|-g -O.?|${CFLAGS}| ; s|g?cc|${CC}|' \
 		${WRKDIR}/diablo.sh-sample ${WRKSRC}/XMakefile.inc
 # Fix for GCC 4.2
-	@${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \
+	${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \
 		${WRKSRC}/dreaderd/main.c
 
-.if !defined(WITH_DES)
-	@${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc
+.if empty(PORT_OPTIONS:MDES)
+	${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc
 .endif
 
 do-build:
-	@cd ${WRKSRC} && xmake all
-
-pre-install:
-	${INSTALL} -d ${DOCDIR} ${PREFIX}/news ${PREFIX}/news/dbin
+	(cd ${WRKSRC} && xmake all)
 
 do-install:
-	@cd ${WRKSRC} && xmake install
+	${MKDIR} ${PREFIX}/news/dbin
+	(cd ${WRKSRC} && xmake install)
 	${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh-sample ${PREFIX}/etc/rc.d
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
diff --git a/news/fidogate-ds/Makefile b/news/fidogate-ds/Makefile
index f5bce7b..727c1a0 100644
--- a/news/fidogate-ds/Makefile
+++ b/news/fidogate-ds/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		fidogate
 PORTVERSION=		5.1.7
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		news mail
 MASTER_SITES=		SF/rus${PORTNAME}/${PORTNAME}-stable/${PORTNAME}%20${PORTVERSION}ds
 PKGNAMESUFFIX=		-ds
@@ -14,16 +14,11 @@ COMMENT=		Fido-Internet Gateway and Tosser
 
 PORTSCOUT=		limit:^5\.[^2] # 5.2.X is development branch
 
-.if !defined(WITHOUT_INN)
-BUILD_DEPENDS=		${LOCALBASE}/news/bin/innconfval:${PORTSDIR}/news/inn
-.endif
-
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=		yes
 GNU_CONFIGURE=		yes
 USES=		perl5
 MAKE_JOBS_UNSAFE=	yes
-NO_STAGE=	yes
 
 SPOOLDIR?=/var/spool/fido/gate
 BTBASEDIR?=/var/spool/fido/bt
@@ -38,39 +33,32 @@ PLIST_SUB+=		SPOOLDIR=${SPOOLDIR} \
 			VARDIR=${VARDIR} \
 			PREFIX=${PREFIX}
 
-HAS_CONFIGURE=		yes
-.if defined(WITHOUT_INN) || defined (BATCH)
-CONFIGURE_ARGS+=	--without-news
-.else
-CONFIGURE_ARGS+=	--with-newsbindir=${LOCALBASE}/news/bin
-.endif
-.if !defined(WITH_BSO)
-CONFIGURE_ARGS+=	--enable-amiga-out
-.endif
-.if !defined(WITH_DESCDIR)
-CONFIGURE_ARGS+=	--disable-desc-dir
-.endif
-.if !defined(WITHOUT_ALIASES)
-CONFIGURE_ARGS+=	--enable-aliases-local
-.endif
-.if defined(WITH_DBC)
-CONFIGURE_ARGS+=	--enable-dbc-history
-.endif
-.if defined(DNT_NETMAIL)
-CONFIGURE_ARGS+=	--enable-dnt-netmail
-.endif
-.if defined(WITHOUT_FMSGID)
-CONFIGURE_ARGS+=	--disable-fs-msgid
-.endif
-.if !defined(WITH_AVAIL)
-CONFIGURE_ARGS+=	--disable-af-avail
-.endif
-.if defined(WITHOUT_BEST_AKA)
-CONFIGURE_ARGS+=	--disable-best-aka
-.endif
-.if defined(WITH_NFS_LOCK)
-CONFIGURE_ARGS+=	--enable-nfs-safe-lock
-.endif
+OPTIONS_DEFINE=	ALIASES AVAIL BEST_AKA BSO DBC DESCDIR DNT_NETMAIL DOCS FMSGID INN NFS_LOCK
+OPTIONS_DEFAULT=ALIASES BEST_AKA BSO DOCS FMSGID INN 
+ALIASES_DESC=	Enable local aliases
+AVAIL_DESC=		Change %list and %avail behaviour
+BEST_AKA_DESC=	Enable best AKA
+BSO_DESC=		Create 4D outbound filenames for AmigaDOS mailers
+DBC_DESC=		Use msgid correspond data base
+DESCDIR_DESC=	Put file descriptions into files.bbs
+DNT_NETMAIL_DESC=	Do not toss netmail
+FMSGID_DESC=	Set gate msgid into outgoing messages
+INN_DESC=		News support
+NFS_LOCK_DESC=	Create lock files/BSY files in an NFS-safe way
+
+ALIASES_CONFIGURE_ENABLE=	aliases-local
+AVAIL_CONFIGURE_ENABLE=		af-avail
+BEST_AKA_CONFIGURE_ENABLE=	best-aka
+BSO_CONFIGURE_ENABLE=		amiga-out
+DBC_CONFIGURE_ENABLE=		dbc-history
+DESCDIR_CONFIGURE_ENABLE=	desc-dir
+DNT_NETMAIL_CONFIGURE_ENABLE=	dnt-netmail
+FMSGID_CONFIGURE_ENABLE=	fs-msgid
+INN_BUILD_DEPENDS=			${LOCALBASE}/news/bin/innconfval:${PORTSDIR}/news/inn
+INN_CONFIGURE_WITH=			news
+INN_CONFIGURE_ON=			--with-newsbindir=${LOCALBASE}/news/bin
+NFS_LOCK_CONFIGURE_ENABLE=	nfs-safe-lock
+
 CONFIGURE_ARGS+=	--libexec=${PREFIX}/libexec/fidogate \
 			--sysconfdir=${PREFIX}/etc/fido/gate \
 			--libdir=${PREFIX}/lib/fidogate \
@@ -85,26 +73,33 @@ DOCS=		doc/README.ru doc/README doc/FAQ.ru doc/FIDOGATE+tracker.ru \
 		doc/old/FIDOGATE_ftrack doc/old/README.snp \
 		doc/old/fidogate.txt doc/old/fidogate.texi doc/old/msgid.doc
 
-.if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for a in ${DOCS}
-	${INSTALL_DATA}	${WRKSRC}/${a} ${DOCSDIR}
+	${INSTALL_DATA}	${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
-	${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for a in point inn postfix sendmail
-	${MKDIR} ${EXAMPLESDIR}/${a}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${a}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/areas ${STAGEDIR}${EXAMPLESDIR}/point/areas
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/areas.bbs ${STAGEDIR}${EXAMPLESDIR}/point/areas.bbs
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/fidogate.conf ${STAGEDIR}${EXAMPLESDIR}/point/fidogate.conf
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/newsfeeds ${STAGEDIR}${EXAMPLESDIR}/point/newsfeeds
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/packing ${STAGEDIR}${EXAMPLESDIR}/point/packing
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/routing ${STAGEDIR}${EXAMPLESDIR}/point/routing
+	${INSTALL_DATA} ${WRKSRC}/doc/news/inn/newsfeeds.fidogate ${STAGEDIR}${EXAMPLESDIR}/inn/newsfeeds.fidogate
+	${INSTALL_DATA}	${WRKSRC}/doc/mailer/postfix/master.cf ${STAGEDIR}${EXAMPLESDIR}/postfix/master.cf
+	${INSTALL_DATA} ${WRKSRC}/doc/mailer/postfix/transport ${STAGEDIR}${EXAMPLESDIR}/postfix/transport
+	${INSTALL_DATA} ${WRKSRC}/doc/mailer/sendmail/mailer/ftn.m4 ${STAGEDIR}${EXAMPLESDIR}/sendmail/ftn.m4
+.for i in toss/bad toss/pack toss/route toss/toss outrfc/mail outrfc/news outpkt/mail outpkt/news
+	@${TOUCH} ${STAGEDIR}${SPOOLDIR}/$i/.keep_me
+.endfor
+.for i in in/bad in/tmpunpack pin/bad pin/tmpunpack tick
+	@${TOUCH} ${STAGEDIR}${BTBASEDIR}/$i/.keep_me
+.endfor
+.for i in ${LOGDIR} ${LOCKDIR}
+	@${TOUCH} ${STAGEDIR}$i/.keep_me
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/areas ${EXAMPLESDIR}/point/areas
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/areas.bbs ${EXAMPLESDIR}/point/areas.bbs
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/fidogate.conf ${EXAMPLESDIR}/point/fidogate.conf
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/newsfeeds ${EXAMPLESDIR}/point/newsfeeds
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/packing ${EXAMPLESDIR}/point/packing
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/point/routing ${EXAMPLESDIR}/point/routing
-	${INSTALL_DATA} ${WRKSRC}/doc/news/inn/newsfeeds.fidogate ${EXAMPLESDIR}/inn/newsfeeds.fidogate
-	${INSTALL_DATA}	${WRKSRC}/doc/mailer/postfix/master.cf ${EXAMPLESDIR}/postfix/master.cf
-	${INSTALL_DATA} ${WRKSRC}/doc/mailer/postfix/transport ${EXAMPLESDIR}/postfix/transport
-	${INSTALL_DATA} ${WRKSRC}/doc/mailer/sendmail/mailer/ftn.m4 ${EXAMPLESDIR}/sendmail/ftn.m4
-.endif
 
 .include <bsd.port.mk>
diff --git a/news/fidogate-ds/pkg-plist b/news/fidogate-ds/pkg-plist
index d315432..a9cb7dc 100644
--- a/news/fidogate-ds/pkg-plist
+++ b/news/fidogate-ds/pkg-plist
@@ -91,21 +91,36 @@ var/fidogate/fareas.bbs.sample
 %%PORTDOCS%%%%DOCSDIR%%/fidogate.txt
 %%PORTDOCS%%%%DOCSDIR%%/fidogate.texi
 %%PORTDOCS%%%%DOCSDIR%%/msgid.doc
-%%PORTDOCS%%%%EXAMPLESDIR%%/point/areas
-%%PORTDOCS%%%%EXAMPLESDIR%%/point/areas.bbs
-%%PORTDOCS%%%%EXAMPLESDIR%%/point/fidogate.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/point/newsfeeds
-%%PORTDOCS%%%%EXAMPLESDIR%%/point/packing
-%%PORTDOCS%%%%EXAMPLESDIR%%/point/routing
-%%PORTDOCS%%%%EXAMPLESDIR%%/postfix/master.cf
-%%PORTDOCS%%%%EXAMPLESDIR%%/postfix/transport
-%%PORTDOCS%%%%EXAMPLESDIR%%/sendmail/ftn.m4
-%%PORTDOCS%%%%EXAMPLESDIR%%/inn/newsfeeds.fidogate
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/point
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/postfix
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/sendmail
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/inn
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/areas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/areas.bbs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/fidogate.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/newsfeeds
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/packing
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/routing
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postfix/master.cf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postfix/transport
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendmail/ftn.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inn/newsfeeds.fidogate
+%%LOGDIR%%/.keep_me
+%%LOCKDIR%%/.keep_me
+%%BTBASEDIR%%/in/bad/.keep_me
+%%BTBASEDIR%%/in/tmpunpack/.keep_me
+%%BTBASEDIR%%/pin/bad/.keep_me
+%%BTBASEDIR%%/pin/tmpunpack/.keep_me
+%%BTBASEDIR%%/tick/.keep_me
+%%SPOOLDIR%%/outpkt/mail/.keep_me
+%%SPOOLDIR%%/outpkt/news/.keep_me
+%%SPOOLDIR%%/outrfc/mail/.keep_me
+%%SPOOLDIR%%/outrfc/news/.keep_me
+%%SPOOLDIR%%/toss/bad/.keep_me
+%%SPOOLDIR%%/toss/pack/.keep_me
+%%SPOOLDIR%%/toss/route/.keep_me
+%%SPOOLDIR%%/toss/toss/.keep_me
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/point
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/postfix
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sendmail
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/inn
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm var/fidogate/seq
 @dirrm var/fidogate
@@ -114,3 +129,27 @@ var/fidogate/fareas.bbs.sample
 @dirrm etc/fido
 @dirrm libexec/fidogate
 @dirrm lib/fidogate
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss/toss || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss/route || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss/pack || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss/bad || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outrfc/news || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outrfc/mail || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outrfc || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outpkt/news || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outpkt/mail || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outpkt || true
+@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%% || true
+@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/tick || true
+@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/pin/tmpunpack || true
+@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/pin/bad || true
+@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/pin || true
+@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/in/tmpunpack || true
+@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/in/bad || true
+@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/in || true
+@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%% || true
+@unexec rmdir >/dev/null 2>&1 /var/spool/fido || true
+@unexec rmdir >/dev/null 2>&1 %%LOCKDIR%% || true
+@unexec rmdir >/dev/null 2>&1 %%LOGDIR%% || true
+@unexec rmdir >/dev/null 2>&1 /var/log/fido || true
diff --git a/news/golded+/Makefile b/news/golded+/Makefile
index 772846d..f07877c 100644
--- a/news/golded+/Makefile
+++ b/news/golded+/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	golded+
 PORTVERSION=	1.1.5.a${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	news mail
 MASTER_SITES=	SF/golded-plus/Golded%2B%201.1.5%20snapshots
 DISTNAME=	gps115-${SNAPDATE}
@@ -11,8 +12,7 @@ SNAPDATE=	20110223
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	GoldEd+ (FTN message editor)
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		tar:bzip2 gmake
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -21,13 +21,15 @@ DOCS=		copying copying.lib license.txt notework.txt rusfaq.txt\
 		tips.txt notework.rus tokencfg.txt tokentpl.txt goldnode.txt
 PORTDOCS=	${DOCS} gold_ref.txt gold_usr.txt
 SUB_FILES=	pkg-message
-.if !defined(NOPORTDOCS)
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 SUB_LIST=	NOTEWORK="Please read the ${DOCSDIR}/notework.txt before using ${PORTNAME}"
 .else
 SUB_LIST=	NOTEWORK=""
 .endif
 
-NO_STAGE=	yes
 post-patch:
 	@${SED}\
 		-e 's,^\(#define __GVER_VENDOR_NAME__\).*,\1 "",'\
@@ -38,28 +40,21 @@ post-patch:
 		<${WRKSRC}/golded3/mygolded.__h >${WRKSRC}/golded3/mygolded.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/gedlnx ${PREFIX}/bin/golded
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/gnlnx ${PREFIX}/bin/goldnode
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/rddtlnx ${PREFIX}/bin/rddt
-.for i in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/docs/$i ${PREFIX}/man/man1
-.endfor
-	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/gedlnx ${STAGEDIR}${PREFIX}/bin/golded
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/gnlnx ${STAGEDIR}${PREFIX}/bin/goldnode
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/rddtlnx ${STAGEDIR}${PREFIX}/bin/rddt
+	${INSTALL_MAN} ${WRKSRC}/docs/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in charset colorset config template
-	${MKDIR} ${EXAMPLESDIR}/$i;
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/$i;
 	${FIND} ${WRKSRC}/cfgs/$i -maxdepth 1 -type f |\
-		${XARGS} -n 1 -J @ ${INSTALL_DATA} @ ${EXAMPLESDIR}/$i
+		${XARGS} -n 1 -J @ ${INSTALL_DATA} @ ${STAGEDIR}${EXAMPLESDIR}/$i
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/docs/$i ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/$i ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/news/golded+/pkg-plist b/news/golded+/pkg-plist
index d6e769c..a28f00e 100644
--- a/news/golded+/pkg-plist
+++ b/news/golded+/pkg-plist
@@ -1,390 +1,393 @@
 bin/golded
 bin/goldnode
 bin/rddt
-%%EXAMPLESDIR%%/charset/1125_i-5.chs
-%%EXAMPLESDIR%%/charset/1125_u8.chs
-%%EXAMPLESDIR%%/charset/12501250.chs
-%%EXAMPLESDIR%%/charset/12501251.chs
-%%EXAMPLESDIR%%/charset/12501252.chs
-%%EXAMPLESDIR%%/charset/12501253.chs
-%%EXAMPLESDIR%%/charset/12501254.chs
-%%EXAMPLESDIR%%/charset/12501257.chs
-%%EXAMPLESDIR%%/charset/12501258.chs
-%%EXAMPLESDIR%%/charset/1250_437.chs
-%%EXAMPLESDIR%%/charset/1250_850.chs
-%%EXAMPLESDIR%%/charset/1250_858.chs
-%%EXAMPLESDIR%%/charset/1250_859.chs
-%%EXAMPLESDIR%%/charset/1250_asc.chs
-%%EXAMPLESDIR%%/charset/1250_i-1.chs
-%%EXAMPLESDIR%%/charset/1250_i15.chs
-%%EXAMPLESDIR%%/charset/1250_mac.chs
-%%EXAMPLESDIR%%/charset/12511250.chs
-%%EXAMPLESDIR%%/charset/12511251.chs
-%%EXAMPLESDIR%%/charset/12511252.chs
-%%EXAMPLESDIR%%/charset/12511253.chs
-%%EXAMPLESDIR%%/charset/12511254.chs
-%%EXAMPLESDIR%%/charset/12511257.chs
-%%EXAMPLESDIR%%/charset/12511258.chs
-%%EXAMPLESDIR%%/charset/1251_437.chs
-%%EXAMPLESDIR%%/charset/1251_850.chs
-%%EXAMPLESDIR%%/charset/1251_858.chs
-%%EXAMPLESDIR%%/charset/1251_859.chs
-%%EXAMPLESDIR%%/charset/1251_asc.chs
-%%EXAMPLESDIR%%/charset/1251_i-1.chs
-%%EXAMPLESDIR%%/charset/1251_i-5.chs
-%%EXAMPLESDIR%%/charset/1251_i15.chs
-%%EXAMPLESDIR%%/charset/1251_mac.chs
-%%EXAMPLESDIR%%/charset/12521250.chs
-%%EXAMPLESDIR%%/charset/12521251.chs
-%%EXAMPLESDIR%%/charset/12521252.chs
-%%EXAMPLESDIR%%/charset/12521253.chs
-%%EXAMPLESDIR%%/charset/12521254.chs
-%%EXAMPLESDIR%%/charset/12521257.chs
-%%EXAMPLESDIR%%/charset/12521258.chs
-%%EXAMPLESDIR%%/charset/1252_437.chs
-%%EXAMPLESDIR%%/charset/1252_850.chs
-%%EXAMPLESDIR%%/charset/1252_858.chs
-%%EXAMPLESDIR%%/charset/1252_859.chs
-%%EXAMPLESDIR%%/charset/1252_asc.chs
-%%EXAMPLESDIR%%/charset/1252_i-1.chs
-%%EXAMPLESDIR%%/charset/1252_i15.chs
-%%EXAMPLESDIR%%/charset/1252_mac.chs
-%%EXAMPLESDIR%%/charset/12531250.chs
-%%EXAMPLESDIR%%/charset/12531251.chs
-%%EXAMPLESDIR%%/charset/12531252.chs
-%%EXAMPLESDIR%%/charset/12531253.chs
-%%EXAMPLESDIR%%/charset/12531254.chs
-%%EXAMPLESDIR%%/charset/12531257.chs
-%%EXAMPLESDIR%%/charset/12531258.chs
-%%EXAMPLESDIR%%/charset/1253_437.chs
-%%EXAMPLESDIR%%/charset/1253_850.chs
-%%EXAMPLESDIR%%/charset/1253_858.chs
-%%EXAMPLESDIR%%/charset/1253_859.chs
-%%EXAMPLESDIR%%/charset/1253_asc.chs
-%%EXAMPLESDIR%%/charset/1253_i-1.chs
-%%EXAMPLESDIR%%/charset/1253_i15.chs
-%%EXAMPLESDIR%%/charset/1253_mac.chs
-%%EXAMPLESDIR%%/charset/12541250.chs
-%%EXAMPLESDIR%%/charset/12541251.chs
-%%EXAMPLESDIR%%/charset/12541252.chs
-%%EXAMPLESDIR%%/charset/12541253.chs
-%%EXAMPLESDIR%%/charset/12541254.chs
-%%EXAMPLESDIR%%/charset/12541257.chs
-%%EXAMPLESDIR%%/charset/12541258.chs
-%%EXAMPLESDIR%%/charset/1254_437.chs
-%%EXAMPLESDIR%%/charset/1254_850.chs
-%%EXAMPLESDIR%%/charset/1254_858.chs
-%%EXAMPLESDIR%%/charset/1254_859.chs
-%%EXAMPLESDIR%%/charset/1254_asc.chs
-%%EXAMPLESDIR%%/charset/1254_i-1.chs
-%%EXAMPLESDIR%%/charset/1254_i15.chs
-%%EXAMPLESDIR%%/charset/1254_mac.chs
-%%EXAMPLESDIR%%/charset/12571250.chs
-%%EXAMPLESDIR%%/charset/12571251.chs
-%%EXAMPLESDIR%%/charset/12571252.chs
-%%EXAMPLESDIR%%/charset/12571253.chs
-%%EXAMPLESDIR%%/charset/12571254.chs
-%%EXAMPLESDIR%%/charset/12571257.chs
-%%EXAMPLESDIR%%/charset/12571258.chs
-%%EXAMPLESDIR%%/charset/1257_437.chs
-%%EXAMPLESDIR%%/charset/1257_850.chs
-%%EXAMPLESDIR%%/charset/1257_858.chs
-%%EXAMPLESDIR%%/charset/1257_859.chs
-%%EXAMPLESDIR%%/charset/1257_asc.chs
-%%EXAMPLESDIR%%/charset/1257_i-1.chs
-%%EXAMPLESDIR%%/charset/1257_i15.chs
-%%EXAMPLESDIR%%/charset/1257_mac.chs
-%%EXAMPLESDIR%%/charset/12581250.chs
-%%EXAMPLESDIR%%/charset/12581251.chs
-%%EXAMPLESDIR%%/charset/12581252.chs
-%%EXAMPLESDIR%%/charset/12581253.chs
-%%EXAMPLESDIR%%/charset/12581254.chs
-%%EXAMPLESDIR%%/charset/12581257.chs
-%%EXAMPLESDIR%%/charset/12581258.chs
-%%EXAMPLESDIR%%/charset/1258_437.chs
-%%EXAMPLESDIR%%/charset/1258_850.chs
-%%EXAMPLESDIR%%/charset/1258_858.chs
-%%EXAMPLESDIR%%/charset/1258_859.chs
-%%EXAMPLESDIR%%/charset/1258_asc.chs
-%%EXAMPLESDIR%%/charset/1258_i-1.chs
-%%EXAMPLESDIR%%/charset/1258_i15.chs
-%%EXAMPLESDIR%%/charset/1258_mac.chs
-%%EXAMPLESDIR%%/charset/437_1250.chs
-%%EXAMPLESDIR%%/charset/437_1251.chs
-%%EXAMPLESDIR%%/charset/437_1252.chs
-%%EXAMPLESDIR%%/charset/437_1253.chs
-%%EXAMPLESDIR%%/charset/437_1254.chs
-%%EXAMPLESDIR%%/charset/437_1257.chs
-%%EXAMPLESDIR%%/charset/437_1258.chs
-%%EXAMPLESDIR%%/charset/437_437.chs
-%%EXAMPLESDIR%%/charset/437_850.chs
-%%EXAMPLESDIR%%/charset/437_858.chs
-%%EXAMPLESDIR%%/charset/437_859.chs
-%%EXAMPLESDIR%%/charset/437_asc.chs
-%%EXAMPLESDIR%%/charset/437_i-1.chs
-%%EXAMPLESDIR%%/charset/437_i15.chs
-%%EXAMPLESDIR%%/charset/437_mac.chs
-%%EXAMPLESDIR%%/charset/437_u8.chs
-%%EXAMPLESDIR%%/charset/850_1250.chs
-%%EXAMPLESDIR%%/charset/850_1251.chs
-%%EXAMPLESDIR%%/charset/850_1252.chs
-%%EXAMPLESDIR%%/charset/850_1253.chs
-%%EXAMPLESDIR%%/charset/850_1254.chs
-%%EXAMPLESDIR%%/charset/850_1257.chs
-%%EXAMPLESDIR%%/charset/850_1258.chs
-%%EXAMPLESDIR%%/charset/850_437.chs
-%%EXAMPLESDIR%%/charset/850_850.chs
-%%EXAMPLESDIR%%/charset/850_858.chs
-%%EXAMPLESDIR%%/charset/850_859.chs
-%%EXAMPLESDIR%%/charset/850_866.chs
-%%EXAMPLESDIR%%/charset/850_asc.chs
-%%EXAMPLESDIR%%/charset/850_i-1.chs
-%%EXAMPLESDIR%%/charset/850_i15.chs
-%%EXAMPLESDIR%%/charset/850_iqp.chs
-%%EXAMPLESDIR%%/charset/850_iso.chs
-%%EXAMPLESDIR%%/charset/850_mac.chs
-%%EXAMPLESDIR%%/charset/850_u8.chs
-%%EXAMPLESDIR%%/charset/858_1250.chs
-%%EXAMPLESDIR%%/charset/858_1251.chs
-%%EXAMPLESDIR%%/charset/858_1252.chs
-%%EXAMPLESDIR%%/charset/858_1253.chs
-%%EXAMPLESDIR%%/charset/858_1254.chs
-%%EXAMPLESDIR%%/charset/858_1257.chs
-%%EXAMPLESDIR%%/charset/858_1258.chs
-%%EXAMPLESDIR%%/charset/858_437.chs
-%%EXAMPLESDIR%%/charset/858_850.chs
-%%EXAMPLESDIR%%/charset/858_858.chs
-%%EXAMPLESDIR%%/charset/858_859.chs
-%%EXAMPLESDIR%%/charset/858_asc.chs
-%%EXAMPLESDIR%%/charset/858_i-1.chs
-%%EXAMPLESDIR%%/charset/858_i15.chs
-%%EXAMPLESDIR%%/charset/858_mac.chs
-%%EXAMPLESDIR%%/charset/859_1250.chs
-%%EXAMPLESDIR%%/charset/859_1251.chs
-%%EXAMPLESDIR%%/charset/859_1252.chs
-%%EXAMPLESDIR%%/charset/859_1253.chs
-%%EXAMPLESDIR%%/charset/859_1254.chs
-%%EXAMPLESDIR%%/charset/859_1257.chs
-%%EXAMPLESDIR%%/charset/859_1258.chs
-%%EXAMPLESDIR%%/charset/859_437.chs
-%%EXAMPLESDIR%%/charset/859_850.chs
-%%EXAMPLESDIR%%/charset/859_858.chs
-%%EXAMPLESDIR%%/charset/859_859.chs
-%%EXAMPLESDIR%%/charset/859_asc.chs
-%%EXAMPLESDIR%%/charset/859_i-1.chs
-%%EXAMPLESDIR%%/charset/859_i15.chs
-%%EXAMPLESDIR%%/charset/859_mac.chs
-%%EXAMPLESDIR%%/charset/865_iso.chs
-%%EXAMPLESDIR%%/charset/865_u8.chs
-%%EXAMPLESDIR%%/charset/866_850.chs
-%%EXAMPLESDIR%%/charset/866_866.chs
-%%EXAMPLESDIR%%/charset/866_ISO.chs
-%%EXAMPLESDIR%%/charset/866_i-5.chs
-%%EXAMPLESDIR%%/charset/866_koi.chs
-%%EXAMPLESDIR%%/charset/866_koi7.chs
-%%EXAMPLESDIR%%/charset/866_koiX.chs
-%%EXAMPLESDIR%%/charset/866_kou.chs
-%%EXAMPLESDIR%%/charset/866_mcyr.chs
-%%EXAMPLESDIR%%/charset/866_u8.chs
-%%EXAMPLESDIR%%/charset/866_ukr.chs
-%%EXAMPLESDIR%%/charset/866_win.chs
-%%EXAMPLESDIR%%/charset/DK1_866.chs
-%%EXAMPLESDIR%%/charset/DK2_866.chs
-%%EXAMPLESDIR%%/charset/IK1_866.chs
-%%EXAMPLESDIR%%/charset/IK2_866.chs
-%%EXAMPLESDIR%%/charset/WK1_866.chs
-%%EXAMPLESDIR%%/charset/WK2_866.chs
-%%EXAMPLESDIR%%/charset/asc_1250.chs
-%%EXAMPLESDIR%%/charset/asc_1251.chs
-%%EXAMPLESDIR%%/charset/asc_1252.chs
-%%EXAMPLESDIR%%/charset/asc_1253.chs
-%%EXAMPLESDIR%%/charset/asc_1254.chs
-%%EXAMPLESDIR%%/charset/asc_1257.chs
-%%EXAMPLESDIR%%/charset/asc_1258.chs
-%%EXAMPLESDIR%%/charset/asc_437.chs
-%%EXAMPLESDIR%%/charset/asc_850.chs
-%%EXAMPLESDIR%%/charset/asc_858.chs
-%%EXAMPLESDIR%%/charset/asc_859.chs
-%%EXAMPLESDIR%%/charset/asc_asc.chs
-%%EXAMPLESDIR%%/charset/asc_i-1.chs
-%%EXAMPLESDIR%%/charset/asc_i15.chs
-%%EXAMPLESDIR%%/charset/asc_mac.chs
-%%EXAMPLESDIR%%/charset/can_asc.chs
-%%EXAMPLESDIR%%/charset/can_ibm.chs
-%%EXAMPLESDIR%%/charset/cmp_ibm.esc
-%%EXAMPLESDIR%%/charset/dut_asc.chs
-%%EXAMPLESDIR%%/charset/dut_ibm.chs
-%%EXAMPLESDIR%%/charset/files.bbs
-%%EXAMPLESDIR%%/charset/fin_asc.chs
-%%EXAMPLESDIR%%/charset/fin_ibm.chs
-%%EXAMPLESDIR%%/charset/frn_asc.chs
-%%EXAMPLESDIR%%/charset/frn_ibm.chs
-%%EXAMPLESDIR%%/charset/ger_asc.chs
-%%EXAMPLESDIR%%/charset/ger_ibm.chs
-%%EXAMPLESDIR%%/charset/i-1_1250.chs
-%%EXAMPLESDIR%%/charset/i-1_1251.chs
-%%EXAMPLESDIR%%/charset/i-1_1252.chs
-%%EXAMPLESDIR%%/charset/i-1_1253.chs
-%%EXAMPLESDIR%%/charset/i-1_1254.chs
-%%EXAMPLESDIR%%/charset/i-1_1257.chs
-%%EXAMPLESDIR%%/charset/i-1_1258.chs
-%%EXAMPLESDIR%%/charset/i-1_437.chs
-%%EXAMPLESDIR%%/charset/i-1_850.chs
-%%EXAMPLESDIR%%/charset/i-1_858.chs
-%%EXAMPLESDIR%%/charset/i-1_859.chs
-%%EXAMPLESDIR%%/charset/i-1_asc.chs
-%%EXAMPLESDIR%%/charset/i-1_i-1.chs
-%%EXAMPLESDIR%%/charset/i-1_i15.chs
-%%EXAMPLESDIR%%/charset/i-1_mac.chs
-%%EXAMPLESDIR%%/charset/i-5_1125.chs
-%%EXAMPLESDIR%%/charset/i-5_1251.chs
-%%EXAMPLESDIR%%/charset/i-5_866.chs
-%%EXAMPLESDIR%%/charset/i-5_koi8r.chs
-%%EXAMPLESDIR%%/charset/i15_1250.chs
-%%EXAMPLESDIR%%/charset/i15_1251.chs
-%%EXAMPLESDIR%%/charset/i15_1252.chs
-%%EXAMPLESDIR%%/charset/i15_1253.chs
-%%EXAMPLESDIR%%/charset/i15_1254.chs
-%%EXAMPLESDIR%%/charset/i15_1257.chs
-%%EXAMPLESDIR%%/charset/i15_1258.chs
-%%EXAMPLESDIR%%/charset/i15_437.chs
-%%EXAMPLESDIR%%/charset/i15_850.chs
-%%EXAMPLESDIR%%/charset/i15_858.chs
-%%EXAMPLESDIR%%/charset/i15_859.chs
-%%EXAMPLESDIR%%/charset/i15_asc.chs
-%%EXAMPLESDIR%%/charset/i15_i-1.chs
-%%EXAMPLESDIR%%/charset/i15_i15.chs
-%%EXAMPLESDIR%%/charset/i15_mac.chs
-%%EXAMPLESDIR%%/charset/i1m_ibm.chs
-%%EXAMPLESDIR%%/charset/i51_ibm.esc
-%%EXAMPLESDIR%%/charset/ibm_asc.chs
-%%EXAMPLESDIR%%/charset/ibm_cmp.chs
-%%EXAMPLESDIR%%/charset/ibm_i51.chs
-%%EXAMPLESDIR%%/charset/ibm_ibm.chs
-%%EXAMPLESDIR%%/charset/ibm_iqp.chs
-%%EXAMPLESDIR%%/charset/ibm_iso.chs
-%%EXAMPLESDIR%%/charset/ibm_mac.chs
-%%EXAMPLESDIR%%/charset/ibm_mne.chs
-%%EXAMPLESDIR%%/charset/ibm_swe.chs
-%%EXAMPLESDIR%%/charset/ibm_vt1.chs
-%%EXAMPLESDIR%%/charset/iqp_850.chs
-%%EXAMPLESDIR%%/charset/iqp_ibm.chs
-%%EXAMPLESDIR%%/charset/iso1_u8.chs
-%%EXAMPLESDIR%%/charset/iso_850.chs
-%%EXAMPLESDIR%%/charset/iso_asc.chs
-%%EXAMPLESDIR%%/charset/iso_ibm.chs
-%%EXAMPLESDIR%%/charset/iso_iso.chs
-%%EXAMPLESDIR%%/charset/iso_mac.chs
-%%EXAMPLESDIR%%/charset/iso_vt1.chs
-%%EXAMPLESDIR%%/charset/ita_asc.chs
-%%EXAMPLESDIR%%/charset/itl_ibm.chs
-%%EXAMPLESDIR%%/charset/k7_k7.chs
-%%EXAMPLESDIR%%/charset/k7_k8.chs
-%%EXAMPLESDIR%%/charset/k8_k7.chs
-%%EXAMPLESDIR%%/charset/koi7_866.chs
-%%EXAMPLESDIR%%/charset/koi8_u8.chs
-%%EXAMPLESDIR%%/charset/koi8r_i-5.chs
-%%EXAMPLESDIR%%/charset/koi_866.chs
-%%EXAMPLESDIR%%/charset/kou_866.chs
-%%EXAMPLESDIR%%/charset/kou_ukr.chs
-%%EXAMPLESDIR%%/charset/mac_1250.chs
-%%EXAMPLESDIR%%/charset/mac_1251.chs
-%%EXAMPLESDIR%%/charset/mac_1252.chs
-%%EXAMPLESDIR%%/charset/mac_1253.chs
-%%EXAMPLESDIR%%/charset/mac_1254.chs
-%%EXAMPLESDIR%%/charset/mac_1257.chs
-%%EXAMPLESDIR%%/charset/mac_1258.chs
-%%EXAMPLESDIR%%/charset/mac_437.chs
-%%EXAMPLESDIR%%/charset/mac_850.chs
-%%EXAMPLESDIR%%/charset/mac_858.chs
-%%EXAMPLESDIR%%/charset/mac_859.chs
-%%EXAMPLESDIR%%/charset/mac_asc.chs
-%%EXAMPLESDIR%%/charset/mac_i-1.chs
-%%EXAMPLESDIR%%/charset/mac_i15.chs
-%%EXAMPLESDIR%%/charset/mac_ibm.chs
-%%EXAMPLESDIR%%/charset/mac_iso.chs
-%%EXAMPLESDIR%%/charset/mac_mac.chs
-%%EXAMPLESDIR%%/charset/mac_vt1.chs
-%%EXAMPLESDIR%%/charset/mcyr_866.chs
-%%EXAMPLESDIR%%/charset/mne_850.esc
-%%EXAMPLESDIR%%/charset/mne_ibm.esc
-%%EXAMPLESDIR%%/charset/nor_asc.chs
-%%EXAMPLESDIR%%/charset/nor_ibm.chs
-%%EXAMPLESDIR%%/charset/prt_asc.chs
-%%EXAMPLESDIR%%/charset/prt_ibm.chs
-%%EXAMPLESDIR%%/charset/spn_asc.chs
-%%EXAMPLESDIR%%/charset/spn_ibm.chs
-%%EXAMPLESDIR%%/charset/swe_asc.chs
-%%EXAMPLESDIR%%/charset/swe_ibm.chs
-%%EXAMPLESDIR%%/charset/swi_asc.chs
-%%EXAMPLESDIR%%/charset/swi_ibm.chs
-%%EXAMPLESDIR%%/charset/uk__asc.chs
-%%EXAMPLESDIR%%/charset/uk__ibm.chs
-%%EXAMPLESDIR%%/charset/ukr_866.chs
-%%EXAMPLESDIR%%/charset/ukr_koi.chs
-%%EXAMPLESDIR%%/charset/ukr_kou.chs
-%%EXAMPLESDIR%%/charset/ukr_ukr.chs
-%%EXAMPLESDIR%%/charset/win_866.chs
-%%EXAMPLESDIR%%/colorset/gedcol00.cfg
-%%EXAMPLESDIR%%/colorset/gedcol01.cfg
-%%EXAMPLESDIR%%/colorset/gedcol02.cfg
-%%EXAMPLESDIR%%/colorset/gedcol03.cfg
-%%EXAMPLESDIR%%/colorset/gedcol04.cfg
-%%EXAMPLESDIR%%/colorset/gedcol05.cfg
-%%EXAMPLESDIR%%/colorset/gedcol06.cfg
-%%EXAMPLESDIR%%/colorset/gedcol07.cfg
-%%EXAMPLESDIR%%/colorset/gedcol08.cfg
-%%EXAMPLESDIR%%/colorset/gedcol09.cfg
-%%EXAMPLESDIR%%/colorset/gedcol10.cfg
-%%EXAMPLESDIR%%/colorset/gedcol11.cfg
-%%EXAMPLESDIR%%/colorset/gedcol12.cfg
-%%EXAMPLESDIR%%/colorset/gedcol13.cfg
-%%EXAMPLESDIR%%/colorset/gedcol14.cfg
-%%EXAMPLESDIR%%/colorset/gedcol15.cfg
-%%EXAMPLESDIR%%/colorset/gedcol16.cfg
-%%EXAMPLESDIR%%/colorset/gedcol17.cfg
-%%EXAMPLESDIR%%/colorset/gedcol18.cfg
-%%EXAMPLESDIR%%/colorset/gedcol19.cfg
-%%EXAMPLESDIR%%/colorset/gedcol20.cfg
-%%EXAMPLESDIR%%/colorset/gedcol21.cfg
-%%EXAMPLESDIR%%/colorset/gedcol22.cfg
-%%EXAMPLESDIR%%/colorset/gedcol23.cfg
-%%EXAMPLESDIR%%/colorset/gedmon00.cfg
-%%EXAMPLESDIR%%/colorset/gedmon01.cfg
-%%EXAMPLESDIR%%/colorset/gedmon02.cfg
-%%EXAMPLESDIR%%/config/advanced.cfg
-%%EXAMPLESDIR%%/config/advanced.rus
-%%EXAMPLESDIR%%/config/aliasru.cfg
-%%EXAMPLESDIR%%/config/charsets.cfg
-%%EXAMPLESDIR%%/config/gedcolor.cfg
-%%EXAMPLESDIR%%/config/gedcolor.rus
-%%EXAMPLESDIR%%/config/gedlngdk.cfg
-%%EXAMPLESDIR%%/config/gedlngit.cfg
-%%EXAMPLESDIR%%/config/gedlngnl.cfg
-%%EXAMPLESDIR%%/config/gedlngus.cfg
-%%EXAMPLESDIR%%/config/goldhelp.cfg
-%%EXAMPLESDIR%%/config/goldhelp.rus
-%%EXAMPLESDIR%%/config/goldkeys.cfg
-%%EXAMPLESDIR%%/config/goldkeys.rus
-%%EXAMPLESDIR%%/config/goldlang.cfg
-%%EXAMPLESDIR%%/config/goldlang.ger
-%%EXAMPLESDIR%%/config/goldlang.it
-%%EXAMPLESDIR%%/config/goldlang.nl
-%%EXAMPLESDIR%%/config/goldlang.ru2
-%%EXAMPLESDIR%%/config/goldlang.ru3
-%%EXAMPLESDIR%%/config/goldlang.rus
-%%EXAMPLESDIR%%/config/goldlang.sv
-%%EXAMPLESDIR%%/config/simple.cfg
-%%EXAMPLESDIR%%/config/xlatcfg.pl
-%%EXAMPLESDIR%%/template/dansk.tpl
-%%EXAMPLESDIR%%/template/default.tpl
-%%EXAMPLESDIR%%/template/email.tpl
-%%EXAMPLESDIR%%/template/golded.cfm
-%%EXAMPLESDIR%%/template/golded.tpl
-%%EXAMPLESDIR%%/template/newsgrps.tpl
-%%EXAMPLESDIR%%/template/rusCP866.tpl
-@dirrm %%EXAMPLESDIR%%/template
-@dirrm %%EXAMPLESDIR%%/config
-@dirrm %%EXAMPLESDIR%%/colorset
-@dirrm %%EXAMPLESDIR%%/charset
-@dirrm %%EXAMPLESDIR%%
+man/man1/golded.1.gz
+man/man1/goldnode.1.gz
+man/man1/rddt.1.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1125_i-5.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1125_u8.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12501250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12501251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12501252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12501253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12501254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12501257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12501258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1250_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1250_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1250_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1250_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1250_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1250_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1250_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1250_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12511250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12511251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12511252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12511253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12511254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12511257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12511258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1251_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1251_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1251_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1251_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1251_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1251_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1251_i-5.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1251_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1251_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12521250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12521251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12521252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12521253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12521254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12521257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12521258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1252_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1252_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1252_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1252_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1252_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1252_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1252_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1252_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12531250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12531251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12531252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12531253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12531254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12531257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12531258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1253_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1253_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1253_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1253_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1253_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1253_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1253_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1253_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12541250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12541251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12541252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12541253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12541254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12541257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12541258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1254_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1254_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1254_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1254_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1254_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1254_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1254_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1254_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12571250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12571251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12571252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12571253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12571254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12571257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12571258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1257_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1257_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1257_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1257_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1257_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1257_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1257_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1257_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12581250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12581251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12581252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12581253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12581254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12581257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/12581258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1258_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1258_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1258_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1258_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1258_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1258_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1258_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/1258_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_1250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_1251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_1252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_1253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_1254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_1257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_1258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/437_u8.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_1250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_1251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_1252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_1253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_1254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_1257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_1258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_iqp.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_iso.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/850_u8.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_1250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_1251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_1252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_1253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_1254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_1257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_1258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/858_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_1250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_1251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_1252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_1253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_1254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_1257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_1258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/859_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/865_iso.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/865_u8.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_ISO.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_i-5.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_koi.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_koi7.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_koiX.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_kou.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_mcyr.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_u8.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_ukr.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/866_win.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/DK1_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/DK2_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/IK1_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/IK2_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/WK1_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/WK2_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_1250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_1251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_1252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_1253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_1254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_1257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_1258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/asc_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/can_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/can_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/cmp_ibm.esc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/dut_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/dut_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/files.bbs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/fin_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/fin_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/frn_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/frn_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ger_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ger_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_1250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_1251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_1252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_1253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_1254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_1257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_1258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-1_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-5_1125.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-5_1251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-5_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i-5_koi8r.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_1250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_1251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_1252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_1253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_1254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_1257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_1258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i15_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i1m_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/i51_ibm.esc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_cmp.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_i51.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_iqp.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_iso.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_mne.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_swe.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ibm_vt1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/iqp_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/iqp_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/iso1_u8.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/iso_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/iso_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/iso_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/iso_iso.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/iso_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/iso_vt1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ita_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/itl_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/k7_k7.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/k7_k8.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/k8_k7.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/koi7_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/koi8_u8.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/koi8r_i-5.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/koi_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/kou_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/kou_ukr.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_1250.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_1251.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_1252.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_1253.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_1254.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_1257.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_1258.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_437.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_850.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_858.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_859.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_i-1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_i15.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_iso.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_mac.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mac_vt1.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mcyr_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mne_850.esc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/mne_ibm.esc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/nor_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/nor_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/prt_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/prt_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/spn_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/spn_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/swe_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/swe_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/swi_asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/swi_ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/uk__asc.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/uk__ibm.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ukr_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ukr_koi.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ukr_kou.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/ukr_ukr.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset/win_866.chs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol00.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol01.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol02.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol03.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol04.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol05.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol06.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol07.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol08.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol09.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol10.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol11.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol12.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol13.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol14.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol15.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol16.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol17.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol18.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol19.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol20.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol21.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol22.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedcol23.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedmon00.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedmon01.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorset/gedmon02.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/advanced.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/advanced.rus
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/aliasru.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/charsets.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/gedcolor.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/gedcolor.rus
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/gedlngdk.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/gedlngit.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/gedlngnl.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/gedlngus.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldhelp.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldhelp.rus
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldkeys.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldkeys.rus
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldlang.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldlang.ger
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldlang.it
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldlang.nl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldlang.ru2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldlang.ru3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldlang.rus
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/goldlang.sv
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/simple.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/xlatcfg.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/template/dansk.tpl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/template/default.tpl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/template/email.tpl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/template/golded.cfm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/template/golded.tpl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/template/newsgrps.tpl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/template/rusCP866.tpl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/template
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/config
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/colorset
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/charset
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/news/nntpbtr/Makefile b/news/nntpbtr/Makefile
index ccd4e07..306af2d 100644
--- a/news/nntpbtr/Makefile
+++ b/news/nntpbtr/Makefile
@@ -5,21 +5,21 @@ PORTNAME=	nntpbtr
 PORTVERSION=	1.7
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/news/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	dk@farm.org
 COMMENT=	NNTP bulk transfer
 
-MAN1=		nntpbtr.1
-PLIST_FILES=	sbin/nntpbtr
+USES=	tar:Z
+PLIST_FILES=	sbin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
-# "patch" complains otherwise
-NO_STAGE=	yes
-post-extract:
-	@${RM} -rf ${WRKSRC}/RCS
+ALL_TARGET=	${PORTNAME}
 
 pre-build:
-	cd ${FILESDIR} ; ${PAX} -rw -l -u dbz ${WRKDIR} || ${TRUE}
-	cd ${WRKDIR}/dbz ; ${CC} ${CFLAGS} -c -I. dbz.c
+	(cd ${FILESDIR} ; ${PAX} -rw -l -u dbz ${WRKDIR}) || ${TRUE}
+	(cd ${WRKDIR}/dbz ; ${CC} ${CFLAGS} -c -I. dbz.c)
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/news/nntpbtr/files/patch-Makefile b/news/nntpbtr/files/patch-Makefile
new file mode 100644
index 0000000..b7b8c09
--- /dev/null
+++ b/news/nntpbtr/files/patch-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.orig	1994-11-25 07:09:25.000000000 -0500
++++ Makefile	2014-03-29 11:43:43.000000000 -0400
+@@ -3,10 +3,10 @@
+ #
+ 
+ # C compiler
+-CC=gcc
++CC?=gcc
+ 
+ # C compilation flags
+-CFLAGS= -O -I../dbz
++CFLAGS+= -I../dbz
+ 
+ # Loader flags
+ LDFLAGS=
diff --git a/news/nntpbtr/files/patch-ab b/news/nntpbtr/files/patch-ab
deleted file mode 100644
index 6e833db..0000000
--- a/news/nntpbtr/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile	1994/11/25 15:09:23	1.1
-+++ Makefile	1996/07/02 05:37:31
-@@ -32,3 +32,10 @@
- 
- clean:
- 	rm -f *.o nntpbtr
-+
-+all:	nntpbtr
-+
-+install:
-+	install -c -m555 nntpbtr ${PREFIX}/sbin
-+	install -c -m555 nntpbtr.1 ${PREFIX}/man/man1
-+
diff --git a/news/nntpbtr/files/patch-aa b/news/nntpbtr/files/patch-btrspc.c
index dabc0c8..dabc0c8 100644
--- a/news/nntpbtr/files/patch-aa
+++ b/news/nntpbtr/files/patch-btrspc.c
diff --git a/news/nntpbtr/files/patch-ac b/news/nntpbtr/files/patch-conf.h
index 7fc2de8..7fc2de8 100644
--- a/news/nntpbtr/files/patch-ac
+++ b/news/nntpbtr/files/patch-conf.h
diff --git a/news/nntpbtr/files/patch-ad b/news/nntpbtr/files/patch-nntpbtr_1.c
index bc102f1..bc102f1 100644
--- a/news/nntpbtr/files/patch-ad
+++ b/news/nntpbtr/files/patch-nntpbtr_1.c
diff --git a/news/nntpbtr/files/patch-nntpbtr.c b/news/nntpbtr/files/patch-nntpbtr_2.c
index f6a80cc..f6a80cc 100644
--- a/news/nntpbtr/files/patch-nntpbtr.c
+++ b/news/nntpbtr/files/patch-nntpbtr_2.c
diff --git a/news/nntpbtr/files/patch-nntpbtr_3.c b/news/nntpbtr/files/patch-nntpbtr_3.c
new file mode 100644
index 0000000..8f39b0d
--- /dev/null
+++ b/news/nntpbtr/files/patch-nntpbtr_3.c
@@ -0,0 +1,80 @@
+--- nntpbtr.c.orig	2014-03-29 11:51:17.000000000 -0400
++++ nntpbtr.c	2014-03-29 11:55:16.000000000 -0400
+@@ -88,6 +88,14 @@
+ char *mktemp();
+ char *malloc();
+ 
++void qsaveunread();
++void readarticle();
++void getnewnews();
++void goodbye();
++void get_time();
++void getlock();
++void unlock();
++
+ int  rnum = 0, anum = 0;
+ 
+ #ifdef SIGTTIN
+@@ -106,7 +114,7 @@
+  *	Save all unreaded articles in art. list file.
+  */
+ 
+-qsaveunread()
++void qsaveunread()
+ {
+ 	if( intflag++ )
+ 		return;
+@@ -381,7 +389,7 @@
+  *	Then get implicit lock of host...
+  */
+ 
+-getlock(host,oldtime)
++void getlock(host,oldtime)
+ 	char *host, *oldtime;
+ {
+ 	time_t tim;
+@@ -428,7 +436,7 @@
+ }
+ 
+ 
+-unlock(host)
++void unlock(host)
+ 	char *host;
+ {
+ 	int i;
+@@ -453,7 +461,7 @@
+ }
+ 
+ 
+-get_time(host,newtime)
++void get_time(host,newtime)
+ 	char *host, *newtime;
+ {
+ 	int server, i;
+@@ -520,7 +528,7 @@
+ /*	Normal goodbye talk
+  */
+ 
+-goodbye()
++void goodbye()
+ {
+ 	char string[NNTP_STRLEN+1];
+ 
+@@ -741,7 +749,7 @@
+  *	If channel fail - reconnect.
+  */
+ 
+-readarticle()
++void readarticle()
+ {
+ 	int incore, n;
+ 	char *endart, *line;
+@@ -914,7 +922,7 @@
+  *	from time of last session.
+  */
+ 
+-getnewnews()
++void getnewnews()
+ {
+ 	int n;
+ 	char string[NNTP_STRLEN+1];
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 6ed69f9..7db8b1f 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nntpcache
 PORTVERSION=	3.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	news
 MASTER_SITES=	http://www.xs4all.nl/~suelette/
 
@@ -27,7 +27,6 @@ USE_RC_SUBR=	nntpcached
 OPTIONS_DEFINE=	LDAP RADIUS SPAMPHOBIA
 SPAMPHOBIA_DESC=	Spamphobia NoCeM support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRADIUS}
@@ -58,17 +57,11 @@ PATCHFILES+=	${DISTNAME}-spamphobia-${REVISEDATE}.diff.gz:SPAMPHOBIA
 .endif
 
 post-configure:
-	@cd ${WRKSRC}/src && ${GMAKE} ${AUTHINFO_EXT}
+	${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -C ${WRKSRC}/src ${AUTHINFO_EXT}
 
 post-install:
-	@ ${MKDIR} ${NNTPSPOOLDIR} && ${CHMOD} 750 ${NNTPSPOOLDIR}
-	@ ${CP} ${PREFIX}/etc/${PORTNAME}/VERSION ${NNTPSPOOLDIR} && \
-	  ${CHMOD} 640 ${NNTPSPOOLDIR}/VERSION
-	@ ${CHOWN} -R news:news ${NNTPSPOOLDIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@ ${MKDIR} ${DOCSDIR}
-	@ cd ${WRKSRC} && ${FIND} ${PORTDOCS} \
-	  | ${CPIO_CMD} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-.endif
+	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${FIND} ${PORTDOCS} \
+	  | ${CPIO_CMD} ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/news/nntpcache/files/patch-cf_Makefile.in b/news/nntpcache/files/patch-cf_Makefile.in
new file mode 100644
index 0000000..f218ba1
--- /dev/null
+++ b/news/nntpcache/files/patch-cf_Makefile.in
@@ -0,0 +1,21 @@
+--- cf/Makefile.in.orig	2006-03-05 16:49:25.000000000 -0500
++++ cf/Makefile.in	2014-03-29 12:18:45.000000000 -0400
+@@ -271,15 +271,15 @@
+ 	echo @VERSION@ >$@
+ 
+ install-data-hook:
+-	for f in $(distf); do { cd $(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
++	for f in $(distf); do { cd $(DESTDIR)$(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
+ 
+ nntpcache.config-dist : nnconf.cf
+ 	sed -e 's/^ *[a-zA-Z_][a-zA-Z_]* //;s/"//g' <nnconf.cf >$@
+ 
+ # this is ugly, but more flexible than merely redefining INSTALL_DATA
+ install-data-local:
+-	cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
+-	cd $(localstatedir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(localstate_DATA) && chown @nntpcacheUID@ $(localstate_DATA) && chgrp @nntpcacheGID@ $(localstate_DATA)
++	cd $(DESTDIR)$(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
++	cd $(DESTDIR)$(localstatedir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(localstate_DATA) && chown @nntpcacheUID@ $(localstate_DATA) && chgrp @nntpcacheGID@ $(localstate_DATA)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/news/nntpcache/files/patch-http_Makefile.in b/news/nntpcache/files/patch-http_Makefile.in
new file mode 100644
index 0000000..fe73bcf
--- /dev/null
+++ b/news/nntpcache/files/patch-http_Makefile.in
@@ -0,0 +1,17 @@
+--- http/Makefile.in.orig	2014-03-29 12:19:41.000000000 -0400
++++ http/Makefile.in	2014-03-29 12:20:08.000000000 -0400
+@@ -216,10 +216,10 @@
+ 
+ 
+ install-data-local:
+-	-mkdir $(sysconfdir)/http
+-	cp $(httpdata) $(sysconfdir)/http
+-	cd $(sysconfdir)/http && chown @nntpcacheUID@ $(ch)
+-	cd $(sysconfdir)/http && chgrp @nntpcacheUID@ $(ch)
++	-mkdir $(DESTDIR)$(sysconfdir)/http
++	cp $(httpdata) $(DESTDIR)$(sysconfdir)/http
++	cd $(DESTDIR)$(sysconfdir)/http && chown @nntpcacheUID@ $(ch)
++	cd $(DESTDIR)$(sysconfdir)/http && chgrp @nntpcacheUID@ $(ch)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/news/nntpcache/files/patch-innreport_Makefile.in b/news/nntpcache/files/patch-innreport_Makefile.in
new file mode 100644
index 0000000..3afc775
--- /dev/null
+++ b/news/nntpcache/files/patch-innreport_Makefile.in
@@ -0,0 +1,17 @@
+--- innreport/Makefile.in.orig	2014-03-29 12:22:45.000000000 -0400
++++ innreport/Makefile.in	2014-03-29 12:23:58.000000000 -0400
+@@ -265,10 +265,10 @@
+ 
+ # the trailing slash is to force symlink transversal
+ install-data-local:
+-	cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
+-	-mkdir $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
+-	chown @nntpcacheUID@ $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
+-	chgrp @nntpcacheGID@ $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
++	cd $(DESTDIR)$(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
++	-mkdir $(DESTDIR)$(sysconfdir)/http $(DESTDIR)$(sysconfdir)/http/innreport $(DESTDIR)$(sysconfdir)/http/innreport/pics
++	chown @nntpcacheUID@ $(DESTDIR)$(sysconfdir)/http $(DESTDIR)$(sysconfdir)/http/innreport $(DESTDIR)$(sysconfdir)/http/innreport/pics
++	chgrp @nntpcacheGID@ $(DESTDIR)$(sysconfdir)/http $(DESTDIR)$(sysconfdir)/http/innreport $(DESTDIR)$(sysconfdir)/http/innreport/pics
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/news/nntpcache/files/patch-pgp_Makefile.in b/news/nntpcache/files/patch-pgp_Makefile.in
new file mode 100644
index 0000000..abd80d6
--- /dev/null
+++ b/news/nntpcache/files/patch-pgp_Makefile.in
@@ -0,0 +1,15 @@
+--- pgp/Makefile.in.orig	2014-03-29 12:21:08.000000000 -0400
++++ pgp/Makefile.in	2014-03-29 12:21:29.000000000 -0400
+@@ -236,10 +236,10 @@
+ 
+ # the trailing slash is to force symlink transversal
+ install-data-local:
+-	cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
++	cd $(DESTDIR)$(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
+ 
+ install-data-hook:
+-	for f in $(sysconf_DATA); do { cd $(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
++	for f in $(sysconf_DATA); do { cd $(DESTDIR)$(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/news/nntpcache/files/patch-unixauth_Makefile.in b/news/nntpcache/files/patch-unixauth_Makefile.in
new file mode 100644
index 0000000..9d47abf
--- /dev/null
+++ b/news/nntpcache/files/patch-unixauth_Makefile.in
@@ -0,0 +1,15 @@
+--- unixauth/Makefile.in.orig	2014-03-29 12:25:30.000000000 -0400
++++ unixauth/Makefile.in	2014-03-29 12:26:15.000000000 -0400
+@@ -327,9 +327,9 @@
+ 
+ 
+ install-exec-hook:
+-	chown root $(libexecdir)/unixauth
+-	chgrp @nntpcacheGID@ $(libexecdir)/unixauth
+-	chmod u+s,g+x,o-x $(libexecdir)/unixauth 
++	chown root $(DESTDIR)$(libexecdir)/unixauth
++	chgrp @nntpcacheGID@ $(DESTDIR)$(libexecdir)/unixauth
++	chmod u+s,g+x,o-x $(DESTDIR)$(libexecdir)/unixauth 
+ 
+ %.ext : %.c %.h $(top_srcdir)/config.h $(top_srcdir)/scripts/genextern.sh
+ 	CPP="$(CPP)";export CPP; sh $(top_srcdir)/scripts/genextern.sh $< > $@.tmp $(DEFS) $(INCLUDES) $(CPPFLAGS) && mv -f $@.tmp $@ || rm -f $@.tmp
diff --git a/news/nntpcache/pkg-plist b/news/nntpcache/pkg-plist
index a5d3610..3ac68cd 100644
--- a/news/nntpcache/pkg-plist
+++ b/news/nntpcache/pkg-plist
@@ -1,42 +1,48 @@
 @exec mkdir -p %%SPOOLDIR%%
 bin/confused
 bin/mmap_tests
-etc/nntpcache/VERSION
+%%ETCDIR%%/VERSION
 @unexec rm %%SPOOLDIR%%/VERSION 2>&1 >/dev/null || true
 @exec cp %D/%F %%SPOOLDIR%%
 @exec chown -R news:news %%SPOOLDIR%%
 @exec chmod 750 %%SPOOLDIR%%
 @exec chmod 640 %%SPOOLDIR%%/VERSION
-etc/nntpcache/http/index.html
-etc/nntpcache/http/moose.gif
-etc/nntpcache/http/nntpcache.jpg
-etc/nntpcache/innreport.conf-dist
-etc/nntpcache/innreport.pl
-etc/nntpcache/innreport.pm
-etc/nntpcache/newshound.conf-dist
-@unexec if cmp -s %D/etc/nntpcache/nntpcache.access %D/etc/nntpcache/nntpcache.access-dist; then rm -f %D/etc/nntpcache/nntpcache.access; fi
-etc/nntpcache/nntpcache.access-dist
-@unexec if cmp -s %D/etc/nntpcache/nntpcache.config %D/etc/nntpcache/nntpcache.config-dist; then rm -f %D/etc/nntpcache/nntpcache.config; fi
-etc/nntpcache/nntpcache.config-dist
-@unexec if cmp -s %D/etc/nntpcache/nntpcache.servers %D/etc/nntpcache/nntpcache.servers-dist; then rm -f %D/etc/nntpcache/nntpcache.servers; fi
-etc/nntpcache/nntpcache.servers-dist
-@unexec if cmp -s %D/etc/nntpcache/pubring.asc %D/etc/nntpcache/pubring.asc-dist; then rm -f %D/etc/nntpcache/pubring.asc; fi
-etc/nntpcache/pubring.asc-dist
-@unexec if cmp -s %D/etc/nntpcache/pubring.pgp %D/etc/nntpcache/pubring.pgp-dist; then rm -f %D/etc/nntpcache/pubring.pgp; fi
-etc/nntpcache/pubring.pgp-dist
-etc/nntpcache/spam.filter
+%%ETCDIR%%/http/index.html
+%%ETCDIR%%/http/moose.gif
+%%ETCDIR%%/http/nntpcache.jpg
+%%ETCDIR%%/innreport.conf-dist
+%%ETCDIR%%/innreport.pl
+%%ETCDIR%%/innreport.pm
+%%ETCDIR%%/newshound.conf-dist
+@unexec if cmp -s %D/%%ETCDIR%%/nntpcache.access %D/etc/nntpcache/nntpcache.access-dist; then rm -f %D/etc/nntpcache/nntpcache.access; fi
+%%ETCDIR%%/nntpcache.access-dist
+@exec if [ ! -f %D/%%ETCDIR%%/nttpcache.access ]; then cp -p %D/%F %B/nntpcache.access
+@unexec if cmp -s %D/%%ETCDIR%%/nntpcache.config %D/etc/nntpcache/nntpcache.config-dist; then rm -f %D/etc/nntpcache/nntpcache.config; fi
+%%ETCDIR%%/nntpcache.config-dist
+@exec if [ ! -f %D/%%ETCDIR%%/nttpcache.config ]; then cp -p %D/%F %B/nntpcache.config
+@unexec if cmp -s %D/%%ETCDIR%%/nntpcache.servers %D/etc/nntpcache/nntpcache.servers-dist; then rm -f %D/etc/nntpcache/nntpcache.servers; fi
+%%ETCDIR%%/nntpcache.servers-dist
+@exec if [ ! -f %D/%%ETCDIR%%/nttpcache.servers ]; then cp -p %D/%F %B/nntpcache.servers
+@unexec if cmp -s %D/%%ETCDIR%%/pubring.asc %D/etc/nntpcache/pubring.asc-dist; then rm -f %D/etc/nntpcache/pubring.asc; fi
+%%ETCDIR%%/pubring.asc-dist
+@exec if [ ! -f %D/%%ETCDIR%%/pubring.asc ]; then cp -p %D/%F %B/pubring.asc
+@unexec if cmp -s %D/%%ETCDIR%%/pubring.pgp %D/etc/nntpcache/pubring.pgp-dist; then rm -f %D/etc/nntpcache/pubring.pgp; fi
+%%ETCDIR%%/pubring.pgp-dist
+@exec if [ ! -f %D/%%ETCDIR%%/pubring.pgp ]; then cp -p %D/%F %B/pubring.pgp
+%%ETCDIR%%/spam.filter
 include/mmap_results.h
 libexec/nntpcache-gdb.sh
 libexec/nntpcache.gdb
-libexec/nntpcached.debug
 libexec/unixauth
+man/man8/newshound.8.gz
+man/man8/nntpcached.8.gz
 sbin/innreport.sh
 sbin/newshound
 sbin/newshound.pl
 sbin/nntpcached
-@exec mkdir -p %D/etc/nntpcache/http/innreport/pics
-@dirrm etc/nntpcache/http/innreport/pics
-@dirrm etc/nntpcache/http/innreport
-@dirrm etc/nntpcache/http
-@dirrmtry etc/nntpcache
+@exec mkdir -p %D/%%ETCDIR%%/http/innreport/pics
+@dirrm %%ETCDIR%%/http/innreport/pics
+@dirrm %%ETCDIR%%/http/innreport
+@dirrm %%ETCDIR%%/http
+@dirrmtry %%ETCDIR%%
 @unexec rmdir %%SPOOLDIR%% 2>&1 >/dev/null || echo "If you want to completely remove nntpcached, please execute 'rm -fr %%SPOOLDIR%%' by yourself."; true
diff --git a/news/nzbperl/Makefile b/news/nzbperl/Makefile
index 14c0609..7c50f4e 100644
--- a/news/nzbperl/Makefile
+++ b/news/nzbperl/Makefile
@@ -16,29 +16,23 @@ COMMENT=	A perl script for downloading nzb files
 
 RUN_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM \
 		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		${LOCALBASE}/bin/uudeview:${PORTSDIR}/converters/uudeview
+		uudeview:${PORTSDIR}/converters/uudeview
 
-PLIST_FILES=	bin/nzbperl
+PLIST_FILES=	bin/${PORTNAME}
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	${DISTNAME}
+WRKSRC=		${WRKDIR}
 
-.if defined(WITH_SSL)
-RUN_DEPENDS+=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
-.endif
+OPTIONS_DEFINE=	SSL
+SSL_RUN_DEPENDS=p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
 
-NO_STAGE=	yes
 do-extract:
 	@${MKDIR} ${WRKDIR}
-	@${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}
-	@${REINPLACE_CMD} -e \
-		"s,#!/usr/bin/perl -w,#!/usr/local/bin/perl -w," \
-		${WRKDIR}/${DISTNAME}
+	${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME} ${PREFIX}/bin/${PORTNAME}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/news/nzbperl/pkg-message b/news/nzbperl/pkg-message
deleted file mode 100644
index ad74d25..0000000
--- a/news/nzbperl/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-================================================================
-
-NOTE:
-	Nzbperl prefers a threaded perl, which FreeBSD does not
-ship with. Either lang/perl5.8 has to be compiled with 
-WITH_THREADS=1 or nzbperl must be run with -dthreadct=0. Note
-that nzbperl will pause downloading while each file part is
-decoded if a threaded perl is not used.
-
-================================================================
diff --git a/news/papercut/Makefile b/news/papercut/Makefile
index 02ac356..2da9143 100644
--- a/news/papercut/Makefile
+++ b/news/papercut/Makefile
@@ -14,27 +14,22 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQ
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 do-configure:
-	@${CP} ${FILESDIR}/papercut-wrapper ${WRKDIR}/papercut-wrapper
-	@${REINPLACE_CMD} -e "s,__DATADIR__,${DATADIR}," ${WRKDIR}/papercut-wrapper
-	@${REINPLACE_CMD} -e "s,__PYTHON__,${PYTHON_CMD}," ${WRKDIR}/papercut-wrapper
-	@${REINPLACE_CMD} "s,/home/papercut,${DATADIR}," ${WRKSRC}/settings.py
+	${CP} ${FILESDIR}/papercut-wrapper ${WRKDIR}/papercut-wrapper
+	${REINPLACE_CMD} -e "s,__DATADIR__,${DATADIR}," ${WRKDIR}/papercut-wrapper
+	${REINPLACE_CMD} -e "s,__PYTHON__,${PYTHON_CMD}," ${WRKDIR}/papercut-wrapper
+	${REINPLACE_CMD} "s,/home/papercut,${DATADIR}," ${WRKSRC}/settings.py
 
 do-install:
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/*.py ${DATADIR}
-	@${MKDIR} ${DATADIR}/cache
-	@${MKDIR} ${DATADIR}/logs
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/*.py ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/cache
+	@${MKDIR} ${STAGEDIR}${DATADIR}/logs
 .for DIR in auth storage
-		@${MKDIR} ${DATADIR}/${DIR}
-		@${INSTALL_SCRIPT} ${WRKSRC}/${DIR}/* ${DATADIR}/${DIR}
+		@${MKDIR} ${STAGEDIR}${DATADIR}/${DIR}
+		${INSTALL_SCRIPT} ${WRKSRC}/${DIR}/* ${STAGEDIR}${DATADIR}/${DIR}
 .endfor
-	@${INSTALL_SCRIPT} ${WRKDIR}/papercut-wrapper ${PREFIX}/bin/papercut
-	@${MV} ${DATADIR}/settings.py ${DATADIR}/settings.py.sample
-
-post-install:
-	@${ECHO_MSG} "To use papercut you need to copy ${DATADIR}/settings.py.sample"
-	@${ECHO_MSG} "to ${DATADIR}/settings.py and edit it."
+	${INSTALL_SCRIPT} ${WRKDIR}/papercut-wrapper ${STAGEDIR}${PREFIX}/bin/papercut
+	${MV} ${STAGEDIR}${DATADIR}/settings.py ${STAGEDIR}${DATADIR}/settings.py.sample
 
 .include <bsd.port.mk>
diff --git a/news/papercut/pkg-plist b/news/papercut/pkg-plist
index 5cc871f..3894a5c 100644
--- a/news/papercut/pkg-plist
+++ b/news/papercut/pkg-plist
@@ -2,7 +2,10 @@ bin/papercut
 %%DATADIR%%/papercut.py
 %%DATADIR%%/papercut_cache.py
 %%DATADIR%%/portable_locker.py
+@unexec if cmp -s %D/%%DATADIR%%/settings.py.sample %D/%%DATADIR%%/settings.py; then rm -f %D/%%DATADIR%%/settings.py; fi
 %%DATADIR%%/settings.py.sample
+@exec if [ ! -f %D/%%DATADIR%%/settings.py ] ; then cp -p %D/%F %B/settings.py; fi
+@exec echo "To use papercut you need to edit %D/%%DATADIR%%/settings.py." |fmt
 %%DATADIR%%/auth/__init__.py
 %%DATADIR%%/auth/mysql.py
 %%DATADIR%%/auth/phorum_mysql_users.py
@@ -26,7 +29,6 @@ bin/papercut
 %%DATADIR%%/storage/phpbb_mysql_fix.sql
 %%DATADIR%%/storage/phpnuke_phpbb_mysql.py
 %%DATADIR%%/storage/strutil.py
-@exec echo "To use papercut you need to copy %D/%%DATADIR%%/settings.py.sample to %D/%%DATADIR%%/settings.py and edit it." |fmt
 @unexec [ -f %D/%%DATADIR%%/papercut.pyc ] && rm %D/%%DATADIR%%/papercut.pyc || true
 @unexec [ -f %D/%%DATADIR%%/papercut_cache.pyc ] && rm %D/%%DATADIR%%/papercut_cache.pyc || true
 @unexec [ -f %D/%%DATADIR%%/portable_locker.pyc ] && rm %D/%%DATADIR%%/portable_locker.pyc || true
diff --git a/news/py-pynzb/Makefile b/news/py-pynzb/Makefile
index b288c66..b358444 100644
--- a/news/py-pynzb/Makefile
+++ b/news/py-pynzb/Makefile
@@ -20,12 +20,6 @@ PYDISTUTILS_NOEGGINFO=	yes
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	LXML
 LXML_DESC=	Add support for py-lxml
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLXML}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:${PORTSDIR}/devel/py-lxml
-.endif
+LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:${PORTSDIR}/devel/py-lxml
 
 .include <bsd.port.mk>
diff --git a/news/py-pynzb/pkg-plist b/news/py-pynzb/pkg-plist
index cf2bb6e..6dd18b9 100644
--- a/news/py-pynzb/pkg-plist
+++ b/news/py-pynzb/pkg-plist
@@ -23,5 +23,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pynzb
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+@dirrmtry %%PYTHON_SITELIBDIR%%
diff --git a/news/s-news/Makefile b/news/s-news/Makefile
index 0b0ad5e..fa40436 100644
--- a/news/s-news/Makefile
+++ b/news/s-news/Makefile
@@ -14,14 +14,14 @@ LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
 
 CONFLICTS=	leafnode-[1-9]* nntp-[0-9]*
 
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
+CONFIGURE_ARGS+= \
 		--with-confdir=${PREFIX}/etc/s-news \
 		--with-spooldir=/var/spool/s-news
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
+USES=	gmake
+GNU_CONFIGURE=	yes
 
 MAN1=		inews.1
 MAN8=		expire.8 listactive.8 makehistory.8 newgroup.8 nntpd.8 overview.8 \
@@ -31,13 +31,8 @@ PORTDOCS=	README README.conf README.suck TODO
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/news/s-news/files/patch-Makefile.in b/news/s-news/files/patch-Makefile.in
index de22277..0e06d5a 100644
--- a/news/s-news/files/patch-Makefile.in
+++ b/news/s-news/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat May 18 21:23:03 2002
-+++ Makefile.in	Sat Jul 17 21:03:08 2004
+--- Makefile.in.orig	2002-05-18 15:23:03.000000000 -0400
++++ Makefile.in	2014-03-29 13:01:10.000000000 -0400
 @@ -113,7 +113,7 @@
  		$(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$p;\
  	done
@@ -9,11 +9,15 @@
  	done
  	$(INSTALL_DIRECTORY) $(DESTDIR)$(mandir)/man1
  	for p in $(MAN1PAGES); do\
-@@ -125,10 +125,9 @@
+@@ -123,12 +123,11 @@
+ 	for p in $(MAN8PAGES); do\
+ 		$(INSTALL_DATA) $$p $(DESTDIR)$(mandir)/man8/$$p;\
  	done
- 	$(INSTALL_VARDIR) $(spooldir)
- 	$(INSTALL_VARDIR) $(confdir)
+-	$(INSTALL_VARDIR) $(spooldir)
+-	$(INSTALL_VARDIR) $(confdir)
 -	$(INSTALL_VARDIR) $(confdir)/suck
++	$(INSTALL_VARDIR) $(DESTDIR)$(spooldir)
++	$(INSTALL_VARDIR) $(DESTDIR)$(confdir)
  	for d in $(DATA); do\
  		if test ! -e $(DESTDIR)$(confdir)/$$d; then\
 -			$(INSTALL_VARDATA) data/$$d $(DESTDIR)$(confdir)/$$d;\
diff --git a/news/s-news/pkg-plist b/news/s-news/pkg-plist
index f25b3a2..df6b9e1 100644
--- a/news/s-news/pkg-plist
+++ b/news/s-news/pkg-plist
@@ -6,6 +6,16 @@ etc/s-news/newsfeeds.sample
 etc/s-news/newsgroups.sample
 etc/s-news/overview.fmt.sample
 etc/s-news/put.news
+man/man1/inews.1.gz
+man/man8/expire.8.gz
+man/man8/listactive.8.gz
+man/man8/makehistory.8.gz
+man/man8/newgroup.8.gz
+man/man8/nntpd.8.gz
+man/man8/overview.8.gz
+man/man8/qnews.8.gz
+man/man8/rmgroup.8.gz
+man/man8/rnews.8.gz
 sbin/expire
 sbin/fetchnews
 sbin/listactive
diff --git a/news/slrnconf/Makefile b/news/slrnconf/Makefile
index d6fcbe0..f13d2d2 100644
--- a/news/slrnconf/Makefile
+++ b/news/slrnconf/Makefile
@@ -17,21 +17,18 @@ USE_BZIP2=	yes
 USES=		perl5
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${DATADIR}/help
-	@${INSTALL_DATA} ${WRKSRC}/help/* ${DATADIR}/help
-	@${MKDIR} ${DATADIR}/data
-	@${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/data
-	@${INSTALL_SCRIPT} ${WRKSRC}/slrnconf ${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}/help
+	${INSTALL_DATA} ${WRKSRC}/help/* ${STAGEDIR}${DATADIR}/help
+	@${MKDIR} ${STAGEDIR}${DATADIR}/data
+	${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${DATADIR}/data
+	${INSTALL_SCRIPT} ${WRKSRC}/slrnconf ${STAGEDIR}${PREFIX}/bin
 .for i in preferences.pm rc_grammar.pm ui.pm
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR}
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ABOUT COPYING README
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/news/slrnface/Makefile b/news/slrnface/Makefile
index 621c64e..0bccb14 100644
--- a/news/slrnface/Makefile
+++ b/news/slrnface/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	slrnface
 PORTVERSION=	2.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	news
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/s/${PORTNAME}
@@ -21,16 +21,15 @@ MAKE_ARGS=	CC="${CC}" C_FLAGS="${CFLAGS}" \
 		XF_LIB="-L${LOCALBASE}/lib -lcompface"
 USE_XORG=	xt
 
-MAN1=		slrnface.1
-PLIST_FILES=	bin/slrnface share/examples/slrnface/slrnface.sl
-PLIST_DIRS=	share/examples/slrnface
+PLIST_FILES=	bin/slrnface man/man1/slrnface.1.gz %%DATADIR%%/slrnface.sl
+PLIST_DIRS=		%%DATADIR%%
+
+SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/slrnface ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/slrnface.1 ${MAN1PREFIX}/man/man1/slrnface.1
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/slrnface.sl ${EXAMPLESDIR}
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/slrnface ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/slrnface.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/slrnface.sl ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/news/slrnface/pkg-message b/news/slrnface/files/pkg-message.in
index 601fdef..5c224d0 100644
--- a/news/slrnface/pkg-message
+++ b/news/slrnface/files/pkg-message.in
@@ -1,7 +1,7 @@
 *********************************************************
 Add
 
- interpret ${PREFIX}/share/examples/slrnface/slrnface.sl
+ interpret %%DATADIR%%/slrnface.sl
 
 to your .slrnrc
 
diff --git a/news/sn/Makefile b/news/sn/Makefile
index 7b80ecd..1bccf59 100644
--- a/news/sn/Makefile
+++ b/news/sn/Makefile
@@ -15,22 +15,14 @@ LICENSE=	GPLv2
 
 USES=		gmake
 USE_BZIP2=	yes
-MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}" LD="${CC}"
+MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" LD="${CC}" CC="${CC}"
 
 PORTDOCS=	README CHANGES FAQ INSTALL INTERNALS \
 		THANKS TODO INSTALL.notes INSTALL.notes2 \
 		INSTALL.run INSTALL.upgrade
 
-MAN8=		sn.8 sncancel.8 sncat.8 sndelgroup.8 sndumpdb.8 \
-		snexpire.8 snfetch.8 snget.8 sngetd.8 snmail.8 \
-		snnewgroup.8 snntpd.8 snprimedb.8 snscan.8 snsend.8 \
-		snsplit.8 snstore.8
-
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 # Try to fix parallel builds (-jX); respect CFLAGS
 post-patch:
 	${REINPLACE_CMD} -e 's|sn\.a$$|& lib/libstuff.a| ; \
@@ -39,12 +31,10 @@ post-patch:
 			${WRKSRC}/Makefile
 
 pre-su-install:
-	@${MKDIR} /var/spool/news
+	@${MKDIR} ${STAGEDIR}/var/spool/news
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/news/sn/pkg-plist b/news/sn/pkg-plist
index 78fd876..e537206 100644
--- a/news/sn/pkg-plist
+++ b/news/sn/pkg-plist
@@ -1,3 +1,20 @@
+man/man8/sn.8.gz
+man/man8/sncancel.8.gz
+man/man8/sncat.8.gz
+man/man8/sndelgroup.8.gz
+man/man8/sndumpdb.8.gz
+man/man8/snexpire.8.gz
+man/man8/snfetch.8.gz
+man/man8/snget.8.gz
+man/man8/sngetd.8.gz
+man/man8/snmail.8.gz
+man/man8/snnewgroup.8.gz
+man/man8/snntpd.8.gz
+man/man8/snprimedb.8.gz
+man/man8/snscan.8.gz
+man/man8/snsend.8.gz
+man/man8/snsplit.8.gz
+man/man8/snstore.8.gz
 sbin/SNHELLO
 sbin/SNPOST
 sbin/dot-outgoing.ex