- Clean up port

- Remove comments which are explaining what is being done the next line
- reset maintainer due to inactivity since 2005 and a really long maintainer timeout
- Convert to OptionsNG

Reviewed by:	jgh

2 files changed, 11 insertions, 46 deletions

diff --git a/mail/qmrtg/Makefile b/mail/qmrtg/Makefile
index e74c6a715487..1eaeee9e7df7 100644
--- a/mail/qmrtg/Makefile
+++ b/mail/qmrtg/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   qmrtg
-# Date created:        12 Jun 2004
-# Whom:                Mij
-#
+# Created by: Mij
 # $FreeBSD$
-#
 
 PORTNAME=	qmrtg
 PORTVERSION=	2.1
@@ -11,14 +7,14 @@ PORTREVISION=	6
 CATEGORIES=	mail net-mgmt
 MASTER_SITES=	http://dev.publicshout.org/qmrtg/download/
 
-MAINTAINER=	mij@bitchx.it
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple tool for monitoring and graphing qmail activity through MRTG
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-.if !defined(WITHOUT_MRTG)
-RUN_DEPENDS+=	mrtg:${PORTSDIR}/net-mgmt/mrtg
-.endif
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		mrtg:${PORTSDIR}/net-mgmt/mrtg
+
+.include <bsd.port.options.mk>
 
 USE_BZIP2=	yes
 
@@ -29,63 +25,32 @@ MANCOMPRESSED=	no
 
 GNU_CONFIGURE=	yes
 
-# where is qmrtg' database directory
 QMRTG_DBDIR:=	/var/db/${PORTNAME}
 
-# variables to be "exported" to plist
 PLIST_SUB=	QMRTG_DBDIR=${QMRTG_DBDIR}
 
 .if !defined(PACKAGE_BUILDING) && !defined(BATCH)
-# interactive --> ask user for options
 IS_INTERACTIVE=		yes
-.if !defined(NOPORTDOCS)
-# install extra doc by default
-OPTIONS=	\
-	DOCS		"Install LICENSE, FAQs etc (shared doc)"	On \
-	HTMLTEMPLATES	"Install QMRTG HTML templates"			On
-.else		# defined(NOPORTDOCS)
-# avoid to offer to install doc
-OPTIONS=	\
-	HTMLTEMPLATES	"Install QMRTG HTML templates"			On
-.endif		# !defined(NOPORTDOCS)
-.else		# defined(PACKAGE_BUILDING) || defined(BATCH)
-# building batch
-# setting defaults
-WITH_HTMLTEMPLATES=	yes
-.if !defined(NOPORTDOCS)
-# also install doc by default
-WITH_DOCS=	yes
-.endif		# !defined(NOPORTDOCS)
 .endif		# !defined(PACKAGE_BUILDING)
 
 .include <bsd.port.pre.mk>
 
-pre-extract:
-	@${ECHO_MSG} "   --->   Qmrtg can be installed without MRTG by defining WITHOUT_MRTG"
-
 post-install:
-# possibly installing docs
-.if defined(WITH_DOCS) && !defined(NOPORTDOCS)
-	@${ECHO_MSG} "   --->   Installing QMRTG extra docs as requested [ ${DOCSDIR} ]"
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
 .endif
-# possibly installing HTML templates
-.if defined(WITH_HTMLTEMPLATES)
-	@${ECHO_MSG} "   --->   Installing examples as requested [ ${EXAMPLESDIR} ]"
+
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${DATADIR}/html
 	${INSTALL_DATA} ${WRKSRC}/html/* ${DATADIR}/html
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/mrtg.cfg ${EXAMPLESDIR}
 .endif
-# creating db directory
-	@${ECHO_MSG} "   --->   Creating QMRTG db directory [ ${QMRTG_DBDIR} ]"
+
 	${MKDIR} ${QMRTG_DBDIR}
-# installing configuration example
-	@${ECHO_MSG} "   --->   Installing configuration example [ ${PREFIX}/etc/qmrtg.conf.dist ]"
 	${MKDIR} ${PREFIX}/etc
 	${CP} ${WRKSRC}/examples/qmrtg.conf.sample ${PREFIX}/etc/qmrtg.conf.dist
-# displaying the port install msg
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/qmrtg/pkg-plist b/mail/qmrtg/pkg-plist
index a99ab9ec50f7..c1d4a81aeeff 100644
--- a/mail/qmrtg/pkg-plist
+++ b/mail/qmrtg/pkg-plist
@@ -24,4 +24,4 @@ etc/qmrtg.conf.dist
 %%PORTDOCS%%%%DOCSDIR%%/RUNNING.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %%QMRTG_DBDIR%%
-@unexec rmdir %%QMRTG_DBDIR%% 2>/dev/null || true
+@dirrmtry %%QMRTG_DBDIR%%