2 files changed, 29 insertions, 21 deletions

diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index fff53b066d1c..2cd1a8d28bb6 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -7,14 +7,36 @@
 
 PORTNAME?=	djbdns
 PORTVERSION?=	${DJBDNS_VER}
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES?=	dns
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
 DISTNAME=	djbdns-${DJBDNS_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-.if !defined(WITHOUT_MAN)
+OPTIONS=	DUMPCACHE	'persistent cache for dnscache' off \
+		IPV6		'IPv6 support by Felix von Leitner' off \
+		IGNOREIP	'ignoreip2 patch by Russell Nelson' off \
+		JUMBO		'jumbo patch by Claudiu Costin' off \
+		MAN		'manual pages by Gerritt Pape' on \
+		PERSISTENT_MMAP	'persistent mmap patch by Lennert Buytenhek' off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_JUMBO)
+.if defined(WITH_IPV6) || defined(WITH_IGNOREIP)
+BROKEN=		"The jumbo patch currently conflicts with the IPv6 and ignoreip2 patches"
+.endif
+
+PATCH_SITES+=	http://www.ro.kde.org/djbdns/mywork/jumbo/:jumbo
+PATCHFILES+=	jumbo-p13.patch.gz:jumbo
+PATCH_DIST_STRIP=	-p1
+.if defined(WITH_DUMPCACHE)
+CFLAGS+=	-DDUMPCACHE
+.endif
+.endif
+
+.if defined(WITH_MAN)
 MANDATE=	-20031023
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:manpages
 DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:manpages
@@ -38,9 +60,9 @@ PATCH_DIST_STRIP=	-p1
 EXTRA_PATCHES+=	${FILESDIR}/uint32.patch
 .endif
 
-.if defined(WITH_DNSCACHE_DUMPCACHE)
+.if defined(WITH_DUMPCACHE) && !defined(WITH_JUMBO)
 .if defined(WITH_IPV6)
-BROKEN=		The IPv6 and dnscache-dumpcache patches are currently in conflict.
+BROKEN=		"The IPv6 and dnscache-dumpcache patches are currently in conflict"
 .endif
 PATCH_SITES+=	http://efge.free.fr/djbdns/:dumpcache
 PATCHFILES+=	patch-dnscache-dumpcache-v4.txt:dumpcache
@@ -74,36 +96,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
 
-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://efge.free.fr/djbdns/"
-	@${ECHO} "- WITHOUT_MAN             - do NOT install Gerritt Pape's manual pages"
-	@${ECHO} "                            http://smarden.org/pape/djb/manpages/"
-	@${ECHO} "- WITH_IGNOREIP           - build with Russel Nelson's ignoreip2 patch"
-	@${ECHO} "                            http://tinydns.org/djbdns-1.05-ignoreip2.patch"
-	@${ECHO} "- WITH_PERSISTENT_MMAP    - build with Lennert Buytenhek's persistent mmap"
-	@${ECHO} "                            patch for tinydns"
-	@${ECHO} "                            http://marc.theaimsgroup.com/?l=djbdns&m=108229203212517&w=2"
-
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@echo "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
 	@echo "${PREFIX}" > ${WRKSRC}/conf-home
 
-.if !defined(WITHOUT_MAN)
+.if defined(WITH_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>
+.include <bsd.port.post.mk>
diff --git a/dns/djbdns/distinfo b/dns/djbdns/distinfo
index ddc26220675b..dd30f8a9e42c 100644
--- a/dns/djbdns/distinfo
+++ b/dns/djbdns/distinfo
@@ -4,3 +4,4 @@ MD5 (djbdns-1.05-test14.diff.bz2) = 52bec93d7ce6226281082367e49157d3
 MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542
 MD5 (djbdns-1.05-ignoreip2.patch) = c032250b209d055847a763c8d9c7e865
 MD5 (tinydns-persistmmap-20040418.patch) = c721977364502180f9563b85cecf133b
+MD5 (jumbo-p13.patch.gz) = c96a7cf19968f26ff1422cd197b1a72d