Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mpl/bind Merge conflicts, bump libraries, adjust th...



details:   https://anonhg.NetBSD.org/src/rev/d8d5af5bd33e
branches:  trunk
changeset: 936767:d8d5af5bd33e
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Aug 03 17:23:34 2020 +0000

description:
Merge conflicts, bump libraries, adjust the build.

diffstat:

 external/mpl/bind/bin/Makefile                                                 |      4 +-
 external/mpl/bind/bin/Makefile.inc                                             |     30 +-
 external/mpl/bind/bin/check/Makefile.inc                                       |      4 +-
 external/mpl/bind/bin/confgen/Makefile.inc                                     |      4 +-
 external/mpl/bind/bin/delv/Makefile                                            |      8 +-
 external/mpl/bind/bin/dig/Makefile                                             |      8 +-
 external/mpl/bind/bin/dnssec/Makefile.inc                                      |      4 +-
 external/mpl/bind/bin/host/Makefile                                            |      8 +-
 external/mpl/bind/bin/html/Makefile                                            |      5 +-
 external/mpl/bind/bin/named/Makefile                                           |      8 +-
 external/mpl/bind/bin/nslookup/Makefile                                        |      8 +-
 external/mpl/bind/bin/nsupdate/Makefile                                        |      8 +-
 external/mpl/bind/bin/rndc/Makefile                                            |      8 +-
 external/mpl/bind/bin/tools/Makefile.inc                                       |      8 +-
 external/mpl/bind/dist/Makefile.in                                             |      3 +-
 external/mpl/bind/dist/bin/check/named-checkconf.8                             |    154 -
 external/mpl/bind/dist/bin/check/named-checkconf.docbook                       |    229 -
 external/mpl/bind/dist/bin/check/named-checkconf.html                          |    180 -
 external/mpl/bind/dist/bin/check/named-checkzone.8                             |    331 -
 external/mpl/bind/dist/bin/check/named-checkzone.c                             |      8 +-
 external/mpl/bind/dist/bin/check/named-checkzone.docbook                       |    529 -
 external/mpl/bind/dist/bin/check/named-checkzone.html                          |    429 -
 external/mpl/bind/dist/bin/confgen/ddns-confgen.8                              |    150 -
 external/mpl/bind/dist/bin/confgen/ddns-confgen.docbook                        |    213 -
 external/mpl/bind/dist/bin/confgen/ddns-confgen.html                           |    187 -
 external/mpl/bind/dist/bin/confgen/rndc-confgen.8                              |    212 -
 external/mpl/bind/dist/bin/confgen/rndc-confgen.docbook                        |    271 -
 external/mpl/bind/dist/bin/confgen/rndc-confgen.html                           |    226 -
 external/mpl/bind/dist/bin/delv/delv.1                                         |    439 -
 external/mpl/bind/dist/bin/delv/delv.c                                         |     38 +-
 external/mpl/bind/dist/bin/delv/delv.docbook                                   |    699 -
 external/mpl/bind/dist/bin/delv/delv.html                                      |    588 -
 external/mpl/bind/dist/bin/dig/dig.1                                           |    855 -
 external/mpl/bind/dist/bin/dig/dig.docbook                                     |   1431 -
 external/mpl/bind/dist/bin/dig/dig.html                                        |   1155 -
 external/mpl/bind/dist/bin/dig/dighost.c                                       |      3 +-
 external/mpl/bind/dist/bin/dig/host.1                                          |    280 -
 external/mpl/bind/dist/bin/dig/host.docbook                                    |    416 -
 external/mpl/bind/dist/bin/dig/host.html                                       |    339 -
 external/mpl/bind/dist/bin/dig/nslookup.1                                      |    310 -
 external/mpl/bind/dist/bin/dig/nslookup.docbook                                |    524 -
 external/mpl/bind/dist/bin/dig/nslookup.html                                   |    409 -
 external/mpl/bind/dist/bin/dnssec/dnssec-cds.8                                 |    299 -
 external/mpl/bind/dist/bin/dnssec/dnssec-cds.docbook                           |    390 -
 external/mpl/bind/dist/bin/dnssec/dnssec-cds.html                              |    343 -
 external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.8                           |    228 -
 external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.docbook                     |    355 -
 external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.html                        |    307 -
 external/mpl/bind/dist/bin/dnssec/dnssec-importkey.8                           |    140 -
 external/mpl/bind/dist/bin/dnssec/dnssec-importkey.docbook                     |    254 -
 external/mpl/bind/dist/bin/dnssec/dnssec-importkey.html                        |    216 -
 external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.8                        |    313 -
 external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.docbook                  |    556 -
 external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.html                     |    462 -
 external/mpl/bind/dist/bin/dnssec/dnssec-keygen.8                              |    380 -
 external/mpl/bind/dist/bin/dnssec/dnssec-keygen.c                              |     15 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-keygen.docbook                        |    671 -
 external/mpl/bind/dist/bin/dnssec/dnssec-keygen.html                           |    555 -
 external/mpl/bind/dist/bin/dnssec/dnssec-revoke.8                              |    105 -
 external/mpl/bind/dist/bin/dnssec/dnssec-revoke.docbook                        |    170 -
 external/mpl/bind/dist/bin/dnssec/dnssec-revoke.html                           |    137 -
 external/mpl/bind/dist/bin/dnssec/dnssec-settime.8                             |    257 -
 external/mpl/bind/dist/bin/dnssec/dnssec-settime.docbook                       |    470 -
 external/mpl/bind/dist/bin/dnssec/dnssec-settime.html                          |    390 -
 external/mpl/bind/dist/bin/dnssec/dnssec-signzone.8                            |    476 -
 external/mpl/bind/dist/bin/dnssec/dnssec-signzone.docbook                      |    837 -
 external/mpl/bind/dist/bin/dnssec/dnssec-signzone.html                         |    673 -
 external/mpl/bind/dist/bin/dnssec/dnssec-verify.8                              |    126 -
 external/mpl/bind/dist/bin/dnssec/dnssec-verify.docbook                        |    219 -
 external/mpl/bind/dist/bin/dnssec/dnssec-verify.html                           |    180 -
 external/mpl/bind/dist/bin/named/bind9.xsl.h                                   |     11 +-
 external/mpl/bind/dist/bin/named/config.c                                      |      8 +-
 external/mpl/bind/dist/bin/named/control.c                                     |      4 +-
 external/mpl/bind/dist/bin/named/controlconf.c                                 |     68 +-
 external/mpl/bind/dist/bin/named/include/named/control.h                       |      3 +-
 external/mpl/bind/dist/bin/named/include/named/server.h                        |      9 +-
 external/mpl/bind/dist/bin/named/main.c                                        |      9 +-
 external/mpl/bind/dist/bin/named/named.8                                       |    384 -
 external/mpl/bind/dist/bin/named/named.conf.5                                  |   1116 -
 external/mpl/bind/dist/bin/named/named.conf.docbook                            |   1066 -
 external/mpl/bind/dist/bin/named/named.conf.html                               |   1063 -
 external/mpl/bind/dist/bin/named/named.docbook                                 |    550 -
 external/mpl/bind/dist/bin/named/named.html                                    |    458 -
 external/mpl/bind/dist/bin/named/server.c                                      |     99 +-
 external/mpl/bind/dist/bin/named/statschannel.c                                |     73 +-
 external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c                      |      6 +-
 external/mpl/bind/dist/bin/named/unix/include/named/os.h                       |      4 +-
 external/mpl/bind/dist/bin/named/unix/os.c                                     |     14 +-
 external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c                     |      6 +-
 external/mpl/bind/dist/bin/named/win32/include/named/os.h                      |      4 +-
 external/mpl/bind/dist/bin/named/win32/os.c                                    |      6 +-
 external/mpl/bind/dist/bin/named/zoneconf.c                                    |     16 +-
 external/mpl/bind/dist/bin/nsupdate/nsupdate.1                                 |    525 -
 external/mpl/bind/dist/bin/nsupdate/nsupdate.c                                 |     55 +-
 external/mpl/bind/dist/bin/nsupdate/nsupdate.docbook                           |    932 -
 external/mpl/bind/dist/bin/nsupdate/nsupdate.html                              |    785 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-destroy.8                             |     99 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-destroy.docbook                       |    154 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-destroy.html                          |    128 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-keygen.8                              |    122 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-keygen.docbook                        |    206 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-keygen.html                           |    166 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-list.8                                |    100 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-list.docbook                          |    150 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-list.html                             |    124 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-tokens.8                              |     71 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-tokens.docbook                        |    102 -
 external/mpl/bind/dist/bin/pkcs11/pkcs11-tokens.html                           |     89 -
 external/mpl/bind/dist/bin/plugins/filter-aaaa.8                               |    118 -
 external/mpl/bind/dist/bin/plugins/filter-aaaa.docbook                         |    148 -
 external/mpl/bind/dist/bin/plugins/filter-aaaa.html                            |    135 -
 external/mpl/bind/dist/bin/python/dnssec-checkds.8                             |     97 -
 external/mpl/bind/dist/bin/python/dnssec-checkds.docbook                       |    148 -
 external/mpl/bind/dist/bin/python/dnssec-checkds.html                          |    122 -
 external/mpl/bind/dist/bin/python/dnssec-coverage.8                            |    158 -
 external/mpl/bind/dist/bin/python/dnssec-coverage.docbook                      |    272 -
 external/mpl/bind/dist/bin/python/dnssec-coverage.html                         |    236 -
 external/mpl/bind/dist/bin/python/dnssec-keymgr.8                              |    300 -
 external/mpl/bind/dist/bin/python/dnssec-keymgr.docbook                        |    422 -
 external/mpl/bind/dist/bin/python/dnssec-keymgr.html                           |    371 -
 external/mpl/bind/dist/bin/rndc/rndc.8                                         |    751 -
 external/mpl/bind/dist/bin/rndc/rndc.c                                         |      5 +-
 external/mpl/bind/dist/bin/rndc/rndc.conf.5                                    |    236 -
 external/mpl/bind/dist/bin/rndc/rndc.conf.docbook                              |    242 -
 external/mpl/bind/dist/bin/rndc/rndc.conf.html                                 |    234 -
 external/mpl/bind/dist/bin/rndc/rndc.docbook                                   |   1158 -
 external/mpl/bind/dist/bin/rndc/rndc.html                                      |    991 -
 external/mpl/bind/dist/bin/tools/arpaname.1                                    |     58 -
 external/mpl/bind/dist/bin/tools/arpaname.docbook                              |     67 -
 external/mpl/bind/dist/bin/tools/arpaname.html                                 |     57 -
 external/mpl/bind/dist/bin/tools/dnstap-read.1                                 |     97 -
 external/mpl/bind/dist/bin/tools/dnstap-read.docbook                           |    129 -
 external/mpl/bind/dist/bin/tools/dnstap-read.html                              |    109 -
 external/mpl/bind/dist/bin/tools/mdig.1                                        |    409 -
 external/mpl/bind/dist/bin/tools/mdig.docbook                                  |    702 -
 external/mpl/bind/dist/bin/tools/mdig.html                                     |    577 -
 external/mpl/bind/dist/bin/tools/named-journalprint.8                          |     70 -
 external/mpl/bind/dist/bin/tools/named-journalprint.docbook                    |     94 -
 external/mpl/bind/dist/bin/tools/named-journalprint.html                       |     83 -
 external/mpl/bind/dist/bin/tools/named-nzd2nzf.8                               |     69 -
 external/mpl/bind/dist/bin/tools/named-nzd2nzf.c                               |      4 +-
 external/mpl/bind/dist/bin/tools/named-nzd2nzf.docbook                         |     95 -
 external/mpl/bind/dist/bin/tools/named-nzd2nzf.html                            |     85 -
 external/mpl/bind/dist/bin/tools/named-rrchecker.1                             |     83 -
 external/mpl/bind/dist/bin/tools/named-rrchecker.docbook                       |     97 -
 external/mpl/bind/dist/bin/tools/named-rrchecker.html                          |     87 -
 external/mpl/bind/dist/bin/tools/nsec3hash.8                                   |     90 -
 external/mpl/bind/dist/bin/tools/nsec3hash.docbook                             |    146 -
 external/mpl/bind/dist/bin/tools/nsec3hash.html                                |    122 -
 external/mpl/bind/dist/configure                                               |   1324 +-
 external/mpl/bind/dist/contrib/dlz/bin/dlzbdb/dlzbdb.c                         |     18 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_filesystem_driver.c             |      4 +-
 external/mpl/bind/dist/contrib/dlz/drivers/sdlz_helper.c                       |      8 +-
 external/mpl/bind/dist/contrib/dlz/modules/common/dlz_dbi.c                    |      8 +-
 external/mpl/bind/dist/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c |      4 +-
 external/mpl/bind/dist/doc/arm/Bv9ARM-book.xml                                 |  18525 ----------
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch01.html                                |    619 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch02.html                                |    151 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch03.html                                |    861 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch04.html                                |   2920 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch05.html                                |  15303 --------
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch06.html                                |    365 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch07.html                                |    196 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch08.html                                |    698 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch09.html                                |    153 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch10.html                                |    940 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch11.html                                |    543 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.ch12.html                                |    215 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.conf                                     |      3 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.html                                     |    449 -
 external/mpl/bind/dist/doc/arm/Bv9ARM.pdf                                      |    Bin 
 external/mpl/bind/dist/doc/arm/README-SGML                                     |     55 -
 external/mpl/bind/dist/doc/arm/acl.grammar.xml                                 |     16 -
 external/mpl/bind/dist/doc/arm/catz.xml                                        |    277 -
 external/mpl/bind/dist/doc/arm/controls.grammar.xml                            |     26 -
 external/mpl/bind/dist/doc/arm/delegation-only.zoneopt.xml                     |     17 -
 external/mpl/bind/dist/doc/arm/dlz.xml                                         |    148 -
 external/mpl/bind/dist/doc/arm/dnssec-policy.grammar.xml                       |     30 -
 external/mpl/bind/dist/doc/arm/dnssec.xml                                      |    370 -
 external/mpl/bind/dist/doc/arm/dyndb.xml                                       |     99 -
 external/mpl/bind/dist/doc/arm/forward.zoneopt.xml                             |     20 -
 external/mpl/bind/dist/doc/arm/hint.zoneopt.xml                                |     20 -
 external/mpl/bind/dist/doc/arm/in-view.zoneopt.xml                             |     17 -
 external/mpl/bind/dist/doc/arm/isc-logo.pdf                                    |    Bin 
 external/mpl/bind/dist/doc/arm/key.grammar.xml                                 |     19 -
 external/mpl/bind/dist/doc/arm/libdns.xml                                      |    523 -
 external/mpl/bind/dist/doc/arm/logging-categories.xml                          |    428 -
 external/mpl/bind/dist/doc/arm/logging.grammar.xml                             |     30 -
 external/mpl/bind/dist/doc/arm/man.arpaname.html                               |     95 -
 external/mpl/bind/dist/doc/arm/man.ddns-confgen.html                           |    225 -
 external/mpl/bind/dist/doc/arm/man.delv.html                                   |    626 -
 external/mpl/bind/dist/doc/arm/man.dig.html                                    |   1193 -
 external/mpl/bind/dist/doc/arm/man.dnssec-cds.html                             |    381 -
 external/mpl/bind/dist/doc/arm/man.dnssec-checkds.html                         |    161 -
 external/mpl/bind/dist/doc/arm/man.dnssec-coverage.html                        |    275 -
 external/mpl/bind/dist/doc/arm/man.dnssec-dsfromkey.html                       |    346 -
 external/mpl/bind/dist/doc/arm/man.dnssec-importkey.html                       |    255 -
 external/mpl/bind/dist/doc/arm/man.dnssec-keyfromlabel.html                    |    501 -
 external/mpl/bind/dist/doc/arm/man.dnssec-keygen.html                          |    594 -
 external/mpl/bind/dist/doc/arm/man.dnssec-keymgr.html                          |    410 -
 external/mpl/bind/dist/doc/arm/man.dnssec-revoke.html                          |    176 -
 external/mpl/bind/dist/doc/arm/man.dnssec-settime.html                         |    429 -
 external/mpl/bind/dist/doc/arm/man.dnssec-signzone.html                        |    712 -
 external/mpl/bind/dist/doc/arm/man.dnssec-verify.html                          |    219 -
 external/mpl/bind/dist/doc/arm/man.dnstap-read.html                            |    148 -
 external/mpl/bind/dist/doc/arm/man.filter-aaaa.html                            |    173 -
 external/mpl/bind/dist/doc/arm/man.host.html                                   |    378 -
 external/mpl/bind/dist/doc/arm/man.mdig.html                                   |    615 -
 external/mpl/bind/dist/doc/arm/man.named-checkconf.html                        |    219 -
 external/mpl/bind/dist/doc/arm/man.named-checkzone.html                        |    468 -
 external/mpl/bind/dist/doc/arm/man.named-journalprint.html                     |    122 -
 external/mpl/bind/dist/doc/arm/man.named-nzd2nzf.html                          |    124 -
 external/mpl/bind/dist/doc/arm/man.named-rrchecker.html                        |    126 -
 external/mpl/bind/dist/doc/arm/man.named.conf.html                             |   1102 -
 external/mpl/bind/dist/doc/arm/man.named.html                                  |    497 -
 external/mpl/bind/dist/doc/arm/man.nsec3hash.html                              |    160 -
 external/mpl/bind/dist/doc/arm/man.nslookup.html                               |    448 -
 external/mpl/bind/dist/doc/arm/man.nsupdate.html                               |    823 -
 external/mpl/bind/dist/doc/arm/man.pkcs11-destroy.html                         |    167 -
 external/mpl/bind/dist/doc/arm/man.pkcs11-keygen.html                          |    205 -
 external/mpl/bind/dist/doc/arm/man.pkcs11-list.html                            |    163 -
 external/mpl/bind/dist/doc/arm/man.pkcs11-tokens.html                          |    128 -
 external/mpl/bind/dist/doc/arm/man.rndc-confgen.html                           |    265 -
 external/mpl/bind/dist/doc/arm/man.rndc.conf.html                              |    273 -
 external/mpl/bind/dist/doc/arm/man.rndc.html                                   |   1026 -
 external/mpl/bind/dist/doc/arm/managed-keys.grammar.xml                        |     19 -
 external/mpl/bind/dist/doc/arm/managed-keys.xml                                |     94 -
 external/mpl/bind/dist/doc/arm/master.zoneopt.xml                              |     71 -
 external/mpl/bind/dist/doc/arm/masters.grammar.xml                             |     19 -
 external/mpl/bind/dist/doc/arm/mirror.zoneopt.xml                              |     56 -
 external/mpl/bind/dist/doc/arm/notes-9.16.0.xml                                |    249 -
 external/mpl/bind/dist/doc/arm/notes-9.16.1.xml                                |     63 -
 external/mpl/bind/dist/doc/arm/notes-9.16.2.xml                                |     82 -
 external/mpl/bind/dist/doc/arm/notes-9.16.3.xml                                |    137 -
 external/mpl/bind/dist/doc/arm/notes-download.xml                              |     20 -
 external/mpl/bind/dist/doc/arm/notes-eol.xml                                   |     24 -
 external/mpl/bind/dist/doc/arm/notes-intro.xml                                 |     22 -
 external/mpl/bind/dist/doc/arm/notes-license.xml                               |     34 -
 external/mpl/bind/dist/doc/arm/notes-numbering.xml                             |     20 -
 external/mpl/bind/dist/doc/arm/notes-platforms.xml                             |     35 -
 external/mpl/bind/dist/doc/arm/notes-thankyou.xml                              |     16 -
 external/mpl/bind/dist/doc/arm/notes-wrapper.xml                               |     18 -
 external/mpl/bind/dist/doc/arm/notes.conf                                      |      3 -
 external/mpl/bind/dist/doc/arm/notes.html                                      |    639 -
 external/mpl/bind/dist/doc/arm/notes.pdf                                       |    Bin 
 external/mpl/bind/dist/doc/arm/notes.txt                                       |    343 -
 external/mpl/bind/dist/doc/arm/notes.xml                                       |     35 -
 external/mpl/bind/dist/doc/arm/noteversion.xml.in                              |     12 -
 external/mpl/bind/dist/doc/arm/options.grammar.xml                             |    309 -
 external/mpl/bind/dist/doc/arm/pkcs11.xml                                      |    613 -
 external/mpl/bind/dist/doc/arm/pkgversion.xml.in                               |     12 -
 external/mpl/bind/dist/doc/arm/plugins.xml                                     |     95 -
 external/mpl/bind/dist/doc/arm/redirect.zoneopt.xml                            |     27 -
 external/mpl/bind/dist/doc/arm/releaseinfo.xml.in                              |     12 -
 external/mpl/bind/dist/doc/arm/server.grammar.xml                              |     47 -
 external/mpl/bind/dist/doc/arm/slave.zoneopt.xml                               |     74 -
 external/mpl/bind/dist/doc/arm/static-stub.zoneopt.xml                         |     25 -
 external/mpl/bind/dist/doc/arm/statistics-channels.grammar.xml                 |     21 -
 external/mpl/bind/dist/doc/arm/stub.zoneopt.xml                                |     41 -
 external/mpl/bind/dist/doc/arm/trust-anchors.grammar.xml                       |     19 -
 external/mpl/bind/dist/doc/arm/trusted-keys.grammar.xml                        |     18 -
 external/mpl/bind/dist/doc/misc/dnssec                                         |     81 -
 external/mpl/bind/dist/doc/misc/docbook-grammars.pl                            |     81 -
 external/mpl/bind/dist/doc/misc/docbook-options.pl                             |    195 -
 external/mpl/bind/dist/doc/misc/docbook-zoneopt.pl                             |     60 -
 external/mpl/bind/dist/doc/misc/ipv6                                           |    105 -
 external/mpl/bind/dist/doc/misc/migration                                      |    264 -
 external/mpl/bind/dist/doc/misc/migration-4to9                                 |     55 -
 external/mpl/bind/dist/doc/misc/roadmap                                        |     43 -
 external/mpl/bind/dist/doc/misc/tcp-fast-open                                  |     32 -
 external/mpl/bind/dist/doc/tex/Makefile.in                                     |     20 -
 external/mpl/bind/dist/doc/tex/armstyle.sty.in                                 |    107 -
 external/mpl/bind/dist/doc/tex/notestyle.sty                                   |     21 -
 external/mpl/bind/dist/doc/xsl/Makefile.in                                     |     21 -
 external/mpl/bind/dist/doc/xsl/arm-param.xsl                                   |    122 -
 external/mpl/bind/dist/doc/xsl/copyright.xsl                                   |     63 -
 external/mpl/bind/dist/doc/xsl/graphics/caution.eps                            |   1348 -
 external/mpl/bind/dist/doc/xsl/graphics/caution.pdf                            |    Bin 
 external/mpl/bind/dist/doc/xsl/graphics/important.eps                          |   1348 -
 external/mpl/bind/dist/doc/xsl/graphics/important.pdf                          |    Bin 
 external/mpl/bind/dist/doc/xsl/graphics/note.eps                               |   1387 -
 external/mpl/bind/dist/doc/xsl/graphics/note.pdf                               |    Bin 
 external/mpl/bind/dist/doc/xsl/graphics/tip.eps                                |   1503 -
 external/mpl/bind/dist/doc/xsl/graphics/tip.pdf                                |    Bin 
 external/mpl/bind/dist/doc/xsl/graphics/warning.eps                            |   1348 -
 external/mpl/bind/dist/doc/xsl/graphics/warning.pdf                            |    Bin 
 external/mpl/bind/dist/doc/xsl/isc-docbook-chunk.xsl.in                        |     72 -
 external/mpl/bind/dist/doc/xsl/isc-docbook-html.xsl.in                         |     65 -
 external/mpl/bind/dist/doc/xsl/isc-docbook-text.xsl                            |     43 -
 external/mpl/bind/dist/doc/xsl/isc-manpage.xsl.in                              |    139 -
 external/mpl/bind/dist/doc/xsl/isc-notes-html.xsl.in                           |     64 -
 external/mpl/bind/dist/doc/xsl/notes-param.xsl                                 |     23 -
 external/mpl/bind/dist/doc/xsl/pre-latex.xsl                                   |     50 -
 external/mpl/bind/dist/lib/bind9/check.c                                       |     79 +-
 external/mpl/bind/dist/lib/dns/adb.c                                           |     37 +-
 external/mpl/bind/dist/lib/dns/catz.c                                          |     12 +-
 external/mpl/bind/dist/lib/dns/compress.c                                      |      4 +-
 external/mpl/bind/dist/lib/dns/db.c                                            |     10 +-
 external/mpl/bind/dist/lib/dns/dispatch.c                                      |      6 +-
 external/mpl/bind/dist/lib/dns/dnstap.c                                        |      6 +-
 external/mpl/bind/dist/lib/dns/dst_api.c                                       |     73 +-
 external/mpl/bind/dist/lib/dns/dyndb.c                                         |      4 +-
 external/mpl/bind/dist/lib/dns/include/dns/keymgr.h                            |     19 +-
 external/mpl/bind/dist/lib/dns/include/dns/keytable.h                          |     15 +-
 external/mpl/bind/dist/lib/dns/include/dns/message.h                           |      3 +-
 external/mpl/bind/dist/lib/dns/include/dns/result.h                            |      5 +-
 external/mpl/bind/dist/lib/dns/include/dns/validator.h                         |      4 +-
 external/mpl/bind/dist/lib/dns/include/dns/view.h                              |     21 +-
 external/mpl/bind/dist/lib/dns/keymgr.c                                        |    765 +-
 external/mpl/bind/dist/lib/dns/keytable.c                                      |    292 +-
 external/mpl/bind/dist/lib/dns/lib.c                                           |      4 +-
 external/mpl/bind/dist/lib/dns/master.c                                        |     63 +-
 external/mpl/bind/dist/lib/dns/masterdump.c                                    |      6 +-
 external/mpl/bind/dist/lib/dns/message.c                                       |    195 +-
 external/mpl/bind/dist/lib/dns/rbtdb.c                                         |    273 +-
 external/mpl/bind/dist/lib/dns/rdata.c                                         |     29 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/amtrelay_260.c                    |      6 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ipseckey_45.c                     |      6 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/l32_105.c                         |      4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.c                          |     22 +-
 external/mpl/bind/dist/lib/dns/rdata/hs_4/a_1.c                                |      4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a6_38.c                              |      4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a_1.c                                |      4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/aaaa_28.c                            |      4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/apl_42.c                             |      6 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c                             |      4 +-
 external/mpl/bind/dist/lib/dns/resolver.c                                      |     42 +-
 external/mpl/bind/dist/lib/dns/result.c                                        |      4 +-
 external/mpl/bind/dist/lib/dns/rpz.c                                           |      4 +-
 external/mpl/bind/dist/lib/dns/sdb.c                                           |      5 +-
 external/mpl/bind/dist/lib/dns/sdlz.c                                          |      4 +-
 external/mpl/bind/dist/lib/dns/spnego.c                                        |     20 +-
 external/mpl/bind/dist/lib/dns/tests/db_test.c                                 |      4 +-
 external/mpl/bind/dist/lib/dns/tests/update_test.c                             |     25 +-
 external/mpl/bind/dist/lib/dns/tkey.c                                          |      4 +-
 external/mpl/bind/dist/lib/dns/tsig.c                                          |      4 +-
 external/mpl/bind/dist/lib/dns/update.c                                        |      4 +-
 external/mpl/bind/dist/lib/dns/validator.c                                     |     70 +-
 external/mpl/bind/dist/lib/dns/view.c                                          |      8 +-
 external/mpl/bind/dist/lib/dns/xfrin.c                                         |      6 +-
 external/mpl/bind/dist/lib/dns/zone.c                                          |     60 +-
 external/mpl/bind/dist/lib/dns/zoneverify.c                                    |     15 +-
 external/mpl/bind/dist/lib/isc/app.c                                           |     14 +-
 external/mpl/bind/dist/lib/isc/assertions.c                                    |      4 +-
 external/mpl/bind/dist/lib/isc/astack.c                                        |      4 +-
 external/mpl/bind/dist/lib/isc/httpd.c                                         |      4 +-
 external/mpl/bind/dist/lib/isc/include/isc/netmgr.h                            |     88 +-
 external/mpl/bind/dist/lib/isc/include/isc/quota.h                             |     14 +-
 external/mpl/bind/dist/lib/isc/include/isc/util.h                              |      4 +-
 external/mpl/bind/dist/lib/isc/mem.c                                           |      4 +-
 external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h                             |     55 +-
 external/mpl/bind/dist/lib/isc/netmgr/netmgr.c                                 |     32 +-
 external/mpl/bind/dist/lib/isc/netmgr/tcp.c                                    |    543 +-
 external/mpl/bind/dist/lib/isc/netmgr/tcpdns.c                                 |    122 +-
 external/mpl/bind/dist/lib/isc/netmgr/udp.c                                    |     61 +-
 external/mpl/bind/dist/lib/isc/netmgr/uv-compat.c                              |      5 +-
 external/mpl/bind/dist/lib/isc/pthreads/mutex.c                                |      4 +-
 external/mpl/bind/dist/lib/isc/radix.c                                         |     15 +-
 external/mpl/bind/dist/lib/isc/task.c                                          |     11 +-
 external/mpl/bind/dist/lib/isc/tests/regex_test.c                              |   2374 -
 external/mpl/bind/dist/lib/isc/tests/socket_test.c                             |    136 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/stdtime.h                      |     17 +-
 external/mpl/bind/dist/lib/isc/unix/socket.c                                   |     27 +-
 external/mpl/bind/dist/lib/isc/unix/stdtime.c                                  |     17 +-
 external/mpl/bind/dist/lib/isc/win32/fsaccess.c                                |      4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/stdtime.h                     |     17 +-
 external/mpl/bind/dist/lib/isc/win32/socket.c                                  |      4 +-
 external/mpl/bind/dist/lib/isc/win32/stdtime.c                                 |     16 +-
 external/mpl/bind/dist/lib/isccfg/parser.c                                     |      3 +-
 external/mpl/bind/dist/lib/ns/Makefile.in                                      |      9 +-
 external/mpl/bind/dist/lib/ns/client.c                                         |    126 +-
 external/mpl/bind/dist/lib/ns/include/ns/client.h                              |      6 +-
 external/mpl/bind/dist/lib/ns/include/ns/interfacemgr.h                        |      8 +-
 external/mpl/bind/dist/lib/ns/interfacemgr.c                                   |     52 +-
 external/mpl/bind/dist/lib/ns/lib.c                                            |      4 +-
 external/mpl/bind/dist/lib/ns/query.c                                          |     20 +-
 external/mpl/bind/dist/lib/ns/tests/query_test.c                               |      5 +-
 external/mpl/bind/dist/lib/ns/update.c                                         |     24 +-
 external/mpl/bind/dist/lib/ns/xfrout.c                                         |     71 +-
 external/mpl/bind/dist/lib/samples/nsprobe.c                                   |     10 +-
 external/mpl/bind/dist/lib/samples/sample-async.c                              |      8 +-
 external/mpl/bind/dist/win32utils/index.html                                   |     57 -
 external/mpl/bind/lib/libbind9/shlib_version                                   |      4 +-
 external/mpl/bind/lib/libdns/shlib_version                                     |      4 +-
 external/mpl/bind/lib/libirs/shlib_version                                     |      4 +-
 external/mpl/bind/lib/libisc/Makefile                                          |      4 +-
 external/mpl/bind/lib/libisc/shlib_version                                     |      4 +-
 external/mpl/bind/lib/libisccc/shlib_version                                   |      4 +-
 external/mpl/bind/lib/libisccfg/shlib_version                                  |      4 +-
 external/mpl/bind/lib/libns/shlib_version                                      |      4 +-
 390 files changed, 3560 insertions(+), 112859 deletions(-)

diffs (truncated from 123006 to 300 lines):

diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/Makefile
--- a/external/mpl/bind/bin/Makefile    Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/Makefile    Mon Aug 03 17:23:34 2020 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.1 2018/08/12 13:02:24 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2020/08/03 17:23:34 christos Exp $
 
-SUBDIR= html dig host named nslookup nsupdate rndc dnssec check tools \
+SUBDIR= dig host named nslookup nsupdate rndc dnssec check tools \
        confgen delv
 
 .include "Makefile.inc"
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/Makefile.inc
--- a/external/mpl/bind/bin/Makefile.inc        Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/Makefile.inc        Mon Aug 03 17:23:34 2020 +0000
@@ -1,4 +1,32 @@
-#      $NetBSD: Makefile.inc,v 1.1 2018/08/12 13:02:24 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2020/08/03 17:23:34 christos Exp $
 
 .include "${.PARSEDIR}/../Makefile.inc"
 WARNS?=                2
+
+.SUFFIXES: .1in .1 .5in .5 .8in .8
+
+# XXX: .USE nodes don't work with suffix rules
+.1in.1:
+        ${_MKTARGET_CREATE}
+        ${TOOL_SED} \
+            -e "s,@BIND9_VERSION@,${MAJORVER}.${MINORVER}.${PATCHVER}," \
+            -e "s,@RELEASE_DATE@,," \
+            -e "s,@BIND9_VERSION_STRING@,," \
+            -e "s,@sysconfdir@,//etc," \
+            -e "s,@plugindir@,/usr/lib/named," < ${.ALLSRC} > ${.TARGET}
+.5in.5:
+        ${_MKTARGET_CREATE}
+        ${TOOL_SED} \
+            -e "s,@BIND9_VERSION@,${MAJORVER}.${MINORVER}.${PATCHVER}," \
+            -e "s,@RELEASE_DATE@,," \
+            -e "s,@BIND9_VERSION_STRING@,," \
+            -e "s,@sysconfdir@,//etc," \
+            -e "s,@plugindir@,/usr/lib/named," < ${.ALLSRC} > ${.TARGET}
+.8in.8:
+        ${_MKTARGET_CREATE}
+        ${TOOL_SED} \
+            -e "s,@BIND9_VERSION@,${MAJORVER}.${MINORVER}.${PATCHVER}," \
+            -e "s,@RELEASE_DATE@,," \
+            -e "s,@BIND9_VERSION_STRING@,," \
+            -e "s,@sysconfdir@,//etc," \
+            -e "s,@plugindir@,/usr/lib/named," < ${.ALLSRC} > ${.TARGET}
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/check/Makefile.inc
--- a/external/mpl/bind/bin/check/Makefile.inc  Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/check/Makefile.inc  Mon Aug 03 17:23:34 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.2 2018/08/14 11:52:41 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2020/08/03 17:23:35 christos Exp $
 
 LDADD+=-lns
 DPADD+=${LIBNS}
@@ -11,7 +11,7 @@
 BINDIR=/usr/sbin
 CHECK=${IDIST}/bin/check
 
-.PATH: ${CHECK}
+.PATH: ${CHECK} ${IDIST}/doc/man
 
 PROG=${BASE}
 SRCS=${BASE}.c check-tool.c
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/confgen/Makefile.inc
--- a/external/mpl/bind/bin/confgen/Makefile.inc        Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/confgen/Makefile.inc        Mon Aug 03 17:23:34 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2018/08/12 13:02:24 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2020/08/03 17:23:35 christos Exp $
 
 PROG=  ${.CURDIR:T}
 SRCS=  ${PROG}.c keygen.c util.c os.c
@@ -14,4 +14,4 @@
        -DRNDC_KEYFILE=\"${SYSCONFDIR}/rndc.key\" \
 
 
-.PATH: ${DIST} ${DIST}/unix
+.PATH: ${DIST} ${DIST}/unix ${IDIST}/doc/man
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/delv/Makefile
--- a/external/mpl/bind/bin/delv/Makefile       Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/delv/Makefile       Mon Aug 03 17:23:34 2020 +0000
@@ -1,19 +1,17 @@
-#      $NetBSD: Makefile,v 1.1 2018/08/12 13:02:24 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2020/08/03 17:23:35 christos Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 PROG=  delv
 SRCS=  delv.c
 BINDIR=        /usr/bin
 
-.include "${.CURDIR}/../Makefile.inc"
-
 DIST=${IDIST}/bin/delv
 CPPFLAGS+= -I${DIST}/include -I${IDIST}/lib/irs/include
 LDADD+=    -lirs -lisccfg
 
 delv.o: ${VERSIONFILE}
 
-.PATH: ${DIST}
+.PATH: ${DIST} ${IDIST}/doc/man
 
 .include <bsd.prog.mk>
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/dig/Makefile
--- a/external/mpl/bind/bin/dig/Makefile        Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/dig/Makefile        Mon Aug 03 17:23:34 2020 +0000
@@ -1,18 +1,16 @@
-#      $NetBSD: Makefile,v 1.1 2018/08/12 13:02:25 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2020/08/03 17:23:35 christos Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 PROG=  dig
 SRCS=  dig.c dighost.c
 BINDIR=        /usr/bin
 
-.include "${.CURDIR}/../Makefile.inc"
-
 DIST=${IDIST}/bin/dig
 CPPFLAGS+= -I${DIST}/include
 
 dig.o: ${VERSIONFILE}
 
-.PATH: ${DIST}
+.PATH: ${DIST} ${IDIST}/doc/man
 
 .include <bsd.prog.mk>
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/dnssec/Makefile.inc
--- a/external/mpl/bind/bin/dnssec/Makefile.inc Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/dnssec/Makefile.inc Mon Aug 03 17:23:34 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2018/08/12 13:02:25 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2020/08/03 17:23:35 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
 BINDIR=/usr/sbin
 DNSSEC=${IDIST}/bin/dnssec
 
-.PATH: ${DNSSEC}
+.PATH: ${DNSSEC} ${IDIST}/doc/man
 
 PROG=${BASE}
 SRCS=${BASE}.c dnssectool.c
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/host/Makefile
--- a/external/mpl/bind/bin/host/Makefile       Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/host/Makefile       Mon Aug 03 17:23:34 2020 +0000
@@ -1,18 +1,16 @@
-#      $NetBSD: Makefile,v 1.1 2018/08/12 13:02:25 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2020/08/03 17:23:35 christos Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 PROG=  host
 SRCS=  host.c dighost.c
 BINDIR=        /usr/bin
 
-.include "${.CURDIR}/../Makefile.inc"
-
 DIST=${IDIST}/bin/dig
 CPPFLAGS+= -I${DIST}/include
 
 host.o: ${VERSIONFILE}
 
-.PATH: ${DIST}
+.PATH: ${DIST} ${IDIST}/doc/man
 
 .include <bsd.prog.mk>
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/html/Makefile
--- a/external/mpl/bind/bin/html/Makefile       Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/html/Makefile       Mon Aug 03 17:23:34 2020 +0000
@@ -1,7 +1,6 @@
-#      $NetBSD: Makefile,v 1.1 2018/08/12 13:02:25 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2020/08/03 17:23:35 christos Exp $
 
-.include <bsd.own.mk>
-.include "${.CURDIR}/../Makefile.inc"
+.include <bsd.init.mk>
 
 .if ${MKDOC} != "no"
 
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/named/Makefile
--- a/external/mpl/bind/bin/named/Makefile      Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/named/Makefile      Mon Aug 03 17:23:34 2020 +0000
@@ -1,16 +1,14 @@
-#      $NetBSD: Makefile,v 1.3 2019/09/09 14:40:39 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2020/08/03 17:23:35 christos Exp $
 
 LDADD+=-lns
 DPADD+=${LIBNS}
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 PROG=  named
 MAN=   named.8 named.conf.5
 BINDIR=        /usr/sbin
 
-.include "${.CURDIR}/../Makefile.inc"
-
 DIST=${IDIST}/bin/named
 CPPFLAGS+=-I${DIST}/include -I${DIST}/unix/include -DCONFIGARGS=\"defaults\"
 CPPFLAGS+=-DNO_VERSION_DATE -DPRODUCT=\"BIND\" -DSRCID=\"${SRCID}\"
@@ -29,7 +27,7 @@
 
 CWARNFLAGS.clang+=     -Wno-tautological-constant-out-of-range-compare
 
-.PATH: ${DIST}/unix ${DIST}
+.PATH: ${DIST}/unix ${DIST} ${IDIST}/doc/man
 
 SRCS_UNIX=     os.c dlz_dlopen_driver.c
 SRCS=  builtin.c config.c control.c controlconf.c \
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/nslookup/Makefile
--- a/external/mpl/bind/bin/nslookup/Makefile   Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/nslookup/Makefile   Mon Aug 03 17:23:34 2020 +0000
@@ -1,18 +1,16 @@
-#      $NetBSD: Makefile,v 1.1 2018/08/12 13:02:26 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2020/08/03 17:23:35 christos Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 PROG=  nslookup
 SRCS=  nslookup.c dighost.c
 MAN=   nslookup.8
 BINDIR=        /usr/bin
 
-.include "${.CURDIR}/../Makefile.inc"
-
 DIST=${IDIST}/bin/dig
 CPPFLAGS+= -I${DIST}/include
 
-.PATH: ${DIST}
+.PATH: ${DIST} ${IDIST}/doc/man
 DPADD+=${LIBEDIT} ${LIBTERMINFO}
 LDADD+=-ledit -lterminfo
 
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/nsupdate/Makefile
--- a/external/mpl/bind/bin/nsupdate/Makefile   Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/nsupdate/Makefile   Mon Aug 03 17:23:34 2020 +0000
@@ -1,16 +1,14 @@
-#      $NetBSD: Makefile,v 1.1 2018/08/12 13:02:26 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2020/08/03 17:23:36 christos Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 PROG=  nsupdate
 MAN=   nsupdate.1
 BINDIR=        /usr/bin
 
-.include "${.CURDIR}/../Makefile.inc"
-
 DIST=${IDIST}/bin/nsupdate
 
-.PATH: ${DIST}
+.PATH: ${DIST} ${IDIST}/doc/man
 DPADD+=${LIBEDIT} ${LIBTERMINFO}
 LDADD+=-ledit -lterminfo
 
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/rndc/Makefile
--- a/external/mpl/bind/bin/rndc/Makefile       Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/rndc/Makefile       Mon Aug 03 17:23:34 2020 +0000
@@ -1,14 +1,12 @@
-#      $NetBSD: Makefile,v 1.1 2018/08/12 13:02:26 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2020/08/03 17:23:36 christos Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 PROG=  rndc
 SRCS=  rndc.c util.c
 MAN=   rndc.8 rndc.conf.5
 BINDIR=        /usr/sbin
 
-.include "${.CURDIR}/../Makefile.inc"
-
 DIST=${IDIST}/bin/rndc
 CPPFLAGS+= -I${DIST}/include \
         -DRNDC_CONFFILE=\"${SYSCONFDIR}/rndc.conf\" \
@@ -16,6 +14,6 @@
 
 rndc.o: ${VERSIONFILE}
 
-.PATH: ${DIST}
+.PATH: ${DIST} ${IDIST}/doc/man
 
 .include <bsd.prog.mk>
diff -r a621864ea2bc -r d8d5af5bd33e external/mpl/bind/bin/tools/Makefile.inc
--- a/external/mpl/bind/bin/tools/Makefile.inc  Mon Aug 03 17:07:01 2020 +0000
+++ b/external/mpl/bind/bin/tools/Makefile.inc  Mon Aug 03 17:23:34 2020 +0000
@@ -1,4 +1,4 @@




Home | Main Index | Thread Index | Old Index