Clean up the port

- Remove unnecessary variables such as USE_REINPLACE
- Define ETCDIR and use it throughout the port
- Use OPT_VARIABLE instead of if statements with PORT_OPTIONS:MOPT
- Sort variables and targets
- Sort pkg-plist and remove unnecessary @dir uses
- Define DOCS and EXAMPLES options for completeness
- Instal manuals under share/man

Approved by:	portmgr blanket

2 files changed, 50 insertions, 64 deletions

diff --git a/news/rntrack/Makefile b/news/rntrack/Makefile
index 9906e4d616a9..02646ca1f68e 100644
--- a/news/rntrack/Makefile
+++ b/news/rntrack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rntrack
 PORTVERSION=	2.1.10
+PORTREVISION=	1
 CATEGORIES=	news mail
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	ftrack-as/RNtrack/${PORTVERSION}
@@ -13,63 +14,53 @@ COMMENT=	FTN Messages tracker
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	tar:bzip2
+USES=		tar:bzip2
 
-WRKSRC=	${WRKDIR}/${DISTNAME}
-NO_WRKSUBDIR=	yes
-
-USE_REINPLACE=	yes
-ALL_TARGET=	${PORTNAME}
 MAKEFILE=	${WRKSRC}/MakeFiles/FreeBSD/Makefile
-MAKE_ENV=	CONFIG=${PREFIX}/etc/fido/rntrack/rntrack.cfg
+MAKE_ENV=	CONFIG=${ETCDIR}/rntrack.cfg
+ALL_TARGET=	${PORTNAME}
 
-DOCS=	FAQ_en FAQ_ru report.err report.err.ru
+ETCDIR=		${PREFIX}/etc/fido
 
-OPTIONS_DEFINE=	LOG_PID SCRIPTS SYSLOG_FORMAT
+NO_WRKSUBDIR=	yes
 
-SCRIPTS_DESC=	Enable Perl scripts support
-LOG_PID_DESC=	Enable pid logging
-SYSLOG_FORMAT_DESC=	Use syslog-like log style
+_DOCS=	FAQ_en FAQ_ru report.err report.err.ru
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES LOG_PID SCRIPTS SYSLOG_FORMAT
 
-.if ${PORT_OPTIONS:MSYSLOG_FORMAT}
-MAKE_ARGS+=	ENABLE_SYSLOG_LOG_FORMAT=1
-.endif
+LOG_PID_DESC=		Enable PID logging
+SCRIPTS_DESC=		Enable Perl scripts support
+SYSLOG_FORMAT_DESC=	Use syslog-like log style
 
-.if ${PORT_OPTIONS:MLOG_PID}
-MAKE_ARGS+=	ENABLE_LOG_PID=1
-.endif
+LOG_PID_MAKE_ARGS=		ENABLE_LOG_PID=1
+SCRIPTS_USES=			perl5
+SCRIPTS_MAKE_ARGS=		ENABLE_SCRIPTS=1
+SYSLOG_FORMAT_MAKE_ARGS=	ENABLE_SYSLOG_LOG_FORMAT=1
 
-.if ${PORT_OPTIONS:MSCRIPTS}
-USES+=	perl5
-MAKE_ARGS+=	ENABLE_SCRIPTS=1
-.endif
+pre-patch:
+	${REINPLACE_CMD} -e "s@\.\./\.\./@@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile
 
 pre-configure:
 	${CP} ${WRKSRC}/MakeFiles/FreeBSD/Makefile ${WRKSRC}
 
-pre-patch:
-	${REINPLACE_CMD} -e "s@\.\./\.\./@@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile
-
 do-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fido/rntrack
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/rntrack ${STAGEDIR}${PREFIX}/sbin
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fido/rntrack/tpl
-	${INSTALL_DATA} ${WRKSRC}/samples/node.cfg ${STAGEDIR}${PREFIX}/etc/fido/rntrack/rntrack.cfg-dist
-	${INSTALL_DATA} ${WRKSRC}/samples/test.pl ${STAGEDIR}${PREFIX}/etc/fido/rntrack
-	${INSTALL_DATA} ${WRKSRC}/samples/tpl/* ${STAGEDIR}${PREFIX}/etc/fido/rntrack/tpl
-	${INSTALL_DATA} ${WRKSRC}/doc/rntrack.1 ${STAGEDIR}${PREFIX}/man/man1
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fido/rntrack/tbl
+	${MKDIR} ${STAGEDIR}${ETCDIR}/tpl
+	${INSTALL_DATA} ${WRKSRC}/samples/node.cfg ${STAGEDIR}${ETCDIR}/rntrack.cfg-dist
+	${INSTALL_DATA} ${WRKSRC}/samples/test.pl ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/tpl/* ${STAGEDIR}${ETCDIR}/tpl
+	${INSTALL_DATA} ${WRKSRC}/doc/rntrack.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${MKDIR} ${STAGEDIR}${ETCDIR}/tbl
 .for f in alt2koi.tbl koi2alt.tbl
-	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}${PREFIX}/etc/fido/rntrack/tbl
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}${ETCDIR}/tbl
 .endfor
 .for f in bignode.zip bignode2.zip node1042.zip node1157.zip node.cfg node2.cfg node3.cfg perl-test.cfg point.cfg point2.cfg traflog.tpl
 	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${DOCS}
+.for f in ${_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .include <bsd.port.mk>
diff --git a/news/rntrack/pkg-plist b/news/rntrack/pkg-plist
index 840232924c1e..bd29d3003f96 100644
--- a/news/rntrack/pkg-plist
+++ b/news/rntrack/pkg-plist
@@ -1,30 +1,25 @@
-@dir %%DOCSDIR%%
-@dir %%EXAMPLESDIR%%
-@dir etc/fido/rntrack/tbl
-@dir etc/fido/rntrack/tpl
-@dir etc/fido/rntrack
-etc/fido/rntrack/rntrack.cfg-dist
-etc/fido/rntrack/tpl/audit.tpl
-etc/fido/rntrack/tpl/badfrom.tpl
-etc/fido/rntrack/tpl/badto.tpl
-etc/fido/rntrack/tpl/loop.tpl
-%%DOCSDIR%%/FAQ_en
-%%DOCSDIR%%/FAQ_ru
-%%DOCSDIR%%/report.err
-%%DOCSDIR%%/report.err.ru
-%%EXAMPLESDIR%%/bignode.zip
-%%EXAMPLESDIR%%/bignode2.zip
-%%EXAMPLESDIR%%/node1042.zip
-%%EXAMPLESDIR%%/node1157.zip
-%%EXAMPLESDIR%%/node.cfg
-%%EXAMPLESDIR%%/node2.cfg
-%%EXAMPLESDIR%%/node3.cfg
-%%EXAMPLESDIR%%/perl-test.cfg
-%%EXAMPLESDIR%%/point.cfg
-%%EXAMPLESDIR%%/point2.cfg
-%%EXAMPLESDIR%%/traflog.tpl
-etc/fido/rntrack/test.pl
-etc/fido/rntrack/tbl/alt2koi.tbl
-etc/fido/rntrack/tbl/koi2alt.tbl
+%%ETCDIR%%/rntrack.cfg-dist
+%%ETCDIR%%/tbl/alt2koi.tbl
+%%ETCDIR%%/tbl/koi2alt.tbl
+%%ETCDIR%%/test.pl
+%%ETCDIR%%/tpl/audit.tpl
+%%ETCDIR%%/tpl/badfrom.tpl
+%%ETCDIR%%/tpl/badto.tpl
+%%ETCDIR%%/tpl/loop.tpl
+share/man/man1/rntrack.1.gz
 sbin/rntrack
-man/man1/rntrack.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/FAQ_en
+%%PORTDOCS%%%%DOCSDIR%%/FAQ_ru
+%%PORTDOCS%%%%DOCSDIR%%/report.err
+%%PORTDOCS%%%%DOCSDIR%%/report.err.ru
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bignode.zip
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bignode2.zip
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/node.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/node1042.zip
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/node1157.zip
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/node2.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/node3.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl-test.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point2.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/traflog.tpl