dns/dnsmasq*: add a checkconfig option to rcfile

and automatically invoke it before restart or stop.
Under the hood, this runs dnsmasq --test.

Bump PORTREVISION of dnsmasq only, the -devel port is not
built regularly.

[commit message by Matthias Andree <mandree@FreeBSD.org>]

dns/dnsmasq: fix pkg-plist order

Approved by:	portmgr (blanket)

dns/dnsmasq: Move man pages to share/man

Approved by:	portmgr (blanket)

dns/dnsmasq: security update to 2.90 (fixes dnssec validation DoS)

ChangeLog:	https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=v2.90
Security:       21a854cc-cac1-11ee-b7a7-353f1e043d9a
Security:       CVE-2023-50387
Security:       CVE-2023-50868
MFH:		2024Q1

dns/dnsmasq: cherry-pick several upstream fixes

all from dnsmasq's Git repository hosted by Simon Kelley:

+ Fix DHCPv6 "use multicast" response
+ Avoid undefined behaviour with the ctype(3) functions.
+ Document suppressing default options in --dhcp-option.
+ Fix --rev-server option.
+ Set the default maximum DNS UDP packet size to 1232.
+ Generalise cached NXDOMAIN replies.
+ Fix possible SEGV when no servers defined.

and bump PORTREVISION. This is so we can let it mature
for two weeks before 2023Q2 and because the upstream
release schedule is unforeseeable.

Obtained from: Simon Kelley <simon@thekelleys.org.uk>
Obtained from: Dominik Derigs <dl6er@dl6er.de>
Obtained from: Taylor R Campbell <campbell+dnsmasq@mumble.net>

dns/dnsmasq*: update to v2.89, and disable -devel port

Changelog:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=v2.89

MFH:		2023Q1

dns/dnsmasq: fix rare cache corruption problem

Simon Kelley sent an advisory that in rare circumstances, the cache can
become corrupted and the DNS subsystem then became disfunctional.
This is reported as regression in 2.88.
Chances seem higher this happens with DNSSEC enabled, but seems not limited
to it.  For details, please see the patch contained in this commit, or
https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2023q1/016821.html

The symptom of this happening is apparently a cache internal error.

2.89 with this fix and a few others is slated for release in a week.
Let's fix the patch already and MFH to 2023Q1 so we keep our liberties
to decide whether we need to move quarterly to 2.89 or rather stick
with 2.88_1.

originally
Reported by:	Timo van Roermund (to Simon Kelley in private)
Reported by:	Simon Kelley (upstream maintainer, through mailing list)
Obtained from:	Simon Kelley (upstream maintainer, Git repository)
MFH:		2023Q1

dns/dnsmasq*: update to 2.88, and ignore -devel port

ChangeLog:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=v2.88

dns/dnsmasq*: update to v2.87

and set dnsmasq-devel port to IGNORE.

Changelog:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=v2.87
https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/msg16445.html

MFH:		2022Q3

Remove WWW entries moved into port Makefiles

Commit b7f05445c00f has added WWW entries to port Makefiles based on
WWW: lines in pkg-descr files.

This commit removes the WWW: lines of moved-over URLs from these
pkg-descr files.

Approved by:		portmgr (tcberner)

Add WWW entries to port Makefiles

It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.

Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.

There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.

dns: remove 'Created by' lines

A big Thank You to the original contributors of these ports:

  *  Aaron Dalton <aaron@FreeBSD.org>
  *  Akinori MUSHA aka knu <knu@idaemons.org>
  *  Alex Samorukov <samm@freebsd.org>
  *  Alexey Dokuchaev <danfe@FreeBSD.org>
  *  Allan Jude <allanjude@freebsd.org>
  *  Amar Takhar <verm@drunkmonk.net>
  *  Anders Nordby <anders@fix.no>
  *  Andrew Greenwood <greenwood.andy@gmail.com>
  *  Anton Berezin <tobez@FreeBSD.org>
  *  Ashish SHUKLA <ashish@FreeBSD.org>
  *  Attila Nagy <bra@fsn.hu>

dns/dnsmasq: fix CVE-2022-0934 DHCPv6 vuln

Security:	3f321a5a-b33b-11ec-80c2-1bb2c6a00592
Security:	CVE-2022-0934
MFH:		2022Q2

dns/dnsmasq: cherry-pick 2.86-related man update

https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=10cd342f5c847a5e0226d6f0f9ff4ca16db610a5

Obtained from:	Simon Kelley's upstream git repository

dns/dnsmasq: pull in three more upstream fixes

Cherry-pick these Git commits from the upstream:

--local should behave as --server, not as --address [...]
Fix confusion in DNS retries and --strict-order.
Fix confusion with log-IDs and DNS retries.

loosely prompted by Olivier's
PR:		260331

dns/dnsmasq: fix error "config error is REFUSED (EDE: not ready)"

Fix --address=/#/...... which was lost in 2.86

ML message:
https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/msg15508.html

Git commit:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=26bbf5a314d833beaf0f147d24409969f05f3dba

PR:		260331
Obtained from:	Simon Kelley (upstream maintainer)

*/*: Remove redundant '-*' from CONFLICTS definitions

The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").

Approved by: portmgr (blanket)

dns/dnsmasq: update to v2.86, ignore dnsmasq-devel

Changelog:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=v2.86

*: Clean up some things

- Fix typos
- Remove duplicate variables
- Remove nop variables
- Sort categories
- Add missing USES

Reported by:	portscan

dns/dnsmasq: cherry-pick upstream-fixes

 *  Handle DHCPREBIND requests in the DHCPv6 server.
 *  Fix bug in TCP process handling.

Clean up some things

- Remove duplicate variables
- Remove nop variables
- Sort categories
- Remove redundant option descriptions that match the default ones

Reported by:	portscan

dns/dnsmasq: security update to v2.85 release

Changelog:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=v2.85

Configurations where server lines contain a @ character,
f.i. server=1.1.1.1@em0 or server=1.1.1.1@192.0.2.1, disabled
source port randomization, making cache poisoning attacks possible.
v2.85 mitigates this.

MFH:		2021Q2
Security:	CVE-2021-3448
Security:	5b72b1ff-877c-11eb-bd4f-2f1d57dafe46 (VuXML)

all: Remove all other $FreeBSD keywords.

Remove # $FreeBSD$ from Makefiles.

dnsmasq-devel: add test release 2.85rc1

This is to fix a port randomization flaw that subjects dnsmasq to a cache
poisoning attack.

ChangeLog:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=155fc966f9542259596b41594f4b85775d1f9c9a;hb=023ace8e54c2e83e88082a1073a281d659f2a860#l1

Add CONFLICTS_INSTALL markers.

Security: CVE-2021-3448
Security: 5b72b1ff-877c-11eb-bd4f-2f1d57dafe46

dns/dnsmasq: upgrade to v2.84 (regression fixes)

Upstream blessed v2.84 rc2 (which 2.83_1 effectively already was)
into v2.84 release, so take it (and patch the upstream bug of
leaving "rc2" in the version out).

MFH:		2021Q1 (regression fixes for security fix release)

dns/dnsmasq: regression fixes from upstream Git

Apparently there are situations where dnsmasq 2.83 can confuse
its peers or sockets, and the upstream Git contains fixes for them.

These four fixes essentially take dnsmasq to 2.84test3.

Obtained from:	Simon Kelley <simon@thekelleys.org.uk>'s Git repository

dns/dnsmasq: security update to 2.83

CHANGELOG of version 2.83:

        Use the values of --min-port and --max-port in outgoing
        TCP connections to upstream DNS servers.

        Fix a remote buffer overflow problem in the DNSSEC code. Any
        dnsmasq with DNSSEC compiled in and enabled is vulnerable to this,
        referenced by CVE-2020-25681, CVE-2020-25682, CVE-2020-25683
        CVE-2020-25687.

        Be sure to only accept UDP DNS query replies at the address
        from which the query was originated. This keeps as much entropy
        in the {query-ID, random-port} tuple as possible, to help defeat

dns/dnsmasq: update to 2.82 (regression and bug fixes)

Quoting Simon Kelley "This fixes a nasty problem
introduced in 2.81 which causes random crashes on systems where there's
significant DNS activity over TCP. It also fixes DNSSEC validation
problems with zero-TTL DNSKEY and DS records."

Changelog:
<http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=e6a223119ffcd9ead6cb15153cd49bd3c61e114f;hb=f60fea1fb0a288011f57a25dfb653b8f6f8b46b9#l1>

MFH:		2020Q3 (regression and bug fixes)

Bump PORTREVISION for security/nettle shlib change

dns/dnsmasq: repair damage from UNAUTHORIZED UCL conversion of pkg-message

The pkg-message contains a security note that is necessary on
new installs and on updates alike.

Since per the porter's handbook, the UCL does not support enumeration
of types, and this is not relevant on removal, the UCL change must be
reverted.  While here, remove formatting.

Failure inducing commit:
|------------------------------------------------------------------------
|r508835 | mat | 2019-08-13 18:01:59 +0200 (Tue, 13 Aug 2019) | 2 lines
|
|Convert to UCL & cleanup pkg-message (categories d)
|
|------------------------------------------------------------------------

NOTE: The UCL conversion of files/pkg-message.in was not authorized
and damaging and no heads-up was sent to the maintainer.

portmgr@ MUST act more carefully with sweeping changes and hand them out
for review first.

dns/dnsmasq: update to 2.81, unlink dnsmasq-devel

Update dns/dnsmasq to the new upstream version 2.81.
The Makefile has been rearranged with portfmt, except the
LDFLAGS+=..._intllibs... line that portfmt does not recognize.

Changelog:
<http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=60b08d015b2d5a979f39b8ad43633b419135cb64;hb=7ddb99d251c3f5870c8c308a98bb8f283c831872#l1>
(or see CHANGELOG in the package)

Unlink dnsmasq-devel from the build, but keep the sources,
and mark it IGNORE and list dnsmasq-devel in MOVED.

dns/dnsmasq: Remove obsolete REINPLACE_CMD line.

Reported by:	swills@ (IRC)

dns/dnsmasq: Fix TFTP regression on recent FreeBSD versions.

Add a patch taken from upstream. Tested successfully on 11.3-RELEASE amd64.

The upstream fix is an extended version of a fix proposed by
Dave Mueller in the PR.

See also:
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2019q4/013412.html

PR:		241068
Reported by:	Phil Chadwick
Obtained from:	Simon Kelley,
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=936bd82755e8f75fc09c1e9a67fb390175b157d4
MFH:		2019Q4

Drop the ipv6 virtual category for d* category as it is not relevant anymore

Convert to UCL & cleanup pkg-message (categories d)

Update security/nettle to 3.5.1

- Bump PORTREVISION of dependent ports for shlib change
- Fix build of devel/pijul [1]

Changes:	https://git.lysator.liu.se/nettle/nettle/blob/master/NEWS
PR:		238991
Exp-run by:	antoine
Thanks to:	tobik [1]

Make compatible with nettle >= 3.5 (not yet in ports)

Pull in patch from
https://github.com/themiron/dnsmasq/commit/6fd9aba7abe1e084123bc5002959350897774ace

Obtained from:	Vladislav Grishenko

Update dns/libidn2 to 2.1.1

- Bump PORTREVISION of dependent ports for shlib change

Changes:	https://gitlab.com/libidn/libidn2/blob/master/NEWS

Update dns/libidn2 to 2.1.0

- Bump PORTREVISION of dependent ports for shlib change

Changes:	https://gitlab.com/libidn/libidn2/blob/master/NEWS

Upgrade dns/dnsmasq to v2.80.

Security: the installed example configuration file shows a way of
disabling WPAD hijacking, but leaves it commented out. Extend pkg-message.

Changelog: 	<http://thekelleys.org.uk/dnsmasq/CHANGELOG>

Since installing v2.80 isn't a fix against the vulnerability, and fixing
it needs administrator intervention on upgrades, I am not marking this in
vuxml for now, since we'd need to mark v2.80 vulnerable, too.

MFH:		2018Q4
Security:	CERT VU#598349

dns/dnsmasq update to release v2.79

Note there are a few incompatible changes. For details, please see the...
Changelog: <http://thekelleys.org.uk/dnsmasq/CHANGELOG>

dns/dnsmasq: Security update to 2.78

PR:		222739
Approved by:	ports-secteam
MFH:		2017Q4
Security:	b77b5646-a778-11e7-ac58-b499baebfeaf

Fix up pxelogic.0 suffix logic.

Regression in v2.77 caused by a patch proposed by yours truly.

Reported by:	Steven Shiau (via upstream dnsmasq-discuss mailing list)
Obtained from:	Chris Novakovich and Simon Kelley
Pointyhat to:	mandree@

Update to new release 2.77.

Changelog: <http://thekelleys.org.uk/dnsmasq/CHANGELOG>

Correct placement of option helpers.

Related to:
PR: 217900

Allow build on PF-less (NO_IPSET) systems.

This adds a new ports option, IPSET, defaulting to on.

Use the opportunity to use the options helpers OPT_CFLAGS[_OFF] on the
trivial options.

PR:		217900
Submitted by:	Oliver Pinter <oliver.pinter@hardenedbsd.org>

Use readelf instead of objdump, unbreaking arm64 build.

Submitted by:	emaste@
Differential Revision:	https://reviews.freebsd.org/D7881

Remove NLS, DOCS, EXAMPLES and IPV6 from OPTIONS_DEFAULT, they are enabled by
default anyway and don't need to be listed

Approved by:	portmgr blanket

Update, new upstream feature+bugfix release v2.76

The upstream maintainer's change log is here, and in the installed
CHANGELOG file:
<http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=v2.76>

Drop two patch files that were previously cherry-picked from the
post-v2.75 upstream repository and should no longer be needed.

Remove ${PORTSDIR}/ from dependencies, categories d, e, f, and g.

With hat:	portmgr
Sponsored by:	Absolight

Bump versions to chase Nettle shared library update

Cherry-pick two upstream fixes for crashers.

(But bump PORTREVISION instead of PORTEPOCH ;-))

http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=0007ee90646a5a78a96ee729932e89d31c69513a
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=41a8d9e99be9f2cc8b02051dd322cb45e0faac87

Submitted by:	garga@
Obtained from:	Edwin Torok, Simon Kelley
Differential Revision:	D4813

Quench unused-parameter warnings during build.

Update to 2.75

Critical bug fix for --dhcp-script

New dnsmasq upstream release 2.74 (bugfixes)

version 2.74
            Fix reversion in 2.73 where --conf-file would attempt to
            read the default file, rather than no file.

            Fix inotify code to handle dangling symlinks better and
            not SEGV in some circumstances.

            DNSSEC fix. In the case of a signed CNAME generated by a
            wildcard which pointed to an unsigned domain, the wrong
            status would be logged, and some necessary checks omitted.

Upgrade dnsmasq to new release 2.73.

Changelog: http://www.thekelleys.org.uk/dnsmasq/CHANGELOGDisable dnsmasq-devel
(older than stable).
Switch to using @sample keyword [1].

PR:           200717 [1]
Submitted by: Jimmy Olgeni

- Add a patch to fix CVE-2015-3294
- Bump PORTREVISION

PR:		199999
Approved by:	mandree@ (maintainer)
Obtained
from:	http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=ad4a8ff7d9097008d7623df8543df435bfddeac8
MFH:		2015Q2
Security:	CVE-2015-3294
Sponsored by:	Netgate

- Add CPE info

Approved by:	portmgr blanket

Update to new upstream version 2.72, disabling dnsmasq-devel again.

Remove @dir* stuff from pkg-plist.  @sample isn't documented properly
and isn't up to handling files with non-.sample suffix, so stay
away from that part of pkg-plist.

ChangeLog:	http://www.thekelleys.org.uk/dnsmasq/CHANGELOG

Remove excess output from pre-configure.

dns/libidn:
- Add USES=libtool and bump dependent ports
- Add INSTALL_TARGET=install-strip
- Always install libidn-components.png because it is used by libidn.info
- Add -lintl to Libs.private instead of Libs in libidn.pc

Add ldconfig to rc.d script requisites to make sure we can link to,
say, libnettle.so.

Submitted by:	Allen Hewes

Add DOCS to OPTIONS_DEFINE to ports that check for PORT_OPTIONS:MDOCS.

Fix build with DNSSEC and without NLS/DBUS options.

PR:		190149
Submitted by:	Kevin Zheng

Upgrade to new upstream version 2.71.  Upstream's changelog:

version 2.71
            Subtle change to error handling to help DNSSEC validation
	    when servers fail to provide NODATA answers for
	    non-existent DS records.

	    Tweak code which removes DNSSEC records from answers when
	    not required. Fixes broken answers when additional section
	    has real records in it. Thanks to Marco Davids for the bug
	    report.

	    Fix DNSSEC validation of ANY queries. Thanks to Marco Davids
	    for spotting that too.

	    Fix total DNS failure and 100% CPU use if cachesize set to zero,
	    regression introduced in 2.69. Thanks to James Hunt and
	    the Ubuntu crowd for assistance in fixing this.

Upgrade to new upstream version 2.70. Upstream changelog:

   Fix crash, introduced in 2.69, on TCP request when dnsmasq compiled
   with DNSSEC support, but running without DNSSEC enabled. Thanks to
   Manish Sing for spotting that one.

   Fix regression which broke ipset functionality. Thanks to Wang Jian
   for the bug report.

Submitted by:	Herbert J. Skuhra

Switch to use lua 5.2

Propose local-service option in default .example configuration.

PR:		ports/188548
Submitted by:	Jeroen van der Ham <jeroen@1sand0s.nl>

Update to new upstream 2.69 release. Adds DNSSEC support.

Full changelog: <http://www.thekelleys.org.uk/dnsmasq/CHANGELOG>

Upgrade dnsmasq to new stable 2.68 release.

Fixes bind-interfaces with IPv6 on FreeBSD.

version 2.68
            Use random addresses for DHCPv6 temporary address
            allocations, instead of algorithmically determined stable
            addresses.

    Fix bug which meant that the DHCPv6 DUID was not available
    in DHCP script runs during the lifetime of the dnsmasq
    process which created the DUID de-novo. Once the DUID was
    created and stored in the lease file and dnsmasq
    restarted, this bug disappeared.

Assorted fixes to dependencies on various build options,
particularly with NLS enabled when libidn was built without NLS.

While here, group OPTIONS and clean up things a bit, and print
configuration of port and libidn port for debugging.

The particular build failure was
Reported by:	Yuri Vorobyev

Upgrade dnsmasq to new upstream release 2.67.
Changelog: <http://www.thekelleys.org.uk/dnsmasq/CHANGELOG>
Enable NLS and IPV6 options by default.
Use shebangfix on files that need it.

Mark dnsmasq-devel (older than release) IGNORE.

Convert to support STAGEDIR; misc. LIB_DEPENDS cleanups.

Add NO_STAGE all over the place in preparation for the staging support (cat:
dns)

- Remove MAKE_JOBS_SAFE variable

Approved by:	portmgr (bdrewery)

Convert USE_GETTEXT -> USES=gettext

While here:
- Trim headers
- Remove some useless pre.mk/post.mk
- Convert to optionsng

Convert dns to USES=pkgconfig

Kill blank line at EOF, to please portlint.

Feature safe: yes

Update to new upstream release 2.66.
New DHCPv6 stuff, ability to act as authoritative server for local data.

Changelog: http://www.thekelleys.org.uk/dnsmasq/CHANGELOG

Feature safe: yes

Tidy up Makefile header.

Drop default options, to keep the Makefile tidy.

Submitted by:	bapt@

Update to new upstream release 2.65.

Upstream changes:

    Fix regression which broke forwarding of queries sent via
    TCP which are not for A and AAAA and which were directed to
    non-default servers. Thanks to Niax for the bug report.

    Fix failure to build with DHCP support excluded. Thanks to
    Gustavo Zacarias for the patch.

    Fix nasty regression in 2.64 which completely broke cacheing.

Update to new upstream release 2.65.

Upstream changes:

    TCP which are not for A and AAAA and which were directed to
    non-default servers. Thanks to Niax for the bug report.

    Fix failure to build with DHCP support excluded. Thanks to
    Gustavo Zacarias for the patch.

    Fix nasty regression in 2.64 which completely broke cacheing.

Update to new upstream release 2.64.

Feature safe:	yes

Changelog for version 2.64:

Handle DHCP FQDN options with all flag bits zero and --dhcp-client-update set.
Thanks to Bernd Krumbroeck for spotting the problem.

Finesse the check for /etc/hosts names which conflict with DHCP names.
Previously a name/address pair in /etc/hosts which didn't match the
name/address of a DHCP lease would generate a warning. Now that only
happesn if there is not also a match. This allows multiple addresses for
a name in /etc/hosts with one of them assigned via DHCP.

Demote USE_PKGCONFIG to =build (was =yes).

Update to 2.63.

Changelog: http://www.thekelleys.org.uk/dnsmasq/CHANGELOG

Add new dnsmasq-devel version, for development/test/release candidate versions.
This port is based on dns/dnsmasq 2.62_1,1 and has been updated to 2.63rc2.

Description (by Simon Kelley, the upstream maintainer):
Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server.
It is designed to provide DNS and, optionally, DHCP, to a small network. It
can serve the names of local machines which are not in the global DNS. The
DHCP server integrates with the DNS server and allows machines with
DHCP-allocated addresses to appear in the DNS with names configured either
in each host or in a central configuration file. Dnsmasq supports static and
dynamic DHCP leases and BOOTP/TFTP/PXE for network booting of diskless
machines.

Move the rc.d scripts of the form *.sh.in to *.in

Where necessary add $FreeBSD$ to the file

No PORTREVISION bump necessary because this is a no-op

new devel/pkgconf added to replace devel/pkg-config. new version of pkg-config
are no more self hosting so we are stuck with 0.25 version while pkgconf provide
the same set of features as 0.27 and a compatible frontend. A symlink to
pkg-config has been added for convenience and compatibility

This also introduces a new macro to use pkgconf in your ports:
USE_PKGCONFIG

it can take the following arguments:
 - yes (meaning build only dep)
 - build (meaning build only dep)
 - run (meaning run only dep)
 - both (meaning run and build dep)

From now USE_GNOME= pkgconfig is deprecated in favour of USE_PKGCONFIG
The old gnome macro has been modified to use pkgconf but still the sameway: run
and build dep to avoid large breakage.

While here fix some ports relying on pkg-config but not specifying it, fix some
ports broken because testing wrong .pc files, and fix ports using pkg-config
--version to determine pkg-config version instead of
pkg-config --modversion pkg-config like recommanded by pkg-config

With Hat:	portmgr
Exp-runs by:	bapt (pointhat-west), beat (pointyhat)

Fix typos in COMMENT

Fix inverted PORT_OPTIONS:MDOCS logic, regression from optionsNG migration.

Reported by: Spil Oss
Reported by: pointyhat (by way of pav@)

Update to bug-fix release 2.62.
Changelog: http://www.thekelleys.org.uk/dnsmasq/CHANGELOG

Convert to OptionsNG.

Update to new upstream release 2.61. Changes are, per Simon Kelley:

Re-write interface discovery code on *BSD to use getifaddrs. This
is more portable, more straightforward, and allows us to find the
prefix length for IPv6 addresses.

Add ra-names, ra-stateless and slaac keywords for DHCPv6.  Dnsmasq
can now synthesise AAAA records for dual-stack hosts which get IPv6
addresses via SLAAC. It is also now possible to use SLAAC and
stateless DHCPv6, and to tell clients to use SLAAC addresses as
well as DHCP ones.  Thanks to Dave Taht for help with this.

Add --dhcp-duid to allow DUID-EN uids to be used.

Explicity send DHCPv6 replies to the correct port, instead of relying

Fix a rare configuration-dependent crash.  Simon Kelley, upstream
maintainer, wrote in message <4F70361B.7080306@thekelleys.org.uk>:

    A bug has been found in dnsmasq 2.60 that can cause crashes. This is
    configuration dependent: it either crashes frequently or not at all.
    The configuration required is one which allows dnsmasq to receive
    DHCPINFORM requests for which there is no valid dhcp-range. This is
    rare.

Adding the patch he offers for download.

Feature safe: yes

Update to new upstream release 2.60.  Notable new features are:
- The LUA port option enables Lua support for DHCP lease-change scripts
- DHCPv6 support
- IPv6 Router Advertisement support

Changelog:    http://www.thekelleys.org.uk/dnsmasq/CHANGELOG
Feature safe: yes

In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().

In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.

Fix BUILD_DEPENDS (use += not =) creation in port.

Upgrade to new upstream regression fix release 2.59:

            Fix regression in 2.58 which caused failure to start up
            with some combinations of dnsmasq config and IPv6 kernel
            network config. Thanks to Brielle Bruns for the bug
            report.

            Improve dnsmasq's behaviour when network interfaces are
            still doing duplicate address detection (DAD). Previously,
            dnsmasq would wait up to 20 seconds at start-up for the
            DAD state to terminate. This is broken for bridge
            interfaces on recent Linux kernels, which don't start DAD
            until the bridge comes up, and so can take arbitrary
            time. The new behaviour lets dnsmasq poll for an arbitrary
            time whilst providing service on other interfaces. Thanks
            to Stephen Hemminger for pointing out the problem.

Note the 2.59.tar.lzma tarball causes the startup banner to print
2.59rc1 which I deem harmless.

Update to new upstream release 2.58
Changes: http://thekelleys.org.uk/dnsmasq/CHANGELOG

Suggested by: Loic Pefferkorn.

- Bump PORTREVISION to chase the update of dns/libidn