Index: head/dns/djbdns/Makefile
===================================================================
--- head/dns/djbdns/Makefile	(revision 291649)
+++ head/dns/djbdns/Makefile	(revision 291650)
@@ -1,125 +1,139 @@
 # New ports collection makefile for: dnscache
 # Date created:		24 Jan 2000
 # Whom:			Neil Blakey-Milner
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	djbdns
 PORTVERSION?=	${DJBDNS_VER}
-PORTREVISION?=	13
+PORTREVISION?=	14
 CATEGORIES?=	dns
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
 DISTNAME=	djbdns-${DJBDNS_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER?=	roam@FreeBSD.org
+MAINTAINER?=	lx@FreeBSD.org
 COMMENT?=	A collection of secure and reliable DNS tools
 
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
 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 \
-		SRV		"SRV record patch by Michael Handler" off
+		SRV		"SRV record patch by Michael Handler" off \
+		DNSCURVE	"DNSCurve support by Matthew Dempsky" off
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_JUMBO)
-.if defined(WITH_IPV6) || defined(WITH_IGNOREIP) || defined(WITH_SRV)
-BROKEN=		The jumbo patch currently conflicts with the IPv6, ignoreip2, and SRV patches
+.if defined(WITH_IPV6) || defined(WITH_IGNOREIP) || defined(WITH_SRV) || \
+	defined(WITH_DNSCURVE)
+BROKEN=		The jumbo patch currently conflicts with the IPv6, ignoreip2, SRV and DNSCURVE patches
 .endif
 
 PATCH_SITES+=	http://people.FreeBSD.org/~roam/ports/dns/djbdns/:jumbo \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%\//roam\/dns\/djbdns\/: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
 
 MAN1=		dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname.1 \
 		dnsq.1 dnsqr.1 dnstrace.1 dnstracesort.1 dnstxt.1 \
 		tinydns-get.1
 MAN8=		axfr-get.8 axfrdns.8 axfrdns-conf.8 dnscache-conf.8 \
 		dnscache.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/:ipv6
 PATCHFILES+=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2:ipv6
 PATCH_DIST_STRIP=	-p1
 EXTRA_PATCHES+=	${FILESDIR}/uint32.patch ${FILESDIR}/djbdns-ipv6-ooyama.patch
 .endif
 
 .if defined(WITH_DUMPCACHE) && !defined(WITH_JUMBO)
 .if defined(WITH_IPV6)
 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
 PATCH_DIST_STRIP=	-p1
 CFLAGS+=	-DDUMPCACHE
 .endif
 
 .if defined(WITH_IGNOREIP)
 .if defined(WITH_IPV6)
 BROKEN=		The IPv6 patch already includes the ignoreip2 functionality
 .endif
 PATCH_SITES+=	http://tinydns.org/:ignoreip
 PATCHFILES+=	djbdns-1.05-ignoreip2.patch:ignoreip
 PATCH_DIST_STRIP=	-p1
 .endif
 
 .if defined(WITH_PERSISTENT_MMAP)
 PATCH_SITES+=	http://people.FreeBSD.org/~roam/ports/patches/dns/:persistent
 PATCHFILES+=	tinydns-persistmmap-20040418.patch:persistent
 PATCH_DIST_STRIP=	-p1
 .endif
 
 .if defined(WITH_SRV)
 PATCH_SITES+=	http://tinydns.org/:srv
 PATCHFILES+=	srv-patch:srv
 PATCH_DIST_STRIP=	-p1
 .endif
 
+.if defined(WITH_DNSCURVE)
+.if defined(WITH_IPV6)
+BROKEN=	The IPv6 and DNSCurve patches are currently in conflict
+.endif
+PATCH_SITES+=	http://shinobi.dempsky.org/~matthew/patches/:dnscurve
+PATCHFILES+=	djbdns-dnscurve-20090602.patch:dnscurve
+PATCH_DIST_STRIP=	-p1
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+LDFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+BUILD_DEPENDS+=	nacl-sha256:${PORTSDIR}/security/nacl
+.endif
+
 DJBDNS_VER=	1.05
 DJBDNS_V6_VER=	test23
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 .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} ${STRIP}" > ${WRKSRC}/conf-ld
+	@echo "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@echo "${PREFIX}" > ${WRKSRC}/conf-home
 
 .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.post.mk>

Property changes on: head/dns/djbdns/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.36
\ No newline at end of property
+1.37
\ No newline at end of property
Index: head/dns/djbdns/distinfo
===================================================================
--- head/dns/djbdns/distinfo	(revision 291649)
+++ head/dns/djbdns/distinfo	(revision 291650)
@@ -1,16 +1,18 @@
 SHA256 (djbdns-1.05.tar.gz) = 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48
 SIZE (djbdns-1.05.tar.gz) = 85648
 SHA256 (djbdns-1.05-man-20031023.tar.gz) = ba1c58f14bc928908d8618230f400d73cfe2200ed800a272b63048e3e50be569
 SIZE (djbdns-1.05-man-20031023.tar.gz) = 17170
 SHA256 (jumbo-p13.patch.gz) = 04397e9a5b35546ae4b5dc134142ad6cc47014791cad2284e5465f6a35a69304
 SIZE (jumbo-p13.patch.gz) = 11779
 SHA256 (patch-dnscache-dumpcache-v4.txt) = c2fbc21035fccbb3564226fc40edaa44643119b7b103483825f82786c89009f0
 SIZE (patch-dnscache-dumpcache-v4.txt) = 16065
 SHA256 (djbdns-1.05-test23.diff.bz2) = e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33
 SIZE (djbdns-1.05-test23.diff.bz2) = 18480
 SHA256 (djbdns-1.05-ignoreip2.patch) = ca5d759380c316132be6680e77c37d24a5d715cd6e1c325a75c8450e01133be0
 SIZE (djbdns-1.05-ignoreip2.patch) = 3890
 SHA256 (tinydns-persistmmap-20040418.patch) = 9c8e685ed628ef80b92611023c098066633f7bf63be434f373edfba0a465ebb6
 SIZE (tinydns-persistmmap-20040418.patch) = 920
 SHA256 (srv-patch) = 779546218b09544493c6ba5e23bc29c33c5d284cfc78ac6fa74fa8e050bb3779
 SIZE (srv-patch) = 4508
+SHA256 (djbdns-dnscurve-20090602.patch) = 7efc54bd1981d0eb920de02b97f9b152c57e6add8023c9b82566358dc9525bba
+SIZE (djbdns-dnscurve-20090602.patch) = 26674

Property changes on: head/dns/djbdns/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property