From 53862497c4642cf6b71928d2fe034eaaa36f15b0 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@FreeBSD.org>
Date: Thu, 14 Mar 2002 17:17:32 +0000
Subject: [PATCH] Add Florent Guillaume's patch for dnscache make the cache
 persistent across restarts, conditional on the WITH_DNSCACHE_DUMPCACHE knob.
 Add a pre-fetch target describing the available makevar knobs.

PR:		35483
Submitted by:	Joe Barbish <barbish@a1poweruser.com>
---
 dns/djbdns/Makefile | 24 +++++++++++++++++++++---
 dns/djbdns/distinfo |  1 +
 net/djbdns/Makefile | 24 +++++++++++++++++++++---
 net/djbdns/distinfo |  1 +
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 5b57ad8d46d4..550f456f5726 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	djbdns
 PORTVERSION=	${DJBDNS_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
@@ -31,8 +31,17 @@ MANCOMPRESSED=	no
 .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_SITES+=	http://www.fefe.de/dns/
+PATCHFILES+=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2
+PATCH_DIST_STRIP=	-p1
+.endif
+
+.if defined(WITH_DNSCACHE_DUMPCACHE)
+.if defined(WITH_IPV6)
+BROKEN=		The IPv6 and dnscache-dumpcache patches are currently in conflict.
+.endif
+PATCH_SITES+=	http://mapage.noos.fr/efge/djbdns/
+PATCHFILES+=	patch-dnscache-dumpcache-v4.txt
 PATCH_DIST_STRIP=	-p1
 .endif
 
@@ -54,6 +63,15 @@ PLIST_SUB+=	WITH_IPV6=""
 PLIST_SUB+=	WITH_IPV6="@comment "
 .endif
 
+pre-fetch:
+	@${ECHO} "You can define the following variables to configure the djbdns build:"
+	@${ECHO} "- WITH_IPV6               - build with IPv6 support"
+	@${ECHO} "                            http://www.fefe.de/dns/"
+	@${ECHO} "- WITH_DNSCACHE_DUMPCACHE - build with the persistent cache patch for dnscache"
+	@${ECHO} "                            http://mapage.noos.fr/efge/djbdns/"
+	@${ECHO} "- WITHOUT_MAN             - do NOT install Gerritt Pape's manual pages"
+	@${ECHO} "                            http://smarden.org/pape/djb/manpages/"
+
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@echo "${CC} -s" > ${WRKSRC}/conf-ld
diff --git a/dns/djbdns/distinfo b/dns/djbdns/distinfo
index 71a53a9f79a3..352117f82c91 100644
--- a/dns/djbdns/distinfo
+++ b/dns/djbdns/distinfo
@@ -1,3 +1,4 @@
 MD5 (djbdns-1.05.tar.gz) = 3147c5cd56832aa3b41955c7a51cbeb2
 MD5 (djbdns-1.05-man-20020130.tar.gz) = f6f3feee042d57af8805f164be79dc85
 MD5 (djbdns-1.05-test11.diff.bz2) = 5ea46298d4fbe2533f4d9d3993c80ddb
+MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 5b57ad8d46d4..550f456f5726 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	djbdns
 PORTVERSION=	${DJBDNS_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
@@ -31,8 +31,17 @@ MANCOMPRESSED=	no
 .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_SITES+=	http://www.fefe.de/dns/
+PATCHFILES+=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2
+PATCH_DIST_STRIP=	-p1
+.endif
+
+.if defined(WITH_DNSCACHE_DUMPCACHE)
+.if defined(WITH_IPV6)
+BROKEN=		The IPv6 and dnscache-dumpcache patches are currently in conflict.
+.endif
+PATCH_SITES+=	http://mapage.noos.fr/efge/djbdns/
+PATCHFILES+=	patch-dnscache-dumpcache-v4.txt
 PATCH_DIST_STRIP=	-p1
 .endif
 
@@ -54,6 +63,15 @@ PLIST_SUB+=	WITH_IPV6=""
 PLIST_SUB+=	WITH_IPV6="@comment "
 .endif
 
+pre-fetch:
+	@${ECHO} "You can define the following variables to configure the djbdns build:"
+	@${ECHO} "- WITH_IPV6               - build with IPv6 support"
+	@${ECHO} "                            http://www.fefe.de/dns/"
+	@${ECHO} "- WITH_DNSCACHE_DUMPCACHE - build with the persistent cache patch for dnscache"
+	@${ECHO} "                            http://mapage.noos.fr/efge/djbdns/"
+	@${ECHO} "- WITHOUT_MAN             - do NOT install Gerritt Pape's manual pages"
+	@${ECHO} "                            http://smarden.org/pape/djb/manpages/"
+
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@echo "${CC} -s" > ${WRKSRC}/conf-ld
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index 71a53a9f79a3..352117f82c91 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -1,3 +1,4 @@
 MD5 (djbdns-1.05.tar.gz) = 3147c5cd56832aa3b41955c7a51cbeb2
 MD5 (djbdns-1.05-man-20020130.tar.gz) = f6f3feee042d57af8805f164be79dc85
 MD5 (djbdns-1.05-test11.diff.bz2) = 5ea46298d4fbe2533f4d9d3993c80ddb
+MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542