- upgraded to current version, which finally uses

  configure.
- added the *proper* MASTER_SITES back in,
- removed patch file on old Makefile (delete it),
- use DOCSDIR

PR:		61569
Submitted by:	maintainer

5 files changed, 16 insertions, 50 deletions

diff --git a/dns/rbldnsd/Makefile b/dns/rbldnsd/Makefile
index 585f349d595a..6571c419bc79 100644
--- a/dns/rbldnsd/Makefile
+++ b/dns/rbldnsd/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	rbldnsd
-PORTVERSION=	0.96
+PORTVERSION=	0.991
 CATEGORIES=	dns
-MASTER_SITES=	http://www.it.ca/~paul/src/:0
+MASTER_SITES=	http://www.corpit.ru/mjt/rbldnsd/:0 \
+		http://www.it.ca/~paul/src/:0
 DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}:0
 
 MAINTAINER=	paul+ports@it.ca
@@ -16,12 +17,15 @@ COMMENT=	Small and fast DNS daemon especially for DNSBL zones
 
 .if !defined(NOPORTDOCS)
 EXTRACT_ONLY=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
-MASTER_SITES+=	http://www.it.ca/~paul/src/:1
+MASTER_SITES+=	http://www.corpit.ru/mjt/:1 \
+		http://www.it.ca/~paul/src/:1
 DISTFILES+=	rbldnsd.html:1
 .endif
 
 MAN8=		rbldnsd.8
 
+HAS_CONFIGURE=	yes
+
 do-install:
 		@${INSTALL_PROGRAM} ${WRKSRC}/rbldnsd ${PREFIX}/sbin/
 		@${INSTALL_MAN} ${WRKSRC}/rbldnsd.8 ${PREFIX}/man/man8/
@@ -30,6 +34,7 @@ do-install:
 		@${INSTALL_DATA} ${WRKSRC}/CHANGES-0.81 ${DOCSDIR}
 		@${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
 		@${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
+		@${INSTALL_DATA} ${WRKSRC}/rbldnsd.spec ${DOCSDIR}
 		@${INSTALL_DATA} ${DISTDIR}/rbldnsd.html ${DOCSDIR}
 .endif
 
diff --git a/dns/rbldnsd/distinfo b/dns/rbldnsd/distinfo
index a6d7fbbb0e8b..4d815cfe2a35 100644
--- a/dns/rbldnsd/distinfo
+++ b/dns/rbldnsd/distinfo
@@ -1,2 +1,2 @@
-MD5 (rbldnsd_0.96.tar.gz) = 7b0d155e70436ddc50528412fa398cad
-MD5 (rbldnsd.html) = d9eae742d3875e467c8a4555eba678ca
+MD5 (rbldnsd_0.991.tar.gz) = f7c3642a92014e8a5712386fb32a2ab0
+MD5 (rbldnsd.html) = 1cde68965234940e33bef4c897b36423
diff --git a/dns/rbldnsd/files/patch-aa b/dns/rbldnsd/files/patch-aa
deleted file mode 100644
index 2fcbfcd29345..000000000000
--- a/dns/rbldnsd/files/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.orig	Fri Jun 13 05:14:45 2003
-+++ Makefile	Fri Jun 13 05:19:41 2003
-@@ -4,26 +4,28 @@
- # Makefile for rbldnsd
- 
--CC = cc
--CFLAGS = -O
-+CC ?= cc
-+CFLAGS += -O
- LD = $(CC)
--LDFLAGS = $(CFLAGS)
-+LDFLAGS += $(CFLAGS)
- AR = ar
- ARFLAGS = rv
- RANLIB = :
--SHELL = /bin/sh
--AWK = awk
-+SHELL = ${SH}
-+AWK ?= awk
- 
- # Disable statistic counters
- #DEFS = -DNOSTATS
- # Disable memory info logging (mallinfo)
--#DEFS = -DNOMEMINFO
-+DEFS += -DNOMEMINFO
- # Disable printing zone (re)load time using utimes()
- #DEFS = -DNOTIMES
- # If your system lacks <stdint.h> header but uint32_t is in sys/types.h
--#DEFS = -DNOSTDINT_H
-+DEFS += -DNOSTDINT_H
- # If you don't want/have IPv6 support (transport only)
--#DEFS = -DNOIPv6
-+.if !defined(WITH_IPV6)
-+DEFS += -DNOIPv6
-+.endif
- #
- # For FreeBSD 4, use DEFS="-DNOMEMINFO -DNOSTDINT_H"
- # For Solaris, use DEFS="-DNOMEMINFO -DNOSTDINT_H -DNOIPv6"
diff --git a/dns/rbldnsd/pkg-descr b/dns/rbldnsd/pkg-descr
index 0c27c8ded02f..c6dd6c24ec5b 100644
--- a/dns/rbldnsd/pkg-descr
+++ b/dns/rbldnsd/pkg-descr
@@ -2,8 +2,6 @@ rbldnsd is a small and fast DNS daemon, made especially to serve DNSBL
 zones.  It was inspired by Dan J. Bernstein's rbldns program, found in
 /usr/ports/net/djbdns, but is significantly faster.
 
-See http://www.corpit.ru/mjt/rbldnsd.html for more information.
-
 rbldnsd was written by Michael Tokarev.
 
 WWW: http://www.corpit.ru/mjt/rbldnsd.html
diff --git a/dns/rbldnsd/pkg-plist b/dns/rbldnsd/pkg-plist
index ae62a84fccf5..98f99d47d8f5 100644
--- a/dns/rbldnsd/pkg-plist
+++ b/dns/rbldnsd/pkg-plist
@@ -1,6 +1,7 @@
 sbin/rbldnsd
-%%PORTDOCS%%share/doc/rbldnsd/CHANGES-0.81
-%%PORTDOCS%%share/doc/rbldnsd/NEWS
-%%PORTDOCS%%share/doc/rbldnsd/TODO
-%%PORTDOCS%%share/doc/rbldnsd/rbldnsd.html
-%%PORTDOCS%%@dirrm share/doc/rbldnsd
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.81
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/rbldnsd.spec
+%%PORTDOCS%%%%DOCSDIR%%/rbldnsd.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%