- Updating to current version (released 2006-07-26).

- renamed start script to modern format (without .sh)
- Added better example data (including pkg-message)
- utilize SUB_FILES

PR:		103153
Submitted by:	paul+ports at it.ca

7 files changed, 17 insertions, 28 deletions

diff --git a/dns/rbldnsd/Makefile b/dns/rbldnsd/Makefile
index e84e835ed1ae..c0c192c46db0 100644
--- a/dns/rbldnsd/Makefile
+++ b/dns/rbldnsd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rbldnsd
-PORTVERSION=	0.996
+PORTVERSION=	0.996a
 CATEGORIES=	dns
 MASTER_SITES=	http://www.corpit.ru/mjt/rbldnsd/:0 \
 		http://www.it.ca/~paul/src/:0
@@ -16,7 +16,7 @@ MAINTAINER=	paul+ports@it.ca
 COMMENT=	Small and fast DNS daemon especially for DNSBL zones
 
 .if !defined(NOPORTDOCS)
-EXTRACT_ONLY=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
+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
@@ -30,20 +30,9 @@ ROOTDIR=	${PREFIX}/etc/rbldnsd/
 MAN8=		rbldnsd.8
 
 HAS_CONFIGURE=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500038
-RC_SUBR?=	/etc/rc.subr
-.else
-USE_RC_SUBR=	yes
-.endif
-
-SED_SCRIPT+=	-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
-
-post-build:
-		@${SED} ${SED_SCRIPT} <${FILESDIR}/rbldnsd.sh >${WRKSRC}/rbldnsd.sh
+USE_RC_SUBR=	rbldnsd
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 
 pre-install:
 		@${ECHO} "==>  Creating custom user to run rbldnsd..."
@@ -70,9 +59,5 @@ do-install:
 		@${INSTALL_DATA} ${WRKSRC}/rbldnsd.spec ${DOCSDIR}
 		@${INSTALL_DATA} ${DISTDIR}/rbldnsd.html ${DOCSDIR}
 .endif
-		@${INSTALL_SCRIPT} -m 751 ${WRKSRC}/rbldnsd.sh ${PREFIX}/etc/rc.d/rbldnsd.sh
-
-post-install:
-		@${SED} ${SED_SCRIPT} < ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/rbldnsd/distinfo b/dns/rbldnsd/distinfo
index a6bd4282ce94..b7be44d69b0e 100644
--- a/dns/rbldnsd/distinfo
+++ b/dns/rbldnsd/distinfo
@@ -1,5 +1,5 @@
-MD5 (rbldnsd_0.996.tar.gz) = adba618d40a724a4d07a9b176d86b645
-SHA256 (rbldnsd_0.996.tar.gz) = 383a3828ff6cad8568cadbe2b8ab0dac6936294460294ea9a90816ec1bd8422e
-SIZE (rbldnsd_0.996.tar.gz) = 110623
+MD5 (rbldnsd_0.996a.tar.gz) = bd2e54e1962408293fcbfaf7ccd66e81
+SHA256 (rbldnsd_0.996a.tar.gz) = 729033daeb3df51e24e13d6133d05ea204dd003c10c553b9ebf4a8e9f71f5458
+SIZE (rbldnsd_0.996a.tar.gz) = 112306
 MD5 (rbldnsd.html) = IGNORE
 SHA256 (rbldnsd.html) = IGNORE
diff --git a/dns/rbldnsd/files/example b/dns/rbldnsd/files/example
index b3107a129782..a4825a8c55b3 100644
--- a/dns/rbldnsd/files/example
+++ b/dns/rbldnsd/files/example
@@ -6,6 +6,9 @@
 # A simplest case: single IP address, with default value.
 127.0.0.2
 #
+# And some example data...
+172.31 Hurray, your installation worked!
+#
 # Netblock - 256 IP addresses with it's own A and TXT records
 10.8.60.0/24 :127.0.0.3:Address $ is from private IP range
 #
diff --git a/dns/rbldnsd/pkg-message b/dns/rbldnsd/files/pkg-message.in
index 41ecefdfdb57..ba5ba332b1cc 100644
--- a/dns/rbldnsd/pkg-message
+++ b/dns/rbldnsd/files/pkg-message.in
@@ -8,9 +8,11 @@ in %%PREFIX%%/etc/rbldnsd/.
 After starting the daemon with this example data, you should be able to
 test the success of your install with the command:
 
-	% host -a 1.1.168.192.bl.example.com. localhost
+	% host -a 1.1.31.172.bl.example.com. localhost
 or
-	% dig @localhost 1.1.168.192.bl.example.com. any
+	% dig @localhost 1.1.31.172.bl.example.com. any
+or
+	% nslookup -query=any 1.1.31.172.bl.example.com. localhost
 
 If you see a response that mentions 127.0.0.2, the install worked!
 
diff --git a/dns/rbldnsd/files/rbldnsd.sh b/dns/rbldnsd/files/rbldnsd.in
index 1fd44f93216e..1fd44f93216e 100644
--- a/dns/rbldnsd/files/rbldnsd.sh
+++ b/dns/rbldnsd/files/rbldnsd.in
diff --git a/dns/rbldnsd/pkg-install b/dns/rbldnsd/pkg-install
index c51c36a6e7ae..a2a7943481e1 100644
--- a/dns/rbldnsd/pkg-install
+++ b/dns/rbldnsd/pkg-install
@@ -18,7 +18,7 @@ fi
 
 if ! pw usershow "$RBLDNSUSER" 2>/dev/null 1>&2; then
         if pw useradd $RBLDNSUSER -g $RBLDNSGROUP -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
+                -s "/usr/sbin/nologin" -d "/nonexistent" \
                 -c "rbldnsd pseudo-user"; \
         then
                 echo "=> Added user \"$RBLDNSUSER\"."
diff --git a/dns/rbldnsd/pkg-plist b/dns/rbldnsd/pkg-plist
index 26a8e4adbcd8..6dff06d6ec9e 100644
--- a/dns/rbldnsd/pkg-plist
+++ b/dns/rbldnsd/pkg-plist
@@ -1,6 +1,5 @@
 sbin/rbldnsd
 etc/rbldnsd/example
-etc/rc.d/rbldnsd.sh
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.81
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/TODO