- Update to 0.997a

- Port cleanup to pass rclint/portlint

PR:		ports/181288
Submitted by:	alexey@renatasystems.org
Approved by:	crees (mentor)

5 files changed, 21 insertions, 41 deletions

diff --git a/dns/rbldnsd/Makefile b/dns/rbldnsd/Makefile
index 2c5d452d1410..f54637446fe2 100644
--- a/dns/rbldnsd/Makefile
+++ b/dns/rbldnsd/Makefile
@@ -1,29 +1,15 @@
-# New ports collection makefile for:	rbldnsd
-# Date created:				Fri Jun 13 05:30:12 EDT 2003
-# Whom:					Paul Chvostek <paul@it.ca>
-#
+# Created by: Paul Chvostek <paul@it.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	rbldnsd
-PORTVERSION=	0.996b
-PORTREVISION=	1
+PORTVERSION=	0.997a
 CATEGORIES=	dns
-MASTER_SITES=	http://www.corpit.ru/mjt/rbldnsd/:0 \
-		http://www.it.ca/~paul/src/:0
-DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}:0
+MASTER_SITES=	http://www.corpit.ru/mjt/rbldnsd/ \
+		ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Small and fast DNS daemon especially for DNSBL zones
 
-.if !defined(NOPORTDOCS)
-EXTRACT_ONLY+=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
-MASTER_SITES+=	http://www.corpit.ru/mjt/:1 \
-		http://www.it.ca/~paul/src/:1
-DISTFILES+=	rbldnsd.html:1
-IGNOREFILES+=	rbldnsd.html
-.endif
-
 RBLDNSUSER=	rbldns
 RBLDNSGROUP=	${RBLDNSUSER}
 ROOTDIR=	${PREFIX}/etc/rbldnsd/
@@ -37,6 +23,8 @@ GROUPS=		${USERS}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
+.include <bsd.port.pre.mk>
+
 do-install:
 		@if [ ! -d ${ROOTDIR} ]; then \
 			${MKDIR} ${ROOTDIR}; \
@@ -47,7 +35,7 @@ do-install:
 			${FILESDIR}/example ${PREFIX}/etc/rbldnsd/
 		@${INSTALL_PROGRAM} ${WRKSRC}/rbldnsd ${PREFIX}/sbin/
 		@${INSTALL_MAN} ${WRKSRC}/rbldnsd.8 ${PREFIX}/man/man8/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 		@${MKDIR} ${DOCSDIR}/
 		@${INSTALL_DATA} ${WRKSRC}/CHANGES-0.81 ${DOCSDIR}
 		@${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
@@ -57,7 +45,6 @@ do-install:
 		@${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.default ${DOCSDIR}
 		@${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.init ${DOCSDIR}
 		@${INSTALL_DATA} ${WRKSRC}/rbldnsd.spec ${DOCSDIR}
-		@${INSTALL_DATA} ${DISTDIR}/rbldnsd.html ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/dns/rbldnsd/distinfo b/dns/rbldnsd/distinfo
index 37baa1cb09eb..ce296fa085cb 100644
--- a/dns/rbldnsd/distinfo
+++ b/dns/rbldnsd/distinfo
@@ -1,3 +1,2 @@
-SHA256 (rbldnsd_0.996b.tar.gz) = 475afe5be8729a76b7c23e2f3d5ce1c773775140406a58bfb7477fac5a528342
-SIZE (rbldnsd_0.996b.tar.gz) = 113128
-SHA256 (rbldnsd.html) = IGNORE
+SHA256 (rbldnsd-0.997a.tar.gz) = 9c17c6bde6995058204a66805444039d31523a7d4ef40cec059e505a0882a8ef
+SIZE (rbldnsd-0.997a.tar.gz) = 144771
diff --git a/dns/rbldnsd/files/pkg-message.in b/dns/rbldnsd/files/pkg-message.in
index ba5ba332b1cc..5eaa84203b17 100644
--- a/dns/rbldnsd/files/pkg-message.in
+++ b/dns/rbldnsd/files/pkg-message.in
@@ -1,6 +1,4 @@
 ========================================================================
-   NOTICE    NOTICE    NOTICE    NOTICE    NOTICE    NOTICE    NOTICE
-========================================================================
 
 The rbldnsd port has been installed with an example zone file, located
 in %%PREFIX%%/etc/rbldnsd/.
diff --git a/dns/rbldnsd/files/rbldnsd.in b/dns/rbldnsd/files/rbldnsd.in
index dcab5decfb7b..1115b27528a3 100644
--- a/dns/rbldnsd/files/rbldnsd.in
+++ b/dns/rbldnsd/files/rbldnsd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 #
 
 # PROVIDE: rbldnsd
@@ -19,25 +19,22 @@
 
 name=rbldnsd
 rcvar=rbldnsd_enable
+load_rc_config $name
+
+rbldnsd_enable=${rbldnsd_enable:-"NO"}
+rbldnsd_flags=${rbldnsd_flags:-"-r %%PREFIX%%/etc/rbldnsd -b 127.0.0.1 bl.example.com:ip4set:example"}
 
 command=%%PREFIX%%/sbin/rbldnsd
 pidfile=/var/run/rbldnsd.pid
 
-load_rc_config $name
-extra_commands="reload"
-
-stop_postcmd=stop_postcmd
+extra_commands=reload
+start_precmd=prestart
+stop_postcmd="rm -f ${pidfile}"
 
-stop_postcmd()
+prestart()
 {
-  rm -f $pidfile
+	# enforce pidfile as first argument
+	rc_flags="-p ${pidfile} ${rbldnsd_flags}"
 }
 
-# set defaults, enforce pidfile by making it last option before db
-
-rbldnsd_enable=${rbldnsd_enable:-"NO"}
-rbldnsd_flags=${rbldnsd_flags:-"-r /usr/local/etc/rbldnsd -b 127.0.0.1 bl.example.com:ip4set:example"}
-rbldnsd_flags="-p $pidfile ${rbldnsd_flags}"
-
 run_rc_command "$1"
-
diff --git a/dns/rbldnsd/pkg-plist b/dns/rbldnsd/pkg-plist
index 6dff06d6ec9e..5a76d79ee77d 100644
--- a/dns/rbldnsd/pkg-plist
+++ b/dns/rbldnsd/pkg-plist
@@ -8,6 +8,5 @@ etc/rbldnsd/example
 %%PORTDOCS%%%%DOCSDIR%%/rbldnsd.default
 %%PORTDOCS%%%%DOCSDIR%%/rbldnsd.init
 %%PORTDOCS%%%%DOCSDIR%%/rbldnsd.spec
-%%PORTDOCS%%%%DOCSDIR%%/rbldnsd.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry etc/rbldnsd/