diff options
author | lx <lx@FreeBSD.org> | 2014-01-04 08:35:04 +0800 |
---|---|---|
committer | lx <lx@FreeBSD.org> | 2014-01-04 08:35:04 +0800 |
commit | d45ee53e218aef998d3fc944379177937450e0c8 (patch) | |
tree | 2140e118282ba12e6e75aa41318d483de4694831 /dns | |
parent | 6c1d8be1255c7172e67960fc9ac5082cc53d4b9a (diff) | |
download | freebsd-ports-gnome-d45ee53e218aef998d3fc944379177937450e0c8.tar.gz freebsd-ports-gnome-d45ee53e218aef998d3fc944379177937450e0c8.tar.zst freebsd-ports-gnome-d45ee53e218aef998d3fc944379177937450e0c8.zip |
Add stage support, update ipv6 patch, update root server IPs, change MAN handling, etc.
PR: 184949
Submitted by: Brad Davis
Diffstat (limited to 'dns')
-rw-r--r-- | dns/djbdns/Makefile | 25 | ||||
-rw-r--r-- | dns/djbdns/distinfo | 4 | ||||
-rw-r--r-- | dns/djbdns/files/patch-dnsroots.global | 11 | ||||
-rw-r--r-- | dns/djbdns/files/uint32.patch | 27 | ||||
-rw-r--r-- | dns/djbdns/pkg-plist | 25 |
5 files changed, 60 insertions, 32 deletions
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile index 541c85f451e7..159597107e6b 100644 --- a/dns/djbdns/Makefile +++ b/dns/djbdns/Makefile @@ -3,7 +3,7 @@ PORTNAME?= djbdns PORTVERSION?= ${DJBDNS_VER} -PORTREVISION?= 14 +PORTREVISION?= 15 CATEGORIES?= dns MASTER_SITES= http://cr.yp.to/djbdns/ \ ftp://cr.yp.to/djbdns/ @@ -28,9 +28,8 @@ MAN_DESC= manual pages by Gerritt Pape PERSISTENT_MMAP_DESC= persistent mmap patch by Lennert Buytenhek SRV_DESC= SRV record patch by Michael Handler DNSCURVE_DESC= DNSCurve support by Matthew Dempsky -ADD_USERS_DESC= Add dnscache, tinydns and dnslog users/groups +ADD_USERS_DESC= Add dnscache, tinydns and dnslog users/groups -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MADD_USERS} @@ -57,15 +56,9 @@ CFLAGS+= -DDUMPCACHE 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 +PLIST_SUB+= WITH_MAN="" +.else +PLIST_SUB+= WITH_MAN="@comment " .endif .if ${PORT_OPTIONS:MIP6} @@ -121,7 +114,7 @@ BUILD_DEPENDS+= nacl-sha256:${PORTSDIR}/security/nacl .endif DJBDNS_VER= 1.05 -DJBDNS_V6_VER= test23 +DJBDNS_V6_VER= test25 ALL_TARGET= it INSTALL_TARGET= setup check @@ -135,12 +128,12 @@ PLIST_SUB+= WITH_IP6="@comment " post-patch: @echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc @echo "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld - @echo "${PREFIX}" > ${WRKSRC}/conf-home + @echo "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-home .if ${PORT_OPTIONS:MMAN} post-install: - @${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${PREFIX}/man/man1/ - @${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${PREFIX}/man/man8/ + @${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${STAGEDIR}${PREFIX}/man/man1/ + @${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${STAGEDIR}${PREFIX}/man/man8/ .endif .include <bsd.port.mk> diff --git a/dns/djbdns/distinfo b/dns/djbdns/distinfo index 0beb2721ae6a..86f147f9d63d 100644 --- a/dns/djbdns/distinfo +++ b/dns/djbdns/distinfo @@ -6,8 +6,8 @@ SHA256 (jumbo-p13.patch.gz) = 04397e9a5b35546ae4b5dc134142ad6cc47014791cad2284e5 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-test25.diff.bz2) = 28c88de08822894cf252e54ed3be9abfdf4f492644ff74a7c479340bdce051ea +SIZE (djbdns-1.05-test25.diff.bz2) = 20376 SHA256 (djbdns-1.05-ignoreip2.patch) = ca5d759380c316132be6680e77c37d24a5d715cd6e1c325a75c8450e01133be0 SIZE (djbdns-1.05-ignoreip2.patch) = 3890 SHA256 (tinydns-persistmmap-20040418.patch) = 9c8e685ed628ef80b92611023c098066633f7bf63be434f373edfba0a465ebb6 diff --git a/dns/djbdns/files/patch-dnsroots.global b/dns/djbdns/files/patch-dnsroots.global index da565637a8e2..bccd37d36a20 100644 --- a/dns/djbdns/files/patch-dnsroots.global +++ b/dns/djbdns/files/patch-dnsroots.global @@ -1,13 +1,14 @@ ---- dnsroots.global.orig 2001-02-11 23:11:45.000000000 +0200 -+++ dnsroots.global 2007-11-04 20:06:59.000000000 +0200 -@@ -1,5 +1,5 @@ +--- dnsroots.global.orig 2001-02-11 14:11:45.000000000 -0700 ++++ dnsroots.global 2014-01-03 08:54:45.000000000 -0700 +@@ -1,13 +1,13 @@ 198.41.0.4 -128.9.0.107 +192.228.79.201 192.33.4.12 - 128.8.10.90 +-128.8.10.90 ++199.7.91.13 192.203.230.10 -@@ -7,7 +7,7 @@ + 192.5.5.241 192.112.36.4 128.63.2.53 192.36.148.17 diff --git a/dns/djbdns/files/uint32.patch b/dns/djbdns/files/uint32.patch index b677eb10628c..075e696ef182 100644 --- a/dns/djbdns/files/uint32.patch +++ b/dns/djbdns/files/uint32.patch @@ -1,6 +1,15 @@ ---- Makefile.orig Wed Dec 29 09:37:36 2004 -+++ Makefile Wed Dec 29 09:52:11 2004 -@@ -333,7 +333,7 @@ +--- Makefile.orig 2013-12-17 14:29:31.000000000 -0700 ++++ Makefile 2013-12-17 14:30:30.000000000 -0700 +@@ -212,7 +212,7 @@ + chmod 755 choose + + clientloc.o: \ +-compile clientloc.c open.h byte.h cdb.h ip6.h ++compile clientloc.c open.h byte.h cdb.h ip6.h uint32.h + ./compile clientloc.c + + compile: \ +@@ -337,7 +337,7 @@ dns_transmit.o: \ compile dns_transmit.c socket.h uint16.h alloc.h error.h byte.h \ uint16.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h uint64.h \ @@ -9,7 +18,7 @@ ./compile dns_transmit.c dns_txt.o: \ -@@ -855,15 +855,15 @@ +@@ -859,15 +859,15 @@ rm -f trylsock.o trylsock socket_accept.o: \ @@ -28,7 +37,7 @@ ./compile socket_bind.c socket_bind6.o: \ -@@ -871,7 +871,7 @@ +@@ -875,7 +875,7 @@ ./compile socket_bind6.c socket_conn.o: \ @@ -37,7 +46,7 @@ ./compile socket_conn.c socket_connect6.o: \ -@@ -879,11 +879,11 @@ +@@ -883,11 +883,11 @@ ./compile socket_connect6.c socket_listen.o: \ @@ -51,7 +60,7 @@ ./compile socket_recv.c socket_recv6.o: \ -@@ -891,7 +891,7 @@ +@@ -895,7 +895,7 @@ ./compile socket_recv6.c socket_send.o: \ @@ -60,7 +69,7 @@ ./compile socket_send.c socket_send6.o: \ -@@ -899,7 +899,7 @@ +@@ -903,7 +903,7 @@ ./compile socket_send6.c socket_tcp.o: \ @@ -69,7 +78,7 @@ ./compile socket_tcp.c socket_tcp6.o: \ -@@ -907,7 +907,7 @@ +@@ -911,7 +911,7 @@ ./compile socket_tcp6.c socket_udp.o: \ diff --git a/dns/djbdns/pkg-plist b/dns/djbdns/pkg-plist index 9d7942ac5588..72fb8382f6f2 100644 --- a/dns/djbdns/pkg-plist +++ b/dns/djbdns/pkg-plist @@ -30,3 +30,28 @@ bin/tinydns-get bin/walldns bin/walldns-conf etc/dnsroots.global +%%WITH_MAN%%man/man1/dnsfilter.1.gz +%%WITH_MAN%%man/man1/dnsip.1.gz +%%WITH_MAN%%man/man1/dnsipq.1.gz +%%WITH_MAN%%man/man1/dnsmx.1.gz +%%WITH_MAN%%man/man1/dnsname.1.gz +%%WITH_MAN%%man/man1/dnsq.1.gz +%%WITH_MAN%%man/man1/dnsqr.1.gz +%%WITH_MAN%%man/man1/dnstrace.1.gz +%%WITH_MAN%%man/man1/dnstracesort.1.gz +%%WITH_MAN%%man/man1/dnstxt.1.gz +%%WITH_MAN%%man/man1/tinydns-get.1.gz +%%WITH_MAN%%man/man8/axfr-get.8.gz +%%WITH_MAN%%man/man8/axfrdns-conf.8.gz +%%WITH_MAN%%man/man8/axfrdns.8.gz +%%WITH_MAN%%man/man8/dnscache-conf.8.gz +%%WITH_MAN%%man/man8/dnscache.8.gz +%%WITH_MAN%%man/man8/rbldns-conf.8.gz +%%WITH_MAN%%man/man8/rbldns-data.8.gz +%%WITH_MAN%%man/man8/rbldns.8.gz +%%WITH_MAN%%man/man8/tinydns-conf.8.gz +%%WITH_MAN%%man/man8/tinydns-data.8.gz +%%WITH_MAN%%man/man8/tinydns-edit.8.gz +%%WITH_MAN%%man/man8/tinydns.8.gz +%%WITH_MAN%%man/man8/walldns-conf.8.gz +%%WITH_MAN%%man/man8/walldns.8.gz |