Date: Wed, 22 May 2013 18:18:35 +0000 (UTC) From: David Thiel <lx@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318784 - head/dns/djbdns Message-ID: <201305221818.r4MIIZLY005780@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lx Date: Wed May 22 18:18:35 2013 New Revision: 318784 URL: http://svnweb.freebsd.org/changeset/ports/318784 Log: Dodge "WITH_IPV6" newly becoming the default, since it pulls in an unofficial third-party patch and makes the version number go "backwards". Modified: head/dns/djbdns/Makefile head/dns/djbdns/pkg-plist Modified: head/dns/djbdns/Makefile ============================================================================== --- head/dns/djbdns/Makefile Wed May 22 18:09:24 2013 (r318783) +++ head/dns/djbdns/Makefile Wed May 22 18:18:35 2013 (r318784) @@ -16,10 +16,10 @@ COMMENT?= A collection of secure and rel RUN_DEPENDS= setuidgid:${PORTSDIR}/sysutils/daemontools \ tcpserver:${PORTSDIR}/sysutils/ucspi-tcp -OPTIONS_DEFINE= DUMPCACHE IPV6 IGNOREIP JUMBO MAN PERSISTENT_MMAP SRV DNSCURVE +OPTIONS_DEFINE= DUMPCACHE IP6 IGNOREIP JUMBO MAN PERSISTENT_MMAP SRV DNSCURVE OPTIONS_DEFAULT= MAN DUMPCACHE_DESC= persistent cache for dnscache -IPV6_DESC= IPv6 support by Felix von Leitner +IP6_DESC= IPv6 support by Felix von Leitner IGNOREIP_DESC= ignoreip2 patch by Russell Nelson JUMBO_DESC= jumbo patch by Claudiu Costin MAN_DESC= manual pages by Gerritt Pape @@ -30,7 +30,7 @@ DNSCURVE_DESC= DNSCurve support by Matth .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MJUMBO} -.if ${PORT_OPTIONS:MIPV6} || ${PORT_OPTIONS:MIGNOREIP} || ${PORT_OPTIONS:MSRV} || \ +.if ${PORT_OPTIONS:MIP6} || ${PORT_OPTIONS:MIGNOREIP} || ${PORT_OPTIONS:MSRV} || \ ${PORT_OPTIONS:MDNSCURVE} BROKEN= The jumbo patch currently conflicts with the IPv6, ignoreip2, SRV and DNSCURVE patches .endif @@ -59,7 +59,7 @@ MAN8= axfr-get.8 axfrdns.8 axfrdns-conf MANCOMPRESSED= no .endif -.if ${PORT_OPTIONS:MIPV6} +.if ${PORT_OPTIONS:MIP6} PKGNAMESUFFIX= -ipv6 PORTVERSION= ${DJBDNS_VER}.${DJBDNS_V6_VER:S/test/b/:S/diff//} PATCH_SITES+= http://www.fefe.de/dns/:ipv6 @@ -69,7 +69,7 @@ EXTRA_PATCHES+= ${FILESDIR}/uint32.patch .endif .if ${PORT_OPTIONS:MDUMPCACHE} && ! ${PORT_OPTIONS:MJUMBO} -.if ${PORT_OPTIONS:MIPV6} +.if ${PORT_OPTIONS:MIP6} BROKEN= The IPv6 and dnscache-dumpcache patches are currently in conflict .endif PATCH_SITES+= http://efge.free.fr/djbdns/:dumpcache @@ -79,7 +79,7 @@ CFLAGS+= -DDUMPCACHE .endif .if ${PORT_OPTIONS:MIGNOREIP} -.if ${PORT_OPTIONS:MIPV6} +.if ${PORT_OPTIONS:MIP6} BROKEN= The IPv6 patch already includes the ignoreip2 functionality .endif PATCH_SITES+= http://tinydns.org/:ignoreip @@ -100,7 +100,7 @@ PATCH_DIST_STRIP= -p1 .endif .if ${PORT_OPTIONS:MDNSCURVE} -.if ${PORT_OPTIONS:MIPV6} +.if ${PORT_OPTIONS:MIP6} BROKEN= The IPv6 and DNSCurve patches are currently in conflict .endif PATCH_SITES+= http://shinobi.dempsky.org/~matthew/patches/:dnscurve @@ -117,10 +117,10 @@ DJBDNS_V6_VER= test23 ALL_TARGET= it INSTALL_TARGET= setup check -.if ${PORT_OPTIONS:MIPV6} -PLIST_SUB+= WITH_IPV6="" +.if ${PORT_OPTIONS:MIP6} +PLIST_SUB+= WITH_IP6="" .else -PLIST_SUB+= WITH_IPV6="@comment " +PLIST_SUB+= WITH_IP6="@comment " .endif post-patch: Modified: head/dns/djbdns/pkg-plist ============================================================================== --- head/dns/djbdns/pkg-plist Wed May 22 18:09:24 2013 (r318783) +++ head/dns/djbdns/pkg-plist Wed May 22 18:18:35 2013 (r318784) @@ -5,8 +5,8 @@ bin/dnscache bin/dnscache-conf bin/dnsfilter bin/dnsip -%%WITH_IPV6%%bin/dnsip6 -%%WITH_IPV6%%bin/dnsip6q +%%WITH_IP6%%bin/dnsip6 +%%WITH_IP6%%bin/dnsip6q bin/dnsipq bin/dnsmx bin/dnsname
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305221818.r4MIIZLY005780>