Add Felix von Leitner's IPv6 patches if WITH_IPV6 is defined.

Add Gerritt Pape's manual pages unless WITHOUT_MAN is defined.
Assume maintainership.

Reviewed by:	nbm
Approved by:	nbm (former maintainer)

6 files changed, 92 insertions, 4 deletions

diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 711f746902e2..5b57ad8d46d4 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -6,12 +6,40 @@
 #
 
 PORTNAME=	djbdns
-PORTVERSION=	1.05
+PORTVERSION=	${DJBDNS_VER}
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
+DISTNAME=	${PORTNAME}-${DJBDNS_VER}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	nbm@FreeBSD.org
+.if !defined(WITHOUT_MAN)
+MANDATE=	-20020130
+MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
+DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:1
+
+MAN1=		dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname.1 \
+		dnsq.1 dnsqr.1 dnstrace.1 dnstracesort.1 dnstxt.1
+MAN8=		axfr-get.8 axfrdns.8 dnscache-conf.8 dnscache.8 \
+		pickdns-conf.8 pickdns-data.8 pickdns.8 rbldns-conf.8 \
+		rbldns-data.8 rbldns.8 tinydns-conf.8 tinydns-data.8 \
+		tinydns-edit.8 tinydns.8 walldns-conf.8 walldns.8
+MANCOMPRESSED=	no
+.endif
+
+.if defined(WITH_IPV6)
+PKGNAMESUFFIX=	-ipv6
+PORTVERSION=	${DJBDNS_VER}.${DJBDNS_V6_VER:S/test/b/:S/diff//}
+PATCH_SITES=	http://www.fefe.de/dns/
+PATCHFILES=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2
+PATCH_DIST_STRIP=	-p1
+.endif
+
+DJBDNS_VER=	1.05
+DJBDNS_V6_VER=	test11
+
+MAINTAINER=	roam@FreeBSD.org
 
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools
 
@@ -20,9 +48,21 @@ INSTALL_TARGET=	setup check
 
 NO_PACKAGE=	Forbidden - we have patches to the distribution.
 
+.if defined(WITH_IPV6)
+PLIST_SUB+=	WITH_IPV6=""
+.else
+PLIST_SUB+=	WITH_IPV6="@comment "
+.endif
+
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@echo "${CC} -s" > ${WRKSRC}/conf-ld
 	@echo "${PREFIX}" > ${WRKSRC}/conf-home
 
+.if !defined(WITHOUT_MAN)
+post-install:
+	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${PREFIX}/man/man1/
+	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${PREFIX}/man/man8/
+.endif
+
 .include <bsd.port.mk>
diff --git a/dns/djbdns/distinfo b/dns/djbdns/distinfo
index bed9421c7ff3..71a53a9f79a3 100644
--- a/dns/djbdns/distinfo
+++ b/dns/djbdns/distinfo
@@ -1 +1,3 @@
 MD5 (djbdns-1.05.tar.gz) = 3147c5cd56832aa3b41955c7a51cbeb2
+MD5 (djbdns-1.05-man-20020130.tar.gz) = f6f3feee042d57af8805f164be79dc85
+MD5 (djbdns-1.05-test11.diff.bz2) = 5ea46298d4fbe2533f4d9d3993c80ddb
diff --git a/dns/djbdns/pkg-plist b/dns/djbdns/pkg-plist
index f8036ed3aac4..6255157f7bbd 100644
--- a/dns/djbdns/pkg-plist
+++ b/dns/djbdns/pkg-plist
@@ -5,6 +5,8 @@ bin/dnscache
 bin/dnscache-conf
 bin/dnsfilter
 bin/dnsip
+%%WITH_IPV6%%bin/dnsip6
+%%WITH_IPV6%%bin/dnsip6q
 bin/dnsipq
 bin/dnsmx
 bin/dnsname
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 711f746902e2..5b57ad8d46d4 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -6,12 +6,40 @@
 #
 
 PORTNAME=	djbdns
-PORTVERSION=	1.05
+PORTVERSION=	${DJBDNS_VER}
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
+DISTNAME=	${PORTNAME}-${DJBDNS_VER}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	nbm@FreeBSD.org
+.if !defined(WITHOUT_MAN)
+MANDATE=	-20020130
+MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
+DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:1
+
+MAN1=		dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname.1 \
+		dnsq.1 dnsqr.1 dnstrace.1 dnstracesort.1 dnstxt.1
+MAN8=		axfr-get.8 axfrdns.8 dnscache-conf.8 dnscache.8 \
+		pickdns-conf.8 pickdns-data.8 pickdns.8 rbldns-conf.8 \
+		rbldns-data.8 rbldns.8 tinydns-conf.8 tinydns-data.8 \
+		tinydns-edit.8 tinydns.8 walldns-conf.8 walldns.8
+MANCOMPRESSED=	no
+.endif
+
+.if defined(WITH_IPV6)
+PKGNAMESUFFIX=	-ipv6
+PORTVERSION=	${DJBDNS_VER}.${DJBDNS_V6_VER:S/test/b/:S/diff//}
+PATCH_SITES=	http://www.fefe.de/dns/
+PATCHFILES=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2
+PATCH_DIST_STRIP=	-p1
+.endif
+
+DJBDNS_VER=	1.05
+DJBDNS_V6_VER=	test11
+
+MAINTAINER=	roam@FreeBSD.org
 
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools
 
@@ -20,9 +48,21 @@ INSTALL_TARGET=	setup check
 
 NO_PACKAGE=	Forbidden - we have patches to the distribution.
 
+.if defined(WITH_IPV6)
+PLIST_SUB+=	WITH_IPV6=""
+.else
+PLIST_SUB+=	WITH_IPV6="@comment "
+.endif
+
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@echo "${CC} -s" > ${WRKSRC}/conf-ld
 	@echo "${PREFIX}" > ${WRKSRC}/conf-home
 
+.if !defined(WITHOUT_MAN)
+post-install:
+	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${PREFIX}/man/man1/
+	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${PREFIX}/man/man8/
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index bed9421c7ff3..71a53a9f79a3 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -1 +1,3 @@
 MD5 (djbdns-1.05.tar.gz) = 3147c5cd56832aa3b41955c7a51cbeb2
+MD5 (djbdns-1.05-man-20020130.tar.gz) = f6f3feee042d57af8805f164be79dc85
+MD5 (djbdns-1.05-test11.diff.bz2) = 5ea46298d4fbe2533f4d9d3993c80ddb
diff --git a/net/djbdns/pkg-plist b/net/djbdns/pkg-plist
index f8036ed3aac4..6255157f7bbd 100644
--- a/net/djbdns/pkg-plist
+++ b/net/djbdns/pkg-plist
@@ -5,6 +5,8 @@ bin/dnscache
 bin/dnscache-conf
 bin/dnsfilter
 bin/dnsip
+%%WITH_IPV6%%bin/dnsip6
+%%WITH_IPV6%%bin/dnsip6q
 bin/dnsipq
 bin/dnsmx
 bin/dnsname