pkgsrc-Changes archive

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

CVS commit: pkgsrc/net



Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Nov  3 11:45:59 UTC 2019

Modified Files:
        pkgsrc/net/6tunnel: Makefile
        pkgsrc/net/DarwinStreamingServer: Makefile
        pkgsrc/net/ORBit: Makefile
        pkgsrc/net/Radicale: options.mk
        pkgsrc/net/Radicale2: Makefile options.mk
        pkgsrc/net/SDL2_net: options.mk
        pkgsrc/net/aiccu: Makefile
        pkgsrc/net/argus: Makefile
        pkgsrc/net/autonet: Makefile
        pkgsrc/net/barnyard: options.mk
        pkgsrc/net/batchftp: Makefile
        pkgsrc/net/bind911: Makefile builtin.mk options.mk
        pkgsrc/net/bind914: Makefile builtin.mk options.mk
        pkgsrc/net/bird: Makefile.common
        pkgsrc/net/bittornado-gui: Makefile
        pkgsrc/net/bittorrent: Makefile
        pkgsrc/net/bittorrent-gui: Makefile
        pkgsrc/net/bsddip: Makefile
        pkgsrc/net/cacti: Makefile
        pkgsrc/net/calypso: Makefile
        pkgsrc/net/cdpd: Makefile
        pkgsrc/net/choparp: Makefile
        pkgsrc/net/choqok: Makefile
        pkgsrc/net/citrix_ica: Makefile
        pkgsrc/net/coherence: Makefile
        pkgsrc/net/coilmq: Makefile
        pkgsrc/net/connect: Makefile
        pkgsrc/net/dante: Makefile
        pkgsrc/net/ddclient: Makefile options.mk
        pkgsrc/net/delegate: Makefile
        pkgsrc/net/dhisd: Makefile
        pkgsrc/net/djbdns: options.mk
        pkgsrc/net/djbdnscurve6: Makefile
        pkgsrc/net/dnsmasq: Makefile
        pkgsrc/net/drill: Makefile
        pkgsrc/net/ekiga: options.mk
        pkgsrc/net/ettercap-NG: Makefile
        pkgsrc/net/exabgp: Makefile
        pkgsrc/net/fehqlibs: Makefile buildlink3.mk
        pkgsrc/net/freeradius: Makefile
        pkgsrc/net/freeradius2: Makefile
        pkgsrc/net/freerdp: Makefile
        pkgsrc/net/fwknop: Makefile
        pkgsrc/net/gcloud-golang-metadata: buildlink3.mk
        pkgsrc/net/gethost: Makefile
        pkgsrc/net/gitso: Makefile
        pkgsrc/net/go-framestream: buildlink3.mk
        pkgsrc/net/go-net: buildlink3.mk
        pkgsrc/net/go-websocket: Makefile
        pkgsrc/net/grive: Makefile
        pkgsrc/net/grive2: Makefile
        pkgsrc/net/gssdp: Makefile
        pkgsrc/net/gssdp12: Makefile
        pkgsrc/net/gst-plugins1-libnice: Makefile
        pkgsrc/net/gtk-vnc: Makefile
        pkgsrc/net/gupnp: Makefile
        pkgsrc/net/gupnp12: Makefile
        pkgsrc/net/hesiod: builtin.mk
        pkgsrc/net/hping: Makefile
        pkgsrc/net/hping3: Makefile
        pkgsrc/net/httptunnel: Makefile
        pkgsrc/net/icinga-base: Makefile
        pkgsrc/net/icsi-finger: Makefile
        pkgsrc/net/inadyn: Makefile
        pkgsrc/net/ipcheck: Makefile
        pkgsrc/net/iperf: Makefile
        pkgsrc/net/irrd: options.mk
        pkgsrc/net/istgt: Makefile
        pkgsrc/net/jftpgw: Makefile
        pkgsrc/net/jigdo: Makefile
        pkgsrc/net/jwhois: options.mk
        pkgsrc/net/kismet: Makefile
        pkgsrc/net/knot: Makefile
        pkgsrc/net/ktorrent: Makefile
        pkgsrc/net/lftp: options.mk
        pkgsrc/net/libasr: Makefile
        pkgsrc/net/libcmis: Makefile
        pkgsrc/net/libdmapsharing: Makefile
        pkgsrc/net/libdmapsharing3: Makefile
        pkgsrc/net/libgdata: Makefile
        pkgsrc/net/libgdata0.6: Makefile
        pkgsrc/net/libktorrent: Makefile
        pkgsrc/net/liblive: Makefile
        pkgsrc/net/libnice: Makefile
        pkgsrc/net/libnids: options.mk
        pkgsrc/net/libpcap: builtin.mk
        pkgsrc/net/libsoup: Makefile
        pkgsrc/net/libvncserver: options.mk
        pkgsrc/net/lldpd: Makefile options.mk
        pkgsrc/net/llnlxdir: Makefile
        pkgsrc/net/llnlxftp: Makefile
        pkgsrc/net/mDNSResponder: builtin.mk
        pkgsrc/net/maradns: options.mk
        pkgsrc/net/mcast-tools: Makefile
        pkgsrc/net/microdc2: Makefile
        pkgsrc/net/mikutter: Makefile
        pkgsrc/net/mimms: Makefile
        pkgsrc/net/mosh: Makefile
        pkgsrc/net/mrt: Makefile
        pkgsrc/net/mtr: options.mk
        pkgsrc/net/nagios-base: Makefile
        pkgsrc/net/nagios-nrpe: options.mk
        pkgsrc/net/nagios-plugin-dnsmaster: Makefile
        pkgsrc/net/nagios-plugin-dnsrbl: Makefile
        pkgsrc/net/nagios-plugin-dotpid: Makefile
        pkgsrc/net/nagios-plugin-dumpdates: Makefile
        pkgsrc/net/nagios-plugin-fstab: Makefile
        pkgsrc/net/nagios-plugin-gfbricks: Makefile
        pkgsrc/net/nagios-plugin-milter: Makefile
        pkgsrc/net/nagios-plugin-mysqlslave: Makefile
        pkgsrc/net/nagios-plugin-radius: Makefile
        pkgsrc/net/nagios-plugin-raidctl: Makefile
        pkgsrc/net/nagios-plugin-spamd: Makefile
        pkgsrc/net/nagios-plugin-syncrepl: Makefile
        pkgsrc/net/nagios-plugins: Makefile Makefile.plugin
        pkgsrc/net/nbtscan: Makefile
        pkgsrc/net/nemesis: Makefile
        pkgsrc/net/net-snmp: builtin.mk
        pkgsrc/net/netatalk22: Makefile
        pkgsrc/net/netatalk3: Makefile
        pkgsrc/net/netdisco: Makefile
        pkgsrc/net/netgroup: Makefile
        pkgsrc/net/nicotine: Makefile
        pkgsrc/net/nidentd: Makefile
        pkgsrc/net/ns: Makefile
        pkgsrc/net/nsd: Makefile
        pkgsrc/net/nslint: Makefile
        pkgsrc/net/ntp4: Makefile
        pkgsrc/net/ocaml-conduit: Makefile
        pkgsrc/net/ocaml-ipaddr: Makefile
        pkgsrc/net/ocamlnet: Makefile buildlink3.mk
        pkgsrc/net/ocsinventory-agent: Makefile
        pkgsrc/net/oinkmaster: Makefile options.mk
        pkgsrc/net/omniNotify: Makefile
        pkgsrc/net/omniORB: Makefile
        pkgsrc/net/openag: Makefile
        pkgsrc/net/openconnect: Makefile
        pkgsrc/net/openslp: hacks.mk
        pkgsrc/net/openvpn: Makefile Makefile.common
        pkgsrc/net/openwbem: Makefile
        pkgsrc/net/ortp: Makefile
        pkgsrc/net/p5-File-Rsync: Makefile
        pkgsrc/net/p5-FusionInventory-Agent: Makefile
        pkgsrc/net/p5-Net-Amazon: Makefile
        pkgsrc/net/p5-Net-Amazon-S3: Makefile
        pkgsrc/net/p5-Net-DHCP: Makefile
        pkgsrc/net/p5-Net-GitHub: Makefile
        pkgsrc/net/p5-Net-Jifty: Makefile
        pkgsrc/net/p5-Net-Libdnet: Makefile
        pkgsrc/net/p5-Net-OpenID-Common: Makefile
        pkgsrc/net/p5-Net-XMPP: Makefile
        pkgsrc/net/p5-Net-Z3950-ZOOM: Makefile
        pkgsrc/net/p5-NetAddr-IP: Makefile
        pkgsrc/net/p5-WebService-Google-Reader: Makefile
        pkgsrc/net/p5-XML-RPC: Makefile
        pkgsrc/net/p5-XMLRPC-Lite: Makefile
        pkgsrc/net/pear-Net_LDAP2: Makefile
        pkgsrc/net/pear-Net_LDAP3: Makefile
        pkgsrc/net/perlbal: Makefile
        pkgsrc/net/php-sockets: Makefile
        pkgsrc/net/pim6sd: Makefile
        pkgsrc/net/portmap: Makefile
        pkgsrc/net/pptp: Makefile
        pkgsrc/net/proxytunnel: Makefile
        pkgsrc/net/py-ORBit: Makefile
        pkgsrc/net/py-beanstalkc: Makefile
        pkgsrc/net/py-bonjour: Makefile
        pkgsrc/net/py-caldav: Makefile
        pkgsrc/net/py-dropbox: Makefile
        pkgsrc/net/py-foolscap: Makefile
        pkgsrc/net/py-google: Makefile
        pkgsrc/net/py-irclib: Makefile
        pkgsrc/net/py-medusa: Makefile
        pkgsrc/net/py-netsnmp: Makefile
        pkgsrc/net/py-nyx: Makefile
        pkgsrc/net/py-omniORBpy: Makefile hacks.mk
        pkgsrc/net/py-pcap: Makefile
        pkgsrc/net/py-s3cmd: Makefile
        pkgsrc/net/py-sbws: Makefile
        pkgsrc/net/py-txamqp: Makefile
        pkgsrc/net/pygopherd: Makefile
        pkgsrc/net/radiusclient-ng: Makefile
        pkgsrc/net/radiusd-cistron: Makefile
        pkgsrc/net/radsecproxy: Makefile
        pkgsrc/net/rdist6: Makefile
        pkgsrc/net/rp-l2tp: Makefile
        pkgsrc/net/ruby-soap4r: Makefile
        pkgsrc/net/ruby-stompserver: Makefile
        pkgsrc/net/samba: Makefile options.mk
        pkgsrc/net/samba4: Makefile
        pkgsrc/net/scapy: Makefile options.mk
        pkgsrc/net/sendfile: Makefile
        pkgsrc/net/ser: Makefile
        pkgsrc/net/siproxd: Makefile
        pkgsrc/net/sipsak: Makefile
        pkgsrc/net/smokeping: Makefile
        pkgsrc/net/socket++: Makefile
        pkgsrc/net/spread: Makefile
        pkgsrc/net/spreadlogd: Makefile
        pkgsrc/net/sysmon: Makefile
        pkgsrc/net/tacacs-shrubbery: Makefile options.mk
        pkgsrc/net/taskserver: Makefile
        pkgsrc/net/tcl-scotty: Makefile
        pkgsrc/net/tcpillust: Makefile
        pkgsrc/net/teamspeak-server: Makefile
        pkgsrc/net/tigervnc: Makefile
        pkgsrc/net/tinyfugue: Makefile
        pkgsrc/net/tkined: Makefile
        pkgsrc/net/tnftp: options.mk
        pkgsrc/net/tor: Makefile
        pkgsrc/net/traceroute-as: Makefile
        pkgsrc/net/traceroute-nanog: Makefile
        pkgsrc/net/trickle: Makefile
        pkgsrc/net/tsocks: Makefile
        pkgsrc/net/ttt: Makefile
        pkgsrc/net/tvnjviewer: Makefile
        pkgsrc/net/ucspi-ssl: Makefile
        pkgsrc/net/ucspi-tcp: options.mk
        pkgsrc/net/udns: Makefile
        pkgsrc/net/unbound: Makefile
        pkgsrc/net/unison2.48: Makefile
        pkgsrc/net/unison2.51: Makefile
        pkgsrc/net/upnpinspector: Makefile
        pkgsrc/net/userppp: Makefile
        pkgsrc/net/uucp: Makefile
        pkgsrc/net/vnc: Makefile
        pkgsrc/net/vnstat: Makefile
        pkgsrc/net/vsftpd: Makefile
        pkgsrc/net/wakeup: Makefile
        pkgsrc/net/walker: Makefile
        pkgsrc/net/wget: options.mk
        pkgsrc/net/whoson: Makefile
        pkgsrc/net/wide-dhcpv6: Makefile
        pkgsrc/net/wu-ftpd: Makefile
        pkgsrc/net/x2vnc: options.mk
        pkgsrc/net/xtraceroute: Makefile
        pkgsrc/net/xymon: options.mk
        pkgsrc/net/yaz: Makefile
        pkgsrc/net/ytalk: Makefile

Log Message:
net: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/6tunnel/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/DarwinStreamingServer/Makefile
cvs rdiff -u -r1.126 -r1.127 pkgsrc/net/ORBit/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/Radicale/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/Radicale2/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/Radicale2/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/SDL2_net/options.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/aiccu/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/argus/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/autonet/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/barnyard/options.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/batchftp/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/bind911/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind911/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/bind911/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/bind914/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind914/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bind914/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/bird/Makefile.common
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/bittornado-gui/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/net/bittorrent/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/bittorrent-gui/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/bsddip/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/cacti/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/calypso/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/cdpd/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/choparp/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/choqok/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/citrix_ica/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/coherence/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/coilmq/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/connect/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/dante/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/ddclient/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ddclient/options.mk
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/delegate/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/dhisd/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/djbdns/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/djbdnscurve6/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/dnsmasq/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/drill/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/ekiga/options.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/ettercap-NG/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/exabgp/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/fehqlibs/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/fehqlibs/buildlink3.mk
cvs rdiff -u -r1.101 -r1.102 pkgsrc/net/freeradius/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/net/freeradius2/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/freerdp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/fwknop/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/gcloud-golang-metadata/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/gethost/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/gitso/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/go-framestream/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/go-net/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/go-websocket/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/grive/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/grive2/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/net/gssdp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/gssdp12/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/gst-plugins1-libnice/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/net/gtk-vnc/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/net/gupnp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/gupnp12/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/hesiod/builtin.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/hping/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/hping3/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/httptunnel/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/icinga-base/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/icsi-finger/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/inadyn/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/ipcheck/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/iperf/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/irrd/options.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/istgt/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/jftpgw/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/net/jigdo/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/jwhois/options.mk
cvs rdiff -u -r1.62 -r1.63 pkgsrc/net/kismet/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/knot/Makefile
cvs rdiff -u -r1.93 -r1.94 pkgsrc/net/ktorrent/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/lftp/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/libasr/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/libcmis/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/net/libdmapsharing/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/libdmapsharing3/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/net/libgdata/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/libgdata0.6/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/libktorrent/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/liblive/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/net/libnice/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/libnids/options.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/libpcap/builtin.mk
cvs rdiff -u -r1.57 -r1.58 pkgsrc/net/libsoup/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/libvncserver/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/lldpd/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/lldpd/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/llnlxdir/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/llnlxftp/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/mDNSResponder/builtin.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/maradns/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/mcast-tools/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/microdc2/Makefile
cvs rdiff -u -r1.185 -r1.186 pkgsrc/net/mikutter/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/mimms/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/mosh/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/mrt/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/mtr/options.mk
cvs rdiff -u -r1.78 -r1.79 pkgsrc/net/nagios-base/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/nagios-nrpe/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/nagios-plugin-dnsmaster/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nagios-plugin-dnsrbl/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/nagios-plugin-dotpid/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nagios-plugin-dumpdates/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nagios-plugin-fstab/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/nagios-plugin-gfbricks/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/nagios-plugin-milter/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/nagios-plugin-mysqlslave/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/nagios-plugin-radius/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nagios-plugin-raidctl/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/nagios-plugin-spamd/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nagios-plugin-syncrepl/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/nagios-plugins/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nagios-plugins/Makefile.plugin
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/nbtscan/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/nemesis/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/net-snmp/builtin.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/netatalk22/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/netatalk3/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/netdisco/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/netgroup/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/net/nicotine/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/nidentd/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/ns/Makefile
cvs rdiff -u -r1.105 -r1.106 pkgsrc/net/nsd/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/nslint/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/net/ntp4/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ocaml-conduit/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/ocaml-ipaddr/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/net/ocamlnet/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/ocamlnet/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/ocsinventory-agent/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/oinkmaster/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/oinkmaster/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/omniNotify/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/omniORB/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/openag/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/openconnect/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/openslp/hacks.mk
cvs rdiff -u -r1.69 -r1.70 pkgsrc/net/openvpn/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/openvpn/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/openwbem/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/ortp/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/p5-File-Rsync/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/p5-FusionInventory-Agent/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/p5-Net-Amazon/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/p5-Net-Amazon-S3/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/p5-Net-DHCP/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/p5-Net-GitHub/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/p5-Net-Jifty/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/p5-Net-Libdnet/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/p5-Net-OpenID-Common/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/p5-Net-XMPP/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/p5-Net-Z3950-ZOOM/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/p5-NetAddr-IP/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/p5-WebService-Google-Reader/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/p5-XML-RPC/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/p5-XMLRPC-Lite/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/pear-Net_LDAP2/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/pear-Net_LDAP3/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/perlbal/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/php-sockets/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/pim6sd/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/portmap/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/pptp/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/proxytunnel/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/net/py-ORBit/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/py-beanstalkc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/py-bonjour/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/py-caldav/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-dropbox/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/py-foolscap/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/py-google/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/py-irclib/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/py-medusa/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-netsnmp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-nyx/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/py-omniORBpy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-omniORBpy/hacks.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/py-pcap/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/py-s3cmd/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-sbws/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-txamqp/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/pygopherd/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/radiusclient-ng/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/radiusd-cistron/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/radsecproxy/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/rdist6/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/rp-l2tp/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/ruby-soap4r/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/ruby-stompserver/Makefile
cvs rdiff -u -r1.276 -r1.277 pkgsrc/net/samba/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/samba/options.mk
cvs rdiff -u -r1.81 -r1.82 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/scapy/options.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/sendfile/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/ser/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/siproxd/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/sipsak/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/smokeping/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/socket++/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/spread/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/spreadlogd/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/sysmon/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/tacacs-shrubbery/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/tacacs-shrubbery/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/taskserver/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/tcl-scotty/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/tcpillust/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/teamspeak-server/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/tinyfugue/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/tkined/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/tnftp/options.mk
cvs rdiff -u -r1.145 -r1.146 pkgsrc/net/tor/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/traceroute-as/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/traceroute-nanog/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/trickle/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/tsocks/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/ttt/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/tvnjviewer/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/ucspi-ssl/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/ucspi-tcp/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/udns/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/net/unbound/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/unison2.48/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/unison2.51/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/upnpinspector/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/userppp/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/uucp/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/net/vnc/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/vnstat/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/vsftpd/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/wakeup/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/walker/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/wget/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/whoson/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/wide-dhcpv6/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/wu-ftpd/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/x2vnc/options.mk
cvs rdiff -u -r1.60 -r1.61 pkgsrc/net/xtraceroute/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/xymon/options.mk
cvs rdiff -u -r1.74 -r1.75 pkgsrc/net/yaz/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/ytalk/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/6tunnel/Makefile
diff -u pkgsrc/net/6tunnel/Makefile:1.16 pkgsrc/net/6tunnel/Makefile:1.17
--- pkgsrc/net/6tunnel/Makefile:1.16    Sun Sep 11 12:46:46 2016
+++ pkgsrc/net/6tunnel/Makefile Sun Nov  3 11:45:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/09/11 12:46:46 mef Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:28 rillig Exp $
 #
 
 DISTNAME=      6tunnel-0.11
@@ -10,7 +10,7 @@ HOMEPAGE=     http://toxygen.net/6tunnel/
 COMMENT=       Tunnelling for applications that don't speak IPv6
 LICENSE=       gnu-gpl-v2
 
-NOT_FOR_PLATFORM+= Interix-*-* # no IPv6 support
+NOT_FOR_PLATFORM+=     Interix-*-* # no IPv6 support
 
 LDFLAGS.SunOS+=        -lsocket -lnsl
 

Index: pkgsrc/net/DarwinStreamingServer/Makefile
diff -u pkgsrc/net/DarwinStreamingServer/Makefile:1.25 pkgsrc/net/DarwinStreamingServer/Makefile:1.26
--- pkgsrc/net/DarwinStreamingServer/Makefile:1.25      Sun Aug 11 13:22:06 2019
+++ pkgsrc/net/DarwinStreamingServer/Makefile   Sun Nov  3 11:45:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:22:06 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 11:45:28 rillig Exp $
 
 DISTNAME=      DarwinStreamingSrvr5.5.5-Source
 PKGNAME=       DarwinStreamingServer-5.5.5
@@ -13,9 +13,9 @@ LICENSE=      apple-public-source-license
 
 MAKE_JOBS_SAFE=        no
 
-RESTRICTED=    Under APSL (see http://www.opensource.apple.com/apsl/).
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+RESTRICTED=            Under APSL (see http://www.opensource.apple.com/apsl/).
+NO_BIN_ON_CDROM=       ${RESTRICTED}
+NO_BIN_ON_FTP=         ${RESTRICTED}
 
 USE_LANGUAGES= c c++03
 
@@ -71,10 +71,10 @@ REPLACE_PERL+=      WebAdmin/src/streamingadm
 REPLACE_PERL+= WinNTSupport/WinPasswdAssistant.pl
 
 PKG_SYSCONFSUBDIR=     streaming
-CONF_FILES=    share/examples/streaming/qtgroups ${PKG_SYSCONFDIR}/qtgroups
-CONF_FILES+=   share/examples/streaming/qtusers ${PKG_SYSCONFDIR}/qtusers
-CONF_FILES+=   share/examples/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR}/relayconfig.xml
-CONF_FILES+=   share/examples/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR}/streamingserver.xml
+CONF_FILES=            share/examples/streaming/qtgroups ${PKG_SYSCONFDIR}/qtgroups
+CONF_FILES+=           share/examples/streaming/qtusers ${PKG_SYSCONFDIR}/qtusers
+CONF_FILES+=           share/examples/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR}/relayconfig.xml
+CONF_FILES+=           share/examples/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR}/streamingserver.xml
 
 SUBST_CLASSES+=                makefile
 SUBST_STAGE.makefile=  pre-configure

Index: pkgsrc/net/ORBit/Makefile
diff -u pkgsrc/net/ORBit/Makefile:1.126 pkgsrc/net/ORBit/Makefile:1.127
--- pkgsrc/net/ORBit/Makefile:1.126     Sun Jul 30 22:47:53 2017
+++ pkgsrc/net/ORBit/Makefile   Sun Nov  3 11:45:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2017/07/30 22:47:53 wiz Exp $
+# $NetBSD: Makefile,v 1.127 2019/11/03 11:45:29 rillig Exp $
 
 DISTNAME=      ORBit-0.5.17
 PKGREVISION=   2
@@ -14,7 +14,7 @@ USE_TOOLS+=           bison flex gmake xgettext
 USE_LIBTOOL=           YES
 PTHREAD_AUTO_VARS=     YES
 
-GNU_CONFIGURE=         YES
+GNU_CONFIGURE= YES
 CONFIGURE_ENV+=        LIBWRAP_PATH=${BUILDLINK_PREFIX.tcp_wrappers}/lib/libwrap.a
 CONFIGURE_ENV+=        LIB_WRAP="-lwrap"
 

Index: pkgsrc/net/Radicale/options.mk
diff -u pkgsrc/net/Radicale/options.mk:1.9 pkgsrc/net/Radicale/options.mk:1.10
--- pkgsrc/net/Radicale/options.mk:1.9  Mon Sep  2 13:19:49 2019
+++ pkgsrc/net/Radicale/options.mk      Sun Nov  3 11:45:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2019/09/02 13:19:49 adam Exp $
+# $NetBSD: options.mk,v 1.10 2019/11/03 11:45:29 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.Radicale
 PKG_SUPPORTED_OPTIONS= git ldap
@@ -10,6 +10,6 @@ DEPENDS+=     ${PYPKGPREFIX}-dulwich-[0-9]*:
 .endif
 
 .if !empty(PKG_OPTIONS:Mldap)
-PYTHON_VERSIONS_ACCEPTED=       27 # py-ldap
+PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap
 DEPENDS+=      ${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap
 .endif

Index: pkgsrc/net/Radicale2/Makefile
diff -u pkgsrc/net/Radicale2/Makefile:1.7 pkgsrc/net/Radicale2/Makefile:1.8
--- pkgsrc/net/Radicale2/Makefile:1.7   Thu Apr 25 07:33:09 2019
+++ pkgsrc/net/Radicale2/Makefile       Sun Nov  3 11:45:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/04/25 07:33:09 maya Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:29 rillig Exp $
 
 DISTNAME=      Radicale-2.1.5
 PKGREVISION=   1
@@ -12,10 +12,10 @@ LICENSE=    gnu-gpl-v3
 
 EGDIR=                 share/examples/radicale
 
-RADICALE_USER?=                www
-RADICALE_GROUP?=       www
-PKG_GROUPS=            ${RADICALE_GROUP}
-PKG_USERS=             ${RADICALE_USER}:${RADICALE_GROUP}
+RADICALE_USER?=                        www
+RADICALE_GROUP?=               www
+PKG_GROUPS=                    ${RADICALE_GROUP}
+PKG_USERS=                     ${RADICALE_USER}:${RADICALE_GROUP}
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 INSTALLATION_DIRS=     ${EGDIR}

Index: pkgsrc/net/Radicale2/options.mk
diff -u pkgsrc/net/Radicale2/options.mk:1.5 pkgsrc/net/Radicale2/options.mk:1.6
--- pkgsrc/net/Radicale2/options.mk:1.5 Mon Sep  2 13:19:49 2019
+++ pkgsrc/net/Radicale2/options.mk     Sun Nov  3 11:45:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2019/09/02 13:19:49 adam Exp $
+# $NetBSD: options.mk,v 1.6 2019/11/03 11:45:29 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.Radicale
 
@@ -8,6 +8,6 @@ PKG_OPTIONS_VAR=        PKG_OPTIONS.Radicale
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mldap)
-PYTHON_VERSIONS_ACCEPTED=       27 # py-ldap
+PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap
 DEPENDS+=      ${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap
 .endif

Index: pkgsrc/net/SDL2_net/options.mk
diff -u pkgsrc/net/SDL2_net/options.mk:1.1 pkgsrc/net/SDL2_net/options.mk:1.2
--- pkgsrc/net/SDL2_net/options.mk:1.1  Sun Feb  2 15:56:29 2014
+++ pkgsrc/net/SDL2_net/options.mk      Sun Nov  3 11:45:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/02/02 15:56:29 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 11:45:29 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.SDL2_net
 PKG_SUPPORTED_OPTIONS= static tests
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS+= static
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=       --enable-static=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=       --enable-static=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)

Index: pkgsrc/net/aiccu/Makefile
diff -u pkgsrc/net/aiccu/Makefile:1.19 pkgsrc/net/aiccu/Makefile:1.20
--- pkgsrc/net/aiccu/Makefile:1.19      Sat Jul 20 22:46:36 2019
+++ pkgsrc/net/aiccu/Makefile   Sun Nov  3 11:45:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/07/20 22:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 11:45:29 rillig Exp $
 
 DISTNAME=              aiccu_20070115
 PKGNAME=               ${DISTNAME:S/_/-/:S/.//g}
@@ -12,7 +12,7 @@ COMMENT=              Automatic IPv6 Connectivity Cl
 
 USE_TOOLS+=            gmake
 USE_FEATURES+=         inet6
-CHECK_PORTABILITY_SKIP+=debian/*
+CHECK_PORTABILITY_SKIP+= debian/*
 
 SUBST_CLASSES+=                sysconfdir
 SUBST_STAGE.sysconfdir=        pre-configure

Index: pkgsrc/net/argus/Makefile
diff -u pkgsrc/net/argus/Makefile:1.26 pkgsrc/net/argus/Makefile:1.27
--- pkgsrc/net/argus/Makefile:1.26      Sun Aug 11 13:22:06 2019
+++ pkgsrc/net/argus/Makefile   Sun Nov  3 11:45:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:22:06 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 11:45:29 rillig Exp $
 
 DISTNAME=      argus-3.7
 PKGREVISION=   5
@@ -21,7 +21,7 @@ DEPENDS+=     p5-Crypt-DES-[0-9]*:../../secu
 DEPENDS+=      p5-DBI-[0-9]*:../../databases/p5-DBI
 
 USE_TOOLS+=            perl:run
-HAS_CONFIGURE= yes
+HAS_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      ${WRKSRC}/Configure
 CONFIGURE_ARGS+=       --bin_dir ${PREFIX}/bin
 CONFIGURE_ARGS+=       --sbin_dir ${PREFIX}/sbin
@@ -35,7 +35,7 @@ REPLACE_PERL+=                ${WRKSRC}/built/argus-co
 
 RCD_SCRIPTS=           argusd
 
-INSTALL_MAKE_FLAGS+=   INSTALL_BIN=${DESTDIR}${PREFIX}/bin \
+INSTALL_MAKE_FLAGS+=   INSTALL_BIN=${DESTDIR}${PREFIX}/bin \
                        INSTALL_SBIN=${DESTDIR}${PREFIX}/sbin \
                        INSTALL_CGI=${DESTDIR}${PREFIX}/libexec/cgi-bin \
                        INSTALL_LIB=${DESTDIR}${PREFIX}/lib/argus \

Index: pkgsrc/net/autonet/Makefile
diff -u pkgsrc/net/autonet/Makefile:1.10 pkgsrc/net/autonet/Makefile:1.11
--- pkgsrc/net/autonet/Makefile:1.10    Fri Mar 13 17:17:11 2015
+++ pkgsrc/net/autonet/Makefile Sun Nov  3 11:45:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/03/13 17:17:11 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:29 rillig Exp $
 
 DISTNAME=      autonet-0.22
 CATEGORIES=    net
@@ -8,7 +8,7 @@ EXTRACT_SUFX=   .tbz
 MAINTAINER=    abs%absd.org@localhost
 COMMENT=       Automatically configure network interface & WEP keys
 
-ONLY_FOR_PLATFORM= NetBSD-*-*
+ONLY_FOR_PLATFORM=     NetBSD-*-*
 
 USE_LANGUAGES= # empty
 USE_TOOLS+=    groff

Index: pkgsrc/net/barnyard/options.mk
diff -u pkgsrc/net/barnyard/options.mk:1.1.1.1 pkgsrc/net/barnyard/options.mk:1.2
--- pkgsrc/net/barnyard/options.mk:1.1.1.1      Mon Dec  8 23:23:26 2008
+++ pkgsrc/net/barnyard/options.mk      Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/12/08 23:23:26 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 11:45:30 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.barnyard
 PKG_SUPPORTED_OPTIONS= mysql pgsql
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=        mysql
 ### Use PostgreSQL for storing user details
 ###
 .if !empty(PKG_OPTIONS:Mpgsql)
-.      include "../../mk/pgsql.buildlink3.mk"
+.  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-postgres
 CONFIGURE_ARGS+=       --with-postgres-includes=${PREFIX}/include/postgresql
 CONFIGURE_ARGS+=       --with-postgres-libraries=${PREFIX}/lib/postgresql
@@ -21,7 +21,7 @@ LIBS+=                        ${COMPILER_RPATH_FLAG}${PREFIX}
 ### Use MySQL for storing user details
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-.      include "../../mk/mysql.buildlink3.mk"
+.  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-mysql
 CONFIGURE_ARGS+=       --with-mysql-includes=${PREFIX}/include/mysql
 CONFIGURE_ARGS+=       --with-mysql-libraries=${PREFIX}/lib/mysql

Index: pkgsrc/net/batchftp/Makefile
diff -u pkgsrc/net/batchftp/Makefile:1.17 pkgsrc/net/batchftp/Makefile:1.18
--- pkgsrc/net/batchftp/Makefile:1.17   Thu Oct  9 14:06:44 2014
+++ pkgsrc/net/batchftp/Makefile        Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/10/09 14:06:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:30 rillig Exp $
 
 DISTNAME=      batchftp102
 PKGNAME=       batchftp-1.02
@@ -11,8 +11,8 @@ COMMENT=      Automatically download files vi
 
 WRKSRC=                ${WRKDIR}
 
-CPPFLAGS.Interix+= -Dsetpgrp=setpgid
-MAKE_ENV+=     BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
+CPPFLAGS.Interix+=     -Dsetpgrp=setpgid
+MAKE_ENV+=             BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
 
 INSTALLATION_DIRS=     bin share/doc/batchftp
 

Index: pkgsrc/net/bind911/Makefile
diff -u pkgsrc/net/bind911/Makefile:1.15 pkgsrc/net/bind911/Makefile:1.16
--- pkgsrc/net/bind911/Makefile:1.15    Thu Oct 17 00:48:31 2019
+++ pkgsrc/net/bind911/Makefile Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/10/17 00:48:31 taca Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:30 rillig Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
@@ -26,18 +26,18 @@ USE_TOOLS+=         pax perl
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 
-CONFIGURE_ARGS+=       --with-libtool
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
-CONFIGURE_ARGS+=       --with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+=       --with-python=no
+CONFIGURE_ARGS+=               --with-libtool
+CONFIGURE_ARGS+=               --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=               --localstatedir=${VARBASE}
+CONFIGURE_ARGS+=               --with-openssl=${SSLBASE:Q}
+CONFIGURE_ARGS+=               --with-python=no
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-vax)
-CONFIGURE_ARGS+=       --disable-atomic
+CONFIGURE_ARGS+=               --disable-atomic
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != ""
-CONFIGURE_ARGS+=       --disable-threads
+CONFIGURE_ARGS+=               --disable-threads
 .endif
 CONFIGURE_ARGS.DragonFly+=     --disable-kqueue
 

Index: pkgsrc/net/bind911/builtin.mk
diff -u pkgsrc/net/bind911/builtin.mk:1.1 pkgsrc/net/bind911/builtin.mk:1.2
--- pkgsrc/net/bind911/builtin.mk:1.1   Sun Sep  9 13:11:38 2018
+++ pkgsrc/net/bind911/builtin.mk       Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2018/09/09 13:11:38 taca Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 11:45:30 rillig Exp $
 
 BUILTIN_PKG:=  bind
 
@@ -34,7 +34,7 @@ IS_BUILTIN.bind=      no
 IS_BUILTIN.bind=       yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.bind
+MAKEVARS+=             IS_BUILTIN.bind
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -45,7 +45,7 @@ MAKEVARS+=    IS_BUILTIN.bind
     defined(BUILTIN_VERSION.bind)
 BUILTIN_PKG.bind=      bind-${BUILTIN_VERSION.bind}
 .endif
-MAKEVARS+=     BUILTIN_PKG.bind
+MAKEVARS+=             BUILTIN_PKG.bind
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -72,7 +72,7 @@ USE_BUILTIN.bind!=                                                    \
 .    endif
 .  endif  # PREFER.bind
 .endif
-MAKEVARS+=     USE_BUILTIN.bind
+MAKEVARS+=             USE_BUILTIN.bind
 
 ###
 ### The section below only applies if we are not including this file

Index: pkgsrc/net/bind911/options.mk
diff -u pkgsrc/net/bind911/options.mk:1.3 pkgsrc/net/bind911/options.mk:1.4
--- pkgsrc/net/bind911/options.mk:1.3   Tue Apr 30 02:51:38 2019
+++ pkgsrc/net/bind911/options.mk       Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/04/30 02:51:38 taca Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/03 11:45:30 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bind911
 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server
@@ -25,7 +25,7 @@ PKG_SUGGESTED_OPTIONS+=       threads
 .if empty(MISSING_FEATURES:Minet6)
 PKG_SUGGESTED_OPTIONS+=        inet6
 .else
-PLIST.inet6=   yes
+PLIST.inet6=           yes
 .endif
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/net/bind914/Makefile
diff -u pkgsrc/net/bind914/Makefile:1.12 pkgsrc/net/bind914/Makefile:1.13
--- pkgsrc/net/bind914/Makefile:1.12    Thu Oct 24 12:50:36 2019
+++ pkgsrc/net/bind914/Makefile Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/24 12:50:36 otis Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:30 rillig Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
@@ -26,15 +26,15 @@ USE_TOOLS+=         pax perl
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 
-CONFIGURE_ARGS+=       --with-libtool
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
-CONFIGURE_ARGS+=       --with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+=       --with-python=no
+CONFIGURE_ARGS+=               --with-libtool
+CONFIGURE_ARGS+=               --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=               --localstatedir=${VARBASE}
+CONFIGURE_ARGS+=               --with-openssl=${SSLBASE:Q}
+CONFIGURE_ARGS+=               --with-python=no
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-vax)
-CONFIGURE_ARGS+=       --disable-atomic
+CONFIGURE_ARGS+=               --disable-atomic
 .endif
 CONFIGURE_ARGS.DragonFly+=     --disable-kqueue
 

Index: pkgsrc/net/bind914/builtin.mk
diff -u pkgsrc/net/bind914/builtin.mk:1.1 pkgsrc/net/bind914/builtin.mk:1.2
--- pkgsrc/net/bind914/builtin.mk:1.1   Tue Apr 30 03:34:34 2019
+++ pkgsrc/net/bind914/builtin.mk       Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2019/04/30 03:34:34 taca Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 11:45:30 rillig Exp $
 
 BUILTIN_PKG:=  bind
 
@@ -34,7 +34,7 @@ IS_BUILTIN.bind=      no
 IS_BUILTIN.bind=       yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.bind
+MAKEVARS+=             IS_BUILTIN.bind
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -45,7 +45,7 @@ MAKEVARS+=    IS_BUILTIN.bind
     defined(BUILTIN_VERSION.bind)
 BUILTIN_PKG.bind=      bind-${BUILTIN_VERSION.bind}
 .endif
-MAKEVARS+=     BUILTIN_PKG.bind
+MAKEVARS+=             BUILTIN_PKG.bind
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -72,7 +72,7 @@ USE_BUILTIN.bind!=                                                    \
 .    endif
 .  endif  # PREFER.bind
 .endif
-MAKEVARS+=     USE_BUILTIN.bind
+MAKEVARS+=             USE_BUILTIN.bind
 
 ###
 ### The section below only applies if we are not including this file

Index: pkgsrc/net/bind914/options.mk
diff -u pkgsrc/net/bind914/options.mk:1.2 pkgsrc/net/bind914/options.mk:1.3
--- pkgsrc/net/bind914/options.mk:1.2   Fri Jun 14 16:14:05 2019
+++ pkgsrc/net/bind914/options.mk       Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/06/14 16:14:05 taca Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:30 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bind914
 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server
@@ -23,9 +23,9 @@ PKG_SUGGESTED_OPTIONS+=       threads
 .endif
 
 .if ${OPSYS} == "NetBSD"
-.if !empty(OS_VERSION:M[8-9].*)
+.  if !empty(OS_VERSION:M[8-9].*)
 PKG_SUGGESTED_OPTIONS+=        blacklist
-.endif
+.  endif
 .endif
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/net/bird/Makefile.common
diff -u pkgsrc/net/bird/Makefile.common:1.8 pkgsrc/net/bird/Makefile.common:1.9
--- pkgsrc/net/bird/Makefile.common:1.8 Sat Feb 11 02:29:48 2017
+++ pkgsrc/net/bird/Makefile.common     Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2017/02/11 02:29:48 mef Exp $
+# $NetBSD: Makefile.common,v 1.9 2019/11/03 11:45:30 rillig Exp $
 # used by net/bird/Makefile
 # used by net/bird6/Makefile
 
@@ -23,8 +23,8 @@ CONFIGURE_ARGS+=      --localstatedir=/var
 BIRD6?=                        # empty
 PLIST_SUBST+=          BIRD6=${BIRD6}
 
-FILESDIR=               ${.CURDIR}/../bird/files
-PATCHDIR=               ${.CURDIR}/../bird/patches
+FILESDIR=              ${.CURDIR}/../bird/files
+PATCHDIR=              ${.CURDIR}/../bird/patches
 DISTINFO_FILE=         ${.CURDIR}/../bird/distinfo
 PLIST_SRC=             ${.CURDIR}/../bird/PLIST
 DESCR_SRC=             ${.CURDIR}/../bird/DESCR

Index: pkgsrc/net/bittornado-gui/Makefile
diff -u pkgsrc/net/bittornado-gui/Makefile:1.38 pkgsrc/net/bittornado-gui/Makefile:1.39
--- pkgsrc/net/bittornado-gui/Makefile:1.38     Mon Sep  2 13:19:48 2019
+++ pkgsrc/net/bittornado-gui/Makefile  Sun Nov  3 11:45:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/09/02 13:19:48 adam Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/03 11:45:30 rillig Exp $
 
 .include "../../net/bittornado/Makefile.common"
 
@@ -14,9 +14,9 @@ DEPENDS+=     ${PYPKGPREFIX}-wxWidgets-[0-9]
 
 NO_BUILD=      yes
 
-REPLACE_PYTHON=        btcompletedirgui.py btdownloadgui.py
-REPLACE_PYTHON+=       btmaketorrentgui.py
-PYTHON_VERSIONS_ACCEPTED=       27 # py-wxWidgets
+REPLACE_PYTHON=                        btcompletedirgui.py btdownloadgui.py
+REPLACE_PYTHON+=               btmaketorrentgui.py
+PYTHON_VERSIONS_ACCEPTED=      27 # py-wxWidgets
 
 INSTALLATION_DIRS=     bin
 

Index: pkgsrc/net/bittorrent/Makefile
diff -u pkgsrc/net/bittorrent/Makefile:1.55 pkgsrc/net/bittorrent/Makefile:1.56
--- pkgsrc/net/bittorrent/Makefile:1.55 Mon Sep  2 13:19:48 2019
+++ pkgsrc/net/bittorrent/Makefile      Sun Nov  3 11:45:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2019/09/02 13:19:48 adam Exp $
+# $NetBSD: Makefile,v 1.56 2019/11/03 11:45:31 rillig Exp $
 
 .include "Makefile.common"
 
@@ -12,7 +12,7 @@ DEPENDS+=     ${PYPKGPREFIX}-cursespanel-[0-
 
 USE_TOOLS+=    msgfmt xgettext msgmerge
 
-SUBST_CLASSES+=         sha
+SUBST_CLASSES+=                sha
 SUBST_MESSAGE.sha=     Fixing references to deprecated sha module.
 SUBST_STAGE.sha=       pre-configure
 SUBST_FILES.sha=       BitTorrent/ConvertedMetainfo.py

Index: pkgsrc/net/bittorrent-gui/Makefile
diff -u pkgsrc/net/bittorrent-gui/Makefile:1.42 pkgsrc/net/bittorrent-gui/Makefile:1.43
--- pkgsrc/net/bittorrent-gui/Makefile:1.42     Mon Sep  2 13:19:52 2019
+++ pkgsrc/net/bittorrent-gui/Makefile  Sun Nov  3 11:45:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/09/02 13:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/03 11:45:31 rillig Exp $
 
 .include "../../net/bittorrent/Makefile.common"
 
@@ -10,8 +10,8 @@ COMMENT+=     (GTK+ GUI)
 DEPENDS+=      bittorrent>=${PKGVERSION_NOREV}:../../net/bittorrent
 DEPENDS+=      ${PYPKGPREFIX}-gtk2>=2.6:../../x11/py-gtk2
 
-REPLACE_PYTHON= bittorrent maketorrent
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+REPLACE_PYTHON=        bittorrent maketorrent
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
 
 CONFLICTS+=    bittornado-gui-[0-9]*
 

Index: pkgsrc/net/bsddip/Makefile
diff -u pkgsrc/net/bsddip/Makefile:1.6 pkgsrc/net/bsddip/Makefile:1.7
--- pkgsrc/net/bsddip/Makefile:1.6      Tue Oct 23 17:18:12 2012
+++ pkgsrc/net/bsddip/Makefile  Sun Nov  3 11:45:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:12 asau Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:31 rillig Exp $
 
 DISTNAME=      bsddip-1.02
 CATEGORIES=    net
@@ -17,9 +17,9 @@ NO_SRC_ON_FTP=                Already in MASTER_SITE_L
 
 INSTALLATION_DIRS=     ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin
 
-NO_CONFIGURE=  yes
+NO_CONFIGURE=          yes
 MANCOMPRESSED_IF_MANZ= yes
-MAKE_ENV+=     ${BSD_MAKE_ENV}
+MAKE_ENV+=             ${BSD_MAKE_ENV}
 
 post-extract:
        cp -f ${FILESDIR}/Makefile ${WRKSRC}/.

Index: pkgsrc/net/cacti/Makefile
diff -u pkgsrc/net/cacti/Makefile:1.41 pkgsrc/net/cacti/Makefile:1.42
--- pkgsrc/net/cacti/Makefile:1.41      Sun Aug 11 13:22:07 2019
+++ pkgsrc/net/cacti/Makefile   Sun Nov  3 11:45:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/08/11 13:22:07 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2019/11/03 11:45:31 rillig Exp $
 
 DISTNAME=      cacti-1.2.3
 PKGREVISION=   2
@@ -31,13 +31,13 @@ DEPENDS+=           ${APACHE_PKG_PREFIX}-${PHP_PK
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/apache.mk"
 
-PKG_USERS=             ${CACTI_USER}:${CACTI_GROUP}
-PKG_GROUPS=            ${CACTI_GROUP}
+PKG_USERS=                     ${CACTI_USER}:${CACTI_GROUP}
+PKG_GROUPS=                    ${CACTI_GROUP}
 PKG_GECOS.${CACTI_USER}=       Cacti user
-PKG_HOME.${CACTI_USER}=        ${CACTIDIR}
+PKG_HOME.${CACTI_USER}=                ${CACTIDIR}
 PKG_SHELL.${CACTI_USER}=       ${SH}
-PKG_USERS_VARS+=       CACTI_USER
-PKG_GROUPS_VARS+=      CACTI_GROUP
+PKG_USERS_VARS+=               CACTI_USER
+PKG_GROUPS_VARS+=              CACTI_GROUP
 
 BUILD_DEFS+=           PKG_SYSCONFBASE VARBASE APACHE_GROUP
 PKG_SYSCONFSUBDIR?=    httpd
@@ -107,7 +107,7 @@ INSTALLATION_DIRS=  bin
 INSTALLATION_DIRS+=    share/examples/cacti
 INSTALLATION_DIRS+=    share/cacti
 
-PLIST_VARS+=   localmemory
+PLIST_VARS+=           localmemory
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || \
     ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
 PLIST.localmemory=     yes

Index: pkgsrc/net/calypso/Makefile
diff -u pkgsrc/net/calypso/Makefile:1.19 pkgsrc/net/calypso/Makefile:1.20
--- pkgsrc/net/calypso/Makefile:1.19    Mon Sep  2 13:19:52 2019
+++ pkgsrc/net/calypso/Makefile Sun Nov  3 11:45:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/09/02 13:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 11:45:31 rillig Exp $
 
 DISTNAME=      calypso-1.3
 PKGREVISION=   2
@@ -16,7 +16,7 @@ DEPENDS+=     git-base-[0-9]*:../../devel/gi
 INSTALLATION_DIRS=     share/examples/calypso
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 1.3
+PYTHON_VERSIONS_ACCEPTED= 27 # as of 1.3
 REPLACE_PYTHON=        calypso.py
 
 post-install:

Index: pkgsrc/net/cdpd/Makefile
diff -u pkgsrc/net/cdpd/Makefile:1.18 pkgsrc/net/cdpd/Makefile:1.19
--- pkgsrc/net/cdpd/Makefile:1.18       Sat Apr  6 12:08:40 2013
+++ pkgsrc/net/cdpd/Makefile    Sun Nov  3 11:45:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/04/06 12:08:40 rodent Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:31 rillig Exp $
 #
 
 DISTNAME=      cdpd-1.0.2
@@ -15,10 +15,10 @@ GNU_CONFIGURE=      YES
 INSTALLATION_DIRS=     ${PKGMANDIR}/man8 sbin
 
 SUBST_CLASSES+=                conf
-SUBST_STAGE.conf=       pre-configure
-SUBST_FILES.conf=       configure
-SUBST_SED.conf=         -e "s|libnet-config|libnet10-config|g"
-SUBST_MESSAGE.conf=     Fixing configuration script.
+SUBST_STAGE.conf=      pre-configure
+SUBST_FILES.conf=      configure
+SUBST_SED.conf=                -e "s|libnet-config|libnet10-config|g"
+SUBST_MESSAGE.conf=    Fixing configuration script.
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/cdpd ${DESTDIR}${PREFIX}/sbin/cdpd

Index: pkgsrc/net/choparp/Makefile
diff -u pkgsrc/net/choparp/Makefile:1.13 pkgsrc/net/choparp/Makefile:1.14
--- pkgsrc/net/choparp/Makefile:1.13    Thu Sep 12 11:15:12 2013
+++ pkgsrc/net/choparp/Makefile Sun Nov  3 11:45:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/09/12 11:15:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:32 rillig Exp $
 #
 
 DISTNAME=      choparp-20021107
@@ -14,7 +14,7 @@ NOT_FOR_PLATFORM=     Interix-*-* # does not
 USE_TOOLS=     nroff
 
 MANCOMPRESSED_IF_MANZ= yes
-MAKE_ENV+=     ${BSD_MAKE_ENV}
+MAKE_ENV+=             ${BSD_MAKE_ENV}
 INSTALLATION_DIRS=     ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/choqok/Makefile
diff -u pkgsrc/net/choqok/Makefile:1.45 pkgsrc/net/choqok/Makefile:1.46
--- pkgsrc/net/choqok/Makefile:1.45     Thu Aug 22 12:23:38 2019
+++ pkgsrc/net/choqok/Makefile  Sun Nov  3 11:45:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/08/22 12:23:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:32 rillig Exp $
 #
 
 DISTNAME=      choqok-1.5
@@ -18,7 +18,7 @@ MAKE_JOBS_SAFE=       no
 USE_LANGUAGES= c c++
 USE_TOOLS+=    perl msgfmt pkg-config
 
-BUILD_DEPENDS+=         automoc4>=0.9.87:../../devel/automoc4
+BUILD_DEPENDS+=        automoc4>=0.9.87:../../devel/automoc4
 DEPENDS=       qca2-ossl-[0-9]*:../../security/qca2-ossl
 
 .include "../../meta-pkgs/kde4/kde4.mk"

Index: pkgsrc/net/citrix_ica/Makefile
diff -u pkgsrc/net/citrix_ica/Makefile:1.46 pkgsrc/net/citrix_ica/Makefile:1.47
--- pkgsrc/net/citrix_ica/Makefile:1.46 Fri Jun 19 15:30:27 2015
+++ pkgsrc/net/citrix_ica/Makefile      Sun Nov  3 11:45:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2015/06/19 15:30:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.47 2019/11/03 11:45:32 rillig Exp $
 
 DISTNAME=      citrix_ica-10.6.115659
 PKGREVISION=   2
@@ -58,10 +58,10 @@ USE_TOOLS+= patch
 INSTALLATION_DIRS=     bin lib
 
 .if ${MASTER_SITES} == "manual"
-FETCH_MESSAGE=  "Please fetch ${DISTFILES} manually from"
-FETCH_MESSAGE+= "${HOMEPAGE}"
-FETCH_MESSAGE+= "and put into"
-FETCH_MESSAGE+= "${DISTDIR}/${PKGNAME_NOREV}"
+FETCH_MESSAGE= "Please fetch ${DISTFILES} manually from"
+FETCH_MESSAGE+=        "${HOMEPAGE}"
+FETCH_MESSAGE+=        "and put into"
+FETCH_MESSAGE+=        "${DISTDIR}/${PKGNAME_NOREV}"
 .endif
 
 do-patch:

Index: pkgsrc/net/coherence/Makefile
diff -u pkgsrc/net/coherence/Makefile:1.19 pkgsrc/net/coherence/Makefile:1.20
--- pkgsrc/net/coherence/Makefile:1.19  Mon Sep  2 13:19:50 2019
+++ pkgsrc/net/coherence/Makefile       Sun Nov  3 11:45:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/09/02 13:19:50 adam Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 11:45:32 rillig Exp $
 
 DISTNAME=      Coherence-0.6.6.2
 PKGNAME=       coherence-0.6.6.2
@@ -12,9 +12,9 @@ COMMENT=      Media server framework
 
 USE_LANGUAGES= # none
 
-DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 0.6.6.2
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.6.6.2
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/coilmq/Makefile
diff -u pkgsrc/net/coilmq/Makefile:1.15 pkgsrc/net/coilmq/Makefile:1.16
--- pkgsrc/net/coilmq/Makefile:1.15     Mon Sep  2 13:19:49 2019
+++ pkgsrc/net/coilmq/Makefile  Sun Nov  3 11:45:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/09/02 13:19:49 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:32 rillig Exp $
 
 DISTNAME=      CoilMQ-0.6.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -26,7 +26,7 @@ SUBST_STAGE.cfg=      pre-configure
 SUBST_FILES.cfg=       coilmq/config/__init__.py
 SUBST_SED.cfg=         -e 's,/path/to/config.cfg,${PKG_SYSCONFDIR}/defaults.cfg,'
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-stompclient, py-daemon
+PYTHON_VERSIONS_ACCEPTED=      27 # py-stompclient, py-daemon
 
 EGDIR=                 ${PREFIX}/share/examples/coilmq
 

Index: pkgsrc/net/connect/Makefile
diff -u pkgsrc/net/connect/Makefile:1.17 pkgsrc/net/connect/Makefile:1.18
--- pkgsrc/net/connect/Makefile:1.17    Mon Mar  9 09:24:35 2015
+++ pkgsrc/net/connect/Makefile Sun Nov  3 11:45:33 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2015/03/09 09:24:35 mef Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:33 rillig Exp $
 
 DISTNAME=      1.104
 PKGNAME=       connect-${DISTNAME}
 CATEGORIES=    net security
-MASTER_SITES=   http://bitbucket.org/gotoh/connect/get/
+MASTER_SITES=  http://bitbucket.org/gotoh/connect/get/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://bitbucket.org/gotoh/connect/wiki/Home

Index: pkgsrc/net/dante/Makefile
diff -u pkgsrc/net/dante/Makefile:1.26 pkgsrc/net/dante/Makefile:1.27
--- pkgsrc/net/dante/Makefile:1.26      Sat Feb  9 19:51:09 2019
+++ pkgsrc/net/dante/Makefile   Sun Nov  3 11:45:33 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2019/02/09 19:51:09 rhialto Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 11:45:33 rillig Exp $
 
 DISTNAME=      dante-1.4.2
-PKGREVISION=    1
+PKGREVISION=   1
 CATEGORIES=    net security
 MASTER_SITES=  http://www.inet.no/dante/files/
 

Index: pkgsrc/net/ddclient/Makefile
diff -u pkgsrc/net/ddclient/Makefile:1.46 pkgsrc/net/ddclient/Makefile:1.47
--- pkgsrc/net/ddclient/Makefile:1.46   Sat Sep 21 10:40:08 2019
+++ pkgsrc/net/ddclient/Makefile        Sun Nov  3 11:45:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2019/09/21 10:40:08 abs Exp $
+# $NetBSD: Makefile,v 1.47 2019/11/03 11:45:33 rillig Exp $
 
 DISTNAME=      ddclient-3.8.3
 PKGREVISION=   6
@@ -22,7 +22,7 @@ CONF_FILES_PERMS=     ${EGDIR}/sample-etc_dd
                        ${PKG_SYSCONFDIR}/ddclient.conf                 \
                        ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
 
-DEPENDS+=               p5-JSON-Any>=0.0:../../converters/p5-JSON-Any
+DEPENDS+=              p5-JSON-Any>=0.0:../../converters/p5-JSON-Any
 
 REPLACE_INTERPRETER+=  sh
 REPLACE.sh.old=                .*/bin/bash

Index: pkgsrc/net/ddclient/options.mk
diff -u pkgsrc/net/ddclient/options.mk:1.1 pkgsrc/net/ddclient/options.mk:1.2
--- pkgsrc/net/ddclient/options.mk:1.1  Fri Mar 13 10:57:14 2015
+++ pkgsrc/net/ddclient/options.mk      Sun Nov  3 11:45:33 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2015/03/13 10:57:14 jmcneill Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 11:45:33 rillig Exp $
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.ddclient
-PKG_SUPPORTED_OPTIONS=  ssl
-PKG_SUGGESTED_OPTIONS=  ssl
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ddclient
+PKG_SUPPORTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= ssl
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/net/delegate/Makefile
diff -u pkgsrc/net/delegate/Makefile:1.45 pkgsrc/net/delegate/Makefile:1.46
--- pkgsrc/net/delegate/Makefile:1.45   Thu Jan 19 18:52:19 2017
+++ pkgsrc/net/delegate/Makefile        Sun Nov  3 11:45:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/01/19 18:52:19 agc Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:33 rillig Exp $
 
 DISTNAME=      delegate9.9.1
 PKGNAME=       delegate-9.9.1
@@ -22,8 +22,8 @@ DELEGATE_MANAGER?=    root@localhost
 RCD_SCRIPTS=           delegated
 FILES_SUBST+=          ADMIN=${DELEGATE_MANAGER:Q}
 
-OWN_DIRS_PERMS+=${VARBASE}/spool/delegate/cache ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777
-OWN_DIRS_PERMS+=${VARBASE}/spool/delegate-nobody nobody nobody 755
+OWN_DIRS_PERMS+=       ${VARBASE}/spool/delegate/cache ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777
+OWN_DIRS_PERMS+=       ${VARBASE}/spool/delegate-nobody nobody nobody 755
 
 INSTALLATION_DIRS=     sbin share/doc/delegate
 

Index: pkgsrc/net/dhisd/Makefile
diff -u pkgsrc/net/dhisd/Makefile:1.20 pkgsrc/net/dhisd/Makefile:1.21
--- pkgsrc/net/dhisd/Makefile:1.20      Fri Dec 18 19:54:14 2015
+++ pkgsrc/net/dhisd/Makefile   Sun Nov  3 11:45:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/12/18 19:54:14 wiedi Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:33 rillig Exp $
 #
 
 DISTNAME=      dhisd-5.5
@@ -20,25 +20,25 @@ SUBST_STAGE.varbase=        pre-configure
 SUBST_MESSAGE.varbase= Adapt VARBASE and PREFIX
 SUBST_VARS.varbase+=   VARBASE PREFIX
 
-SPECIAL_PERMS+=         bin/dhisd-genkeys ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 \
-                        bin/dhisd        ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
+SPECIAL_PERMS+=                bin/dhisd-genkeys ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 \
+                       bin/dhisd         ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 
 do-install:
-               ${INSTALL_DATA} \
-                       ${WRKSRC}/*.sample \
-                       ${DESTDIR}${PREFIX}/share/examples/dhisd
-               ${INSTALL_DATA} \
-                       ${WRKSRC}/CONTRIBUTORS  \
-                       ${WRKSRC}/COPYRIGHT  \
-                       ${WRKSRC}/INSTALL  \
-                       ${WRKSRC}/README  \
-                       ${DESTDIR}${PREFIX}/share/doc/dhisd
-               ${INSTALL_PROGRAM} \
-                       ${WRKSRC}/dhisd \
-                       ${DESTDIR}${PREFIX}/bin
-               ${INSTALL_PROGRAM} \
-                       ${WRKSRC}/dhisgenkeys \
-                       ${DESTDIR}${PREFIX}/bin/dhisd-genkeys
+       ${INSTALL_DATA} \
+               ${WRKSRC}/*.sample \
+               ${DESTDIR}${PREFIX}/share/examples/dhisd
+       ${INSTALL_DATA} \
+               ${WRKSRC}/CONTRIBUTORS  \
+               ${WRKSRC}/COPYRIGHT  \
+               ${WRKSRC}/INSTALL  \
+               ${WRKSRC}/README  \
+               ${DESTDIR}${PREFIX}/share/doc/dhisd
+       ${INSTALL_PROGRAM} \
+               ${WRKSRC}/dhisd \
+               ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} \
+               ${WRKSRC}/dhisgenkeys \
+               ${DESTDIR}${PREFIX}/bin/dhisd-genkeys
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/djbdns/options.mk
diff -u pkgsrc/net/djbdns/options.mk:1.22 pkgsrc/net/djbdns/options.mk:1.23
--- pkgsrc/net/djbdns/options.mk:1.22   Sat Jan  5 06:18:11 2019
+++ pkgsrc/net/djbdns/options.mk        Sun Nov  3 11:45:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2019/01/05 06:18:11 schmonz Exp $
+# $NetBSD: options.mk,v 1.23 2019/11/03 11:45:33 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.djbdns
 PKG_SUPPORTED_OPTIONS+=                djbdns-cachestats djbdns-ignoreip2
@@ -8,10 +8,10 @@ PKG_SUGGESTED_OPTIONS+=               djbdns-mergeque
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdjbdns-cachestats)
-CACHESTATS_PATCH=              djbdns-cachestats.patch
-PATCHFILES+=                   ${CACHESTATS_PATCH}
-SITES.${CACHESTATS_PATCH}=     http://romana.now.ie/software/
-PATCH_DIST_STRIP.${CACHESTATS_PATCH}= -p1
+CACHESTATS_PATCH=                      djbdns-cachestats.patch
+PATCHFILES+=                           ${CACHESTATS_PATCH}
+SITES.${CACHESTATS_PATCH}=             http://romana.now.ie/software/
+PATCH_DIST_STRIP.${CACHESTATS_PATCH}=  -p1
 .endif
 
 .if !empty(PKG_OPTIONS:Mdjbdns-ignoreip2)

Index: pkgsrc/net/djbdnscurve6/Makefile
diff -u pkgsrc/net/djbdnscurve6/Makefile:1.9 pkgsrc/net/djbdnscurve6/Makefile:1.10
--- pkgsrc/net/djbdnscurve6/Makefile:1.9        Sat Aug  3 10:45:18 2019
+++ pkgsrc/net/djbdnscurve6/Makefile    Sun Nov  3 11:45:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/03 10:45:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:33 rillig Exp $
 
 DISTNAME=              djbdnscurve6-35
 PKGREVISION=           3
@@ -25,11 +25,11 @@ SUBST_FILES.etc=    src/dns_rcrw.c man/qual
 SUBST_SED.etc=         -e 's|/etc/dnsrewrite|${PKG_SYSCONFBASE}/dnsrewrite|g'
 SUBST_MESSAGE.etc=     Fixing prefix.
 
-SUBST_CLASSES+=                sysconfdir
-SUBST_STAGE.sysconfdir=        do-configure
-SUBST_FILES.sysconfdir=        src/dnscache-conf.c
-SUBST_VARS.sysconfdir= PKG_SYSCONFDIR
-SUBST_MESSAGE.sysconfdir=Fixing sysconfdir.
+SUBST_CLASSES+=                        sysconfdir
+SUBST_STAGE.sysconfdir=                do-configure
+SUBST_FILES.sysconfdir=                src/dnscache-conf.c
+SUBST_VARS.sysconfdir=         PKG_SYSCONFDIR
+SUBST_MESSAGE.sysconfdir=      Fixing sysconfdir.
 
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES+=           ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global

Index: pkgsrc/net/dnsmasq/Makefile
diff -u pkgsrc/net/dnsmasq/Makefile:1.39 pkgsrc/net/dnsmasq/Makefile:1.40
--- pkgsrc/net/dnsmasq/Makefile:1.39    Sat Jul 20 22:46:37 2019
+++ pkgsrc/net/dnsmasq/Makefile Sun Nov  3 11:45:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/07/20 22:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/03 11:45:34 rillig Exp $
 
 DISTNAME=      dnsmasq-2.80
 PKGREVISION=   1
@@ -26,7 +26,7 @@ DNSMASQ_GROUP?=               dnsmasq
 
 PKG_GROUPS=            ${DNSMASQ_GROUP}
 PKG_USERS=             ${DNSMASQ_USER}:${DNSMASQ_GROUP}
-PKG_GECOS.${DNSMASQ_USER}=DNS\ forwarder\ user
+PKG_GECOS.${DNSMASQ_USER}= DNS\ forwarder\ user
 
 .include "options.mk"
 

Index: pkgsrc/net/drill/Makefile
diff -u pkgsrc/net/drill/Makefile:1.13 pkgsrc/net/drill/Makefile:1.14
--- pkgsrc/net/drill/Makefile:1.13      Tue Aug  1 17:40:14 2017
+++ pkgsrc/net/drill/Makefile   Sun Nov  3 11:45:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/08/01 17:40:14 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:34 rillig Exp $
 
 VERSION=       1.6.17
 DISTNAME=      ldns-${VERSION}
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=      --with-ssl=${BUILDLINK_
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/drill
 
-BUILDLINK_API_DEPENDS.ldns+=    ldns>=${VERSION}
+BUILDLINK_API_DEPENDS.ldns+=   ldns>=${VERSION}
 
 .include "../../net/ldns/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/net/ekiga/options.mk
diff -u pkgsrc/net/ekiga/options.mk:1.5 pkgsrc/net/ekiga/options.mk:1.6
--- pkgsrc/net/ekiga/options.mk:1.5     Wed Nov  6 13:31:21 2013
+++ pkgsrc/net/ekiga/options.mk Sun Nov  3 11:45:34 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2013/11/06 13:31:21 joerg Exp $
+# $NetBSD: options.mk,v 1.6 2019/11/03 11:45:34 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ekiga
-PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify
-PKG_SUGGESTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify
+PKG_SUPPORTED_OPTIONS+=        avahi dbus evolution-data-server gconf gnome notify
+PKG_SUGGESTED_OPTIONS+=        avahi dbus evolution-data-server gconf gnome notify
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/net/ettercap-NG/Makefile
diff -u pkgsrc/net/ettercap-NG/Makefile:1.27 pkgsrc/net/ettercap-NG/Makefile:1.28
--- pkgsrc/net/ettercap-NG/Makefile:1.27        Fri May 12 12:01:01 2017
+++ pkgsrc/net/ettercap-NG/Makefile     Sun Nov  3 11:45:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2017/05/12 12:01:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/03 11:45:34 rillig Exp $
 
 DISTNAME=      ettercap-NG-0.7.3
 PKGREVISION=   14
@@ -44,7 +44,7 @@ SUBST_MESSAGE.conf=   Fixing configuration
 CONF_FILES=    ${PREFIX}/share/examples/ettercap-NG/etter.conf \
                ${PKG_SYSCONFDIR}/etter.conf
 
-INSTALLATION_DIRS+=     share/examples/ettercap-NG
+INSTALLATION_DIRS+=    share/examples/ettercap-NG
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/share/etter.conf \

Index: pkgsrc/net/exabgp/Makefile
diff -u pkgsrc/net/exabgp/Makefile:1.30 pkgsrc/net/exabgp/Makefile:1.31
--- pkgsrc/net/exabgp/Makefile:1.30     Mon Sep  2 13:19:52 2019
+++ pkgsrc/net/exabgp/Makefile  Sun Nov  3 11:45:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/09/02 13:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/03 11:45:34 rillig Exp $
 
 VERSION=       3.4.23
 DISTNAME=      ${VERSION}
@@ -58,7 +58,7 @@ REPLACE_PYTHON+=      qa/conf/watchdog.run
 
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 3.2.19
 
-USE_LANGUAGES=  # none
+USE_LANGUAGES= # none
 
 INSTALLATION_DIRS+=    share/exabgp bin
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1 ${PKGMANDIR}/man5

Index: pkgsrc/net/fehqlibs/Makefile
diff -u pkgsrc/net/fehqlibs/Makefile:1.7 pkgsrc/net/fehqlibs/Makefile:1.8
--- pkgsrc/net/fehqlibs/Makefile:1.7    Sat Aug  3 10:42:46 2019
+++ pkgsrc/net/fehqlibs/Makefile        Sun Nov  3 11:45:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/08/03 10:42:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:34 rillig Exp $
 
 DISTNAME=              fehQlibs-12c
 PKGNAME=               ${DISTNAME:S/Qlibs-/qlibs-0.9./:S/12/12.12/}
@@ -36,10 +36,10 @@ do-configure:
 .include "../../mk/bsd.prefs.mk"
 
 post-build:
-.      if ${OPSYS} == Darwin
+.if ${OPSYS} == Darwin
        cd ${WRKSRC} && for lib in *.so; do \
          install_name_tool -id ${PREFIX}/lib/qlibs/$${lib} $${lib}; \
        done
-.      endif
+.endif
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/fehqlibs/buildlink3.mk
diff -u pkgsrc/net/fehqlibs/buildlink3.mk:1.5 pkgsrc/net/fehqlibs/buildlink3.mk:1.6
--- pkgsrc/net/fehqlibs/buildlink3.mk:1.5       Fri Jul 12 15:34:54 2019
+++ pkgsrc/net/fehqlibs/buildlink3.mk   Sun Nov  3 11:45:34 2019
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.5 2019/07/12 15:34:54 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2019/11/03 11:45:34 rillig Exp $
 
 BUILDLINK_TREE+=       fehqlibs
 
 .if !defined(FEHQLIBS_BUILDLINK3_MK)
 FEHQLIBS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.fehqlibs+=fehqlibs>=0.9.12.10
-BUILDLINK_PKGSRCDIR.fehqlibs?= ../../net/fehqlibs
-BUILDLINK_INCDIRS.fehqlibs+=   include/qlibs
-BUILDLINK_LIBDIRS.fehqlibs+=   lib/qlibs
-LDFLAGS.SunOS+=                        -lnsl -lsocket
+BUILDLINK_API_DEPENDS.fehqlibs+=       fehqlibs>=0.9.12.10
+BUILDLINK_PKGSRCDIR.fehqlibs?=         ../../net/fehqlibs
+BUILDLINK_INCDIRS.fehqlibs+=           include/qlibs
+BUILDLINK_LIBDIRS.fehqlibs+=           lib/qlibs
+LDFLAGS.SunOS+=                                -lnsl -lsocket
 .endif # FEHQLIBS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -fehqlibs

Index: pkgsrc/net/freeradius/Makefile
diff -u pkgsrc/net/freeradius/Makefile:1.101 pkgsrc/net/freeradius/Makefile:1.102
--- pkgsrc/net/freeradius/Makefile:1.101        Sun Aug 11 13:22:08 2019
+++ pkgsrc/net/freeradius/Makefile      Sun Nov  3 11:45:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2019/08/11 13:22:08 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2019/11/03 11:45:34 rillig Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -34,7 +34,7 @@ RADIUS_GROUP?=                radiusd
 RADIUS_USER?=          radiusd
 PKG_GROUPS=            ${RADIUS_GROUP}
 PKG_USERS=             ${RADIUS_USER}:${RADIUS_GROUP}
-PKG_HOME.${RADIUS_USER}=${VARBASE}/log/radiusd
+PKG_HOME.${RADIUS_USER}= ${VARBASE}/log/radiusd
 
 OWN_DIRS_PERMS+=       ${VARBASE}/log/radiusd \
                        ${RADIUS_USER} ${RADIUS_GROUP} 0750

Index: pkgsrc/net/freeradius2/Makefile
diff -u pkgsrc/net/freeradius2/Makefile:1.51 pkgsrc/net/freeradius2/Makefile:1.52
--- pkgsrc/net/freeradius2/Makefile:1.51        Sun Aug 11 13:22:08 2019
+++ pkgsrc/net/freeradius2/Makefile     Sun Nov  3 11:45:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/08/11 13:22:08 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/03 11:45:34 rillig Exp $
 
 DISTNAME=      freeradius-server-2.2.10
 PKGNAME=       ${DISTNAME:S/-server//}
@@ -80,7 +80,7 @@ SUBST_MESSAGE.config= Fixing configurati
 
 .include "options.mk"
 
-EGFILES=acct_users attrs attrs.access_reject attrs.accounting_response \
+EGFILES=       acct_users attrs attrs.access_reject attrs.accounting_response \
        attrs.pre-proxy certs/README certs/Makefile certs/bootstrap \
        certs/ca.cnf certs/client.cnf certs/server.cnf \
        certs/xpextensions clients.conf dictionary eap.conf experimental.conf \
@@ -117,8 +117,8 @@ EGFILES=acct_users attrs attrs.access_re
        sql/postgresql/schema.sql \
        sql/postgresql/update_radacct_group_trigger.sql \
        sql/postgresql/voip-postpaid.conf sqlippool.conf templates.conf users
-EGDIRS=        certs modules sql sql/mssql sql/mysql sql/oracle \
-       sql/postgresql sites-available sites-enabled
+EGDIRS=                certs modules sql sql/mssql sql/mysql sql/oracle \
+               sql/postgresql sites-available sites-enabled
 
 .for f in ${EGFILES}
 CONF_FILES_PERMS+=     ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \

Index: pkgsrc/net/freerdp/Makefile
diff -u pkgsrc/net/freerdp/Makefile:1.39 pkgsrc/net/freerdp/Makefile:1.40
--- pkgsrc/net/freerdp/Makefile:1.39    Wed Sep 18 14:17:15 2019
+++ pkgsrc/net/freerdp/Makefile Sun Nov  3 11:45:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/09/18 14:17:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/03 11:45:35 rillig Exp $
 
 DISTNAME=      freerdp-1.0.2
 PKGREVISION=   36
@@ -12,9 +12,9 @@ LICENSE=      apache-2.0
 
 TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
 
-USE_CMAKE=     yes
-USE_TOOLS+=    pkg-config
-USE_OLD_DES_API=yes
+USE_CMAKE=             yes
+USE_TOOLS+=            pkg-config
+USE_OLD_DES_API=       yes
 
 PKGCONFIG_OVERRIDE+=   freerdp.pc.in
 

Index: pkgsrc/net/fwknop/Makefile
diff -u pkgsrc/net/fwknop/Makefile:1.1 pkgsrc/net/fwknop/Makefile:1.2
--- pkgsrc/net/fwknop/Makefile:1.1      Tue May  1 21:10:42 2018
+++ pkgsrc/net/fwknop/Makefile  Sun Nov  3 11:45:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/05/01 21:10:42 khorben Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:35 rillig Exp $
 
 DISTNAME=      fwknop-2.6.9
 CATEGORIES=    net
@@ -14,14 +14,14 @@ DEPENDS+=   wget-[0-9]*:../../net/wget
 
 USE_TOOLS+=    aclocal autoconf automake autoheader makeinfo
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--infodir=${PREFIX}/${PKGINFODIR}
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --infodir=${PREFIX}/${PKGINFODIR}
 
-EGDIR=         ${PREFIX}/share/examples/fwknop
-CONF_FILES+=   ${EGDIR}/access.conf \
-               ${PKG_SYSCONFDIR}/fwknop/access.conf
-CONF_FILES+=   ${EGDIR}/fwknopd.conf \
-               ${PKG_SYSCONFDIR}/fwknop/fwknopd.conf
+EGDIR=                 ${PREFIX}/share/examples/fwknop
+CONF_FILES+=           ${EGDIR}/access.conf \
+                       ${PKG_SYSCONFDIR}/fwknop/access.conf
+CONF_FILES+=           ${EGDIR}/fwknopd.conf \
+                       ${PKG_SYSCONFDIR}/fwknop/fwknopd.conf
 INSTALLATION_DIRS+=    ${EGDIR}
 
 INFO_FILES=    yes

Index: pkgsrc/net/gcloud-golang-metadata/buildlink3.mk
diff -u pkgsrc/net/gcloud-golang-metadata/buildlink3.mk:1.2 pkgsrc/net/gcloud-golang-metadata/buildlink3.mk:1.3
--- pkgsrc/net/gcloud-golang-metadata/buildlink3.mk:1.2 Tue Dec 29 21:47:48 2015
+++ pkgsrc/net/gcloud-golang-metadata/buildlink3.mk     Sun Nov  3 11:45:35 2019
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2019/11/03 11:45:35 rillig Exp $
 
 BUILDLINK_TREE+=       gcloud-golang-metadata
 
 .if !defined(GCLOUD_GOLANG_METADATA_BUILDLINK3_MK)
 GCLOUD_GOLANG_METADATA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcloud-golang-metadata+= gcloud-golang-metadata>=20150310
-BUILDLINK_PKGSRCDIR.gcloud-golang-metadata?=   ../../net/gcloud-golang-metadata
-BUILDLINK_DEPMETHOD.gcloud-golang-metadata?=   build
-BUILDLINK_CONTENTS_FILTER.gcloud-golang-metadata= ${EGREP} gopkg/
+BUILDLINK_API_DEPENDS.gcloud-golang-metadata+=         gcloud-golang-metadata>=20150310
+BUILDLINK_PKGSRCDIR.gcloud-golang-metadata?=           ../../net/gcloud-golang-metadata
+BUILDLINK_DEPMETHOD.gcloud-golang-metadata?=           build
+BUILDLINK_CONTENTS_FILTER.gcloud-golang-metadata=      ${EGREP} gopkg/
 
 .include "../../net/go-net/buildlink3.mk"
 .endif # GCLOUD_GOLANG_METADATA_BUILDLINK3_MK

Index: pkgsrc/net/gethost/Makefile
diff -u pkgsrc/net/gethost/Makefile:1.13 pkgsrc/net/gethost/Makefile:1.14
--- pkgsrc/net/gethost/Makefile:1.13    Thu Oct  9 14:06:44 2014
+++ pkgsrc/net/gethost/Makefile Sun Nov  3 11:45:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/10/09 14:06:44 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:35 rillig Exp $
 
 DISTNAME=      gethost-0.03
 PKGREVISION=   1
@@ -14,7 +14,7 @@ CONFLICTS=    dnssec-tools-[0-9]*
 USE_FEATURES=          inet6
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
-BUILD_TARGET=  gethost
+BUILD_TARGET=          gethost
 
 LIBS.SunOS=    -lnsl -lresolv -lsocket
 

Index: pkgsrc/net/gitso/Makefile
diff -u pkgsrc/net/gitso/Makefile:1.35 pkgsrc/net/gitso/Makefile:1.36
--- pkgsrc/net/gitso/Makefile:1.35      Mon Sep  2 13:19:52 2019
+++ pkgsrc/net/gitso/Makefile   Sun Nov  3 11:45:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/09/02 13:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/03 11:45:35 rillig Exp $
 
 DISTNAME=              gitso-0.6
 PKGREVISION=           22
@@ -17,7 +17,7 @@ DEPENDS+=             x11vnc-[0-9]*:../../x11/x11vn
 WRKSRC=                        ${WRKDIR}/Gitso
 
 PY_PATCHPLIST=         yes
-PYTHON_VERSIONS_ACCEPTED=       27 # py-wxWidgets
+PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets
 
 USE_TOOLS+=            bash:run
 

Index: pkgsrc/net/go-framestream/buildlink3.mk
diff -u pkgsrc/net/go-framestream/buildlink3.mk:1.1 pkgsrc/net/go-framestream/buildlink3.mk:1.2
--- pkgsrc/net/go-framestream/buildlink3.mk:1.1 Wed Jan 16 15:15:49 2019
+++ pkgsrc/net/go-framestream/buildlink3.mk     Sun Nov  3 11:45:35 2019
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/01/16 15:15:49 he Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 11:45:35 rillig Exp $
 
 BUILDLINK_TREE+=       go-framestream
 
 .if !defined(GO_FRAMESTREAM_BUILDLINK3_MK)
 GO_FRAMESTREAM_BUILDLINK3_MK:=
 
-BUILDLINK_CONTENTS_FILTER.go-framestream=${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-framestream?=   build
+BUILDLINK_CONTENTS_FILTER.go-framestream=      ${EGREP} gopkg/
+BUILDLINK_DEPMETHOD.go-framestream?=           build
 
 BUILDLINK_API_DEPENDS.go-framestream+= go-framestream>=0.1.0
 BUILDLINK_PKGSRCDIR.go-framestream?=   ../../net/go-framestream

Index: pkgsrc/net/go-net/buildlink3.mk
diff -u pkgsrc/net/go-net/buildlink3.mk:1.5 pkgsrc/net/go-net/buildlink3.mk:1.6
--- pkgsrc/net/go-net/buildlink3.mk:1.5 Thu Mar 16 19:14:19 2017
+++ pkgsrc/net/go-net/buildlink3.mk     Sun Nov  3 11:45:35 2019
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/03/16 19:14:19 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2019/11/03 11:45:35 rillig Exp $
 
 BUILDLINK_TREE+=       go-net
 
 .if !defined(GO_NET_BUILDLINK3_MK)
 GO_NET_BUILDLINK3_MK:=
 
-BUILDLINK_CONTENTS_FILTER.go-net= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-net?=   build
+BUILDLINK_CONTENTS_FILTER.go-net=      ${EGREP} gopkg/
+BUILDLINK_DEPMETHOD.go-net?=           build
 
 BUILDLINK_API_DEPENDS.go-net+= go-net>=20170308
 BUILDLINK_PKGSRCDIR.go-net?=   ../../net/go-net

Index: pkgsrc/net/go-websocket/Makefile
diff -u pkgsrc/net/go-websocket/Makefile:1.16 pkgsrc/net/go-websocket/Makefile:1.17
--- pkgsrc/net/go-websocket/Makefile:1.16       Fri Oct 18 14:58:55 2019
+++ pkgsrc/net/go-websocket/Makefile    Sun Nov  3 11:45:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/10/18 14:58:55 bsiegert Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:35 rillig Exp $
 
 DISTNAME=      websocket-1.0.0
 PKGNAME=       go-${DISTNAME}
@@ -6,7 +6,7 @@ PKGREVISION=    13
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gorilla/}
 CATEGORIES=    net
 GITHUB_TAG=    v${PKGVERSION_NOREV}
-GITHUB_PROJECT= ${PKGBASE:S/^go-//}
+GITHUB_PROJECT=        ${PKGBASE:S/^go-//}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/gorilla/websocket

Index: pkgsrc/net/grive/Makefile
diff -u pkgsrc/net/grive/Makefile:1.18 pkgsrc/net/grive/Makefile:1.19
--- pkgsrc/net/grive/Makefile:1.18      Thu Aug 22 12:23:39 2019
+++ pkgsrc/net/grive/Makefile   Sun Nov  3 11:45:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/08/22 12:23:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:35 rillig Exp $
 
 DISTNAME=      ${GHNAME}-${GHDATE}-${GHCOMMIT}
 PKGNAME=       ${GHNAME}-0.3.0.${GHDATE}
@@ -20,11 +20,11 @@ WRKSRC=             ${WRKDIR}/grive-${GHCOMMIT}
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++11
 
-SUBST_CLASSES+=                disableqt
-SUBST_MESSAGE.disableqt=Disable QT frontend
-SUBST_STAGE.disableqt= pre-configure
-SUBST_FILES.disableqt= CMakeLists.txt
-SUBST_SED.disableqt=   -e '/ bgrive/d'
+SUBST_CLASSES+=                        disableqt
+SUBST_MESSAGE.disableqt=       Disable QT frontend
+SUBST_STAGE.disableqt=         pre-configure
+SUBST_FILES.disableqt=         CMakeLists.txt
+SUBST_SED.disableqt=           -e '/ bgrive/d'
 
 SUBST_CLASSES+=                manpath
 SUBST_MESSAGE.manpath= Fix manpath

Index: pkgsrc/net/grive2/Makefile
diff -u pkgsrc/net/grive2/Makefile:1.16 pkgsrc/net/grive2/Makefile:1.17
--- pkgsrc/net/grive2/Makefile:1.16     Thu Aug 22 12:23:39 2019
+++ pkgsrc/net/grive2/Makefile  Sun Nov  3 11:45:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/22 12:23:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:36 rillig Exp $
 
 DISTNAME=      grive2-0.4.1
 PKGREVISION=   13
@@ -10,7 +10,7 @@ HOMEPAGE=     https://github.com/vitalif/Gri
 COMMENT=       Independent open source implementation of Google Drive client
 LICENSE=       gnu-gpl-v2
 
-GITHUB_TAG=v${PKGVERSION_NOREV}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config

Index: pkgsrc/net/gssdp/Makefile
diff -u pkgsrc/net/gssdp/Makefile:1.81 pkgsrc/net/gssdp/Makefile:1.82
--- pkgsrc/net/gssdp/Makefile:1.81      Fri Oct 11 16:40:03 2019
+++ pkgsrc/net/gssdp/Makefile   Sun Nov  3 11:45:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2019/10/11 16:40:03 kamil Exp $
+# $NetBSD: Makefile,v 1.82 2019/11/03 11:45:36 rillig Exp $
 
 DISTNAME=      gssdp-1.0.3
 PKGREVISION=   4
@@ -11,10 +11,10 @@ HOMEPAGE=   http://www.gupnp.org/
 COMMENT=       Simple Service Discovery Protocol library and device sniffer (1.0 branch)
 LICENSE=       gnu-lgpl-v2
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-gtk
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config gmake
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --without-gtk
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config gmake
 
 PKGCONFIG_OVERRIDE+=   gssdp-1.0.pc.in
 

Index: pkgsrc/net/gssdp12/Makefile
diff -u pkgsrc/net/gssdp12/Makefile:1.2 pkgsrc/net/gssdp12/Makefile:1.3
--- pkgsrc/net/gssdp12/Makefile:1.2     Mon Oct  7 09:28:12 2019
+++ pkgsrc/net/gssdp12/Makefile Sun Nov  3 11:45:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/07 09:28:12 prlw1 Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/03 11:45:36 rillig Exp $
 
 DISTNAME=      gssdp-1.2.1
 PKGNAME=       ${DISTNAME:S/gssdp/gssdp12/}
@@ -18,9 +18,9 @@ MESON_ARGS+=  -Dsniffer=false
 # needs gtk-doc
 MESON_ARGS+=   -Dgtk-doc=false
 
-PKGCONFIG_OVERRIDE+=   output/meson-private/gssdp-1.2.pc
-PKGCONFIG_OVERRIDE_STAGE=pre-install
-MAKE_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/output/libgssdp
+PKGCONFIG_OVERRIDE+=           output/meson-private/gssdp-1.2.pc
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+MAKE_ENV+=                     LD_LIBRARY_PATH=${WRKSRC}/output/libgssdp
 
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection=     build

Index: pkgsrc/net/gst-plugins1-libnice/Makefile
diff -u pkgsrc/net/gst-plugins1-libnice/Makefile:1.36 pkgsrc/net/gst-plugins1-libnice/Makefile:1.37
--- pkgsrc/net/gst-plugins1-libnice/Makefile:1.36       Sat Jul 20 22:46:38 2019
+++ pkgsrc/net/gst-plugins1-libnice/Makefile    Sun Nov  3 11:45:36 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2019/07/20 22:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/03 11:45:36 rillig Exp $
 
 PKGNAME=       gst-plugins1-${DISTNAME}
 PKGREVISION=   1
 COMMENT+=      (gstreamer plugin)
 
-CONFIGURE_ARGS+= --with-gstreamer
+CONFIGURE_ARGS+=       --with-gstreamer
 
 .include "../../net/libnice/Makefile.common"
 

Index: pkgsrc/net/gtk-vnc/Makefile
diff -u pkgsrc/net/gtk-vnc/Makefile:1.69 pkgsrc/net/gtk-vnc/Makefile:1.70
--- pkgsrc/net/gtk-vnc/Makefile:1.69    Wed Sep 18 14:17:15 2019
+++ pkgsrc/net/gtk-vnc/Makefile Sun Nov  3 11:45:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2019/09/18 14:17:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2019/11/03 11:45:36 rillig Exp $
 #
 
 DISTNAME=      gtk-vnc-0.5.2
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+=  gtk-vnc-1.0.pc.in
 PKGCONFIG_OVERRIDE+=   gtk-vnc-2.0.pc.in
 PKGCONFIG_OVERRIDE+=   gvnc-1.0.pc.in
 PKGCONFIG_OVERRIDE+=   gvncpulse-1.0.pc.in
-PY_PATCHPLIST= yes
+PY_PATCHPLIST=         yes
 
 CONFIGURE_ARGS+=       --with-coroutine=gthread
 
@@ -50,7 +50,7 @@ SUBST_STAGE.mapfile=  pre-build
 SUBST_FILES.mapfile=   gtk3-build/src/Makefile
 SUBST_SED.mapfile=     -e '/VERSION_SCRIPT_FLAGS.*GTK_VNC_VERSION_FILE/d'
 
-#VIEW_REQUIRED=0.6.0
+#VIEW_REQUIRED=        0.6.0
 #libview
 
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/net/gupnp/Makefile
diff -u pkgsrc/net/gupnp/Makefile:1.60 pkgsrc/net/gupnp/Makefile:1.61
--- pkgsrc/net/gupnp/Makefile:1.60      Tue Aug 20 13:17:48 2019
+++ pkgsrc/net/gupnp/Makefile   Sun Nov  3 11:45:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2019/08/20 13:17:48 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2019/11/03 11:45:36 rillig Exp $
 
 DISTNAME=      gupnp-1.0.3
 PKGREVISION=   4
@@ -16,10 +16,10 @@ USE_LIBTOOL=        yes
 USE_TOOLS+=    gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=   gupnp-1.0.pc.in
-REPLACE_PYTHON=        tools/gupnp-binding-tool
+REPLACE_PYTHON=                tools/gupnp-binding-tool
 
-TEST_TARGET=   check
-#CFLAGS=-O0 -g
+TEST_TARGET=           check
+#CFLAGS=               -O0 -g
 #CONFIGURE_ARGS+=      CFLAGS=${CFLAGS:Q}
 #CONFIGURE_ARGS+=      --disable-shared
 #CONFIGURE_ARGS+=      --enable-static

Index: pkgsrc/net/gupnp12/Makefile
diff -u pkgsrc/net/gupnp12/Makefile:1.2 pkgsrc/net/gupnp12/Makefile:1.3
--- pkgsrc/net/gupnp12/Makefile:1.2     Mon Oct  7 09:28:12 2019
+++ pkgsrc/net/gupnp12/Makefile Sun Nov  3 11:45:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/07 09:28:12 prlw1 Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/03 11:45:36 rillig Exp $
 
 DISTNAME=      gupnp-1.2.1
 PKGNAME=       ${DISTNAME:S/gupnp/gupnp12/}
@@ -17,9 +17,9 @@ USE_TOOLS+=   gmake pkg-config
 
 REPLACE_PYTHON=        tools/gupnp-binding-tool-1.2
 
-PKGCONFIG_OVERRIDE+=    output/meson-private/gupnp-1.2.pc
-PKGCONFIG_OVERRIDE_STAGE=pre-install
-MAKE_ENV+=              LD_LIBRARY_PATH=${WRKSRC}/output/libgupnp
+PKGCONFIG_OVERRIDE+=           output/meson-private/gupnp-1.2.pc
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+MAKE_ENV+=                     LD_LIBRARY_PATH=${WRKSRC}/output/libgupnp
 
 TEST_TARGET=   check
 

Index: pkgsrc/net/hesiod/builtin.mk
diff -u pkgsrc/net/hesiod/builtin.mk:1.1 pkgsrc/net/hesiod/builtin.mk:1.2
--- pkgsrc/net/hesiod/builtin.mk:1.1    Thu Oct  6 08:48:00 2011
+++ pkgsrc/net/hesiod/builtin.mk        Sun Nov  3 11:45:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2011/10/06 08:48:00 dholland Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 11:45:37 rillig Exp $
 
 BUILTIN_PKG:=  hesiod
 
@@ -19,7 +19,7 @@ IS_BUILTIN.hesiod=    no
 IS_BUILTIN.hesiod=     yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.hesiod
+MAKEVARS+=             IS_BUILTIN.hesiod
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -36,15 +36,15 @@ _BLTN_HESIOD_300!=  \
        ${GREP} -c hesiod_init ${H_HESIOD} || ${TRUE}
 
 .  if ${_BLTN_HESIOD_302} == "1"
-BUILTIN_VERSION.hesiod=                3.0.2
+BUILTIN_VERSION.hesiod=        3.0.2
 .  elif ${_BLTN_HESIOD_300} == "1"
-BUILTIN_VERSION.hesiod=                3.0.0
+BUILTIN_VERSION.hesiod=        3.0.0
 .  else
-BUILTIN_VERSION.hesiod=                2.0.0
+BUILTIN_VERSION.hesiod=        2.0.0
 .  endif
 BUILTIN_PKG.hesiod=    hesiod-${BUILTIN_VERSION.hesiod}
 .endif
-MAKEVARS+=     BUILTIN_PKG.hesiod
+MAKEVARS+=             BUILTIN_PKG.hesiod
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -71,4 +71,4 @@ USE_BUILTIN.hesiod!=                                                  \
 .    endif
 .  endif  # PREFER.hesiod
 .endif
-MAKEVARS+=     USE_BUILTIN.hesiod
+MAKEVARS+=             USE_BUILTIN.hesiod

Index: pkgsrc/net/hping/Makefile
diff -u pkgsrc/net/hping/Makefile:1.15 pkgsrc/net/hping/Makefile:1.16
--- pkgsrc/net/hping/Makefile:1.15      Thu Aug 24 11:04:00 2017
+++ pkgsrc/net/hping/Makefile   Sun Nov  3 11:45:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/08/24 11:04:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:37 rillig Exp $
 #
 
 DISTNAME=              hping2.0.0-rc3
@@ -22,7 +22,7 @@ INSTALLATION_DIRS=    ${PKGMANDIR}/man8 sbi
 CONFIGURE_ENV+=                PCAPINCDIR=${BUILDLINK_PREFIX.libpcap}/include
 CONFIGURE_ENV+=                PCAPLIBDIR=${BUILDLINK_PREFIX.libpcap}/lib
 
-CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t
+CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t
 
 .include "options.mk"
 

Index: pkgsrc/net/hping3/Makefile
diff -u pkgsrc/net/hping3/Makefile:1.9 pkgsrc/net/hping3/Makefile:1.10
--- pkgsrc/net/hping3/Makefile:1.9      Thu May 23 19:23:09 2019
+++ pkgsrc/net/hping3/Makefile  Sun Nov  3 11:45:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:09 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:37 rillig Exp $
 #
 
 DISTNAME=              hping3-alpha-2
@@ -13,7 +13,7 @@ COMMENT=              Command-line oriented TCP/IP p
 LICENSE=               gnu-gpl-v2 AND original-bsd
 
 SUBST_CLASSES+=                paths
-SUBST_STAGE.paths=      pre-configure
+SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     Makefile.in configure
 SUBST_VARS.paths=      PREFIX
 

Index: pkgsrc/net/httptunnel/Makefile
diff -u pkgsrc/net/httptunnel/Makefile:1.11 pkgsrc/net/httptunnel/Makefile:1.12
--- pkgsrc/net/httptunnel/Makefile:1.11 Wed Aug 16 20:45:42 2017
+++ pkgsrc/net/httptunnel/Makefile      Sun Nov  3 11:45:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/08/16 20:45:42 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 11:45:37 rillig Exp $
 #
 
 DISTNAME=      httptunnel-3.3
@@ -10,7 +10,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Encapsulate TCP/IP connections in HTTP requests
 LICENSE=       gnu-gpl-v2
 
-HAS_CONFIGURE= YES
+HAS_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 

Index: pkgsrc/net/icinga-base/Makefile
diff -u pkgsrc/net/icinga-base/Makefile:1.21 pkgsrc/net/icinga-base/Makefile:1.22
--- pkgsrc/net/icinga-base/Makefile:1.21        Sun Aug 11 13:22:09 2019
+++ pkgsrc/net/icinga-base/Makefile     Sun Nov  3 11:45:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:22:09 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 11:45:37 rillig Exp $
 #
 
 DISTNAME=      icinga-1.9.4
@@ -68,10 +68,10 @@ CONF_FILES+=                ${EGDIR}/${files} ${PKG_SY
 .endfor
 CONF_FILES+=           ${EGDIR}/icinga.conf ${PKG_SYSCONFDIR}/icinga.conf
 
-OWN_DIRS_PERMS+=${ICINGADIR} ${ICINGA_USER} ${ICINGA_GROUP} 0775
-OWN_DIRS_PERMS+=${ICINGADIR}/archives ${ICINGA_USER} ${ICINGA_GROUP} 0775
-OWN_DIRS_PERMS+=${ICINGADIR}/rw ${ICINGA_USER} ${ICINGACMD_GROUP} 0775
-OWN_DIRS_PERMS+=${ICINGADIR}/checkresults ${ICINGA_USER} ${ICINGACMD_GROUP} 0775
+OWN_DIRS_PERMS+=       ${ICINGADIR} ${ICINGA_USER} ${ICINGA_GROUP} 0775
+OWN_DIRS_PERMS+=       ${ICINGADIR}/archives ${ICINGA_USER} ${ICINGA_GROUP} 0775
+OWN_DIRS_PERMS+=       ${ICINGADIR}/rw ${ICINGA_USER} ${ICINGACMD_GROUP} 0775
+OWN_DIRS_PERMS+=       ${ICINGADIR}/checkresults ${ICINGA_USER} ${ICINGACMD_GROUP} 0775
 
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     post-build

Index: pkgsrc/net/icsi-finger/Makefile
diff -u pkgsrc/net/icsi-finger/Makefile:1.30 pkgsrc/net/icsi-finger/Makefile:1.31
--- pkgsrc/net/icsi-finger/Makefile:1.30        Sun Apr 24 10:34:44 2016
+++ pkgsrc/net/icsi-finger/Makefile     Sun Nov  3 11:45:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/04/24 10:34:44 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/03 11:45:37 rillig Exp $
 
 DISTNAME=      icsi-finger-1.0.29
 CATEGORIES=    net
@@ -29,54 +29,54 @@ CPPFLAGS+=  -Wno-error=return-type
 MAKE_ENV.SunOS+=       CPP_ARGS=-DSVR4
 
 pre-configure:
-               chmod +w ${WRKSRC}/config.h
-               ${ECHO} \#define ManDir ${PREFIX}/${PKGMANDIR} >> \
-                       ${WRKSRC}/config.h
-               ${ECHO} \#define TARGETDIR \"${PKG_SYSCONFDIR}/fingerdir/targets\"\
-                       >> ${WRKSRC}/config.h
-               ${ECHO} \#define TargetDir ${PKG_SYSCONFDIR}/fingerdir/targets \
-                       >> ${WRKSRC}/config.h
-               ${ECHO} \#define TTYLOCFILE \"${PKG_SYSCONFDIR}/fingerdir/ttylocs\" \
-                       >> ${WRKSRC}/config.h
-               ${ECHO} \#define HOSTCONFIGFILE \"${PKG_SYSCONFDIR}/fingerdir/hostconfig\" \
-                       >> ${WRKSRC}/config.h
-               ${MV} -f ${WRKSRC}/support/inetd.conf-add \
-                       ${WRKSRC}/support/inetd.conf-add.bak
-               ${SED}  -e s@/usr/local/etc@${PREFIX}/libexec@      \
-                       -e s@/usr/local/etc@${PREFIX}/libexec@      \
-                       ${WRKSRC}/support/inetd.conf-add.bak > \
-                       ${WRKSRC}/support/inetd.conf-add
-               ${MV} -f ${WRKSRC}/support/rc.local-add \
-                       ${WRKSRC}/support/rc.local-add.bak
-               ${SED}  -e s@/usr/local/bin/@${PREFIX}/sbin/g@      \
-                       ${WRKSRC}/support/rc.local-add.bak > \
-                       ${WRKSRC}/support/rc.local-add
-               for i in ${WRKSRC}/src/targets/x-.busy \
-                       ${WRKSRC}/src/targets/x-.down; do \
-                       ${MV} $$i $$i.bak; ${SED} -e s@nawk@awk@ \
-                               -e s@/usr/local/etc@${PREFIX}/libexec@ \
-                               $$i.bak > $$i ; \
-                       ${RM} -f $$i.bak ; \
-               done
+       chmod +w ${WRKSRC}/config.h
+       ${ECHO} \#define ManDir ${PREFIX}/${PKGMANDIR} >> \
+               ${WRKSRC}/config.h
+       ${ECHO} \#define TARGETDIR \"${PKG_SYSCONFDIR}/fingerdir/targets\"\
+               >> ${WRKSRC}/config.h
+       ${ECHO} \#define TargetDir ${PKG_SYSCONFDIR}/fingerdir/targets \
+               >> ${WRKSRC}/config.h
+       ${ECHO} \#define TTYLOCFILE \"${PKG_SYSCONFDIR}/fingerdir/ttylocs\" \
+               >> ${WRKSRC}/config.h
+       ${ECHO} \#define HOSTCONFIGFILE \"${PKG_SYSCONFDIR}/fingerdir/hostconfig\" \
+               >> ${WRKSRC}/config.h
+       ${MV} -f ${WRKSRC}/support/inetd.conf-add \
+               ${WRKSRC}/support/inetd.conf-add.bak
+       ${SED}  -e s@/usr/local/etc@${PREFIX}/libexec@      \
+               -e s@/usr/local/etc@${PREFIX}/libexec@      \
+               ${WRKSRC}/support/inetd.conf-add.bak > \
+               ${WRKSRC}/support/inetd.conf-add
+       ${MV} -f ${WRKSRC}/support/rc.local-add \
+               ${WRKSRC}/support/rc.local-add.bak
+       ${SED}  -e s@/usr/local/bin/@${PREFIX}/sbin/g@      \
+               ${WRKSRC}/support/rc.local-add.bak > \
+               ${WRKSRC}/support/rc.local-add
+       for i in ${WRKSRC}/src/targets/x-.busy \
+               ${WRKSRC}/src/targets/x-.down; do \
+               ${MV} $$i $$i.bak; ${SED} -e s@nawk@awk@ \
+                       -e s@/usr/local/etc@${PREFIX}/libexec@ \
+                       $$i.bak > $$i ; \
+               ${RM} -f $$i.bak ; \
+       done
 
 do-install:
-               ${INSTALL_PROGRAM} ${WRKSRC}/src/finger ${DESTDIR}${PREFIX}/bin/gfinger
-               ${INSTALL_PROGRAM} ${WRKSRC}/src/fingerd ${DESTDIR}${PREFIX}/sbin/gfingerd
-               ${INSTALL_SCRIPT} ${WRKSRC}/src/vifinger ${DESTDIR}${PREFIX}/sbin
-               ${INSTALL_PROGRAM} ${WRKSRC}/src/packet2ascii ${DESTDIR}${PREFIX}/sbin
-               ${LN} -sf packet2ascii ${DESTDIR}${PREFIX}/sbin/ascii2packet
-               ${INSTALL_PROGRAM} ${WRKSRC}/src/in.fingerd ${DESTDIR}${PREFIX}/libexec
-               ${INSTALL_PROGRAM} ${WRKSRC}/src/in.cfingerd ${DESTDIR}${PREFIX}/libexec
-               ${INSTALL_PROGRAM} ${WRKSRC}/src/in.cfingerd ${DESTDIR}${PREFIX}/libexec
-               ${INSTALL_SCRIPT_DIR} ${DESTDIR}${PREFIX}/etc/fingerdir/targets
-               ${INSTALL_DATA} ${WRKSRC}/support/ttylocs ${XMPLD}
-               ${INSTALL_DATA} ${WRKSRC}/support/hostconfig ${XMPLD}
-               ${INSTALL_DATA} ${WRKSRC}/support/rc.local-add ${XMPLD}
-               ${INSTALL_DATA} ${WRKSRC}/support/services-add ${XMPLD}
-               ${INSTALL_DATA} ${WRKSRC}/support/inetd.conf-add ${XMPLD}
-               (cd ${WRKSRC}/src; ${MAKE} install.man DESTDIR=${DESTDIR} \
-                       INSTALLMAN=${INSTALL_MAN:Q})
-               (cd ${WRKSRC}/src; ${MAKE} TARGETD=${XMPLDT} install.targets \
-                       INSTALLSCRIPT=${INSTALL_SCRIPT:Q})
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/finger ${DESTDIR}${PREFIX}/bin/gfinger
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/fingerd ${DESTDIR}${PREFIX}/sbin/gfingerd
+       ${INSTALL_SCRIPT} ${WRKSRC}/src/vifinger ${DESTDIR}${PREFIX}/sbin
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/packet2ascii ${DESTDIR}${PREFIX}/sbin
+       ${LN} -sf packet2ascii ${DESTDIR}${PREFIX}/sbin/ascii2packet
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/in.fingerd ${DESTDIR}${PREFIX}/libexec
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/in.cfingerd ${DESTDIR}${PREFIX}/libexec
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/in.cfingerd ${DESTDIR}${PREFIX}/libexec
+       ${INSTALL_SCRIPT_DIR} ${DESTDIR}${PREFIX}/etc/fingerdir/targets
+       ${INSTALL_DATA} ${WRKSRC}/support/ttylocs ${XMPLD}
+       ${INSTALL_DATA} ${WRKSRC}/support/hostconfig ${XMPLD}
+       ${INSTALL_DATA} ${WRKSRC}/support/rc.local-add ${XMPLD}
+       ${INSTALL_DATA} ${WRKSRC}/support/services-add ${XMPLD}
+       ${INSTALL_DATA} ${WRKSRC}/support/inetd.conf-add ${XMPLD}
+       (cd ${WRKSRC}/src; ${MAKE} install.man DESTDIR=${DESTDIR} \
+               INSTALLMAN=${INSTALL_MAN:Q})
+       (cd ${WRKSRC}/src; ${MAKE} TARGETD=${XMPLDT} install.targets \
+               INSTALLSCRIPT=${INSTALL_SCRIPT:Q})
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/inadyn/Makefile
diff -u pkgsrc/net/inadyn/Makefile:1.14 pkgsrc/net/inadyn/Makefile:1.15
--- pkgsrc/net/inadyn/Makefile:1.14     Wed Feb  8 23:48:45 2017
+++ pkgsrc/net/inadyn/Makefile  Sun Nov  3 11:45:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/02/08 23:48:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:37 rillig Exp $
 
 DISTNAME=      inadyn-1.99.15
 CATEGORIES=    net
@@ -16,8 +16,8 @@ GITHUB_TYPE=  release
 USE_TOOLS+=    autoconf automake gmake
 RCD_SCRIPTS=   inadyn
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--enable-openssl --disable-gitcheck
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --enable-openssl --disable-gitcheck
 
 LIBS.SunOS=    -lsocket -lnsl
 
@@ -43,7 +43,7 @@ SUBST_STAGE.var=      pre-configure
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.inadyn
-PKG_SUPPORTED_OPTIONS=  static
+PKG_SUPPORTED_OPTIONS= static
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/net/ipcheck/Makefile
diff -u pkgsrc/net/ipcheck/Makefile:1.23 pkgsrc/net/ipcheck/Makefile:1.24
--- pkgsrc/net/ipcheck/Makefile:1.23    Thu Apr 25 07:33:11 2019
+++ pkgsrc/net/ipcheck/Makefile Sun Nov  3 11:45:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/04/25 07:33:11 maya Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:37 rillig Exp $
 #
 
 DISTNAME=      ipcheck.233
@@ -17,7 +17,7 @@ EXTRACT_SUFX= #none
 EXTRACT_CMD=   ${CP} "$${extract_file}" ipcheck.py
 NO_BUILD=      yes
 
-REPLACE_PYTHON=        ipcheck.py
+REPLACE_PYTHON=                ipcheck.py
 INSTALLATION_DIRS=     bin
 
 do-install:

Index: pkgsrc/net/iperf/Makefile
diff -u pkgsrc/net/iperf/Makefile:1.22 pkgsrc/net/iperf/Makefile:1.23
--- pkgsrc/net/iperf/Makefile:1.22      Mon Oct  1 09:47:06 2018
+++ pkgsrc/net/iperf/Makefile   Sun Nov  3 11:45:38 2019
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.22 2018/10/01 09:47:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 11:45:38 rillig Exp $
 
 DISTNAME=      iperf-2.0.5
 PKGREVISION=   1
 CATEGORIES=    net benchmarks
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=iperf/}
 
-PATCH_SITES=   http://sourceforge.net/p/iperf/patches/28/attachment/
-PATCHFILES=    nomaxcpu.patch
-PATCH_DIST_STRIP=-p1
+PATCH_SITES=           http://sourceforge.net/p/iperf/patches/28/attachment/
+PATCHFILES=            nomaxcpu.patch
+PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://iperf.sourceforge.net/

Index: pkgsrc/net/irrd/options.mk
diff -u pkgsrc/net/irrd/options.mk:1.3 pkgsrc/net/irrd/options.mk:1.4
--- pkgsrc/net/irrd/options.mk:1.3      Mon Apr  8 11:17:18 2013
+++ pkgsrc/net/irrd/options.mk  Sun Nov  3 11:45:38 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2013/04/08 11:17:18 rodent Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/03 11:45:38 rillig Exp $
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.irrd
-PKG_SUPPORTED_OPTIONS=  pthreads
+PKG_OPTIONS_VAR=       PKG_OPTIONS.irrd
+PKG_SUPPORTED_OPTIONS= pthreads
 PKG_SUGGESTED_OPTIONS= pthreads
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/net/istgt/Makefile
diff -u pkgsrc/net/istgt/Makefile:1.18 pkgsrc/net/istgt/Makefile:1.19
--- pkgsrc/net/istgt/Makefile:1.18      Mon Oct  8 12:04:33 2018
+++ pkgsrc/net/istgt/Makefile   Sun Nov  3 11:45:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/10/08 12:04:33 sborrill Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:38 rillig Exp $
 #
 
 DISTNAME=              istgt-20150713
@@ -27,7 +27,7 @@ CONF_FILES=   ${EG_DIR}/auth.conf ${PKG_SY
                ${EG_DIR}/istgt.conf ${PKG_SYSCONFDIR}/istgt.conf \
                ${EG_DIR}/istgtcontrol.conf ${PKG_SYSCONFDIR}/istgtcontrol.conf
 
-RCD_SCRIPTS=   istgt
+RCD_SCRIPTS=           istgt
 INSTALLATION_DIRS+=    bin ${EG_DIR} ${PKGMANDIR}/man1
 
 CPPFLAGS.SunOS+=       -D_POSIX_PTHREAD_SEMANTICS

Index: pkgsrc/net/jftpgw/Makefile
diff -u pkgsrc/net/jftpgw/Makefile:1.15 pkgsrc/net/jftpgw/Makefile:1.16
--- pkgsrc/net/jftpgw/Makefile:1.15     Sun Dec  9 21:05:33 2018
+++ pkgsrc/net/jftpgw/Makefile  Sun Nov  3 11:45:38 2019
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2018/12/09 21:05:33 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:38 rillig Exp $
 
-DISTNAME=          jftpgw-0.13.5
-CATEGORIES=        net
-MASTER_SITES=      http://www.mcknight.de/jftpgw/
-
-MAINTAINER=        pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=          http://www.mcknight.de/jftpgw/
-COMMENT=           FTP gateway/proxy
+DISTNAME=      jftpgw-0.13.5
+CATEGORIES=    net
+MASTER_SITES=  http://www.mcknight.de/jftpgw/
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.mcknight.de/jftpgw/
+COMMENT=       FTP gateway/proxy
 
 GNU_CONFIGURE=         yes
 

Index: pkgsrc/net/jigdo/Makefile
diff -u pkgsrc/net/jigdo/Makefile:1.70 pkgsrc/net/jigdo/Makefile:1.71
--- pkgsrc/net/jigdo/Makefile:1.70      Thu Aug 22 12:23:39 2019
+++ pkgsrc/net/jigdo/Makefile   Sun Nov  3 11:45:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2019/08/22 12:23:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.71 2019/11/03 11:45:38 rillig Exp $
 
 DISTNAME=              jigdo-0.7.3
 PKGREVISION=           47
@@ -13,10 +13,10 @@ LICENSE=            gnu-gpl-v2
 
 MAKE_JOBS_SAFE=                no
 
-USE_TOOLS+=            pkg-config wget:run
-USE_LANGUAGES=         c c++
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --without-libdb
+USE_TOOLS+=                    pkg-config wget:run
+USE_LANGUAGES=                 c c++
+GNU_CONFIGURE=                 yes
+CONFIGURE_ARGS+=               --without-libdb
 BROKEN_GETTEXT_DETECTION=      yes
 
 #.include "../../databases/db3/buildlink3.mk"

Index: pkgsrc/net/jwhois/options.mk
diff -u pkgsrc/net/jwhois/options.mk:1.2 pkgsrc/net/jwhois/options.mk:1.3
--- pkgsrc/net/jwhois/options.mk:1.2    Tue Oct 23 20:49:38 2012
+++ pkgsrc/net/jwhois/options.mk        Sun Nov  3 11:45:38 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2012/10/23 20:49:38 shattered Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:38 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.jwhois
-PKG_SUPPORTED_OPTIONS= jwhois-enable-cache
+PKG_OPTIONS_VAR=               PKG_OPTIONS.jwhois
+PKG_SUPPORTED_OPTIONS=         jwhois-enable-cache
 PKG_OPTIONS_LEGACY_VARS+=      JWHOIS_ENABLE_CACHE:jwhois-enable-cache
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/net/kismet/Makefile
diff -u pkgsrc/net/kismet/Makefile:1.62 pkgsrc/net/kismet/Makefile:1.63
--- pkgsrc/net/kismet/Makefile:1.62     Sun Aug 11 13:22:09 2019
+++ pkgsrc/net/kismet/Makefile  Sun Nov  3 11:45:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2019/08/11 13:22:09 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2019/11/03 11:45:38 rillig Exp $
 
 DISTNAME=              kismet-2008-05-R1
 PKGNAME=               kismet-2008.05.01
@@ -24,15 +24,15 @@ PLIST_SRC=          PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
-KISMET_USER?=          kismet
-KISMET_GROUP?=         kismet
-PKG_GROUPS=            ${KISMET_GROUP}
-PKG_USERS=             ${KISMET_USER}:${KISMET_GROUP}
+KISMET_USER?=                  kismet
+KISMET_GROUP?=                 kismet
+PKG_GROUPS=                    ${KISMET_GROUP}
+PKG_USERS=                     ${KISMET_USER}:${KISMET_GROUP}
 PKG_GECOS.${KISMET_USER}=      Kismet user
 PKG_HOME.${KISMET_USER}=       ${VARBASE}/log/kismet
-PKG_GROUPS_VARS+=      KISMET_GROUP
-PKG_USERS_VARS+=       KISMET_USER
-BUILD_DEFS+=           VARBASE
+PKG_GROUPS_VARS+=              KISMET_GROUP
+PKG_USERS_VARS+=               KISMET_USER
+BUILD_DEFS+=                   VARBASE
 
 PKG_SYSCONFSUBDIR=     ${PKGBASE}
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}

Index: pkgsrc/net/knot/Makefile
diff -u pkgsrc/net/knot/Makefile:1.47 pkgsrc/net/knot/Makefile:1.48
--- pkgsrc/net/knot/Makefile:1.47       Wed Aug 21 14:19:00 2019
+++ pkgsrc/net/knot/Makefile    Sun Nov  3 11:45:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/08/21 14:19:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2019/11/03 11:45:38 rillig Exp $
 
 DISTNAME=      knot-2.8.3
 CATEGORIES=    net
@@ -26,7 +26,7 @@ CONFIGURE_ARGS.NetBSD+=       --enable-recvmms
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386" 
-CFLAGS += -march=i586 
+CFLAGS +=      -march=i586 
 .endif 
 
 USE_LIBTOOL=   yes

Index: pkgsrc/net/ktorrent/Makefile
diff -u pkgsrc/net/ktorrent/Makefile:1.93 pkgsrc/net/ktorrent/Makefile:1.94
--- pkgsrc/net/ktorrent/Makefile:1.93   Thu Aug 22 12:23:40 2019
+++ pkgsrc/net/ktorrent/Makefile        Sun Nov  3 11:45:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2019/08/22 12:23:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2019/11/03 11:45:38 rillig Exp $
 
 DISTNAME=      ktorrent-${KTORRENT_VER}
 PKGREVISION=   19
@@ -6,7 +6,7 @@ CATEGORIES=     net kde
 #MASTER_SITES= http://ktorrent.pwsp.net/downloads/${KTORRENT_VER}/
 EXTRACT_SUFX=  .tar.bz2
 
-BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
+BUILD_DEPENDS+=        automoc4>=0.9.87:../../devel/automoc4
 
 .include "../../net/libktorrent/Makefile.version"
 
@@ -24,7 +24,7 @@ DEPENDS+=     oxygen-icons-[0-9]*:../../grap
 CFLAGS+=               -DENABLE_KIO_MAGNET=1
 SCRDIR=                        share/kde/apps/ktorrent/scripts
 
-CHECK_INTERPRETER_SKIP= ${SCRDIR}/auto_remove/auto_remove.py \
+CHECK_INTERPRETER_SKIP=        ${SCRDIR}/auto_remove/auto_remove.py \
                        ${SCRDIR}/auto_resume/auto_resume.py \
                        ${SCRDIR}/email_notifications/email_notifications.py \
                        ${SCRDIR}/tracker_groups/tracker_groups.py

Index: pkgsrc/net/lftp/options.mk
diff -u pkgsrc/net/lftp/options.mk:1.14 pkgsrc/net/lftp/options.mk:1.15
--- pkgsrc/net/lftp/options.mk:1.14     Sat Jul  8 21:45:42 2017
+++ pkgsrc/net/lftp/options.mk  Sun Nov  3 11:45:39 2019
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.14 2017/07/08 21:45:42 adam Exp $
+# $NetBSD: options.mk,v 1.15 2019/11/03 11:45:39 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.lftp
+PKG_OPTIONS_VAR=               PKG_OPTIONS.lftp
 PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
-PKG_OPTIONS_GROUP.ssl= gnutls ssl
-PKG_SUPPORTED_OPTIONS= perl dnssec
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_OPTIONS_GROUP.ssl=         gnutls ssl
+PKG_SUPPORTED_OPTIONS=         perl dnssec
+PKG_SUGGESTED_OPTIONS=         ssl
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/net/libasr/Makefile
diff -u pkgsrc/net/libasr/Makefile:1.3 pkgsrc/net/libasr/Makefile:1.4
--- pkgsrc/net/libasr/Makefile:1.3      Tue Jul 31 07:04:29 2018
+++ pkgsrc/net/libasr/Makefile  Sun Nov  3 11:45:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/31 07:04:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:39 rillig Exp $
 
 DISTNAME=      libasr-1.0.2
 CATEGORIES=    net
@@ -9,8 +9,8 @@ HOMEPAGE=       https://github.com/OpenSMTPD/l
 COMMENT=       Asynchronous DNS resolver library
 LICENSE=       isc AND modified-bsd AND 2-clause-bsd
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
 CONFIGURE_ARGS+=       --with-mantype=man
 
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/net/libcmis/Makefile
diff -u pkgsrc/net/libcmis/Makefile:1.21 pkgsrc/net/libcmis/Makefile:1.22
--- pkgsrc/net/libcmis/Makefile:1.21    Thu Aug 22 12:23:40 2019
+++ pkgsrc/net/libcmis/Makefile Sun Nov  3 11:45:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/22 12:23:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 11:45:39 rillig Exp $
 
 DISTNAME=      libcmis-0.5.2
 PKGREVISION=   3
@@ -12,11 +12,11 @@ HOMEPAGE=   https://github.com/tdf/libcmis
 COMMENT=       Client library for the CMIS interface
 LICENSE=       gnu-gpl-v2 OR gnu-lgpl-v2 OR mpl-1.1
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-man=no --disable-werror
-USE_LANGUAGES+=        c c++
-USE_TOOLS+=    gmake pkg-config
-USE_LIBTOOL=   yes
+USE_LANGUAGES+=                c c++
+USE_TOOLS+=            gmake pkg-config
+USE_LIBTOOL=           yes
 
 BUILDLINK_DEPMETHOD.boost-headers?=     build
 .include "../../devel/boost-headers/buildlink3.mk"

Index: pkgsrc/net/libdmapsharing/Makefile
diff -u pkgsrc/net/libdmapsharing/Makefile:1.59 pkgsrc/net/libdmapsharing/Makefile:1.60
--- pkgsrc/net/libdmapsharing/Makefile:1.59     Sun Jul 21 22:25:31 2019
+++ pkgsrc/net/libdmapsharing/Makefile  Sun Nov  3 11:45:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2019/07/21 22:25:31 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2019/11/03 11:45:39 rillig Exp $
 
 DISTNAME=      libdmapsharing-2.1.9
 PKGREVISION=   54
@@ -17,7 +17,7 @@ USE_TOOLS+=           gmake pkg-config
 PKGCONFIG_OVERRIDE=    libdmapsharing.pc.in
 
 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.23.2
-BUILDLINK_ABI_DEPENDS.libsoup+= libsoup>=2.32
+BUILDLINK_ABI_DEPENDS.libsoup+=        libsoup>=2.32
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/net/libdmapsharing3/Makefile
diff -u pkgsrc/net/libdmapsharing3/Makefile:1.45 pkgsrc/net/libdmapsharing3/Makefile:1.46
--- pkgsrc/net/libdmapsharing3/Makefile:1.45    Sun Jul 21 22:25:32 2019
+++ pkgsrc/net/libdmapsharing3/Makefile Sun Nov  3 11:45:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/07/21 22:25:32 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:39 rillig Exp $
 
 DISTNAME=      libdmapsharing-2.9.15
 PKGNAME=       ${DISTNAME:S/sharing/sharing3/}
@@ -18,7 +18,7 @@ USE_TOOLS+=           gmake pkg-config
 PKGCONFIG_OVERRIDE=    libdmapsharing-3.0.pc.in
 
 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.23.2
-BUILDLINK_ABI_DEPENDS.libsoup+= libsoup>=2.32
+BUILDLINK_ABI_DEPENDS.libsoup+=        libsoup>=2.32
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgee0.6/buildlink3.mk"

Index: pkgsrc/net/libgdata/Makefile
diff -u pkgsrc/net/libgdata/Makefile:1.50 pkgsrc/net/libgdata/Makefile:1.51
--- pkgsrc/net/libgdata/Makefile:1.50   Thu Aug 22 12:23:40 2019
+++ pkgsrc/net/libgdata/Makefile        Sun Nov  3 11:45:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2019/08/22 12:23:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2019/11/03 11:45:39 rillig Exp $
 
 DISTNAME=      libgdata-0.16.1
 PKGREVISION=   24
@@ -11,11 +11,11 @@ HOMEPAGE=   http://live.gnome.org/libgdata
 COMMENT=       Google Data API based Glib client library
 LICENSE=       gnu-lgpl-v2.1
 
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config gmake intltool msgfmt
-USE_LANGUAGES= c c++
+GNU_CONFIGURE=         yes
+USE_PKGLOCALEDIR=      yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config gmake intltool msgfmt
+USE_LANGUAGES=         c c++
 
 PKGCONFIG_OVERRIDE+=   libgdata.pc.in
 

Index: pkgsrc/net/libgdata0.6/Makefile
diff -u pkgsrc/net/libgdata0.6/Makefile:1.13 pkgsrc/net/libgdata0.6/Makefile:1.14
--- pkgsrc/net/libgdata0.6/Makefile:1.13        Wed Apr  3 00:32:59 2019
+++ pkgsrc/net/libgdata0.6/Makefile     Sun Nov  3 11:45:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/04/03 00:32:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:39 rillig Exp $
 
 DISTNAME=      libgdata-0.6.6
 PKGREVISION=   28
@@ -11,11 +11,11 @@ HOMEPAGE=   http://live.gnome.org/libgdata
 COMMENT=       Google Data API based Glib client library
 LICENSE=       gnu-lgpl-v2.1
 
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config gmake intltool msgfmt
-USE_LANGUAGES= c c++
+GNU_CONFIGURE=         yes
+USE_PKGLOCALEDIR=      yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config gmake intltool msgfmt
+USE_LANGUAGES=         c c++
 
 PKGCONFIG_OVERRIDE+=   libgdata.pc.in
 

Index: pkgsrc/net/libktorrent/Makefile
diff -u pkgsrc/net/libktorrent/Makefile:1.47 pkgsrc/net/libktorrent/Makefile:1.48
--- pkgsrc/net/libktorrent/Makefile:1.47        Thu Aug 22 12:23:40 2019
+++ pkgsrc/net/libktorrent/Makefile     Sun Nov  3 11:45:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/08/22 12:23:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2019/11/03 11:45:39 rillig Exp $
 
 DISTNAME=      libktorrent-${LIBKTORRENT_VER}
 PKGREVISION=   18
@@ -24,7 +24,7 @@ USE_CMAKE=            yes
 APIDOCS=               /share/docs/libktorrent-api
 WRKSRC=                        ${WRKDIR}/libktorrent-${LIBKTORRENT_FILEVER}
 
-BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
+BUILD_DEPENDS+=        automoc4>=0.9.87:../../devel/automoc4
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/net/liblive/Makefile
diff -u pkgsrc/net/liblive/Makefile:1.22 pkgsrc/net/liblive/Makefile:1.23
--- pkgsrc/net/liblive/Makefile:1.22    Sat Dec 13 09:20:02 2014
+++ pkgsrc/net/liblive/Makefile Sun Nov  3 11:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/12/13 09:20:02 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 11:45:40 rillig Exp $
 
 DISTNAME=      live.2014.12.11
 PKGNAME=       lib${DISTNAME:S/./-/:S/.//g}
@@ -22,11 +22,11 @@ INSTALLATION_DIRS+= share/examples/libli
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-. if ${MACHINE_ARCH} == "x86_64"
+.  if ${MACHINE_ARCH} == "x86_64"
 LIVE_BITNESS=  -64bit
-. else
+.  else
 LIVE_BITNESS=  -32bit
-. endif
+.  endif
 .else
 LIVE_BITNESS=  # empty
 .endif

Index: pkgsrc/net/libnice/Makefile
diff -u pkgsrc/net/libnice/Makefile:1.57 pkgsrc/net/libnice/Makefile:1.58
--- pkgsrc/net/libnice/Makefile:1.57    Sat Jul 20 22:46:02 2019
+++ pkgsrc/net/libnice/Makefile Sun Nov  3 11:45:40 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.57 2019/07/20 22:46:02 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2019/11/03 11:45:40 rillig Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
 
 # introspection Makefile uses GNUisms
-USE_TOOLS+=    gmake
-CONFIGURE_ARGS+= --without-gstreamer
+USE_TOOLS+=            gmake
+CONFIGURE_ARGS+=       --without-gstreamer
 
 PKGCONFIG_OVERRIDE+=   nice/nice.pc.in
 

Index: pkgsrc/net/libnids/options.mk
diff -u pkgsrc/net/libnids/options.mk:1.8 pkgsrc/net/libnids/options.mk:1.9
--- pkgsrc/net/libnids/options.mk:1.8   Wed Dec  9 12:27:28 2009
+++ pkgsrc/net/libnids/options.mk       Sun Nov  3 11:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2009/12/09 12:27:28 obache Exp $
+# $NetBSD: options.mk,v 1.9 2019/11/03 11:45:40 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libnids
 
@@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS=                libnet10 glib
 ### libnet 1.0.x branch support
 ###
 .if !empty(PKG_OPTIONS:Mlibnet10)
-.      include "../../devel/libnet10/buildlink3.mk"
+.  include "../../devel/libnet10/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libnet10+= build
 .endif
 
@@ -23,7 +23,7 @@ BUILDLINK_DEPMETHOD.libnet10+=        build
 ### libnet 1.1.x branch support
 ###
 .if !empty(PKG_OPTIONS:Mlibnet11)
-.      include "../../devel/libnet11/buildlink3.mk"
+.  include "../../devel/libnet11/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libnet11+= build
 .endif
 

Index: pkgsrc/net/libpcap/builtin.mk
diff -u pkgsrc/net/libpcap/builtin.mk:1.18 pkgsrc/net/libpcap/builtin.mk:1.19
--- pkgsrc/net/libpcap/builtin.mk:1.18  Mon Jul 24 07:23:28 2017
+++ pkgsrc/net/libpcap/builtin.mk       Sun Nov  3 11:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.18 2017/07/24 07:23:28 dbj Exp $
+# $NetBSD: builtin.mk,v 1.19 2019/11/03 11:45:40 rillig Exp $
 
 BUILTIN_PKG:=  libpcap
 
@@ -20,7 +20,7 @@ IS_BUILTIN.libpcap=   no
 IS_BUILTIN.libpcap=    yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.libpcap
+MAKEVARS+=             IS_BUILTIN.libpcap
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -77,9 +77,9 @@ BUILTIN_VERSION.libpcap=      0.5.0
 .  else
 BUILTIN_VERSION.libpcap=       0.4.0
 .  endif
-BUILTIN_PKG.libpcap=   libpcap-${BUILTIN_VERSION.libpcap}
+BUILTIN_PKG.libpcap=           libpcap-${BUILTIN_VERSION.libpcap}
 .endif
-MAKEVARS+=     BUILTIN_PKG.libpcap
+MAKEVARS+=                     BUILTIN_PKG.libpcap
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -106,4 +106,4 @@ USE_BUILTIN.libpcap!=                                                       \
 .    endif
 .  endif  # PREFER.libpcap
 .endif
-MAKEVARS+=     USE_BUILTIN.libpcap
+MAKEVARS+=             USE_BUILTIN.libpcap

Index: pkgsrc/net/libsoup/Makefile
diff -u pkgsrc/net/libsoup/Makefile:1.57 pkgsrc/net/libsoup/Makefile:1.58
--- pkgsrc/net/libsoup/Makefile:1.57    Thu Oct 10 14:23:53 2019
+++ pkgsrc/net/libsoup/Makefile Sun Nov  3 11:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2019/10/10 14:23:53 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2019/11/03 11:45:40 rillig Exp $
 
 DISTNAME=      libsoup-2.68.2
 CATEGORIES=    net gnome
@@ -14,10 +14,10 @@ DEPENDS+=   glib-networking-[0-9]*:../../n
 
 USE_TOOLS+=            pkg-config gmake intltool msgfmt
 
-PKGCONFIG_OVERRIDE+=   output/meson-private/libsoup-2.4.pc
-PKGCONFIG_OVERRIDE+=   output/meson-private/libsoup-gnome-2.4.pc
-PKGCONFIG_OVERRIDE_STAGE=pre-install
-MAKE_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}
+PKGCONFIG_OVERRIDE+=           output/meson-private/libsoup-2.4.pc
+PKGCONFIG_OVERRIDE+=           output/meson-private/libsoup-gnome-2.4.pc
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+MAKE_ENV+=                     LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}
 
 # disable vala detection
 MESON_ARGS+=           -Dvapi=disabled

Index: pkgsrc/net/libvncserver/options.mk
diff -u pkgsrc/net/libvncserver/options.mk:1.3 pkgsrc/net/libvncserver/options.mk:1.4
--- pkgsrc/net/libvncserver/options.mk:1.3      Wed Feb 20 12:21:34 2019
+++ pkgsrc/net/libvncserver/options.mk  Sun Nov  3 11:45:40 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2019/02/20 12:21:34 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/03 11:45:40 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.libVNCServer
-PKG_SUPPORTED_OPTIONS= gnutls inet6 libgcrypt openssl sasl
-PKG_SUGGESTED_OPTIONS= gnutls inet6 libgcrypt
+PKG_OPTIONS_VAR=               PKG_OPTIONS.libVNCServer
+PKG_SUPPORTED_OPTIONS=         gnutls inet6 libgcrypt openssl sasl
+PKG_SUGGESTED_OPTIONS=         gnutls inet6 libgcrypt
 PKG_OPTIONS_OPTIONAL_GROUPS+=  ssl
 PKG_OPTIONS_GROUP.ssl=         gnutls openssl
 

Index: pkgsrc/net/lldpd/Makefile
diff -u pkgsrc/net/lldpd/Makefile:1.22 pkgsrc/net/lldpd/Makefile:1.23
--- pkgsrc/net/lldpd/Makefile:1.22      Sun Aug 11 13:22:10 2019
+++ pkgsrc/net/lldpd/Makefile   Sun Nov  3 11:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:22:10 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 11:45:40 rillig Exp $
 
 DISTNAME=              lldpd-1.0.1
 PKGREVISION=           2
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=      --with-privsep-chroot=$
 CONFIGURE_ARGS+=       --disable-hardening
 # run/lldpd.socket is created under this directory
 # (the default is ${PRERIX}/var, changed since 0.7.9)
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 BUILD_DEFS+=           VARBASE
 
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}

Index: pkgsrc/net/lldpd/options.mk
diff -u pkgsrc/net/lldpd/options.mk:1.2 pkgsrc/net/lldpd/options.mk:1.3
--- pkgsrc/net/lldpd/options.mk:1.2     Tue Feb  7 12:13:12 2017
+++ pkgsrc/net/lldpd/options.mk Sun Nov  3 11:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2017/02/07 12:13:12 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:40 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lldpd
 PKG_SUPPORTED_OPTIONS= json snmp xml
@@ -6,18 +6,18 @@ PKG_SUGGESTED_OPTIONS=        json snmp xml
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mjson)
-.      include "../../textproc/jansson/buildlink3.mk"
+.  include "../../textproc/jansson/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-json
 .endif
 
 .if !empty(PKG_OPTIONS:Msnmp)
-.      include "../../net/net-snmp/buildlink3.mk"
+.  include "../../net/net-snmp/buildlink3.mk"
 USE_TOOLS+= perl
-.      include "../../lang/perl5/buildlink3.mk"
+.  include "../../lang/perl5/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-snmp
 .endif
 
 .if !empty(PKG_OPTIONS:Mxml)
-.      include "../../textproc/libxml2/buildlink3.mk"
+.  include "../../textproc/libxml2/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-xml
 .endif

Index: pkgsrc/net/llnlxdir/Makefile
diff -u pkgsrc/net/llnlxdir/Makefile:1.14 pkgsrc/net/llnlxdir/Makefile:1.15
--- pkgsrc/net/llnlxdir/Makefile:1.14   Tue Oct 23 17:18:35 2012
+++ pkgsrc/net/llnlxdir/Makefile        Sun Nov  3 11:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/23 17:18:35 asau Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:40 rillig Exp $
 #
 
 DISTNAME=              llnlxdir2_1_2
@@ -12,8 +12,8 @@ MAINTAINER=           tor%stormwall.org@localhost
 HOMEPAGE=              http://www.llnl.gov/icc/sdd/img/xdir.html
 COMMENT=               Advanced graphical FTP client
 
-USE_IMAKE=     yes
-WRKSRC=                ${WRKDIR}/llnlxdir2_1_2/sources
+USE_IMAKE=             yes
+WRKSRC=                        ${WRKDIR}/llnlxdir2_1_2/sources
 INSTALLATION_DIRS=     bin lib/X11/app-defaults
 
 do-install:

Index: pkgsrc/net/llnlxftp/Makefile
diff -u pkgsrc/net/llnlxftp/Makefile:1.13 pkgsrc/net/llnlxftp/Makefile:1.14
--- pkgsrc/net/llnlxftp/Makefile:1.13   Tue Oct 23 17:18:35 2012
+++ pkgsrc/net/llnlxftp/Makefile        Sun Nov  3 11:45:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/23 17:18:35 asau Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:40 rillig Exp $
 #
 
 DISTNAME=              llnlxftp2.1
@@ -12,8 +12,8 @@ MAINTAINER=           tor%stormwall.org@localhost
 HOMEPAGE=              http://www.llnl.gov/icc/sdd/img/xftp.html
 COMMENT=               Motif FTP client
 
-USE_IMAKE=     yes
-WRKSRC=                ${WRKDIR}/llnlxftp2.1/sources
+USE_IMAKE=             yes
+WRKSRC=                        ${WRKDIR}/llnlxftp2.1/sources
 INSTALLATION_DIRS=     bin lib/X11/app-defaults
 
 do-install:

Index: pkgsrc/net/mDNSResponder/builtin.mk
diff -u pkgsrc/net/mDNSResponder/builtin.mk:1.9 pkgsrc/net/mDNSResponder/builtin.mk:1.10
--- pkgsrc/net/mDNSResponder/builtin.mk:1.9     Mon Feb 26 18:13:16 2018
+++ pkgsrc/net/mDNSResponder/builtin.mk Sun Nov  3 11:45:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2018/02/26 18:13:16 ryoon Exp $
+# $NetBSD: builtin.mk,v 1.10 2019/11/03 11:45:41 rillig Exp $
 
 BUILTIN_PKG:=  mDNSResponder
 
@@ -17,7 +17,7 @@ IS_BUILTIN.mDNSResponder=     no
 IS_BUILTIN.mDNSResponder=      yes
 .  endif
 .endif # IS_BUILTIN.mDNSResponder
-MAKEVARS+=     IS_BUILTIN.mDNSResponder
+MAKEVARS+=                     IS_BUILTIN.mDNSResponder
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -26,19 +26,19 @@ MAKEVARS+=  IS_BUILTIN.mDNSResponder
 .if !defined(BUILTIN_PKG.mDNSResponder) && \
     !empty(IS_BUILTIN.mDNSResponder:M[yY][eE][sS]) && \
     empty(H_DNSSD:M__nonexistent__)
-_BLTN_DNSSD_212_1!= \
+_BLTN_DNSSD_212_1!=            \
        ${GREP} -c 2120100 ${H_DNSSD} || ${TRUE}
-_BLTN_DNSSD_214_3_2!= \
+_BLTN_DNSSD_214_3_2!=          \
        ${GREP} -c 2140302 ${H_DNSSD} || ${TRUE}
-_BLTN_DNSSD_258_14!= \
+_BLTN_DNSSD_258_14!=           \
        ${GREP} -c 2581400 ${H_DNSSD} || ${TRUE}
-_BLTN_DNSSD_320_5!= \
+_BLTN_DNSSD_320_5!=            \
        ${GREP} -c 3200500 ${H_DNSSD} || ${TRUE}
-_BLTN_DNSSD_320_16!= \
+_BLTN_DNSSD_320_16!=           \
        ${GREP} -c 3201600 ${H_DNSSD} || ${TRUE}
-_BLTN_DNSSD_878_1_1!= \
+_BLTN_DNSSD_878_1_1!=          \
        ${GREP} -c 8780101 ${H_DNSSD} || ${TRUE}
-_BLTN_DNSSD_878_30_4!= \
+_BLTN_DNSSD_878_30_4!=         \
        ${GREP} -c 8783004 ${H_DNSSD} || ${TRUE}
 .  if ${_BLTN_DNSSD_320_16} == "1"
 BUILTIN_VERSION.mDNSResponder= 320.16
@@ -85,4 +85,4 @@ USE_BUILTIN.mDNSResponder!=                                                   \
 .    endif
 .  endif  # PREFER.mDNSResponder
 .endif
-MAKEVARS+=     USE_BUILTIN.mDNSResponder
+MAKEVARS+=                     USE_BUILTIN.mDNSResponder

Index: pkgsrc/net/maradns/options.mk
diff -u pkgsrc/net/maradns/options.mk:1.1 pkgsrc/net/maradns/options.mk:1.2
--- pkgsrc/net/maradns/options.mk:1.1   Tue Feb 28 21:55:27 2012
+++ pkgsrc/net/maradns/options.mk       Sun Nov  3 11:45:41 2019
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2012/02/28 21:55:27 cheusov Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 11:45:41 rillig Exp $
 
-PKG_OPTIONS_VAR=                    PKG_OPTIONS.maradns
-PKG_SUPPORTED_OPTIONS+=             inet6
-PKG_SUGGESTED_OPTIONS+=             inet6
+PKG_OPTIONS_VAR=       PKG_OPTIONS.maradns
+PKG_SUPPORTED_OPTIONS+=        inet6
+PKG_SUGGESTED_OPTIONS+=        inet6
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=                    --ipv6
+CONFIGURE_ARGS+=       --ipv6
 .endif

Index: pkgsrc/net/mcast-tools/Makefile
diff -u pkgsrc/net/mcast-tools/Makefile:1.7 pkgsrc/net/mcast-tools/Makefile:1.8
--- pkgsrc/net/mcast-tools/Makefile:1.7 Tue Oct 23 17:18:36 2012
+++ pkgsrc/net/mcast-tools/Makefile     Sun Nov  3 11:45:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:36 asau Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:41 rillig Exp $
 
 DISTNAME=      mcast-tools-20061214
 PKGREVISION=   1
@@ -16,7 +16,7 @@ GNU_CONFIGURE=        yes
 
 USE_TOOLS+=    yacc lex
 
-INSTALLATION_DIRS= share/examples/mcast-tools
+INSTALLATION_DIRS=     share/examples/mcast-tools
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample ${DESTDIR}${PREFIX}/share/examples/mcast-tools

Index: pkgsrc/net/microdc2/Makefile
diff -u pkgsrc/net/microdc2/Makefile:1.8 pkgsrc/net/microdc2/Makefile:1.9
--- pkgsrc/net/microdc2/Makefile:1.8    Mon Jul 15 02:02:27 2013
+++ pkgsrc/net/microdc2/Makefile        Sun Nov  3 11:45:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 11:45:41 rillig Exp $
 #
 
 DISTNAME=      microdc2-0.15.6
@@ -10,8 +10,8 @@ MAINTAINER=   d.den.brok%uni-bonn.de@localhost
 HOMEPAGE=      http://corsair626.no-ip.org/microdc/
 COMMENT=       Console-based DirectConnect client
 
-BUILDLINK_API_DEPENDS.readline+=readline>=4
-BUILDLINK_API_DEPENDS.libxml2+=        libxml2>=2.6.16
+BUILDLINK_API_DEPENDS.readline+=       readline>=4
+BUILDLINK_API_DEPENDS.libxml2+=                libxml2>=2.6.16
 
 GNU_CONFIGURE=         yes
 

Index: pkgsrc/net/mikutter/Makefile
diff -u pkgsrc/net/mikutter/Makefile:1.185 pkgsrc/net/mikutter/Makefile:1.186
--- pkgsrc/net/mikutter/Makefile:1.185  Sun Oct  6 11:19:15 2019
+++ pkgsrc/net/mikutter/Makefile        Sun Nov  3 11:45:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.185 2019/10/06 11:19:15 tsutsui Exp $
+# $NetBSD: Makefile,v 1.186 2019/11/03 11:45:41 rillig Exp $
 #
 
 DISTNAME=      mikutter.3.9.6
@@ -32,7 +32,7 @@ WRKSRC=               ${WRKDIR}/mikutter
 USE_LANGUAGES= # none
 USE_TOOLS+=    pax
 
-REPLACE_RUBY=  mikutter.rb
+REPLACE_RUBY=          mikutter.rb
 REPLACE_RUBY_DIRS=     core
 
 INSTALLATION_DIRS+=    bin share/doc/mikutter share/applications share/mikutter

Index: pkgsrc/net/mimms/Makefile
diff -u pkgsrc/net/mimms/Makefile:1.12 pkgsrc/net/mimms/Makefile:1.13
--- pkgsrc/net/mimms/Makefile:1.12      Mon Sep  2 13:19:49 2019
+++ pkgsrc/net/mimms/Makefile   Sun Nov  3 11:45:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/09/02 13:19:49 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:41 rillig Exp $
 
 DISTNAME=      mimms-3.2.1
 PKGREVISION=   1
@@ -13,7 +13,7 @@ LICENSE=      gnu-gpl-v3
 
 # default is at lang/python/distutils.mk, but
 # drop the third digit from DISTNAME. Is it too tricky ?
-EGG_NAME?=       ${DISTNAME:C/-([^0-9])/_\1/gC/([0-9])\.([0-9])\.([0-9])/\1.\2/}
+EGG_NAME?=     ${DISTNAME:C/-([^0-9])/_\1/gC/([0-9])\.([0-9])\.([0-9])/\1.\2/}
 
 USE_LANGUAGES= # none
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 3.2

Index: pkgsrc/net/mosh/Makefile
diff -u pkgsrc/net/mosh/Makefile:1.23 pkgsrc/net/mosh/Makefile:1.24
--- pkgsrc/net/mosh/Makefile:1.23       Sun Aug 11 13:22:11 2019
+++ pkgsrc/net/mosh/Makefile    Sun Nov  3 11:45:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:41 rillig Exp $
 
 DISTNAME=      mosh-1.3.2
 PKGREVISION=   1
@@ -10,10 +10,10 @@ HOMEPAGE=   http://mosh.mit.edu/
 COMMENT=       Remote terminal application which allows roaming
 LICENSE=       gnu-gpl-v3
 
-GNU_CONFIGURE= yes
-USE_TOOLS+=    perl:run pkg-config
-USE_LANGUAGES+=        c c++11
-USE_GCC_RUNTIME=yes
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            perl:run pkg-config
+USE_LANGUAGES+=                c c++11
+USE_GCC_RUNTIME=       yes
 
 REPLACE_PERL+= scripts/mosh.pl
 REPLACE_PERL+= src/tests/genbase64.pl

Index: pkgsrc/net/mrt/Makefile
diff -u pkgsrc/net/mrt/Makefile:1.16 pkgsrc/net/mrt/Makefile:1.17
--- pkgsrc/net/mrt/Makefile:1.16        Tue Oct 23 17:18:38 2012
+++ pkgsrc/net/mrt/Makefile     Sun Nov  3 11:45:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/23 17:18:38 asau Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:41 rillig Exp $
 #
 
 DISTNAME=      mrt-2.2.2a-Aug11
@@ -13,8 +13,8 @@ COMMENT=      Multi-threaded Routing Toolkit
 
 MAKE_JOBS_SAFE=                no
 
-WRKSRC=                ${WRKDIR}/mrt/src
-GNU_CONFIGURE= yes
+WRKSRC=                        ${WRKDIR}/mrt/src
+GNU_CONFIGURE=         yes
 DESTDIR_VARNAME=       # empty
 INSTALL_MAKE_FLAGS+=   DESTDIR=${DESTDIR}${PREFIX}/sbin
 INSTALL_MAKE_FLAGS+=   MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}

Index: pkgsrc/net/mtr/options.mk
diff -u pkgsrc/net/mtr/options.mk:1.6 pkgsrc/net/mtr/options.mk:1.7
--- pkgsrc/net/mtr/options.mk:1.6       Sun Dec 14 15:57:44 2014
+++ pkgsrc/net/mtr/options.mk   Sun Nov  3 11:45:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/12/14 15:57:44 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2019/11/03 11:45:42 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mtr
 PKG_SUPPORTED_OPTIONS= gtk inet6
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+=      --without-gtk
 .endif
 
 .if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=        --enable-ipv6
+CONFIGURE_ARGS+=       --enable-ipv6
 .else
-CONFIGURE_ARGS+=        --disable-ipv6
+CONFIGURE_ARGS+=       --disable-ipv6
 .endif

Index: pkgsrc/net/nagios-base/Makefile
diff -u pkgsrc/net/nagios-base/Makefile:1.78 pkgsrc/net/nagios-base/Makefile:1.79
--- pkgsrc/net/nagios-base/Makefile:1.78        Sun Aug 11 13:22:11 2019
+++ pkgsrc/net/nagios-base/Makefile     Sun Nov  3 11:45:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2019/08/11 13:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2019/11/03 11:45:42 rillig Exp $
 #
 
 DISTNAME=              nagios-4.3.2
@@ -72,10 +72,10 @@ CONF_FILES+=                ${EGDIR}/${files}-sample $
 .endfor
 CONF_FILES+=           ${EGDIR}/nagios.conf ${PKG_SYSCONFDIR}/nagios.conf
 
-OWN_DIRS_PERMS+=${NAGIOSDIR} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
-OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
-OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
-OWN_DIRS_PERMS+=${NAGIOSDIR}/checkresults ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
+OWN_DIRS_PERMS+=       ${NAGIOSDIR} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
+OWN_DIRS_PERMS+=       ${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
+OWN_DIRS_PERMS+=       ${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
+OWN_DIRS_PERMS+=       ${NAGIOSDIR}/checkresults ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
 
 SPECIAL_PERMS+=        share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
 

Index: pkgsrc/net/nagios-nrpe/options.mk
diff -u pkgsrc/net/nagios-nrpe/options.mk:1.6 pkgsrc/net/nagios-nrpe/options.mk:1.7
--- pkgsrc/net/nagios-nrpe/options.mk:1.6       Sat Oct 11 23:57:04 2014
+++ pkgsrc/net/nagios-nrpe/options.mk   Sun Nov  3 11:45:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/10/11 23:57:04 gdt Exp $
+# $NetBSD: options.mk,v 1.7 2019/11/03 11:45:42 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nagios-nrpe
 PKG_SUPPORTED_OPTIONS= ssl tcpwrappers nagios-nrpe-args
@@ -17,12 +17,12 @@ CONFIGURE_ARGS+=    --disable-ssl
 .endif
 
 .if !empty(PKG_OPTIONS:Mnagios-nrpe-args)
-CONFIGURE_ARGS+=       --enable-command-args
+CONFIGURE_ARGS+=       --enable-command-args
 .else
 # Upstream's configure enables command args when given
 # "--disable-command-args", so (departing from pkgsrc norms) don't
 # give the --disable option.
-#CONFIGURE_ARGS+=       --disable-command-args
+#CONFIGURE_ARGS+=      --disable-command-args
 .endif
 
 .if !empty(PKG_OPTIONS:Mtcpwrappers)

Index: pkgsrc/net/nagios-plugin-dnsmaster/Makefile
diff -u pkgsrc/net/nagios-plugin-dnsmaster/Makefile:1.1 pkgsrc/net/nagios-plugin-dnsmaster/Makefile:1.2
--- pkgsrc/net/nagios-plugin-dnsmaster/Makefile:1.1     Mon Dec  3 02:29:20 2018
+++ pkgsrc/net/nagios-plugin-dnsmaster/Makefile Sun Nov  3 11:45:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/12/03 02:29:20 manu Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:42 rillig Exp $
 #
 
 DISTNAME=      check_dnsmaster-0.1
@@ -12,7 +12,7 @@ HOMEPAGE=     http://ftp.espci.fr/pub/nagios
 COMMENT=       Domain NS record monitoring plugin for Nagios
 LICENSE=       modified-bsd
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/check_dnsmaster \

Index: pkgsrc/net/nagios-plugin-dnsrbl/Makefile
diff -u pkgsrc/net/nagios-plugin-dnsrbl/Makefile:1.4 pkgsrc/net/nagios-plugin-dnsrbl/Makefile:1.5
--- pkgsrc/net/nagios-plugin-dnsrbl/Makefile:1.4        Fri Sep  8 02:26:20 2017
+++ pkgsrc/net/nagios-plugin-dnsrbl/Makefile    Sun Nov  3 11:45:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/09/08 02:26:20 manu Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:42 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-dnsrbl-${DISTNAME:C/.*-//}
@@ -12,7 +12,7 @@ HOMEPAGE=     http://ftp.espci.fr/pub/nagios
 COMMENT=       DNSRBL monitoring plugin for Nagios
 LICENSE=       modified-bsd
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/check_dnsrbl \

Index: pkgsrc/net/nagios-plugin-dotpid/Makefile
diff -u pkgsrc/net/nagios-plugin-dotpid/Makefile:1.6 pkgsrc/net/nagios-plugin-dotpid/Makefile:1.7
--- pkgsrc/net/nagios-plugin-dotpid/Makefile:1.6        Mon Aug  7 09:19:19 2017
+++ pkgsrc/net/nagios-plugin-dotpid/Makefile    Sun Nov  3 11:45:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/07 09:19:19 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:42 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-dotpid-${DISTNAME:C/.*-//}
@@ -13,13 +13,13 @@ HOMEPAGE=   http://ftp.espci.fr/pub/nagios
 COMMENT=       /var/run/*.pid monitoring plugin for Nagios
 LICENSE=       modified-bsd
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 BUILD_DEFS+=           NAGIOS_GROUP
 PKG_GROUPS_VARS=       NAGIOS_GROUP
 PKG_GROUPS=            ${NAGIOS_GROUP}
 
-SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_dotpid \
+SPECIAL_PERMS+=        ${PREFIX}/libexec/nagios/check_dotpid \
                ${REAL_ROOT_USER} ${NAGIOS_GROUP} 4551
 
 do-install:

Index: pkgsrc/net/nagios-plugin-dumpdates/Makefile
diff -u pkgsrc/net/nagios-plugin-dumpdates/Makefile:1.4 pkgsrc/net/nagios-plugin-dumpdates/Makefile:1.5
--- pkgsrc/net/nagios-plugin-dumpdates/Makefile:1.4     Thu Mar  9 23:47:47 2017
+++ pkgsrc/net/nagios-plugin-dumpdates/Makefile Sun Nov  3 11:45:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/03/09 23:47:47 manu Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:42 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-dumpdates-${DISTNAME:C/.*-//}
@@ -12,7 +12,7 @@ HOMEPAGE=     http://ftp.espci.fr/pub/nagios
 COMMENT=       /etc/dumpdates monitoring plugin for Nagios
 LICENSE=       modified-bsd
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/check_dumpdates \

Index: pkgsrc/net/nagios-plugin-fstab/Makefile
diff -u pkgsrc/net/nagios-plugin-fstab/Makefile:1.4 pkgsrc/net/nagios-plugin-fstab/Makefile:1.5
--- pkgsrc/net/nagios-plugin-fstab/Makefile:1.4 Mon Sep 14 13:53:03 2015
+++ pkgsrc/net/nagios-plugin-fstab/Makefile     Sun Nov  3 11:45:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/09/14 13:53:03 manu Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:42 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-fstab-${DISTNAME:C/.*-//}
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM=    FreeBSD-*-* NetBSD-*-
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/check_fstab \

Index: pkgsrc/net/nagios-plugin-gfbricks/Makefile
diff -u pkgsrc/net/nagios-plugin-gfbricks/Makefile:1.2 pkgsrc/net/nagios-plugin-gfbricks/Makefile:1.3
--- pkgsrc/net/nagios-plugin-gfbricks/Makefile:1.2      Mon Aug  7 09:30:45 2017
+++ pkgsrc/net/nagios-plugin-gfbricks/Makefile  Sun Nov  3 11:45:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/08/07 09:30:45 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/03 11:45:42 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-gfbricks-${DISTNAME:C/.*-//}
@@ -13,13 +13,13 @@ HOMEPAGE=   http://ftp.espci.fr/pub/nagios
 COMMENT=       GlusterFS bricks monitoring plugin for Nagios
 LICENSE=       modified-bsd
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 BUILD_DEFS+=           NAGIOS_GROUP
 PKG_GROUPS_VARS=       NAGIOS_GROUP
 PKG_GROUPS=            ${NAGIOS_GROUP}
 
-SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_gfbricks \
+SPECIAL_PERMS+=        ${PREFIX}/libexec/nagios/check_gfbricks \
                ${REAL_ROOT_USER} ${NAGIOS_GROUP} 4554
 
 do-install:

Index: pkgsrc/net/nagios-plugin-milter/Makefile
diff -u pkgsrc/net/nagios-plugin-milter/Makefile:1.3 pkgsrc/net/nagios-plugin-milter/Makefile:1.4
--- pkgsrc/net/nagios-plugin-milter/Makefile:1.3        Mon Aug 14 15:24:42 2017
+++ pkgsrc/net/nagios-plugin-milter/Makefile    Sun Nov  3 11:45:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/08/14 15:24:42 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:43 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-milter-${DISTNAME:C/.*-//}
@@ -13,7 +13,7 @@ HOMEPAGE=     http://ftp.espci.fr/pub/nagios
 COMMENT=       Milter monitoring plugin for Nagios
 LICENSE=       modified-bsd
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 BUILD_DEFS+=           NAGIOS_GROUP
 PKG_GROUPS_VARS=       NAGIOS_GROUP
@@ -22,15 +22,15 @@ PKG_GROUPS=         ${NAGIOS_GROUP}
 # The default `smmsp' username and group match the ones hardcoded
 # into mail/sendmail/Makefile.
 #
-SMMSP_USER?=           smmsp
-BUILD_DEFS+=           SMMSP_USER
-PKG_GROUPS_VARS=       SMMSP_USER
-PKG_USERS_VARS=                SMMSP_USER
-PKG_GROUPS=            ${SMMSP_USER}
-PKG_USERS=             ${SMMSP_USER}:${SMMSP_USER}
-PKG_GECOS.${SMMSP_USER}=Sendmail Message Submission Program
+SMMSP_USER?=                   smmsp
+BUILD_DEFS+=                   SMMSP_USER
+PKG_GROUPS_VARS=               SMMSP_USER
+PKG_USERS_VARS=                        SMMSP_USER
+PKG_GROUPS=                    ${SMMSP_USER}
+PKG_USERS=                     ${SMMSP_USER}:${SMMSP_USER}
+PKG_GECOS.${SMMSP_USER}=       Sendmail Message Submission Program
 
-SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_milter \
+SPECIAL_PERMS+=        ${PREFIX}/libexec/nagios/check_milter \
                ${SMMSP_USER} ${NAGIOS_GROUP} 4554
 
 do-install:

Index: pkgsrc/net/nagios-plugin-mysqlslave/Makefile
diff -u pkgsrc/net/nagios-plugin-mysqlslave/Makefile:1.3 pkgsrc/net/nagios-plugin-mysqlslave/Makefile:1.4
--- pkgsrc/net/nagios-plugin-mysqlslave/Makefile:1.3    Mon Aug  7 09:30:45 2017
+++ pkgsrc/net/nagios-plugin-mysqlslave/Makefile        Sun Nov  3 11:45:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/08/07 09:30:45 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:43 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-mysqlslave-${DISTNAME:C/.*-//}
@@ -15,13 +15,13 @@ LICENSE=    modified-bsd
 
 MAKE_ENV+=     PREFIX=${PREFIX}
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 BUILD_DEFS+=           NAGIOS_GROUP
 PKG_GROUPS_VARS+=      NAGIOS_GROUP
 PKG_GROUPS=            ${NAGIOS_GROUP}
 
-SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_mysql_slave \
+SPECIAL_PERMS+=        ${PREFIX}/libexec/nagios/check_mysql_slave \
                ${REAL_ROOT_USER} ${NAGIOS_GROUP} 4554
 
 do-install:

Index: pkgsrc/net/nagios-plugin-radius/Makefile
diff -u pkgsrc/net/nagios-plugin-radius/Makefile:1.18 pkgsrc/net/nagios-plugin-radius/Makefile:1.19
--- pkgsrc/net/nagios-plugin-radius/Makefile:1.18       Wed Jul  4 13:40:29 2018
+++ pkgsrc/net/nagios-plugin-radius/Makefile    Sun Nov  3 11:45:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:43 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-radius-${PLUGINSVERSION}
@@ -12,7 +12,7 @@ DEPENDS+=     nagios-plugins-${PLUGINSVERSIO
 DEPENDS+=      p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP
 
 # linked with libradiusclient-ng.so.
-BUILDLINK_DEPMETHOD.radiusclient-ng= full
+BUILDLINK_DEPMETHOD.radiusclient-ng=   full
 
 BUILD_DEFS+=   PKG_SYSCONFBASE
 

Index: pkgsrc/net/nagios-plugin-raidctl/Makefile
diff -u pkgsrc/net/nagios-plugin-raidctl/Makefile:1.4 pkgsrc/net/nagios-plugin-raidctl/Makefile:1.5
--- pkgsrc/net/nagios-plugin-raidctl/Makefile:1.4       Mon Aug  7 09:30:46 2017
+++ pkgsrc/net/nagios-plugin-raidctl/Makefile   Sun Nov  3 11:45:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/08/07 09:30:46 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:43 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-raidctl-${DISTNAME:C/.*-//}
@@ -13,13 +13,13 @@ HOMEPAGE=   http://ftp.espci.fr/pub/nagios
 COMMENT=       RAIDframe monitoring plugin for Nagios
 LICENSE=       modified-bsd
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 BUILD_DEFS+=           NAGIOS_GROUP
 PKG_GROUPS_VARS+=      NAGIOS_GROUP
 PKG_GROUPS=            ${NAGIOS_GROUP}
 
-SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_raidctl \
+SPECIAL_PERMS+=        ${PREFIX}/libexec/nagios/check_raidctl \
                ${REAL_ROOT_USER} ${NAGIOS_GROUP} 4554
 
 do-install:

Index: pkgsrc/net/nagios-plugin-spamd/Makefile
diff -u pkgsrc/net/nagios-plugin-spamd/Makefile:1.14 pkgsrc/net/nagios-plugin-spamd/Makefile:1.15
--- pkgsrc/net/nagios-plugin-spamd/Makefile:1.14        Sun Aug 11 13:22:12 2019
+++ pkgsrc/net/nagios-plugin-spamd/Makefile     Sun Nov  3 11:45:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:43 rillig Exp $
 #
 
 DISTNAME=      check_spamd-1.6.0
@@ -6,7 +6,7 @@ PKGNAME=        nagios-plugin-${DISTNAME:S/chec
 PKGREVISION=   4
 CATEGORIES=    net mail
 MASTER_SITES=  ${MASTER_SITE_BACKUP}
-               # http://exchange.nagios.org/components/com_mtree/
+       # http://exchange.nagios.org/components/com_mtree/
 EXTRACT_SUFX=  .pl
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -28,11 +28,11 @@ REPLACE_PERL+=              ${DISTFILES}
 
 PLUGIN_DIR=            ${PREFIX}/libexec/nagios
 
-SUBST_CLASSES+=                check_spamd
-SUBST_STAGE.check_spamd=post-configure
-SUBST_FILES.check_spamd=${DISTFILES}
-SUBST_MESSAGE.check_spamd=Fixing path to spamc.
-SUBST_SED.check_spamd= -e 's|/usr/local/perl/bin/|${PREFIX}/${PERL5_SUB_INSTALLVENDORBIN}|1'
+SUBST_CLASSES+=                        check_spamd
+SUBST_STAGE.check_spamd=       post-configure
+SUBST_FILES.check_spamd=       ${DISTFILES}
+SUBST_MESSAGE.check_spamd=     Fixing path to spamc.
+SUBST_SED.check_spamd=         -e 's|/usr/local/perl/bin/|${PREFIX}/${PERL5_SUB_INSTALLVENDORBIN}|1'
 
 INSTALLATION_DIRS+=    ${PLUGIN_DIR}
 
@@ -40,4 +40,4 @@ do-install:
        ${INSTALL_SCRIPT} "${WRKDIR}/${DISTFILES}" \
                "${DESTDIR}${PLUGIN_DIR}/check_spamd"
 
-.include "../../mk/bsd.pkg.mk"
+#.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/nagios-plugin-syncrepl/Makefile
diff -u pkgsrc/net/nagios-plugin-syncrepl/Makefile:1.4 pkgsrc/net/nagios-plugin-syncrepl/Makefile:1.5
--- pkgsrc/net/nagios-plugin-syncrepl/Makefile:1.4      Tue Oct 30 02:48:24 2018
+++ pkgsrc/net/nagios-plugin-syncrepl/Makefile  Sun Nov  3 11:45:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/10/30 02:48:24 manu Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:43 rillig Exp $
 #
 
 PKGNAME=       nagios-plugin-syncrepl-${DISTNAME:C/.*-//}
@@ -12,7 +12,7 @@ HOMEPAGE=     http://ftp.espci.fr/pub/nagios
 COMMENT=       LDAP replication monitoring plugin for Nagios
 LICENSE=       modified-bsd
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/check_syncrepl \

Index: pkgsrc/net/nagios-plugins/Makefile
diff -u pkgsrc/net/nagios-plugins/Makefile:1.49 pkgsrc/net/nagios-plugins/Makefile:1.50
--- pkgsrc/net/nagios-plugins/Makefile:1.49     Sun Aug 11 13:22:12 2019
+++ pkgsrc/net/nagios-plugins/Makefile  Sun Nov  3 11:45:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2019/08/11 13:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2019/11/03 11:45:43 rillig Exp $
 #
 
 PKGREVISION=   3
@@ -17,10 +17,10 @@ USE_TOOLS+= msgfmt msgmerge intltool per
 
 PKG_GROUPS+=   ${NAGIOS_GROUP}
 
-CONFIGURE_ARGS+= --without-pgsql --without-mysql \
-               --without-smbclient-command --without-snmpget-command \
-               --without-snmpgetnext-command --without-fping-command \
-               --without-apt-get-command
+CONFIGURE_ARGS+=       --without-pgsql --without-mysql \
+                       --without-smbclient-command --without-snmpget-command \
+                       --without-snmpgetnext-command --without-fping-command \
+                       --without-apt-get-command
 
 SPECIAL_PERMS+=        ${PREFIX}/libexec/nagios/check_icmp ${SETUID_ROOT_PERMS}
 SPECIAL_PERMS+=        ${PREFIX}/libexec/nagios/check_dhcp ${SETUID_ROOT_PERMS}
@@ -42,8 +42,8 @@ SPECIAL_PERMS+=       ${PREFIX}/libexec/nagios
 
 # required to enable large file support on Solaris
 .if ${OPSYS} == "SunOS"
-CPPFLAGS_LFS!=         getconf LFS_CFLAGS
-MAKE_ENV+=             CPPFLAGS_LFS=${CPPFLAGS_LFS:Q}
+CPPFLAGS_LFS!= getconf LFS_CFLAGS
+MAKE_ENV+=     CPPFLAGS_LFS=${CPPFLAGS_LFS:Q}
 .endif
 LIBS.SunOS+=   -lm
 

Index: pkgsrc/net/nagios-plugins/Makefile.plugin
diff -u pkgsrc/net/nagios-plugins/Makefile.plugin:1.4 pkgsrc/net/nagios-plugins/Makefile.plugin:1.5
--- pkgsrc/net/nagios-plugins/Makefile.plugin:1.4       Fri Apr  8 22:56:12 2011
+++ pkgsrc/net/nagios-plugins/Makefile.plugin   Sun Nov  3 11:45:43 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.plugin,v 1.4 2011/04/08 22:56:12 morr Exp $
+# $NetBSD: Makefile.plugin,v 1.5 2019/11/03 11:45:43 rillig Exp $
 #
 
-INSTALLATION_DIRS+= libexec/nagios
+INSTALLATION_DIRS+=    libexec/nagios
 
 do-build:
        cd ${WRKSRC}/lib && ${SETENV} ${MAKE_ENV} \

Index: pkgsrc/net/nbtscan/Makefile
diff -u pkgsrc/net/nbtscan/Makefile:1.16 pkgsrc/net/nbtscan/Makefile:1.17
--- pkgsrc/net/nbtscan/Makefile:1.16    Sun Sep  3 08:36:57 2017
+++ pkgsrc/net/nbtscan/Makefile Sun Nov  3 11:45:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/09/03 08:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:43 rillig Exp $
 #
 
 DISTNAME=      nbtscan-1.5.1
@@ -6,9 +6,9 @@ PKGREVISION=    2
 CATEGORIES=    net
 MASTER_SITES=  http://www.inetcat.net/software/
 
-PATCHFILES=    nbtscan-jumbo-patch-20141122.gz
-PATCH_SITES=   http://www.NetBSD.org/~dholland/patchkits/nbtscan/
-PATCH_DIST_STRIP= -p1
+PATCHFILES=            nbtscan-jumbo-patch-20141122.gz
+PATCH_SITES=           http://www.NetBSD.org/~dholland/patchkits/nbtscan/
+PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://www.inetcat.net/software/nbtscan.html

Index: pkgsrc/net/nemesis/Makefile
diff -u pkgsrc/net/nemesis/Makefile:1.21 pkgsrc/net/nemesis/Makefile:1.22
--- pkgsrc/net/nemesis/Makefile:1.21    Sun Sep  3 08:36:57 2017
+++ pkgsrc/net/nemesis/Makefile Sun Nov  3 11:45:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/09/03 08:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 11:45:43 rillig Exp $
 
 DISTNAME=      nemesis-1.4
 PKGREVISION=   2
@@ -9,7 +9,7 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://jeff.wwti.com/nemesis/
 COMMENT=       Nemesis is a command-line UNIX network packet injection suite
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-libnet-includes=${BUILDLINK_PREFIX.libnet10}/include/libnet10
 CONFIGURE_ARGS+=       --with-libnet-libs=${BUILDLINK_PREFIX.libnet10}/lib/libnet10
 

Index: pkgsrc/net/net-snmp/builtin.mk
diff -u pkgsrc/net/net-snmp/builtin.mk:1.1 pkgsrc/net/net-snmp/builtin.mk:1.2
--- pkgsrc/net/net-snmp/builtin.mk:1.1  Sat Jul 29 16:48:27 2006
+++ pkgsrc/net/net-snmp/builtin.mk      Sun Nov  3 11:45:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2006/07/29 16:48:27 adam Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 11:45:44 rillig Exp $
 
 BUILTIN_PKG:=  net-snmp
 
@@ -17,7 +17,7 @@ IS_BUILTIN.net-snmp=  no
 IS_BUILTIN.net-snmp=   yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.net-snmp
+MAKEVARS+=             IS_BUILTIN.net-snmp
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -35,7 +35,7 @@ BUILTIN_VERSION.net-snmp!=                            \
        ' ${H_NETSNMP:Q}
 BUILTIN_PKG.net-snmp=  net-snmp-${BUILTIN_VERSION.net-snmp}
 .endif
-MAKEVARS+=     BUILTIN_PKG.net-snmp
+MAKEVARS+=             BUILTIN_PKG.net-snmp
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -62,4 +62,4 @@ USE_BUILTIN.net-snmp!=                                                        \
 .    endif
 .  endif
 .endif
-MAKEVARS+=     USE_BUILTIN.net-snmp
+MAKEVARS+=             USE_BUILTIN.net-snmp

Index: pkgsrc/net/netatalk22/Makefile
diff -u pkgsrc/net/netatalk22/Makefile:1.23 pkgsrc/net/netatalk22/Makefile:1.24
--- pkgsrc/net/netatalk22/Makefile:1.23 Sun Aug 11 13:22:12 2019
+++ pkgsrc/net/netatalk22/Makefile      Sun Nov  3 11:45:44 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:44 rillig Exp $
 
 DISTNAME=      netatalk-2.2.6
-PKGNAME=        ${DISTNAME:C/-/22-/}
+PKGNAME=       ${DISTNAME:C/-/22-/}
 PKGREVISION=   13
 CATEGORIES=    net print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/}
@@ -24,13 +24,13 @@ GNU_CONFIGURE=              yes
 BUILDLINK_TRANSFORM+=  l:db48:${BDB_TYPE}
 
 PKG_SYSCONFSUBDIR=     netatalk
-EGDIR=         ${PREFIX}/share/examples/netatalk
-CONF_FILES=    ${EGDIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default
-CONF_FILES+=   ${EGDIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system
-CONF_FILES+=   ${EGDIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf
-CONF_FILES+=   ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf
-CONF_FILES+=   ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf
-CONF_FILES+=   ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
+EGDIR=                 ${PREFIX}/share/examples/netatalk
+CONF_FILES=            ${EGDIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default
+CONF_FILES+=           ${EGDIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system
+CONF_FILES+=           ${EGDIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf
+CONF_FILES+=           ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf
+CONF_FILES+=           ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf
+CONF_FILES+=           ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/net/netatalk3/Makefile
diff -u pkgsrc/net/netatalk3/Makefile:1.23 pkgsrc/net/netatalk3/Makefile:1.24
--- pkgsrc/net/netatalk3/Makefile:1.23  Sun Aug 11 13:22:13 2019
+++ pkgsrc/net/netatalk3/Makefile       Sun Nov  3 11:45:44 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:22:13 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:44 rillig Exp $
 
 DISTNAME=      netatalk-3.1.12
-PKGNAME=        ${DISTNAME:C/-/3-/}
+PKGNAME=       ${DISTNAME:C/-/3-/}
 PKGREVISION=   5
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/}

Index: pkgsrc/net/netdisco/Makefile
diff -u pkgsrc/net/netdisco/Makefile:1.45 pkgsrc/net/netdisco/Makefile:1.46
--- pkgsrc/net/netdisco/Makefile:1.45   Sun Aug 11 13:22:13 2019
+++ pkgsrc/net/netdisco/Makefile        Sun Nov  3 11:45:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/08/11 13:22:13 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:44 rillig Exp $
 
 DISTNAME=              netdisco-1.3.3_with_mibs
 PKGNAME=               ${DISTNAME:S/_with_mibs//}
@@ -126,7 +126,7 @@ SUBST_FILES.apachevers=             html/admin_user
 SUBST_FILES.apachevers+=       html/logout.html html/portcontrol.html
 SUBST_FILES.apachevers+=       html/public_debugging.html
 SUBST_SED.apachevers=          -e "s|connection->remote_ip|connection->client_ip|g"
-SUBST_MESSAGE.apachevers=      Fixing perl files for apache > 2.2.
+SUBST_MESSAGE.apachevers=      Fixing perl files for apache > 2.2.
 
 do-build:
        ${RM} -f ${WRKSRC:Q}/html/doc/ChangeLog.txt

Index: pkgsrc/net/netgroup/Makefile
diff -u pkgsrc/net/netgroup/Makefile:1.6 pkgsrc/net/netgroup/Makefile:1.7
--- pkgsrc/net/netgroup/Makefile:1.6    Tue Oct 23 17:18:41 2012
+++ pkgsrc/net/netgroup/Makefile        Sun Nov  3 11:45:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:41 asau Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:44 rillig Exp $
 #
 
 DISTNAME=      netgroup-0.0
@@ -13,7 +13,7 @@ USE_FEATURES+=                cdefs
 NOT_FOR_PLATFORM=      Interix-*-* # no netgroups
 
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
-INSTALL_TARGET=        inst-all
+INSTALL_TARGET=                inst-all
 INSTALL_MAKE_FLAGS+=   BINDIR=${DESTDIR}${PREFIX}/bin \
                        MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 

Index: pkgsrc/net/nicotine/Makefile
diff -u pkgsrc/net/nicotine/Makefile:1.53 pkgsrc/net/nicotine/Makefile:1.54
--- pkgsrc/net/nicotine/Makefile:1.53   Mon Sep  2 13:19:52 2019
+++ pkgsrc/net/nicotine/Makefile        Sun Nov  3 11:45:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2019/09/02 13:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.54 2019/11/03 11:45:44 rillig Exp $
 
 DISTNAME=      nicotine-1.0.8
 PKGREVISION=   17
@@ -13,9 +13,9 @@ LICENSE=      gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-gtk2>=1.99.16:../../x11/py-gtk2
 
-USE_PKGLOCALEDIR=      yes
-USE_LANGUAGES=         # empty
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+USE_PKGLOCALEDIR=              yes
+USE_LANGUAGES=                 # empty
+PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
 
 MAKE_ENV+=     PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 

Index: pkgsrc/net/nidentd/Makefile
diff -u pkgsrc/net/nidentd/Makefile:1.12 pkgsrc/net/nidentd/Makefile:1.13
--- pkgsrc/net/nidentd/Makefile:1.12    Sat Apr  6 03:45:21 2013
+++ pkgsrc/net/nidentd/Makefile Sun Nov  3 11:45:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/04/06 03:45:21 rodent Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:44 rillig Exp $
 #
 
 DISTNAME=      nidentd-1.0
@@ -15,10 +15,10 @@ DEPENDS+=   lsof>=4.61:../../sysutils/lsof
 INSTALLATION_DIRS+=    etc libexec
 
 do-build:
-               ${SED} \
-                       -e 's,@LOCALBASE@,${LOCALBASE},' \
-                       <${WRKSRC}/nidentd >${WRKSRC}/nidentd.tmp
-               ${MV} ${WRKSRC}/nidentd.tmp ${WRKSRC}/nidentd
+       ${SED} \
+               -e 's,@LOCALBASE@,${LOCALBASE},' \
+               <${WRKSRC}/nidentd >${WRKSRC}/nidentd.tmp
+       ${MV} ${WRKSRC}/nidentd.tmp ${WRKSRC}/nidentd
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/nidentd.nat ${DESTDIR}${PREFIX}/etc/nidentd.nat.example ; \

Index: pkgsrc/net/ns/Makefile
diff -u pkgsrc/net/ns/Makefile:1.49 pkgsrc/net/ns/Makefile:1.50
--- pkgsrc/net/ns/Makefile:1.49 Mon Mar 12 11:17:22 2018
+++ pkgsrc/net/ns/Makefile      Sun Nov  3 11:45:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2018/03/12 11:17:22 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2019/11/03 11:45:44 rillig Exp $
 
 DISTNAME=      ns-src-2.35
 PKGNAME=       ns-2.35
@@ -16,7 +16,7 @@ USE_TOOLS+=   gmake
 GNU_CONFIGURE= yes
 PTHREAD_OPTS+= require
 # Perl is only needed if you want to run the validation tests.
-#USE_TOOLS+=           perl
+#USE_TOOLS+=   perl
 
 CONFIGURE_ARGS+=       LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`"
 CONFIGURE_ARGS+=       --with-tcl=${BUILDLINK_PREFIX.tcl}

Index: pkgsrc/net/nsd/Makefile
diff -u pkgsrc/net/nsd/Makefile:1.105 pkgsrc/net/nsd/Makefile:1.106
--- pkgsrc/net/nsd/Makefile:1.105       Wed Aug 21 14:16:40 2019
+++ pkgsrc/net/nsd/Makefile     Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2019/08/21 14:16:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.106 2019/11/03 11:45:45 rillig Exp $
 
 DISTNAME=      nsd-4.2.2
 CATEGORIES=    net
@@ -10,7 +10,7 @@ COMMENT=      Authoritative-only DNS server
 LICENSE=       modified-bsd
 
 BUILD_DEFS+=   VARBASE NSD_USER NSD_GROUP
-FILES_SUBST+=   NSD_USER=${NSD_USER} NSD_GROUP=${NSD_GROUP}
+FILES_SUBST+=  NSD_USER=${NSD_USER} NSD_GROUP=${NSD_GROUP}
 
 BUILDLINK_API_DEPENDS.openssl+=        openssl>=0.9.7
 
@@ -32,28 +32,28 @@ GNU_CONFIGURE=      yes
 
 PKG_SYSCONFSUBDIR=     nsd
 
-CONFIGURE_ARGS+=--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=--with-configdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+CONFIGURE_ARGS+=       --with-configdir=${PKG_SYSCONFDIR:Q}
 .if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=--enable-ipv6
+CONFIGURE_ARGS+=       --enable-ipv6
 .else
-CONFIGURE_ARGS+=--disable-ipv6
+CONFIGURE_ARGS+=       --disable-ipv6
 .endif
 .if !empty(PKG_OPTIONS:Mrrl)
-CONFIGURE_ARGS+=--enable-ratelimit
+CONFIGURE_ARGS+=       --enable-ratelimit
 .else
-CONFIGURE_ARGS+=--disable-ratelimit
+CONFIGURE_ARGS+=       --disable-ratelimit
 .endif
 
-CONFIGURE_ARGS+=--disable-dnstap
+CONFIGURE_ARGS+=       --disable-dnstap
 
-CONFIGURE_ARGS+=--with-pidfile=${VARBASE}/run/nsd/nsd.pid
-CONFIGURE_ARGS+=--with-user=${NSD_USER}
-CONFIGURE_ARGS+=--with-dbfile=${VARBASE}/nsd/nsd.db
-CONFIGURE_ARGS+=--with-xfrdfile=${VARBASE}/nsd/nsd-xfrd.state
-CONFIGURE_ARGS+=--with-libevent=${BUILDLINK_PREFIX.libevent}
-CONFIGURE_ARGS+=--with-ssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-pidfile=${VARBASE}/run/nsd/nsd.pid
+CONFIGURE_ARGS+=       --with-user=${NSD_USER}
+CONFIGURE_ARGS+=       --with-dbfile=${VARBASE}/nsd/nsd.db
+CONFIGURE_ARGS+=       --with-xfrdfile=${VARBASE}/nsd/nsd-xfrd.state
+CONFIGURE_ARGS+=       --with-libevent=${BUILDLINK_PREFIX.libevent}
+CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
 
 RCD_SCRIPTS=   nlnsd
 
@@ -65,7 +65,7 @@ PKG_USERS=    ${NSD_USER}:${NSD_GROUP}
 
 CONF_FILES+=   share/examples/nsd/nsd.conf ${PKG_SYSCONFDIR}/nsd.conf
 
-OWN_DIRS_PERMS+=        ${VARBASE}/nsd ${NSD_USER} ${NSD_GROUP} 755
+OWN_DIRS_PERMS+=       ${VARBASE}/nsd ${NSD_USER} ${NSD_GROUP} 755
 
 INSTALLATION_DIRS=     share/examples/nsd
 

Index: pkgsrc/net/nslint/Makefile
diff -u pkgsrc/net/nslint/Makefile:1.13 pkgsrc/net/nslint/Makefile:1.14
--- pkgsrc/net/nslint/Makefile:1.13     Thu Jan 19 18:52:20 2017
+++ pkgsrc/net/nslint/Makefile  Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/01/19 18:52:20 agc Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:45 rillig Exp $
 
 DISTNAME=      nslint-3.1
 CATEGORIES=    net
@@ -10,8 +10,8 @@ HOMEPAGE=     http://ee.lbl.gov/ftp.html
 COMMENT=       Perform consistency checks on DNS zone files
 LICENSE=       original-bsd
 
-GNU_CONFIGURE= YES
-BUILD_TARGET=  nslint
+GNU_CONFIGURE=         YES
+BUILD_TARGET=          nslint
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ntp4/Makefile
diff -u pkgsrc/net/ntp4/Makefile:1.101 pkgsrc/net/ntp4/Makefile:1.102
--- pkgsrc/net/ntp4/Makefile:1.101      Sun Aug 11 13:22:13 2019
+++ pkgsrc/net/ntp4/Makefile    Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2019/08/11 13:22:13 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2019/11/03 11:45:45 rillig Exp $
 #
 
 DISTNAME=      ntp-4.2.8p13
@@ -17,9 +17,9 @@ GNU_CONFIGURE=        YES
 USE_LIBTOOL=   YES
 USE_TOOLS+=    pax perl:run
 
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=--with-locfile=loc/pkgsrc
-CONFIGURE_ENV+=          PATH_PERL=${PERL5}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --with-locfile=loc/pkgsrc
+CONFIGURE_ENV+=                PATH_PERL=${PERL5}
 
 OVERRIDE_DIRDEPTH=     4
 

Index: pkgsrc/net/ocaml-conduit/Makefile
diff -u pkgsrc/net/ocaml-conduit/Makefile:1.1 pkgsrc/net/ocaml-conduit/Makefile:1.2
--- pkgsrc/net/ocaml-conduit/Makefile:1.1       Mon Jul  1 16:01:36 2019
+++ pkgsrc/net/ocaml-conduit/Makefile   Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/07/01 16:01:36 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:45 rillig Exp $
 
 GITHUB_PROJECT=        ocaml-conduit
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -13,7 +13,7 @@ LICENSE=      isc
 
 USE_LANGUAGES= # none
 
-OCAML_USE_DUNE=        yes
+OCAML_USE_DUNE=                yes
 DUNE_BUILD_PACKAGES=   conduit
 OPAM_INSTALL_FILES=    conduit
 

Index: pkgsrc/net/ocaml-ipaddr/Makefile
diff -u pkgsrc/net/ocaml-ipaddr/Makefile:1.18 pkgsrc/net/ocaml-ipaddr/Makefile:1.19
--- pkgsrc/net/ocaml-ipaddr/Makefile:1.18       Tue Mar  5 18:53:15 2019
+++ pkgsrc/net/ocaml-ipaddr/Makefile    Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/03/05 18:53:15 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:45 rillig Exp $
 
 GITHUB_PROJECT=        ocaml-ipaddr
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://github.com/mirage/ocam
 COMMENT=       Library for manipulation of IP and MAC addresses
 LICENSE=       isc
 
-OCAML_USE_DUNE=        yes
+OCAML_USE_DUNE=                yes
 DUNE_BUILD_PACKAGES=   macaddr ipaddr
 OPAM_INSTALL_FILES=    macaddr ipaddr
 

Index: pkgsrc/net/ocamlnet/Makefile
diff -u pkgsrc/net/ocamlnet/Makefile:1.65 pkgsrc/net/ocamlnet/Makefile:1.66
--- pkgsrc/net/ocamlnet/Makefile:1.65   Sun Jul 21 22:25:33 2019
+++ pkgsrc/net/ocamlnet/Makefile        Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2019/07/21 22:25:33 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2019/11/03 11:45:45 rillig Exp $
 #
 
 DISTNAME=              ocamlnet-4.1.6
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=      -without-nethttpd -disa
 USE_TOOLS+=            gmake
 BUILD_TARGET=          all
 OCAML_USE_FINDLIB=     yes
-OCAML_FINDLIB_DIRS= \
+OCAML_FINDLIB_DIRS=    \
        equeue netcamlbox netcgi2-plex netcgi2 netclient netmulticore \
        netplex netshm netstring-pcre netstring netsys netunidata \
        netzip rpc-auth-local rpc-generator rpc

Index: pkgsrc/net/ocamlnet/buildlink3.mk
diff -u pkgsrc/net/ocamlnet/buildlink3.mk:1.12 pkgsrc/net/ocamlnet/buildlink3.mk:1.13
--- pkgsrc/net/ocamlnet/buildlink3.mk:1.12      Thu Jul 19 15:15:28 2018
+++ pkgsrc/net/ocamlnet/buildlink3.mk   Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2018/07/19 15:15:28 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2019/11/03 11:45:45 rillig Exp $
 
 BUILDLINK_TREE+=       ocamlnet
 
@@ -7,7 +7,7 @@ OCAMLNET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocamlnet+=       ocamlnet>=4.1.2
 BUILDLINK_ABI_DEPENDS.ocamlnet+=       ocamlnet>=4.1.6nb1
-BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
+BUILDLINK_PKGSRCDIR.ocamlnet?=         ../../net/ocamlnet
 
 .endif # OCAMLNET_BUILDLINK3_MK
 

Index: pkgsrc/net/ocsinventory-agent/Makefile
diff -u pkgsrc/net/ocsinventory-agent/Makefile:1.20 pkgsrc/net/ocsinventory-agent/Makefile:1.21
--- pkgsrc/net/ocsinventory-agent/Makefile:1.20 Sun Aug 11 13:22:13 2019
+++ pkgsrc/net/ocsinventory-agent/Makefile      Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:22:13 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:45 rillig Exp $
 #
 VERS=                  1.1.2.1
 PKGREVISION=           11
@@ -24,8 +24,8 @@ DEPENDS+=             dmidecode-[0-9]*:../../sysuti
 
 WRKSRC=                        ${WRKDIR}/Ocsinventory-Agent-${VERS}
 
-BUILD_DEFS+=           VARBASE
-AUTO_MKDIRS=yes
+BUILD_DEFS+=   VARBASE
+AUTO_MKDIRS=   yes
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/net/oinkmaster/Makefile
diff -u pkgsrc/net/oinkmaster/Makefile:1.28 pkgsrc/net/oinkmaster/Makefile:1.29
--- pkgsrc/net/oinkmaster/Makefile:1.28 Sun Aug 11 13:22:13 2019
+++ pkgsrc/net/oinkmaster/Makefile      Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/08/11 13:22:13 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/03 11:45:45 rillig Exp $
 
 DISTNAME=      oinkmaster-2.0
 PKGREVISION=   7
@@ -39,9 +39,9 @@ INSTALLATION_DIRS=    bin ${PKGMANDIR}/man1
                        share/snort/rules
 
 do-install:
-.      for f in ${DOCS}
-               ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
-.      endfor
+.for f in ${DOCS}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
+.endfor
 
        ${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${DESTDIR}${EGDIR}

Index: pkgsrc/net/oinkmaster/options.mk
diff -u pkgsrc/net/oinkmaster/options.mk:1.2 pkgsrc/net/oinkmaster/options.mk:1.3
--- pkgsrc/net/oinkmaster/options.mk:1.2        Sat Sep 17 11:12:26 2011
+++ pkgsrc/net/oinkmaster/options.mk    Sun Nov  3 11:45:45 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2011/09/17 11:12:26 shattered Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:45 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.oinkmaster
 
-PKG_SUPPORTED_OPTIONS= perl
+PKG_SUPPORTED_OPTIONS=         perl
 PKG_OPTIONS_LEGACY_OPTS+=      oinkmaster-perl-tools:perl
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/net/omniNotify/Makefile
diff -u pkgsrc/net/omniNotify/Makefile:1.3 pkgsrc/net/omniNotify/Makefile:1.4
--- pkgsrc/net/omniNotify/Makefile:1.3  Fri Dec 25 04:41:14 2015
+++ pkgsrc/net/omniNotify/Makefile      Sun Nov  3 11:45:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/12/25 04:41:14 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:45 rillig Exp $
 #
 
 DISTNAME=      omniNotify-2.1
@@ -6,9 +6,9 @@ PKGREVISION=    1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=omninotify/}
 
-PATCH_SITES=   http://www.NetBSD.org/~dholland/patchkits/omniNotify/
-PATCHFILES=    omniNotify-jumbo-patch-20151224.gz
-PATCH_DIST_STRIP= -p1
+PATCH_SITES=           http://www.NetBSD.org/~dholland/patchkits/omniNotify/
+PATCHFILES=            omniNotify-jumbo-patch-20151224.gz
+PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://omninotify.sourceforge.net/

Index: pkgsrc/net/omniORB/Makefile
diff -u pkgsrc/net/omniORB/Makefile:1.20 pkgsrc/net/omniORB/Makefile:1.21
--- pkgsrc/net/omniORB/Makefile:1.20    Mon Sep  2 13:19:50 2019
+++ pkgsrc/net/omniORB/Makefile Sun Nov  3 11:45:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:50 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:46 rillig Exp $
 
 DISTNAME=              omniORB-4.1.7
 PKGREVISION=           2
@@ -16,19 +16,19 @@ GNU_CONFIGURE=      YES
 USE_LANGUAGES= c c++03
 USE_TOOLS+=    gmake
 
-PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniCOS4.pc.in
-PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniCOSDynamic4.pc.in
-PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniConnectionMgmt4.pc.in
-PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniDynamic4.pc.in
-PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniORB4.pc.in
-PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omnithread3.pc.in
+PKGCONFIG_OVERRIDE+=   contrib/pkgconfig/omniCOS4.pc.in
+PKGCONFIG_OVERRIDE+=   contrib/pkgconfig/omniCOSDynamic4.pc.in
+PKGCONFIG_OVERRIDE+=   contrib/pkgconfig/omniConnectionMgmt4.pc.in
+PKGCONFIG_OVERRIDE+=   contrib/pkgconfig/omniDynamic4.pc.in
+PKGCONFIG_OVERRIDE+=   contrib/pkgconfig/omniORB4.pc.in
+PKGCONFIG_OVERRIDE+=   contrib/pkgconfig/omnithread3.pc.in
 
 # omniORB requires native threads support
 PTHREAD_OPTS=  require native
-RCD_SCRIPTS=   omninames
+RCD_SCRIPTS=   omninames
 
-OMNIORB_ETCDIR?= ${PKG_SYSCONFDIR}
-OMNIORB_CONFIG=        ${OMNIORB_ETCDIR}/omniORB.cfg
+OMNIORB_ETCDIR?=       ${PKG_SYSCONFDIR}
+OMNIORB_CONFIG=                ${OMNIORB_ETCDIR}/omniORB.cfg
 
 CONFIGURE_ARGS+=       --with-omniORB-config=${OMNIORB_CONFIG:Q}
 #CONFIGURE_ARGS+=      --with-omniNames-logdir=
@@ -43,8 +43,8 @@ PKG_SUGGESTED_OPTIONS=        inet6
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
-PY_PATCHPLIST=         yes
-REPLACE_PYTHON+=       src/tool/omniidl/python/scripts/omniidlrun.py
+PY_PATCHPLIST=                 yes
+REPLACE_PYTHON+=               src/tool/omniidl/python/scripts/omniidlrun.py
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 4.1.7
 
 post-install:

Index: pkgsrc/net/openag/Makefile
diff -u pkgsrc/net/openag/Makefile:1.14 pkgsrc/net/openag/Makefile:1.15
--- pkgsrc/net/openag/Makefile:1.14     Sun Sep  3 08:53:13 2017
+++ pkgsrc/net/openag/Makefile  Sun Nov  3 11:45:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/09/03 08:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:46 rillig Exp $
 #
 
 DISTNAME=      OpenAG-1.1.1
@@ -24,7 +24,7 @@ INSTALLATION_DIRS+=   share/doc/OpenAG
 
 post-install:
 .for i in AUTHORS ChangeLog INSTALL NEWS README
-               ${INSTALL_MAN} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/OpenAG/${i}
+       ${INSTALL_MAN} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/OpenAG/${i}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/openconnect/Makefile
diff -u pkgsrc/net/openconnect/Makefile:1.12 pkgsrc/net/openconnect/Makefile:1.13
--- pkgsrc/net/openconnect/Makefile:1.12        Thu Sep 12 19:23:13 2019
+++ pkgsrc/net/openconnect/Makefile     Sun Nov  3 11:45:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/09/12 19:23:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:46 rillig Exp $
 
 DISTNAME=      openconnect-8.05
 CATEGORIES=    net security
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=      --disable-nls
 REPLACE_PYTHON=                trojans/tncc-wrapper.py
 REPLACE_BASH=          trojans/*.sh
 
-PYTHON_VERSIONS_ACCEPTED=27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 INSTALLATION_DIRS=     sbin include lib ${PKGMANDIR}/man8
 

Index: pkgsrc/net/openslp/hacks.mk
diff -u pkgsrc/net/openslp/hacks.mk:1.2 pkgsrc/net/openslp/hacks.mk:1.3
--- pkgsrc/net/openslp/hacks.mk:1.2     Tue Oct 16 23:48:59 2007
+++ pkgsrc/net/openslp/hacks.mk Sun Nov  3 11:45:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:59 tnn Exp $
+# $NetBSD: hacks.mk,v 1.3 2019/11/03 11:45:46 rillig Exp $
 
 .if !defined(LIBEXIF_HACKS_MK)
 LIBEXIF_HACKS_MK=      # defined
@@ -10,7 +10,7 @@ LIBEXIF_HACKS_MK=     # defined
 .if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
 PKG_HACKS+=            sys_types_h-inttypes_h-conflict
 post-wrapper:
-               ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
+       ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
 # should match int8_t, int16_t, and int32_t (only)
 .endif
 

Index: pkgsrc/net/openvpn/Makefile
diff -u pkgsrc/net/openvpn/Makefile:1.69 pkgsrc/net/openvpn/Makefile:1.70
--- pkgsrc/net/openvpn/Makefile:1.69    Sat Jul 20 22:46:40 2019
+++ pkgsrc/net/openvpn/Makefile Sun Nov  3 11:45:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2019/07/20 22:46:40 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2019/11/03 11:45:46 rillig Exp $
 
 DISTNAME=      ${OPENVPN_DISTNAME}
 PKGREVISION=   2
@@ -37,7 +37,7 @@ SMF_METHODS=  openvpn
 
 PKG_GROUPS=            ${OPENVPN_GROUP}
 PKG_USERS=             ${OPENVPN_USER}:${OPENVPN_GROUP}
-PKG_GECOS.${OPENVPN_USER}=OpenVPN\ server\ user
+PKG_GECOS.${OPENVPN_USER}= OpenVPN\ server\ user
 
 MESSAGE_SUBST+=        OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
 

Index: pkgsrc/net/openvpn/Makefile.common
diff -u pkgsrc/net/openvpn/Makefile.common:1.15 pkgsrc/net/openvpn/Makefile.common:1.16
--- pkgsrc/net/openvpn/Makefile.common:1.15     Thu Feb 21 16:22:54 2019
+++ pkgsrc/net/openvpn/Makefile.common  Sun Nov  3 11:45:46 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.15 2019/02/21 16:22:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2019/11/03 11:45:46 rillig Exp $
 # used by net/openvpn/Makefile
 # used by net/openvpn-acct-wtmpx/Makefile
 # used by net/openvpn-nagios/Makefile
 
-OPENVPN_DISTNAME=      openvpn-2.4.7
-OPENVPN_DISTFILE=      ${OPENVPN_DISTNAME}.tar.xz
-OPENVPN_MASTER_SITES=  http://swupdate.openvpn.org/community/releases/
+OPENVPN_DISTNAME=              openvpn-2.4.7
+OPENVPN_DISTFILE=              ${OPENVPN_DISTNAME}.tar.xz
+OPENVPN_MASTER_SITES=          http://swupdate.openvpn.org/community/releases/
 SITES.${OPENVPN_DISTFILE}=     ${OPENVPN_MASTER_SITES}
 
 OPENVPN_USER?=         openvpn

Index: pkgsrc/net/openwbem/Makefile
diff -u pkgsrc/net/openwbem/Makefile:1.13 pkgsrc/net/openwbem/Makefile:1.14
--- pkgsrc/net/openwbem/Makefile:1.13   Sun Aug 11 13:22:13 2019
+++ pkgsrc/net/openwbem/Makefile        Sun Nov  3 11:45:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:22:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:46 rillig Exp $
 
 DISTNAME=      openwbem-3.2.2
 PKGREVISION=   7
@@ -9,11 +9,11 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.openwbem.org/
 COMMENT=       Web-based Enterprise Management software
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       ac_cv_path_TRUE_PATHNAME=true ac_cv_path_FALSE_PATHNAME=false
-USE_TOOLS+=    gmake
-USE_LIBTOOL=   yes
-USE_LANGUAGES+=        c c++
+USE_TOOLS+=            gmake
+USE_LIBTOOL=           yes
+USE_LANGUAGES+=                c c++
 
 INSTALLATION_DIRS+=    etc/openwbem include/openwbem var/openwbem
 INSTALLATION_DIRS+=    share/openwbem lib/openwbem share/examples/openwbem
@@ -24,11 +24,11 @@ INSTALLATION_DIRS+= lib/authentication
 PKG_SYSCONFSUBDIR=     openwbem
 EGDIR=                 ${PREFIX}/share/examples/openwbem
 CONF_FILES+=           ${EGDIR}/openwbem.conf \
-                        ${PKG_SYSCONFDIR}/openwbem.conf
+                       ${PKG_SYSCONFDIR}/openwbem.conf
 CONF_FILES+=           ${EGDIR}/owgencert \
-                        ${PKG_SYSCONFDIR}/owgencert
+                       ${PKG_SYSCONFDIR}/owgencert
 CONF_FILES+=           ${EGDIR}/ssleay.cnf \
-                        ${PKG_SYSCONFDIR}/ssleay.cnf
+                       ${PKG_SYSCONFDIR}/ssleay.cnf
 
 
 SUBST_CLASSES+=                mkdir
@@ -80,8 +80,8 @@ SUBST_FILES.mkdir+=   ${WRKSRC}/src/provid
 SUBST_FILES.mkdir+=    ${WRKSRC}/src/providers/cpp/instance/CIM_IndicationFilter/Makefile.in
 SUBST_FILES.mkdir+=    ${WRKSRC}/src/providers/cpp/instance/CIM_NamespaceInManager/Makefile.in
 SUBST_FILES.mkdir+=    ${WRKSRC}/src/providers/cpp/instance/OpenWBEM_ConfigSettingData/Makefile.in
-SUBST_SED.mkdir=        -e "s|\$$(INSTALL_PROGRAM) -d|\$${mkdir_p}|g"
-SUBST_MESSAGE.mkdir=    Fixing ${INSTALL_PROGRAM} -d lines (the -s does not interoperate with -d)
+SUBST_SED.mkdir=       -e "s|\$$(INSTALL_PROGRAM) -d|\$${mkdir_p}|g"
+SUBST_MESSAGE.mkdir=   Fixing ${INSTALL_PROGRAM} -d lines (the -s does not interoperate with -d)
 
 CONFIGURE_ARGS.NetBSD+=        ac_cv_func_gethostbyname_r=no
 

Index: pkgsrc/net/ortp/Makefile
diff -u pkgsrc/net/ortp/Makefile:1.10 pkgsrc/net/ortp/Makefile:1.11
--- pkgsrc/net/ortp/Makefile:1.10       Thu Sep 13 12:10:03 2018
+++ pkgsrc/net/ortp/Makefile    Sun Nov  3 11:45:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/09/13 12:10:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:46 rillig Exp $
 #
 
 DISTNAME=      ortp-0.16.1
@@ -15,7 +15,7 @@ GNU_CONFIGURE=        yes
 USE_LANGUAGES= c99
 USE_LIBTOOL=   yes
 
-CONFIGURE_ENV+=        ac_cv_path_DOXYGEN=false
+CONFIGURE_ENV+=                ac_cv_path_DOXYGEN=false
 PKGCONFIG_OVERRIDE+=   ortp.pc.in
 
 CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -DBSD_COMP

Index: pkgsrc/net/p5-File-Rsync/Makefile
diff -u pkgsrc/net/p5-File-Rsync/Makefile:1.9 pkgsrc/net/p5-File-Rsync/Makefile:1.10
--- pkgsrc/net/p5-File-Rsync/Makefile:1.9       Sun Aug 11 13:22:14 2019
+++ pkgsrc/net/p5-File-Rsync/Makefile   Sun Nov  3 11:45:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/11 13:22:14 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:46 rillig Exp $
 
 DISTNAME=      File-Rsync-0.49
 PKGNAME=       p5-${DISTNAME}
@@ -24,10 +24,10 @@ SUBST_MESSAGE.fix-paths=    Fixing absolute
 SUBST_FILES.fix-paths=         Rsync.pm
 SUBST_VARS.fix-paths+=         PREFIX
 
-PERL5_MODULE_TYPE=      MakeMaker
-PERL5_PACKLIST=         auto/File/Rsync/.packlist
+PERL5_MODULE_TYPE=     MakeMaker
+PERL5_PACKLIST=                auto/File/Rsync/.packlist
 
-USE_LANGUAGES=          # none
+USE_LANGUAGES=         # none
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/p5-FusionInventory-Agent/Makefile
diff -u pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.14 pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.15
--- pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.14   Sun Aug 11 13:22:14 2019
+++ pkgsrc/net/p5-FusionInventory-Agent/Makefile        Sun Nov  3 11:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:22:14 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:47 rillig Exp $
 
 DISTNAME=      FusionInventory-Agent-2.3.21
 PKGNAME=       p5-${DISTNAME}
@@ -12,8 +12,8 @@ COMMENT=      Fusion Inventory agent
 LICENSE=       gnu-gpl-v2
 
 PKG_SYSCONFSUBDIR?=    fusioninventory
-EGDIR=         ${PREFIX}/share/examples/fusioninventory
-CONF_FILES+=   ${EGDIR}/agent.cfg ${PKG_SYSCONFDIR}/agent.cfg
+EGDIR=                 ${PREFIX}/share/examples/fusioninventory
+CONF_FILES+=           ${EGDIR}/agent.cfg ${PKG_SYSCONFDIR}/agent.cfg
 
 BUILD_DEFS+=   VARBASE
 
@@ -40,7 +40,7 @@ BUILD_DEPENDS+=       p5-Test-MockModule-[0-9]
 BUILD_DEPENDS+=        p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject
 BUILD_DEPENDS+=        p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
 
-PERL5_PACKLIST= auto/FusionInventory/Agent/.packlist
+PERL5_PACKLIST=        auto/FusionInventory/Agent/.packlist
 
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 

Index: pkgsrc/net/p5-Net-Amazon/Makefile
diff -u pkgsrc/net/p5-Net-Amazon/Makefile:1.22 pkgsrc/net/p5-Net-Amazon/Makefile:1.23
--- pkgsrc/net/p5-Net-Amazon/Makefile:1.22      Sun Aug 11 13:22:16 2019
+++ pkgsrc/net/p5-Net-Amazon/Makefile   Sun Nov  3 11:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/08/11 13:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 11:45:47 rillig Exp $
 
 DISTNAME=      Net-Amazon-0.62
 PKGNAME=       p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=     p5-XML-Simple>=2.08:../../text
 DEPENDS+=      p5-Log-Log4perl>=0.30:../../devel/p5-Log-Log4perl
 #DEPENDS+=     {perl>=5.007.003,p5-Time-HiRes>=1}:../../time/p5-Time-HiRes
 
-PERL5_PACKLIST= auto/Net/Amazon/.packlist
+PERL5_PACKLIST=        auto/Net/Amazon/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/p5-Net-Amazon-S3/Makefile
diff -u pkgsrc/net/p5-Net-Amazon-S3/Makefile:1.31 pkgsrc/net/p5-Net-Amazon-S3/Makefile:1.32
--- pkgsrc/net/p5-Net-Amazon-S3/Makefile:1.31   Sun Aug 11 13:22:16 2019
+++ pkgsrc/net/p5-Net-Amazon-S3/Makefile        Sun Nov  3 11:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/08/11 13:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 11:45:47 rillig Exp $
 
 DISTNAME=      Net-Amazon-S3-0.85
 PKGNAME=       p5-${DISTNAME}
@@ -40,9 +40,9 @@ TEST_DEPENDS+=        p5-Test-LoadAllModules-[0
 
 REPLACE_PERL=  bin/s3cl
 
-PERL5_PACKLIST= auto/Net/Amazon/S3/.packlist
+PERL5_PACKLIST=        auto/Net/Amazon/S3/.packlist
 
 post-install:
-               (cd ${DESTDIR}; ${FIND} . -name \*.pm \( -perm 0555  -or -perm 0755 \) -exec ${CHMOD} -x '{}' \; )
+       (cd ${DESTDIR}; ${FIND} . -name \*.pm \( -perm 0555  -or -perm 0755 \) -exec ${CHMOD} -x '{}' \; )
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/p5-Net-DHCP/Makefile
diff -u pkgsrc/net/p5-Net-DHCP/Makefile:1.15 pkgsrc/net/p5-Net-DHCP/Makefile:1.16
--- pkgsrc/net/p5-Net-DHCP/Makefile:1.15        Sun Aug 11 13:22:17 2019
+++ pkgsrc/net/p5-Net-DHCP/Makefile     Sun Nov  3 11:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:22:17 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:47 rillig Exp $
 #
 
 DISTNAME=      Net-DHCP-0.696
@@ -12,8 +12,8 @@ HOMEPAGE=     https://metacpan.org/release/N
 COMMENT=       Object methods to create a DHCP packet
 LICENSE=       ${PERL5_LICENSE}
 
-EGSUBDIR=       share/examples/p5-Net-DHCP
-INSTALLATION_DIRS+=     ${EGSUBDIR}
+EGSUBDIR=              share/examples/p5-Net-DHCP
+INSTALLATION_DIRS+=    ${EGSUBDIR}
 
 EGFILES=       examples/dhcp_sniffer.pl
 EGFILES+=      examples/dhcpd.pl
@@ -27,7 +27,7 @@ EGFILES+=     examples/send_packet.pl
 PERL5_REQD+=           5.8.0
 PERL5_MODULE_TYPE=     Module::Build
 
-REPLACE_PERL+= ${EGFILES}
+REPLACE_PERL+=                 ${EGFILES}
 # has /bin/false as shebang argument
 CHECK_INTERPRETER_SKIP+=       ${PERL5_SUB_INSTALLVENDORLIB}/Net/DHCP/Constants.pm
 CHECK_INTERPRETER_SKIP+=       ${PERL5_SUB_INSTALLVENDORLIB}/Net/DHCP/Packet.pm

Index: pkgsrc/net/p5-Net-GitHub/Makefile
diff -u pkgsrc/net/p5-Net-GitHub/Makefile:1.27 pkgsrc/net/p5-Net-GitHub/Makefile:1.28
--- pkgsrc/net/p5-Net-GitHub/Makefile:1.27      Sun Aug 11 13:22:19 2019
+++ pkgsrc/net/p5-Net-GitHub/Makefile   Sun Nov  3 11:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/08/11 13:22:19 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/03 11:45:47 rillig Exp $
 
 DISTNAME=      Net-GitHub-0.95
 PKGNAME=       p5-${DISTNAME}
@@ -19,8 +19,8 @@ DEPENDS+=     p5-Moo-[0-9]*:../../devel/p5-M
 DEPENDS+=      p5-Type-Tiny-[0-9]*:../../devel/p5-Type-Tiny
 DEPENDS+=      p5-JSON-MaybeXS-[0-9]*:../../converters/p5-JSON-MaybeXS
 DEPENDS+=      p5-URI-[0-9]*:../../www/p5-URI
-DEPENDS+=       p5-Cache-LRU-[0-9]*:../../devel/p5-Cache-LRU
-DEPENDS+=       p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+=      p5-Cache-LRU-[0-9]*:../../devel/p5-Cache-LRU
+DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/p5-Net-Jifty/Makefile
diff -u pkgsrc/net/p5-Net-Jifty/Makefile:1.24 pkgsrc/net/p5-Net-Jifty/Makefile:1.25
--- pkgsrc/net/p5-Net-Jifty/Makefile:1.24       Sun Aug 11 13:22:20 2019
+++ pkgsrc/net/p5-Net-Jifty/Makefile    Sun Nov  3 11:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:22:20 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 11:45:47 rillig Exp $
 
 DISTNAME=      Net-Jifty-0.14
 PKGNAME=       p5-${DISTNAME}
@@ -24,8 +24,8 @@ DEPENDS+=     p5-YAML-[0-9]*:../../textproc/
 DEPENDS+=      p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject
 DEPENDS+=      p5-DateTime-[0-9]*:../../time/p5-DateTime
 
-MAKE_ENV+=     PERL_USE_UNSAFE_INC=1
-PERL5_PACKLIST=        auto/Net/Jifty/.packlist
+MAKE_ENV+=             PERL_USE_UNSAFE_INC=1
+PERL5_PACKLIST=                auto/Net/Jifty/.packlist
 PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/net/p5-Net-Libdnet/Makefile
diff -u pkgsrc/net/p5-Net-Libdnet/Makefile:1.20 pkgsrc/net/p5-Net-Libdnet/Makefile:1.21
--- pkgsrc/net/p5-Net-Libdnet/Makefile:1.20     Sun Aug 11 13:22:21 2019
+++ pkgsrc/net/p5-Net-Libdnet/Makefile  Sun Nov  3 11:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:22:21 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:47 rillig Exp $
 #
 
 DISTNAME=      Net-Libdnet-0.99
@@ -16,7 +16,7 @@ LICENSE=      2-clause-bsd
 PERL5_PACKLIST=        auto/Net/Libdnet/.packlist
 USE_LANGUAGES+=        c
 
-DEPENDS+= p5-Class-Gomor-[0-9]*:../../devel/p5-Class-Gomor
+DEPENDS+=      p5-Class-Gomor-[0-9]*:../../devel/p5-Class-Gomor
 
 .include "../../net/libdnet/buildlink3.mk"
 .include "../../lang/perl5/module.mk"

Index: pkgsrc/net/p5-Net-OpenID-Common/Makefile
diff -u pkgsrc/net/p5-Net-OpenID-Common/Makefile:1.9 pkgsrc/net/p5-Net-OpenID-Common/Makefile:1.10
--- pkgsrc/net/p5-Net-OpenID-Common/Makefile:1.9        Sun Aug 11 13:22:21 2019
+++ pkgsrc/net/p5-Net-OpenID-Common/Makefile    Sun Nov  3 11:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/11 13:22:21 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:47 rillig Exp $
 
 DISTNAME=      Net-OpenID-Common-1.20
 PKGNAME=       p5-${DISTNAME}
@@ -15,8 +15,8 @@ DEPENDS+=     p5-Crypt-DH-GMP>=0.00011:../..
 
 REPLACE_PERL=  lib/Net/OpenID/URIFetch.pm
 
-PERL5_PACKLIST=         auto/Net/OpenID/Common/.packlist
-USE_LANGUAGES=          # none
+PERL5_PACKLIST=                auto/Net/OpenID/Common/.packlist
+USE_LANGUAGES=         # none
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/p5-Net-XMPP/Makefile
diff -u pkgsrc/net/p5-Net-XMPP/Makefile:1.15 pkgsrc/net/p5-Net-XMPP/Makefile:1.16
--- pkgsrc/net/p5-Net-XMPP/Makefile:1.15        Sun Aug 11 13:22:24 2019
+++ pkgsrc/net/p5-Net-XMPP/Makefile     Sun Nov  3 11:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:22:24 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:47 rillig Exp $
 #
 
 DISTNAME=      Net-XMPP-1.05
@@ -15,8 +15,8 @@ LICENSE=      gnu-lgpl-v2.1
 DEPENDS+=      p5-XML-Stream>=1.24:../../textproc/p5-XML-Stream
 DEPENDS+=      p5-Digest-SHA1>=1.02:../../security/p5-Digest-SHA1
 
-PERL5_MODULE_TYPE= Module::Build
-PERL5_PACKLIST=        auto/Net/XMPP/.packlist
+PERL5_MODULE_TYPE=     Module::Build
+PERL5_PACKLIST=                auto/Net/XMPP/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/p5-Net-Z3950-ZOOM/Makefile
diff -u pkgsrc/net/p5-Net-Z3950-ZOOM/Makefile:1.49 pkgsrc/net/p5-Net-Z3950-ZOOM/Makefile:1.50
--- pkgsrc/net/p5-Net-Z3950-ZOOM/Makefile:1.49  Sun Aug 11 13:22:24 2019
+++ pkgsrc/net/p5-Net-Z3950-ZOOM/Makefile       Sun Nov  3 11:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2019/08/11 13:22:24 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2019/11/03 11:45:48 rillig Exp $
 
 DISTNAME=              Net-Z3950-ZOOM-1.30
 PKGNAME=               p5-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=             https://metacpan.org/release/
 COMMENT=               Perl extension for talking to Z39.50 servers
 LICENSE=               ${PERL5_LICENSE}
 
-DEPENDS+=     p5-Event>=1.06:../../devel/p5-Event
-DEPENDS+=     p5-MARC-Record>=2.0.0:../../databases/p5-MARC-Record
+DEPENDS+=      p5-Event>=1.06:../../devel/p5-Event
+DEPENDS+=      p5-MARC-Record>=2.0.0:../../databases/p5-MARC-Record
 BUILDLINK_API_DEPENDS.yaz+=    yaz>=4
 
 PERL5_PACKLIST=        auto/Net/Z3950/ZOOM/.packlist

Index: pkgsrc/net/p5-NetAddr-IP/Makefile
diff -u pkgsrc/net/p5-NetAddr-IP/Makefile:1.44 pkgsrc/net/p5-NetAddr-IP/Makefile:1.45
--- pkgsrc/net/p5-NetAddr-IP/Makefile:1.44      Sun Aug 11 13:22:24 2019
+++ pkgsrc/net/p5-NetAddr-IP/Makefile   Sun Nov  3 11:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2019/08/11 13:22:24 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/03 11:45:48 rillig Exp $
 
 DISTNAME=      NetAddr-IP-4.079
 PKGNAME=       p5-${DISTNAME}
@@ -20,7 +20,7 @@ REPLACE_PERL+=        Lite/Util/Util.pm
 REPLACE_PERL+= Lite/Util/lib/NetAddr/IP/UtilPP.pm
 REPLACE_PERL+= Lite/Util/tlib/NetAddr/IP/Util_IS.pm
 
-SUBST_CLASSES+=        fixperl
+SUBST_CLASSES+=                fixperl
 SUBST_STAGE.fixperl=   pre-configure
 SUBST_MESSAGE.fixperl= Fixing perl interpreter
 SUBST_FILES.fixperl+=  Lite/Util/Makefile.PL

Index: pkgsrc/net/p5-WebService-Google-Reader/Makefile
diff -u pkgsrc/net/p5-WebService-Google-Reader/Makefile:1.17 pkgsrc/net/p5-WebService-Google-Reader/Makefile:1.18
--- pkgsrc/net/p5-WebService-Google-Reader/Makefile:1.17        Sun Aug 11 13:22:27 2019
+++ pkgsrc/net/p5-WebService-Google-Reader/Makefile     Sun Nov  3 11:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/11 13:22:27 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:48 rillig Exp $
 #
 
 DISTNAME=              WebService-Google-Reader-0.23
@@ -15,13 +15,13 @@ LICENSE=            ${PERL5_LICENSE}
 PERL5_PACKLIST=                auto/WebService/Google/Reader/.packlist
 
 #BUILD_DEPENDS+=       {perl>=5.10.1,p5-Test-Simple>=0.82}:../../devel/p5-Test-Simple
-DEPENDS+=      p5-JSON-XS>=2:../../converters/p5-JSON-XS
-DEPENDS+=      p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
-DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+=      p5-JSON-[0-9]*:../../converters/p5-JSON
-DEPENDS+=      p5-URI-[0-9]*:../../www/p5-URI
-DEPENDS+=      p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
-DEPENDS+=      p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
+DEPENDS+=              p5-JSON-XS>=2:../../converters/p5-JSON-XS
+DEPENDS+=              p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
+DEPENDS+=              p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+=              p5-JSON-[0-9]*:../../converters/p5-JSON
+DEPENDS+=              p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+=              p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
+DEPENDS+=              p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/p5-XML-RPC/Makefile
diff -u pkgsrc/net/p5-XML-RPC/Makefile:1.6 pkgsrc/net/p5-XML-RPC/Makefile:1.7
--- pkgsrc/net/p5-XML-RPC/Makefile:1.6  Sun Aug 11 13:22:27 2019
+++ pkgsrc/net/p5-XML-RPC/Makefile      Sun Nov  3 11:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/08/11 13:22:27 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:48 rillig Exp $
 
 DISTNAME=      XML-RPC-1.1
 PKGNAME=       p5-${DISTNAME}
@@ -13,8 +13,8 @@ LICENSE=      ${PERL5_LICENSE}
 
 DEPENDS+=      p5-XML-TreePP-[0-9]*:../../textproc/p5-XML-TreePP
 
-PERL5_PACKLIST= auto/XML/RPC/.packlist
-USE_LANGUAGES=  # none
+PERL5_PACKLIST=        auto/XML/RPC/.packlist
+USE_LANGUAGES= # none
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/p5-XMLRPC-Lite/Makefile
diff -u pkgsrc/net/p5-XMLRPC-Lite/Makefile:1.6 pkgsrc/net/p5-XMLRPC-Lite/Makefile:1.7
--- pkgsrc/net/p5-XMLRPC-Lite/Makefile:1.6      Sun Aug 11 13:22:28 2019
+++ pkgsrc/net/p5-XMLRPC-Lite/Makefile  Sun Nov  3 11:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/08/11 13:22:28 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:48 rillig Exp $
 
 DISTNAME=      XMLRPC-Lite-0.717
 PKGNAME=       p5-${DISTNAME}
@@ -9,13 +9,13 @@ MASTER_SITES= https://cpan.metacpan.org/
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://cpan.metacpan.org/authors/id/P/PH/PHRED/
 COMMENT=       Client and server implementation of XML-RPC protocol
-LICENSE=        ${PERL5_LICENSE}
+LICENSE=       ${PERL5_LICENSE}
 
 # for make test
 BUILD_DEPENDS+=        p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
 
-PERL5_PACKLIST= auto/XMLRPC-Lite/.packlist
-USE_LANGUAGES=  # none
+PERL5_PACKLIST=        auto/XMLRPC-Lite/.packlist
+USE_LANGUAGES= # none
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/pear-Net_LDAP2/Makefile
diff -u pkgsrc/net/pear-Net_LDAP2/Makefile:1.7 pkgsrc/net/pear-Net_LDAP2/Makefile:1.8
--- pkgsrc/net/pear-Net_LDAP2/Makefile:1.7      Tue Jul 19 14:19:34 2016
+++ pkgsrc/net/pear-Net_LDAP2/Makefile  Sun Nov  3 11:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/07/19 14:19:34 taca Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:48 rillig Exp $
 
 DISTNAME=      Net_LDAP2-2.2.0
 CATEGORIES+=   net
@@ -7,7 +7,7 @@ MAINTAINER=     wenheping%gmail.com@localhost
 COMMENT=       Object oriented interface for searching and manipulating LDAP-entries
 LICENSE=       gnu-lgpl-v3
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=5.2.12:../../databases/php-ldap
+DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=5.2.12:../../databases/php-ldap
 
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/pear-Net_LDAP3/Makefile
diff -u pkgsrc/net/pear-Net_LDAP3/Makefile:1.4 pkgsrc/net/pear-Net_LDAP3/Makefile:1.5
--- pkgsrc/net/pear-Net_LDAP3/Makefile:1.4      Mon Sep 12 16:09:52 2016
+++ pkgsrc/net/pear-Net_LDAP3/Makefile  Sun Nov  3 11:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/09/12 16:09:52 taca Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:48 rillig Exp $
 
 DISTNAME=      Net_LDAP3-1.0.5
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
@@ -9,7 +9,7 @@ COMMENT=        Object oriented interface for s
 HOMEPAGE=      https://git.kolab.org/project/profile/27/
 LICENSE=       gnu-lgpl-v3
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=5.2.12:../../databases/php-ldap
+DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=5.2.12:../../databases/php-ldap
 
 PEAR_PACKAGE_XML=      no
 

Index: pkgsrc/net/perlbal/Makefile
diff -u pkgsrc/net/perlbal/Makefile:1.13 pkgsrc/net/perlbal/Makefile:1.14
--- pkgsrc/net/perlbal/Makefile:1.13    Sun Aug 11 13:22:28 2019
+++ pkgsrc/net/perlbal/Makefile Sun Nov  3 11:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:22:28 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:48 rillig Exp $
 #
 
 DISTNAME=      Perlbal-1.80
@@ -6,16 +6,16 @@ PKGNAME=      p5-${DISTNAME}
 PKGREVISION=   7
 CATEGORIES=    net
 MASTER_SITES=  http://search.cpan.org/CPAN/authors/id/D/DO/DORMANDO/
-USE_TOOLS+= perl
+USE_TOOLS+=    perl
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://danga.com/perlbal/
 COMMENT=       Very configurable load balancer in perl
 LICENSE=       ${PERL5_LICENSE}
-REPLACE_PERL+= lib/Perlbal.pm
-REPLACE_PERL+= lib/Perlbal/*.pm
-REPLACE_PERL+= lib/Perlbal/Plugin/*.pm
-REPLACE_PERL+= lib/Perlbal/Test/*.pm
+REPLACE_PERL+= lib/Perlbal.pm
+REPLACE_PERL+= lib/Perlbal/*.pm
+REPLACE_PERL+= lib/Perlbal/Plugin/*.pm
+REPLACE_PERL+= lib/Perlbal/Test/*.pm
 
 DEPENDS+=      p5-IO-Socket-SSL>=0:../../security/p5-IO-Socket-SSL
 DEPENDS+=      p5-IO-AIO>=0:../../devel/p5-IO-AIO

Index: pkgsrc/net/php-sockets/Makefile
diff -u pkgsrc/net/php-sockets/Makefile:1.15 pkgsrc/net/php-sockets/Makefile:1.16
--- pkgsrc/net/php-sockets/Makefile:1.15        Thu Feb  1 13:37:09 2018
+++ pkgsrc/net/php-sockets/Makefile     Sun Nov  3 11:45:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/02/01 13:37:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:49 rillig Exp $
 
 MODNAME=               sockets
 CATEGORIES+=           net
@@ -14,7 +14,7 @@ CONFIGURE_ARGS.SunOS+=        ac_cv_func_if_ind
 
 .include "../../mk/compiler.mk"
 
-. if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*)
+.if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*)
 CFLAGS.SunOS+=         -D_XOPEN_SOURCE=600
 .else
 CFLAGS.SunOS+=         -D_XOPEN_SOURCE=500     # msghdr extensions

Index: pkgsrc/net/pim6sd/Makefile
diff -u pkgsrc/net/pim6sd/Makefile:1.23 pkgsrc/net/pim6sd/Makefile:1.24
--- pkgsrc/net/pim6sd/Makefile:1.23     Tue Sep 10 14:37:32 2013
+++ pkgsrc/net/pim6sd/Makefile  Sun Nov  3 11:45:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/09/10 14:37:32 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:49 rillig Exp $
 
 DISTNAME=      pim6sd-20031021a
 PKGREVISION=   1
@@ -11,8 +11,8 @@ COMMENT=      IPv6 PIM sparse mode daemon
 USE_BSD_MAKEFILE=      yes
 USE_FEATURES+=         inet6
 
-CWARNFLAGS.clang=-Wno-error=knr-promoted-parameter -Wno-error=pointer-sign
-MAKE_ENV+=     CWARNFLAGS.clang=${CWARNFLAGS.clang:Q}
+CWARNFLAGS.clang=      -Wno-error=knr-promoted-parameter -Wno-error=pointer-sign
+MAKE_ENV+=             CWARNFLAGS.clang=${CWARNFLAGS.clang:Q}
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/pim6sd/
 USE_TOOLS+=    lex yacc

Index: pkgsrc/net/portmap/Makefile
diff -u pkgsrc/net/portmap/Makefile:1.3 pkgsrc/net/portmap/Makefile:1.4
--- pkgsrc/net/portmap/Makefile:1.3     Tue Oct 23 17:18:59 2012
+++ pkgsrc/net/portmap/Makefile Sun Nov  3 11:45:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/23 17:18:59 asau Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:49 rillig Exp $
 
 DISTNAME=      portmap_4
 PKGNAME=       portmap-4
@@ -16,9 +16,9 @@ COMMENT=      RPC portmapper with access cont
 # XXX provides pmap_dump and pmap_set
 
 INSTALLATION_DIRS+=    sbin share/doc/portmap
-MAKE_FLAGS+=   WRAP_DIR=${BUILDLINK_PREFIX.tcp_wrappers}/lib
-NO_CONFIGURE=  yes
-RCD_SCRIPTS=   portmap
+MAKE_FLAGS+=           WRAP_DIR=${BUILDLINK_PREFIX.tcp_wrappers}/lib
+NO_CONFIGURE=          yes
+RCD_SCRIPTS=           portmap
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/portmap ${DESTDIR}${PREFIX}/sbin/

Index: pkgsrc/net/pptp/Makefile
diff -u pkgsrc/net/pptp/Makefile:1.18 pkgsrc/net/pptp/Makefile:1.19
--- pkgsrc/net/pptp/Makefile:1.18       Wed Jul  4 13:40:29 2018
+++ pkgsrc/net/pptp/Makefile    Sun Nov  3 11:45:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:49 rillig Exp $
 
 DISTNAME=      pptp-1.7.1
 PKGREVISION=   1
@@ -20,7 +20,7 @@ MAKE_FLAGS+=  PPPDIR=${PREFIX}/share/exam
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man8 share/examples/pptp
 INSTALLATION_DIRS+=    share/doc/pptp/Documentation share/doc/pptp/Reference
-DOCDIR=                ${PREFIX}/share/doc/pptp
+DOCDIR=                        ${PREFIX}/share/doc/pptp
 
 post-install:
        cd ${WRKSRC}/Documentation && ${INSTALL_DATA} * ${DESTDIR}${DOCDIR}/Documentation

Index: pkgsrc/net/proxytunnel/Makefile
diff -u pkgsrc/net/proxytunnel/Makefile:1.8 pkgsrc/net/proxytunnel/Makefile:1.9
--- pkgsrc/net/proxytunnel/Makefile:1.8 Wed Jul  4 13:40:30 2018
+++ pkgsrc/net/proxytunnel/Makefile     Sun Nov  3 11:45:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 11:45:49 rillig Exp $
 #
 
 DISTNAME=      proxytunnel-1.9.0
@@ -13,8 +13,8 @@ COMMENT=      Connect stdin/stdout to a remot
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=    gmake
-BUILD_TARGET=  proxytunnel
+USE_TOOLS+=            gmake
+BUILD_TARGET=          proxytunnel
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1 bin
 
 SUBST_CLASSES+=                        fix-paths

Index: pkgsrc/net/py-ORBit/Makefile
diff -u pkgsrc/net/py-ORBit/Makefile:1.56 pkgsrc/net/py-ORBit/Makefile:1.57
--- pkgsrc/net/py-ORBit/Makefile:1.56   Mon Sep  2 13:19:51 2019
+++ pkgsrc/net/py-ORBit/Makefile        Sun Nov  3 11:45:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2019/09/02 13:19:51 adam Exp $
+# $NetBSD: Makefile,v 1.57 2019/11/03 11:45:49 rillig Exp $
 
 DISTNAME=      pyorbit-2.24.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pyorbit/ORBit/}
@@ -12,18 +12,18 @@ HOMEPAGE=   https://www.gnome.org/
 COMMENT=       Python bindings for ORBit2
 LICENSE=       gnu-lgpl-v2.1
 
-PY_PATCHPLIST= YES
-USE_TOOLS+=    gmake pkg-config
-USE_LIBTOOL=   YES
+PY_PATCHPLIST=         YES
+USE_TOOLS+=            gmake pkg-config
+USE_LIBTOOL=           YES
 PKGCONFIG_OVERRIDE+=   pyorbit-2.pc.in
-GNU_CONFIGURE= YES
-CONFIGURE_ENV+=        PYTHON=${PYTHONBIN:Q}
+GNU_CONFIGURE=         YES
+CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
 
 PYTHON_SELF_CONFLICT=  YES
 
-BUILDLINK_API_DEPENDS.python26+= python26>=2.6.2nb4
+BUILDLINK_API_DEPENDS.python26+=       python26>=2.6.2nb4
 
-PYTHON_VERSIONS_ACCEPTED=       27 # dead upstream, no plans to port
+PYTHON_VERSIONS_ACCEPTED=      27 # dead upstream, no plans to port
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-std=c9x
 

Index: pkgsrc/net/py-beanstalkc/Makefile
diff -u pkgsrc/net/py-beanstalkc/Makefile:1.10 pkgsrc/net/py-beanstalkc/Makefile:1.11
--- pkgsrc/net/py-beanstalkc/Makefile:1.10      Mon Sep  2 13:19:51 2019
+++ pkgsrc/net/py-beanstalkc/Makefile   Sun Nov  3 11:45:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/02 13:19:51 adam Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:49 rillig Exp $
 
 DISTNAME=      beanstalkc-0.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=      apache-2.0
 USE_LANGUAGES= # none
 
 REPLACE_PYTHON+=               beanstalkc.py
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"

Index: pkgsrc/net/py-bonjour/Makefile
diff -u pkgsrc/net/py-bonjour/Makefile:1.5 pkgsrc/net/py-bonjour/Makefile:1.6
--- pkgsrc/net/py-bonjour/Makefile:1.5  Wed Feb 20 13:29:43 2019
+++ pkgsrc/net/py-bonjour/Makefile      Sun Nov  3 11:45:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/02/20 13:29:43 hauke Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/03 11:45:50 rillig Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-bonjour-${PKGVER}
 DISTNAME=      bonjour-py-${PKGVER}
@@ -24,11 +24,11 @@ PYTHON_VERSIONS_ACCEPTED=   27 # Uses old 
 REPLACE_PYTHON+=       examples/${ee}
 .endfor
 
-SUBST_CLASSES+=                 fix-paths
-SUBST_STAGE.fix-paths=          pre-configure
-SUBST_MESSAGE.fix-paths=        Fixing absolute paths.
-SUBST_FILES.fix-paths=          setup.py
-SUBST_SED.fix-paths=            -e 's,%PREFIX%,${PREFIX},g'
+SUBST_CLASSES+=                        fix-paths
+SUBST_STAGE.fix-paths=         pre-configure
+SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
+SUBST_FILES.fix-paths=         setup.py
+SUBST_SED.fix-paths=           -e 's,%PREFIX%,${PREFIX},g'
 
 PLIST_SUBST+=  EGDIR=${EGDIR}
 PLIST_SUBST+=  DOCDIR=${DOCDIR}

Index: pkgsrc/net/py-caldav/Makefile
diff -u pkgsrc/net/py-caldav/Makefile:1.16 pkgsrc/net/py-caldav/Makefile:1.17
--- pkgsrc/net/py-caldav/Makefile:1.16  Mon Sep  2 13:19:50 2019
+++ pkgsrc/net/py-caldav/Makefile       Sun Nov  3 11:45:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/09/02 13:19:50 adam Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:50 rillig Exp $
 
 DISTNAME=      caldav-0.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=     ${PYPKGPREFIX}-vobject-[0-9]*:
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 0.2.1
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.2.1
 
 REPLACE_PYTHON+=       caldav/__init__.py caldav/davclient.py
 REPLACE_PYTHON+=       caldav/elements/__init__.py caldav/elements/base.py

Index: pkgsrc/net/py-dropbox/Makefile
diff -u pkgsrc/net/py-dropbox/Makefile:1.6 pkgsrc/net/py-dropbox/Makefile:1.7
--- pkgsrc/net/py-dropbox/Makefile:1.6  Thu Dec 27 15:04:42 2018
+++ pkgsrc/net/py-dropbox/Makefile      Sun Nov  3 11:45:50 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2018/12/27 15:04:42 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:50 rillig Exp $
 
 DISTNAME=      dropbox-python-sdk-2.2.0
 PKGNAME=       ${PYPKGPREFIX}-dropbox-2.2.0
 PKGREVISION=   1
 CATEGORIES=    net
-MASTER_SITES=   https://www.dropbox.com/developers/downloads/sdks/core/python/
+MASTER_SITES=  https://www.dropbox.com/developers/downloads/sdks/core/python/
 EXTRACT_SUFX=  .zip
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/net/py-foolscap/Makefile
diff -u pkgsrc/net/py-foolscap/Makefile:1.33 pkgsrc/net/py-foolscap/Makefile:1.34
--- pkgsrc/net/py-foolscap/Makefile:1.33        Mon Sep  2 13:19:51 2019
+++ pkgsrc/net/py-foolscap/Makefile     Sun Nov  3 11:45:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/09/02 13:19:51 adam Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/03 11:45:50 rillig Exp $
 
 DISTNAME=      foolscap-0.13.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=     ${PYPKGPREFIX}-OpenSSL>=0.6:..
 DEPENDS+=      ${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface
 DEPENDS+=      ${PYPKGPREFIX}-twisted>=16.0:../../net/py-twisted
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 0.12.7
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.12.7
 
 TEST_TARGET=   test
 

Index: pkgsrc/net/py-google/Makefile
diff -u pkgsrc/net/py-google/Makefile:1.40 pkgsrc/net/py-google/Makefile:1.41
--- pkgsrc/net/py-google/Makefile:1.40  Mon Sep  2 13:19:52 2019
+++ pkgsrc/net/py-google/Makefile       Sun Nov  3 11:45:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2019/09/02 13:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.41 2019/11/03 11:45:50 rillig Exp $
 
 DISTNAME=      pygoogle-0.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -14,7 +14,7 @@ DEPENDS+=     ${PYPKGPREFIX}-SOAPpy-[0-9]*:.
 
 EGG_NAME=      pygoogle-0.5
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-xml via py-soappy
+PYTHON_VERSIONS_ACCEPTED=      27 # py-xml via py-soappy
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-irclib/Makefile
diff -u pkgsrc/net/py-irclib/Makefile:1.13 pkgsrc/net/py-irclib/Makefile:1.14
--- pkgsrc/net/py-irclib/Makefile:1.13  Wed Jun  8 17:43:36 2016
+++ pkgsrc/net/py-irclib/Makefile       Sun Nov  3 11:45:50 2019
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:36 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:50 rillig Exp $
 #
 
-PYIRCVERS=     11.1.1
-DISTNAME=      irc-${PYIRCVERS}
-PKGNAME=       ${PYPKGPREFIX}-irclib-${PYIRCVERS}
-CATEGORIES=    net python
-MASTER_SITES=  ${MASTER_SITE_PYPI:=i/irc/}
-EXTRACT_SUFX=  .zip
-EXTRACT_OPTS_ZIP=-aa -q -o
+PYIRCVERS=             11.1.1
+DISTNAME=              irc-${PYIRCVERS}
+PKGNAME=               ${PYPKGPREFIX}-irclib-${PYIRCVERS}
+CATEGORIES=            net python
+MASTER_SITES=          ${MASTER_SITE_PYPI:=i/irc/}
+EXTRACT_SUFX=          .zip
+EXTRACT_OPTS_ZIP=      -aa -q -o
 
 MAINTAINER=    imil%NetBSD.org@localhost
 HOMEPAGE=      http://python-irclib.sourceforge.net/

Index: pkgsrc/net/py-medusa/Makefile
diff -u pkgsrc/net/py-medusa/Makefile:1.13 pkgsrc/net/py-medusa/Makefile:1.14
--- pkgsrc/net/py-medusa/Makefile:1.13  Mon Sep  2 13:19:51 2019
+++ pkgsrc/net/py-medusa/Makefile       Sun Nov  3 11:45:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/09/02 13:19:51 adam Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:50 rillig Exp $
 
 DISTNAME=      medusa-0.5.4
 PKGREVISION=   1
@@ -12,7 +12,7 @@ COMMENT=      Framework for writing asynchron
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-netsnmp/Makefile
diff -u pkgsrc/net/py-netsnmp/Makefile:1.8 pkgsrc/net/py-netsnmp/Makefile:1.9
--- pkgsrc/net/py-netsnmp/Makefile:1.8  Mon Sep  2 13:19:48 2019
+++ pkgsrc/net/py-netsnmp/Makefile      Sun Nov  3 11:45:50 2019
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2019/09/02 13:19:48 adam Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 11:45:50 rillig Exp $
 
 .include "../../net/net-snmp/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/net-snmp/netsnmp/}
-CATEGORIES=     net python
+CATEGORIES=    net python
 
-MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
-COMMENT=        Python bindings to extensible SNMP implementation
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+COMMENT=       Python bindings to extensible SNMP implementation
 
-PYTHON_VERSIONS_ACCEPTED=    27
+PYTHON_VERSIONS_ACCEPTED=      27
 
-USE_LANGUAGES=         c
+USE_LANGUAGES=         c
 EGG_NAME=              netsnmp_python-1.0a1
 PYSETUPSUBDIR=         python
 

Index: pkgsrc/net/py-nyx/Makefile
diff -u pkgsrc/net/py-nyx/Makefile:1.1 pkgsrc/net/py-nyx/Makefile:1.2
--- pkgsrc/net/py-nyx/Makefile:1.1      Tue Oct 23 01:42:34 2018
+++ pkgsrc/net/py-nyx/Makefile  Sun Nov  3 11:45:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/10/23 01:42:34 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:51 rillig Exp $
 
 .include "../../net/py-nyx/Makefile.common"
 
@@ -16,9 +16,9 @@ USE_LANGUAGES=        # none
 
 DEPENDS+=      ${PYPKGPREFIX}-stem>=1.7.0:../../devel/py-stem
 
-REPLACE_PYTHON+=run_nyx
-REPLACE_PYTHON+=run_tests.py
-REPLACE_PYTHON+=setup.py
+REPLACE_PYTHON+=       run_nyx
+REPLACE_PYTHON+=       run_tests.py
+REPLACE_PYTHON+=       setup.py
 
 do-test:
        cd ${WRKSRC} && ./run_tests.py

Index: pkgsrc/net/py-omniORBpy/Makefile
diff -u pkgsrc/net/py-omniORBpy/Makefile:1.16 pkgsrc/net/py-omniORBpy/Makefile:1.17
--- pkgsrc/net/py-omniORBpy/Makefile:1.16       Mon Sep  2 13:19:51 2019
+++ pkgsrc/net/py-omniORBpy/Makefile    Sun Nov  3 11:45:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/09/02 13:19:51 adam Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:51 rillig Exp $
 
 DISTNAME=      omniORBpy-3.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,8 +17,8 @@ USE_TOOLS+=   gmake
 USE_LANGUAGES+=        c c++
 MAKE_FILE=     GNUmakefile
 
-PYTHON_SELF_CONFLICT=  yes
-PYTHON_VERSIONS_ACCEPTED=       27 # omniORB
+PYTHON_SELF_CONFLICT=          yes
+PYTHON_VERSIONS_ACCEPTED=      27 # omniORB
 
 .include "../../lang/python/application.mk"
 .include "../../net/omniORB/buildlink3.mk"

Index: pkgsrc/net/py-omniORBpy/hacks.mk
diff -u pkgsrc/net/py-omniORBpy/hacks.mk:1.2 pkgsrc/net/py-omniORBpy/hacks.mk:1.3
--- pkgsrc/net/py-omniORBpy/hacks.mk:1.2        Mon Apr  8 11:17:18 2013
+++ pkgsrc/net/py-omniORBpy/hacks.mk    Sun Nov  3 11:45:51 2019
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.2 2013/04/08 11:17:18 rodent Exp $
+# $NetBSD: hacks.mk,v 1.3 2019/11/03 11:45:51 rillig Exp $
 .if !defined(HACKS_MK)
-HACKS_MK= defined
+HACKS_MK=      defined
 
 ### [ Tue Feb 28 17:44:28 NZDT 2012 : sbd ]
 ### The omniORB package install files into ${PYSITELIB}/omniidl_be,
@@ -9,13 +9,13 @@ HACKS_MK= defined
 ### So if this package is being built with the same PYTHON_VERSION_DEFAULT as
 ### omniORB was simply don't install the __int__.py{,c} files.
 ###
-PKG_HACKS+=    omniidl_be_init
-PLIST_VARS+=    omniidl_be_init
+PKG_HACKS+=                    omniidl_be_init
+PLIST_VARS+=                   omniidl_be_init
 .if defined(_PKGSRC_BARRIER)
 omniORB_PYTHON_VERSION!=       ${PKG_INFO} -Q PYTHON_VERSION_DEFAULT omniORB
 .  if "${omniORB_PYTHON_VERSION}" != "${PYTHON_VERSION_DEFAULT}"
-PLIST.omniidl_be_init=  yes
-INSTALL_ENV+=   INSTALL_OMNIIDL_BE_INIT=yes
+PLIST.omniidl_be_init=         yes
+INSTALL_ENV+=                  INSTALL_OMNIIDL_BE_INIT=yes
 .  endif
 .endif
 

Index: pkgsrc/net/py-pcap/Makefile
diff -u pkgsrc/net/py-pcap/Makefile:1.15 pkgsrc/net/py-pcap/Makefile:1.16
--- pkgsrc/net/py-pcap/Makefile:1.15    Mon Sep  2 13:19:51 2019
+++ pkgsrc/net/py-pcap/Makefile Sun Nov  3 11:45:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/09/02 13:19:51 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:51 rillig Exp $
 
 DISTNAME=      pypcap-1.1
 PKGNAME=       ${PYPKGPREFIX}-pcap-1.1
@@ -24,7 +24,7 @@ SUBST_VARS.prefix=    PREFIX
 SUBST_STAGE.prefix=    pre-configure
 
 PYDISTUTILSPKG=                        yes
-PYTHON_VERSIONS_ACCEPTED=       27 # py-pyrex
+PYTHON_VERSIONS_ACCEPTED=      27 # py-pyrex
 
 FILES_SUBST+=  PYTHONBIN=${PYTHONBIN:Q}
 

Index: pkgsrc/net/py-s3cmd/Makefile
diff -u pkgsrc/net/py-s3cmd/Makefile:1.20 pkgsrc/net/py-s3cmd/Makefile:1.21
--- pkgsrc/net/py-s3cmd/Makefile:1.20   Mon Sep  2 13:19:49 2019
+++ pkgsrc/net/py-s3cmd/Makefile        Sun Nov  3 11:45:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:49 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:51 rillig Exp $
 
 DISTNAME=      s3cmd-1.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE=      gnu-gpl-v2
 PYDISTUTILSPKG=                yes
 MAKE_ENV+=             S3CMD_INSTPATH_MAN=${PKGMANDIR}
 
-PYTHON_SELF_CONFLICT=  yes
+PYTHON_SELF_CONFLICT=          yes
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 1.0.1
 
 .include "../../lang/python/pyversion.mk"

Index: pkgsrc/net/py-sbws/Makefile
diff -u pkgsrc/net/py-sbws/Makefile:1.1 pkgsrc/net/py-sbws/Makefile:1.2
--- pkgsrc/net/py-sbws/Makefile:1.1     Tue Oct 23 01:42:35 2018
+++ pkgsrc/net/py-sbws/Makefile Sun Nov  3 11:45:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/10/23 01:42:35 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:51 rillig Exp $
 
 DISTNAME=      sbws-0.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -34,11 +34,11 @@ REPLACE_BASH+=      tests/testnets/simple.com
 REPLACE_BASH+= tests/testnets/simple.common/02-start-network.sh
 REPLACE_BASH+= tests/testnets/simple.common/04-stop-network.sh
 
-REPLACE_PYTHON+=scripts/tools/get-per-relay-budget.py
-REPLACE_PYTHON+=scripts/tools/sbws-http-server.py
-REPLACE_PYTHON+=scripts/tools/scale-v3bw-with-budget.py
-REPLACE_PYTHON+=setup.py
-REPLACE_PYTHON+=tests/testnets/simple.common/03-network-in-ready-state.py
+REPLACE_PYTHON+=       scripts/tools/get-per-relay-budget.py
+REPLACE_PYTHON+=       scripts/tools/sbws-http-server.py
+REPLACE_PYTHON+=       scripts/tools/scale-v3bw-with-budget.py
+REPLACE_PYTHON+=       setup.py
+REPLACE_PYTHON+=       tests/testnets/simple.common/03-network-in-ready-state.py
 
 # XXX Should run the integration tests too, but it's a bit more
 # involved.

Index: pkgsrc/net/py-txamqp/Makefile
diff -u pkgsrc/net/py-txamqp/Makefile:1.8 pkgsrc/net/py-txamqp/Makefile:1.9
--- pkgsrc/net/py-txamqp/Makefile:1.8   Mon Sep  2 13:19:50 2019
+++ pkgsrc/net/py-txamqp/Makefile       Sun Nov  3 11:45:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/09/02 13:19:50 adam Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 11:45:51 rillig Exp $
 
 DISTNAME=      python-txamqp_0.3.orig
 PKGNAME=       ${PYPKGPREFIX}-txamqp-0.3
@@ -12,7 +12,7 @@ LICENSE=      apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 0.3
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.3
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/net/pygopherd/Makefile
diff -u pkgsrc/net/pygopherd/Makefile:1.36 pkgsrc/net/pygopherd/Makefile:1.37
--- pkgsrc/net/pygopherd/Makefile:1.36  Mon Sep  2 13:19:51 2019
+++ pkgsrc/net/pygopherd/Makefile       Sun Nov  3 11:45:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/09/02 13:19:51 adam Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/03 11:45:51 rillig Exp $
 
 DISTNAME=      pygopherd_2.0.16
 PKGREVISION=   5
@@ -12,8 +12,8 @@ COMMENT=      Gopher server
 LICENSE=       gnu-gpl-v2
 
 PKG_SYSCONFSUBDIR=     pygopherd
-EXAMPLEDIR=    ${PREFIX}/share/examples/pygopherd
-RUNTIMEDIR=    ${VARBASE}/gopher
+EXAMPLEDIR=            ${PREFIX}/share/examples/pygopherd
+RUNTIMEDIR=            ${VARBASE}/gopher
 
 BUILD_DEFS+=   VARBASE
 
@@ -34,12 +34,12 @@ FILES_SUBST+=       RUNTIMEDIR=${RUNTIMEDIR:Q}
 FILES_SUBST+=  PYTHONBIN=${PYTHONBIN:Q}
 
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 2.0.16
-REPLACE_PYTHON=        bin/pygopherd
-REPLACE_PYTHON+=       pygopherd/GopherExceptionsTest.py
-REPLACE_PYTHON+=       pygopherd/fileextTest.py
-REPLACE_PYTHON+=       pygopherd/gopherentryTest.py
-REPLACE_PYTHON+=       pygopherd/initializationTest.py
-REPLACE_PYTHON+=       pygopherd/testutil.py
+REPLACE_PYTHON=                        bin/pygopherd
+REPLACE_PYTHON+=               pygopherd/GopherExceptionsTest.py
+REPLACE_PYTHON+=               pygopherd/fileextTest.py
+REPLACE_PYTHON+=               pygopherd/gopherentryTest.py
+REPLACE_PYTHON+=               pygopherd/initializationTest.py
+REPLACE_PYTHON+=               pygopherd/testutil.py
 
 SUBST_CLASSES+=                man
 SUBST_STAGE.man=       pre-configure

Index: pkgsrc/net/radiusclient-ng/Makefile
diff -u pkgsrc/net/radiusclient-ng/Makefile:1.6 pkgsrc/net/radiusclient-ng/Makefile:1.7
--- pkgsrc/net/radiusclient-ng/Makefile:1.6     Mon Sep  4 18:00:58 2017
+++ pkgsrc/net/radiusclient-ng/Makefile Sun Nov  3 11:45:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/09/04 18:00:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:51 rillig Exp $
 
 DISTNAME=      radiusclient-ng-0.5.5.1
 CATEGORIES=    net
@@ -16,12 +16,12 @@ USE_LIBTOOL=                YES
 PKG_SYSCONFSUBDIR=     radiusclient-ng
 EGDIR=                 ${PREFIX}/share/examples/radiusclient-ng
 
-CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 
-EGFILES= issue port-id-map radiusclient.conf  dictionary dictionary.ascend \
-       dictionary.compat dictionary.merit  dictionary.sip
+EGFILES=       issue port-id-map radiusclient.conf  dictionary dictionary.ascend \
+               dictionary.compat dictionary.merit  dictionary.sip
 .for f in ${EGFILES}
-CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+=   ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/radiusd-cistron/Makefile
diff -u pkgsrc/net/radiusd-cistron/Makefile:1.34 pkgsrc/net/radiusd-cistron/Makefile:1.35
--- pkgsrc/net/radiusd-cistron/Makefile:1.34    Sun Aug 11 13:22:29 2019
+++ pkgsrc/net/radiusd-cistron/Makefile Sun Nov  3 11:45:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/08/11 13:22:29 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/03 11:45:51 rillig Exp $
 
 DISTNAME=      radiusd-cistron-1.6.8
 PKGREVISION=   7
@@ -15,9 +15,9 @@ USE_TOOLS+=   perl:run
 
 REPLACE_PERL=  src/checkrad.pl
 
-MAKE_FILE=     Makefile.BSD
-BUILD_DIRS=    src
-INSTALL_DIRS=  src
+MAKE_FILE=             Makefile.BSD
+BUILD_DIRS=            src
+INSTALL_DIRS=          src
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
                        ${PKGMANDIR}/man8 sbin share/examples/raddb \
                        share/doc/radiusd-cistron
@@ -27,7 +27,7 @@ RCD_SCRIPTS=  radiusd
 OWN_DIRS_PERMS=        /var/log/radacct ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
 
 PKG_SYSCONFSUBDIR=     raddb
-EGDIR=         ${PREFIX}/share/examples/raddb
+EGDIR=                 ${PREFIX}/share/examples/raddb
 CONF_FILES=
 .for cfile in  clients.sample dictionary dictionary.ascend dictionary.bay \
                dictionary.cisco dictionary.cistron dictionary.compat \
@@ -35,7 +35,7 @@ CONF_FILES=
                dictionary.shiva dictionary.tunnel dictionary.usr \
                dictionary.versanet hints.sample huntgroups.sample \
                naslist.sample naspasswd.sample realms.sample users.sample
-CONF_FILES+=   ${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//}
+CONF_FILES+=           ${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//}
 .endfor
 
 post-install:

Index: pkgsrc/net/radsecproxy/Makefile
diff -u pkgsrc/net/radsecproxy/Makefile:1.7 pkgsrc/net/radsecproxy/Makefile:1.8
--- pkgsrc/net/radsecproxy/Makefile:1.7 Tue Oct  1 16:38:08 2019
+++ pkgsrc/net/radsecproxy/Makefile     Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/10/01 16:38:08 he Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:52 rillig Exp $
 
 VERSION=       1.8.1
 DISTNAME=      radsecproxy-${VERSION}
@@ -13,7 +13,7 @@ LICENSE=      modified-bsd
 
 USE_TOOLS+=    gmake
 
-GNU_CONFIGURE= YES
+GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
 

Index: pkgsrc/net/rdist6/Makefile
diff -u pkgsrc/net/rdist6/Makefile:1.25 pkgsrc/net/rdist6/Makefile:1.26
--- pkgsrc/net/rdist6/Makefile:1.25     Sat Dec 15 21:40:33 2012
+++ pkgsrc/net/rdist6/Makefile  Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/12/15 21:40:33 markd Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 11:45:52 rillig Exp $
 #
 
 DISTNAME=      freerdist-0.94
@@ -14,8 +14,8 @@ USE_TOOLS+=   byacc
 RDIST6_NAME=   rdist6
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
-INSTALL_TARGET=        install install.man
-MAKE_ENV+=     RDIST6_NAME=${RDIST6_NAME:Q}
+INSTALL_TARGET=                install install.man
+MAKE_ENV+=             RDIST6_NAME=${RDIST6_NAME:Q}
 
 CONFLICTS=     rdist6-[0-9]*
 

Index: pkgsrc/net/rp-l2tp/Makefile
diff -u pkgsrc/net/rp-l2tp/Makefile:1.13 pkgsrc/net/rp-l2tp/Makefile:1.14
--- pkgsrc/net/rp-l2tp/Makefile:1.13    Mon Sep  4 18:08:26 2017
+++ pkgsrc/net/rp-l2tp/Makefile Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/09/04 18:08:26 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:52 rillig Exp $
 #
 
 DISTNAME=      rp-l2tp-0.3
@@ -12,7 +12,7 @@ COMMENT=      User-space implementation of la
 
 NOT_FOR_PLATFORM+=     Interix-*-* # no userland protocol stack support
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 USE_TOOLS+=            gmake
 

Index: pkgsrc/net/ruby-soap4r/Makefile
diff -u pkgsrc/net/ruby-soap4r/Makefile:1.6 pkgsrc/net/ruby-soap4r/Makefile:1.7
--- pkgsrc/net/ruby-soap4r/Makefile:1.6 Mon Jun  8 15:13:02 2015
+++ pkgsrc/net/ruby-soap4r/Makefile     Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/06/08 15:13:02 taca Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:52 rillig Exp $
 
 DISTNAME=      soap4r-ruby1.9-2.0.5
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby1.9//}
@@ -13,7 +13,7 @@ LICENSE=      gnu-gpl-v2 OR ruby-license
 USE_LANGUAGES= # none
 
 RUBYGEM_OPTIONS+=      --format-executable
-OVERRIDE_GEMSPEC= \
+OVERRIDE_GEMSPEC=      \
        :files lib/soap/rpc/element.rb.orig= lib/xsd/xmlparser.rb.orig=
 
 .include "../../lang/ruby/gem.mk"

Index: pkgsrc/net/ruby-stompserver/Makefile
diff -u pkgsrc/net/ruby-stompserver/Makefile:1.10 pkgsrc/net/ruby-stompserver/Makefile:1.11
--- pkgsrc/net/ruby-stompserver/Makefile:1.10   Thu May 23 19:23:11 2019
+++ pkgsrc/net/ruby-stompserver/Makefile        Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/05/23 19:23:11 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:52 rillig Exp $
 
 DISTNAME=      drizztbsd-stompserver-1c7a275
 PKGNAME=       ${RUBY_PKGPREFIX}-stompserver-1.0.0
@@ -41,11 +41,11 @@ STOMPSERVER_GROUP?= stompserver
 PKG_USERS_VARS+=       STOMPSERVER_USER
 PKG_GROUPS_VARS+=      STOMPSERVER_GROUP
 
-PKG_USERS=     ${STOMPSERVER_USER}:${STOMPSERVER_GROUP}
-PKG_GROUPS=    ${STOMPSERVER_GROUP}
-PKG_GECOS.${STOMPSERVER_USER}=stompserver server user
-PKG_HOME.${STOMPSERVER_USER}=${STOMPSERVER_WRKDIR}
-PKG_SHELL.${STOMPSERVER_USER}=${NOLOGIN}
+PKG_USERS=                     ${STOMPSERVER_USER}:${STOMPSERVER_GROUP}
+PKG_GROUPS=                    ${STOMPSERVER_GROUP}
+PKG_GECOS.${STOMPSERVER_USER}= stompserver server user
+PKG_HOME.${STOMPSERVER_USER}=  ${STOMPSERVER_WRKDIR}
+PKG_SHELL.${STOMPSERVER_USER}= ${NOLOGIN}
 
 EGDIR=         ${PREFIX}/share/examples/stompserver
 

Index: pkgsrc/net/samba/Makefile
diff -u pkgsrc/net/samba/Makefile:1.276 pkgsrc/net/samba/Makefile:1.277
--- pkgsrc/net/samba/Makefile:1.276     Sun Aug 11 13:22:29 2019
+++ pkgsrc/net/samba/Makefile   Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.276 2019/08/11 13:22:29 wiz Exp $
+# $NetBSD: Makefile,v 1.277 2019/11/03 11:45:52 rillig Exp $
 
 DISTNAME=      samba-${VERSION}
 CATEGORIES=    net
@@ -52,26 +52,26 @@ FILES_SUBST+=               WINBINDD_RCD_SCRIPT=${WIN
 USE_TOOLS+=            gmake mktemp perl:run pkg-config
 REPLACE_PERL=          script/findsmb.in
 
-BROKEN_GETTEXT_DETECTION=yes
-GNU_CONFIGURE=         yes
-GNU_CONFIGURE_LIBDIR=  ${SAMBA_LIBDIR}
-CONFIGURE_ARGS+=       --with-libiconv=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
-CONFIGURE_ARGS+=       --with-configdir=${SAMBA_ETCDIR}
-CONFIGURE_ARGS+=       --with-lockdir=${SAMBA_LOCKDIR}
-CONFIGURE_ARGS+=       --with-logfilebase=${SAMBA_LOGDIR}
-CONFIGURE_ARGS+=       --with-modulesdir=${SAMBA_MODULESDIR}
-CONFIGURE_ARGS+=       --with-piddir=${SAMBA_PIDDIR}
-CONFIGURE_ARGS+=       --with-privatedir=${SAMBA_PRIVATE:Q}
-CONFIGURE_ARGS+=       --with-statedir=${SAMBA_STATEDIR}
-CONFIGURE_ARGS+=       --localstatedir=${SAMBA_VARDIR}
-CONFIGURE_ARGS+=       --with-mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+=       --with-swatdir=${PREFIX}/share/samba/swat
-CONFIGURE_ARGS+=       --enable-external-libtdb
+BROKEN_GETTEXT_DETECTION=      yes
+GNU_CONFIGURE=                 yes
+GNU_CONFIGURE_LIBDIR=          ${SAMBA_LIBDIR}
+CONFIGURE_ARGS+=               --with-libiconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=               --with-readline=${BUILDLINK_PREFIX.readline}
+CONFIGURE_ARGS+=               --with-configdir=${SAMBA_ETCDIR}
+CONFIGURE_ARGS+=               --with-lockdir=${SAMBA_LOCKDIR}
+CONFIGURE_ARGS+=               --with-logfilebase=${SAMBA_LOGDIR}
+CONFIGURE_ARGS+=               --with-modulesdir=${SAMBA_MODULESDIR}
+CONFIGURE_ARGS+=               --with-piddir=${SAMBA_PIDDIR}
+CONFIGURE_ARGS+=               --with-privatedir=${SAMBA_PRIVATE:Q}
+CONFIGURE_ARGS+=               --with-statedir=${SAMBA_STATEDIR}
+CONFIGURE_ARGS+=               --localstatedir=${SAMBA_VARDIR}
+CONFIGURE_ARGS+=               --with-mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=               --with-swatdir=${PREFIX}/share/samba/swat
+CONFIGURE_ARGS+=               --enable-external-libtdb
 #
 # Explicitly disable samba4 merged-build option which is broken.
 #
-CONFIGURE_ARGS+=       --enable-merged-build=no
+CONFIGURE_ARGS+=               --enable-merged-build=no
 
 .include "../../net/samba/options.mk"
 

Index: pkgsrc/net/samba/options.mk
diff -u pkgsrc/net/samba/options.mk:1.39 pkgsrc/net/samba/options.mk:1.40
--- pkgsrc/net/samba/options.mk:1.39    Tue Jan 16 07:48:47 2018
+++ pkgsrc/net/samba/options.mk Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.39 2018/01/16 07:48:47 maya Exp $
+# $NetBSD: options.mk,v 1.40 2019/11/03 11:45:52 rillig Exp $
 
 # Recommended package options for various setups:
 #
@@ -154,10 +154,10 @@ NSS_WINBIND_cmd=  \
 # Install a /usr/lib/${NSS_WINBIND:T} -> ${PREFIX}/${NSS_WINBIND} symlink
 # Unfortunately NSS_WINDIND_cmd can not be used to determine whether the
 # (de)install templates are needed or not.
-.if ${OS_VARIANT} != "SmartOS"
+.  if ${OS_VARIANT} != "SmartOS"
 INSTALL_TEMPLATES+=    INSTALL.nss_winbind
 DEINSTALL_TEMPLATES+=  DEINSTALL.nss_winbind
-.endif
+.  endif
 
 .PHONY: samba-nss-winbind-install
 post-install: samba-nss-winbind-install

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.81 pkgsrc/net/samba4/Makefile:1.82
--- pkgsrc/net/samba4/Makefile:1.81     Mon Sep  9 00:33:05 2019
+++ pkgsrc/net/samba4/Makefile  Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2019/09/09 00:33:05 taca Exp $
+# $NetBSD: Makefile,v 1.82 2019/11/03 11:45:52 rillig Exp $
 
 DISTNAME=      samba-4.10.8
 PKGREVISION=   1
@@ -58,7 +58,7 @@ FILES_SUBST+=         SMB_PID=${SMB_PID}
 USE_TOOLS+=            gmake mktemp perl:run pkg-config
 
 USE_GNU_ICONV=         yes     # FIXME: something doesn't work on NetBSD
-BROKEN_GETTEXT_DETECTION=yes
+BROKEN_GETTEXT_DETECTION= yes
 
 # Debugging
 #CONFIGURE_ARGS+=      -vvv

Index: pkgsrc/net/scapy/Makefile
diff -u pkgsrc/net/scapy/Makefile:1.28 pkgsrc/net/scapy/Makefile:1.29
--- pkgsrc/net/scapy/Makefile:1.28      Mon Sep  2 13:19:50 2019
+++ pkgsrc/net/scapy/Makefile   Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/09/02 13:19:50 adam Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/03 11:45:52 rillig Exp $
 
 DISTNAME=      scapy-2.3.2
 PKGREVISION=   1
@@ -17,7 +17,7 @@ DEPENDS+=     ${PYPKGPREFIX}-readline-[0-9]*
 
 NO_BUILD=      yes
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-libpcap, py-libdnet
+PYTHON_VERSIONS_ACCEPTED=      27 # py-libpcap, py-libdnet
 
 INSTALLATION_DIRS+=    share/examples/scapy
 

Index: pkgsrc/net/scapy/options.mk
diff -u pkgsrc/net/scapy/options.mk:1.10 pkgsrc/net/scapy/options.mk:1.11
--- pkgsrc/net/scapy/options.mk:1.10    Mon Sep  2 13:19:50 2019
+++ pkgsrc/net/scapy/options.mk Sun Nov  3 11:45:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2019/09/02 13:19:50 adam Exp $
+# $NetBSD: options.mk,v 1.11 2019/11/03 11:45:52 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.scapy
 
@@ -18,7 +18,7 @@ DEPENDS+=     ${PYPKGPREFIX}-amkCrypto-[0-9]
 ###
 .if !empty(PKG_OPTIONS:Mgnuplot)
 DEPENDS+=      ${PYPKGPREFIX}-gnuplot-[0-9]*:../../graphics/py-gnuplot
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gnuplot
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gnuplot
 .endif
 
 ###

Index: pkgsrc/net/sendfile/Makefile
diff -u pkgsrc/net/sendfile/Makefile:1.36 pkgsrc/net/sendfile/Makefile:1.37
--- pkgsrc/net/sendfile/Makefile:1.36   Tue May 17 10:32:08 2016
+++ pkgsrc/net/sendfile/Makefile        Sun Nov  3 11:45:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2016/05/17 10:32:08 fhajny Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/03 11:45:53 rillig Exp $
 #
 
 DISTNAME=      sendfile-2.1b
@@ -26,8 +26,8 @@ OVERRIDE_GNU_CONFIG_SCRIPTS=  yes
 post-configure:
        cd ${WRKSRC} &&${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} config
 
-OWN_DIRS+=     ${VARBASE}/spool/sendfile
-OWN_DIRS_PERMS+=${VARBASE}/spool/sendfile/LOG ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
-OWN_DIRS_PERMS+=${VARBASE}/spool/sendfile/OUTGOING ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777
+OWN_DIRS+=             ${VARBASE}/spool/sendfile
+OWN_DIRS_PERMS+=       ${VARBASE}/spool/sendfile/LOG ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
+OWN_DIRS_PERMS+=       ${VARBASE}/spool/sendfile/OUTGOING ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ser/Makefile
diff -u pkgsrc/net/ser/Makefile:1.7 pkgsrc/net/ser/Makefile:1.8
--- pkgsrc/net/ser/Makefile:1.7 Mon Sep  4 18:00:59 2017
+++ pkgsrc/net/ser/Makefile     Sun Nov  3 11:45:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/09/04 18:00:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:53 rillig Exp $
 #
 
 DISTNAME=      ser-0.8.14_src
@@ -22,10 +22,10 @@ CONF_FILES=         ${PREFIX}/${EGDIR}/ser.cfg 
 
 REQD_DIRS=     ${PREFIX}/${EGDIR}
 
-MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
-MAKE_ENV+= cfg-prefix=${PREFIX}/share/examples
-MAKE_ENV+= EGDIR=${EGDIR:Q}
-INSTALL_ENV+= BASEDIR=${DESTDIR}
+MAKE_ENV+=     BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
+MAKE_ENV+=     cfg-prefix=${PREFIX}/share/examples
+MAKE_ENV+=     EGDIR=${EGDIR:Q}
+INSTALL_ENV+=  BASEDIR=${DESTDIR}
 
 CHECK_PORTABILITY_SKIP+=       scripts/sc
 

Index: pkgsrc/net/siproxd/Makefile
diff -u pkgsrc/net/siproxd/Makefile:1.1 pkgsrc/net/siproxd/Makefile:1.2
--- pkgsrc/net/siproxd/Makefile:1.1     Wed Nov 14 15:25:28 2018
+++ pkgsrc/net/siproxd/Makefile Sun Nov  3 11:45:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/11/14 15:25:28 hauke Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:53 rillig Exp $
 
 DISTNAME=      siproxd-0.8.2
 PKGREVISION=   2
@@ -24,8 +24,8 @@ SIPROXD_HOME?=                ${VARBASE}/chroot/siprox
 PKG_GROUPS=            ${SIPROXD_GROUP}
 PKG_USERS=             ${SIPROXD_USER}:${SIPROXD_GROUP}
 
-PKG_GECOS.${SIPROXD_USER}= SIP proxy
-PKG_HOME.${SIPROXD_USER}=  ${SIPROXD_HOME}
+PKG_GECOS.${SIPROXD_USER}=     SIP proxy
+PKG_HOME.${SIPROXD_USER}=      ${SIPROXD_HOME}
 
 PKG_GROUPS_VARS+=      SIPROXD_GROUP
 PKG_USERS_VARS+=       SIPROXD_USER
@@ -54,9 +54,9 @@ INSTALLATION_DIRS=    sbin ${DOCDIR} ${EGDI
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=      doc/siproxd.conf.example
-SUBST_MESSAGE.paths=    performing pathname substitutions
-SUBST_VARS.paths=       VARBASE PREFIX PKG_SYSCONFDIR SIPROXD_USER SIPROXD_HOME
+SUBST_FILES.paths=     doc/siproxd.conf.example
+SUBST_MESSAGE.paths=   performing pathname substitutions
+SUBST_VARS.paths=      VARBASE PREFIX PKG_SYSCONFDIR SIPROXD_USER SIPROXD_HOME
 
 post-install:
 .for ff in README RELNOTES doc/FAQ doc/KNOWN_BUGS doc/RFC3261_compliance.txt

Index: pkgsrc/net/sipsak/Makefile
diff -u pkgsrc/net/sipsak/Makefile:1.16 pkgsrc/net/sipsak/Makefile:1.17
--- pkgsrc/net/sipsak/Makefile:1.16     Wed Jul  4 13:40:30 2018
+++ pkgsrc/net/sipsak/Makefile  Sun Nov  3 11:45:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:53 rillig Exp $
 
 DISTNAME=      sipsak-0.9.6-1
 PKGNAME=       ${DISTNAME:S/-1//}
@@ -17,7 +17,7 @@ GNU_CONFIGURE=        YES
 USE_TOOLS+=    gmake
 
 # get rid of inline
-SUBST_CLASSES+=        inline
+SUBST_CLASSES+=                inline
 SUBST_STAGE.inline=    pre-configure
 SUBST_FILES.inline=    header_f.h header_f.c
 SUBST_SED.inline=      -e 's/^inline //g'

Index: pkgsrc/net/smokeping/Makefile
diff -u pkgsrc/net/smokeping/Makefile:1.42 pkgsrc/net/smokeping/Makefile:1.43
--- pkgsrc/net/smokeping/Makefile:1.42  Sun Aug 11 13:22:30 2019
+++ pkgsrc/net/smokeping/Makefile       Sun Nov  3 11:45:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/08/11 13:22:30 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/03 11:45:53 rillig Exp $
 
 DISTNAME=      smokeping-2.6.7
 PKGREVISION=   8
@@ -62,7 +62,7 @@ SUBST_MESSAGE.files=  Fixing configuratio
 SUBST_CLASSES+=                libs
 SUBST_STAGE.libs=      pre-configure
 SUBST_FILES.libs=      bin/smokeping_cgi bin/smokeping bin/smokeinfo bin/tSmoke
-SUBST_SED.libs=        -e "s|FindBin::Bin/../lib|FindBin::Bin/../lib/smokeping|g"
+SUBST_SED.libs=                -e "s|FindBin::Bin/../lib|FindBin::Bin/../lib/smokeping|g"
 SUBST_MESSAGE.libs=    Fixing library path
 
 OWN_DIRS+=             ${SMOKEPING_HOME}

Index: pkgsrc/net/socket++/Makefile
diff -u pkgsrc/net/socket++/Makefile:1.12 pkgsrc/net/socket++/Makefile:1.13
--- pkgsrc/net/socket++/Makefile:1.12   Mon Nov  6 13:36:39 2017
+++ pkgsrc/net/socket++/Makefile        Sun Nov  3 11:45:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/11/06 13:36:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:53 rillig Exp $
 
 DISTNAME=              socket++-1.12.10
 PKGREVISION=           2
@@ -18,11 +18,11 @@ TEST_DIRS=          test
 TEST_TARGET=           check
 
 pre-configure:
-               cd ${WRKSRC};                                           \
-               ${LOCALBASE}/bin/libtoolize --automake;                 \
-               aclocal -I .;                                           \
-               autoheader;                                             \
-               automake --add-missing;                                 \
-               autoconf
+       cd ${WRKSRC};                                           \
+       ${LOCALBASE}/bin/libtoolize --automake;                 \
+       aclocal -I .;                                           \
+       autoheader;                                             \
+       automake --add-missing;                                 \
+       autoconf
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/spread/Makefile
diff -u pkgsrc/net/spread/Makefile:1.35 pkgsrc/net/spread/Makefile:1.36
--- pkgsrc/net/spread/Makefile:1.35     Sun Aug 11 13:22:30 2019
+++ pkgsrc/net/spread/Makefile  Sun Nov  3 11:45:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/08/11 13:22:30 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/03 11:45:53 rillig Exp $
 #
 
 DISTNAME=      spread-src-3.17.3
@@ -11,13 +11,13 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.spread.org/
 COMMENT=       Group communication system providing a number of messaging services
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}
-USE_GCC_RUNTIME=yes
-USE_TOOLS+=    perl
-GNU_CONFIGURE= YES
+WRKSRC=                        ${WRKDIR}/${DISTNAME}
+USE_GCC_RUNTIME=       yes
+USE_TOOLS+=            perl
+GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --includedir=${PREFIX:Q}/include/spread
 CONFIGURE_ARGS+=       --with-pid-dir=${RUNTIME_DIR:Q}
-MAKE_FLAGS+=   LD=${CC:Q}
+MAKE_FLAGS+=           LD=${CC:Q}
 
 BUILD_DEFS+=   SPREAD_DIR
 

Index: pkgsrc/net/spreadlogd/Makefile
diff -u pkgsrc/net/spreadlogd/Makefile:1.25 pkgsrc/net/spreadlogd/Makefile:1.26
--- pkgsrc/net/spreadlogd/Makefile:1.25 Sun Aug 11 13:22:30 2019
+++ pkgsrc/net/spreadlogd/Makefile      Sun Nov  3 11:45:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/11 13:22:30 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 11:45:53 rillig Exp $
 #
 
 DISTNAME=      spreadlogd
@@ -33,7 +33,7 @@ INSTALLATION_DIRS+=   ${EXAMPLEDIR}
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/spreadlogd.conf ${DESTDIR}${EXAMPLEDIR}/spreadlogd.conf.sample
 
-BUILDLINK_API_DEPENDS.libevent+=libevent>=1.0c
+BUILDLINK_API_DEPENDS.libevent+=       libevent>=1.0c
 
 .include "../../net/spread/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"

Index: pkgsrc/net/sysmon/Makefile
diff -u pkgsrc/net/sysmon/Makefile:1.10 pkgsrc/net/sysmon/Makefile:1.11
--- pkgsrc/net/sysmon/Makefile:1.10     Wed Jul  4 13:40:31 2018
+++ pkgsrc/net/sysmon/Makefile  Sun Nov  3 11:45:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:53 rillig Exp $
 
 DISTNAME=              sysmon-0.93
 CATEGORIES=            net
@@ -21,13 +21,13 @@ SMDOC=                      ${PREFIX}/share/doc/sysmon
 CONF_FILES=            ${EGDIR}/sysmon.conf.dist \
                        ${PKG_SYSCONFDIR}/sysmon.conf
 
-SUBST_CLASSES+=         paths
-SUBST_FILES.paths=      ${WRKSRC}/autoconf/Makefile.in
-SUBST_STAGE.paths=      pre-configure
-SUBST_SED.paths=        -e 's,@destdir@,${DESTDIR},g'
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     ${WRKSRC}/autoconf/Makefile.in
+SUBST_STAGE.paths=     pre-configure
+SUBST_SED.paths=       -e 's,@destdir@,${DESTDIR},g'
 
-INSTALLATION_DIRS=      share/examples/sysmon
-INSTALLATION_DIRS+=     share/doc/sysmon bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+INSTALLATION_DIRS=     share/examples/sysmon
+INSTALLATION_DIRS+=    share/doc/sysmon bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/examples/sysmon.conf.dist ${DESTDIR}${EGDIR}/sysmon.conf.dist

Index: pkgsrc/net/tacacs-shrubbery/Makefile
diff -u pkgsrc/net/tacacs-shrubbery/Makefile:1.16 pkgsrc/net/tacacs-shrubbery/Makefile:1.17
--- pkgsrc/net/tacacs-shrubbery/Makefile:1.16   Sun Aug 11 13:22:30 2019
+++ pkgsrc/net/tacacs-shrubbery/Makefile        Sun Nov  3 11:45:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/08/11 13:22:30 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:54 rillig Exp $
 #
 
 DISTNAME=      tacacs-F4.0.4.28
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE=       no
 
 GNU_CONFIGURE= yes
 USE_TOOLS+=    bison flex perl
-USE_LIBTOOL=    yes
+USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
 USE_FEATURES+= snprintf
 

Index: pkgsrc/net/tacacs-shrubbery/options.mk
diff -u pkgsrc/net/tacacs-shrubbery/options.mk:1.2 pkgsrc/net/tacacs-shrubbery/options.mk:1.3
--- pkgsrc/net/tacacs-shrubbery/options.mk:1.2  Thu May 10 19:01:08 2012
+++ pkgsrc/net/tacacs-shrubbery/options.mk      Sun Nov  3 11:45:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/05/10 19:01:08 schwarz Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:54 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tacacs-shrubbery
 PKG_SUPPORTED_OPTIONS= tacacs-shrubbery-acls-support tacacs-shrubbery-drop-root-privileges tcpwrappers skey
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=      --with-groupid=${TACACS
 
 .if !empty(PKG_OPTIONS:Mtcpwrappers)
 CONFIGURE_ARGS+=       --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
-. include "../../security/tcp_wrappers/buildlink3.mk"
+.  include "../../security/tcp_wrappers/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-libwrap
 .endif
@@ -34,13 +34,13 @@ CONFIGURE_ARGS+=    --without-libwrap
 .if !empty(PKG_OPTIONS:Mskey)
 CONFIGURE_ARGS+=       --with-skey=${BUILDLINK_PREFIX.skey}
 CHECK_BUILTIN.skey:=yes
-. include "../../security/skey/builtin.mk"
+.  include "../../security/skey/builtin.mk"
 CHECK_BUILTIN.skey:=no
-. if !empty(USE_BUILTIN.skey:M[nN][oO]) || ${OPSYS} == "OpenBSD"
+.  if !empty(USE_BUILTIN.skey:M[nN][oO]) || ${OPSYS} == "OpenBSD"
 # pkgsrc's version uses three arguments only, as does OpenBSD's
 CPPFLAGS+=             -DOLDSKEY
-. endif
-. include "../../security/skey/buildlink3.mk"
+.  endif
+.  include "../../security/skey/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-skey
 .endif

Index: pkgsrc/net/taskserver/Makefile
diff -u pkgsrc/net/taskserver/Makefile:1.3 pkgsrc/net/taskserver/Makefile:1.4
--- pkgsrc/net/taskserver/Makefile:1.3  Sat Jul 20 22:46:42 2019
+++ pkgsrc/net/taskserver/Makefile      Sun Nov  3 11:45:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/07/20 22:46:42 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:54 rillig Exp $
 
 DISTNAME=      taskd-1.1.0
 PKGNAME=       ${DISTNAME:S/taskd/taskserver/}
@@ -42,7 +42,7 @@ INSTALLATION_DIRS+=   ${EGDIR}/pki
 
 BUILD_DEFS+=   TASKD_USER TASKD_GROUP TASKD_DATA VARBASE
 
-REPLACE_SH=    src/taskdctl
+REPLACE_SH=            src/taskdctl
 SUBST_CLASSES+=                abspath
 SUBST_STAGE.abspath=   post-configure
 SUBST_MESSAGE.abspath= Set absolute paths.

Index: pkgsrc/net/tcl-scotty/Makefile
diff -u pkgsrc/net/tcl-scotty/Makefile:1.46 pkgsrc/net/tcl-scotty/Makefile:1.47
--- pkgsrc/net/tcl-scotty/Makefile:1.46 Tue May 29 12:56:55 2018
+++ pkgsrc/net/tcl-scotty/Makefile      Sun Nov  3 11:45:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2018/05/29 12:56:55 he Exp $
+# $NetBSD: Makefile,v 1.47 2019/11/03 11:45:54 rillig Exp $
 #
 
 DISTNAME=      scotty-${DIST_VERS}
@@ -20,11 +20,11 @@ DIST_VERS=  2.1.11
 CONFIGURE_DIRS=        unix
 BUILD_DIRS=    unix
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib  \
-               --enable-multicast                              \
-               --enable-gdmo --without-tk-config
-CONFIGURE_ENV+=        TARGET=scotty
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib   \
+                       --enable-multicast                              \
+                       --enable-gdmo --without-tk-config
+CONFIGURE_ENV+=                TARGET=scotty
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -35,7 +35,7 @@ USE_TOOLS+=   lex yacc
 
 PLIST_SUBST+=  MACHINE="${MACHINE}"
 
-INSTALL_TARGET= tnm-install install-man sinstall
+INSTALL_TARGET=        tnm-install install-man sinstall
 
 SPECIAL_PERMS+=        bin/ntping ${SETUID_ROOT_PERMS}
 SPECIAL_PERMS+=        bin/straps ${SETUID_ROOT_PERMS}

Index: pkgsrc/net/tcpillust/Makefile
diff -u pkgsrc/net/tcpillust/Makefile:1.30 pkgsrc/net/tcpillust/Makefile:1.31
--- pkgsrc/net/tcpillust/Makefile:1.30  Mon Mar 12 11:17:23 2018
+++ pkgsrc/net/tcpillust/Makefile       Sun Nov  3 11:45:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/03/12 11:17:23 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/03 11:45:54 rillig Exp $
 
 DISTNAME=      tcpillust-1.0a
 PKGREVISION=   11
@@ -12,10 +12,10 @@ COMMENT=    Graphical TCP connection analys
 USE_IMAKE=     yes
 GNU_CONFIGURE= yes
 
-CONFIGURE_ARGS+=--with-tcl-include=${BUILDLINK_PREFIX.tcl}/include
-CONFIGURE_ARGS+=--with-tcl-lib=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+=--with-tk-include=${BUILDLINK_PREFIX.tk}/include
-CONFIGURE_ARGS+=--with-tk-lib=${BUILDLINK_PREFIX.tk}/lib
+CONFIGURE_ARGS+=       --with-tcl-include=${BUILDLINK_PREFIX.tcl}/include
+CONFIGURE_ARGS+=       --with-tcl-lib=${BUILDLINK_PREFIX.tcl}/lib
+CONFIGURE_ARGS+=       --with-tk-include=${BUILDLINK_PREFIX.tk}/include
+CONFIGURE_ARGS+=       --with-tk-lib=${BUILDLINK_PREFIX.tk}/lib
 
 DOCS=          README
 SAMPLES=       tcpclient.log tcpserver.log

Index: pkgsrc/net/teamspeak-server/Makefile
diff -u pkgsrc/net/teamspeak-server/Makefile:1.14 pkgsrc/net/teamspeak-server/Makefile:1.15
--- pkgsrc/net/teamspeak-server/Makefile:1.14   Mon Feb  4 09:34:49 2019
+++ pkgsrc/net/teamspeak-server/Makefile        Sun Nov  3 11:45:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/02/04 09:34:49 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:54 rillig Exp $
 
 PKGNAME=               teamspeak-server-2.0.24.01
 DISTNAME=              ts2_server_rc2_202319
@@ -14,10 +14,10 @@ HOMEPAGE=           http://www.goteamspeak.com/
 COMMENT=               Teamspeak group VoIP server
 LICENSE=               teamspeak-license-200700213
 
-RESTRICTED=             Redistribution to third parties is expressly prohibited
-NO_SRC_ON_CDROM=        ${RESTRICTED}
-NO_BIN_ON_FTP=          ${RESTRICTED}
-NO_BIN_ON_CDROM=        ${RESTRICTED}
+RESTRICTED=            Redistribution to third parties is expressly prohibited
+NO_SRC_ON_CDROM=       ${RESTRICTED}
+NO_BIN_ON_FTP=         ${RESTRICTED}
+NO_BIN_ON_CDROM=       ${RESTRICTED}
 
 EMUL_PLATFORMS=                linux-i386
 EMUL_MODULES.linux=    base
@@ -51,7 +51,7 @@ PKG_GECOS.${TSUSER}=  Teamspeak server us
 PKG_HOME.${TSUSER}=    ${TSHOME}
 PKG_SHELL.${TSUSER}=   ${SH}
 
-FILES_SUBST+=          TSUSER=${TSUSER}
+FILES_SUBST+=          TSUSER=${TSUSER}
 
 INSTALLATION_DIRS=     ${LIB_DIR} share/examples/rc.d ${SHARE_DIR}/httpdocs \
                        ${SHARE_DIR}/tcpquerydocs ${SHARE_DIR}/mysql_sql \

Index: pkgsrc/net/tigervnc/Makefile
diff -u pkgsrc/net/tigervnc/Makefile:1.26 pkgsrc/net/tigervnc/Makefile:1.27
--- pkgsrc/net/tigervnc/Makefile:1.26   Sun Aug 11 13:22:30 2019
+++ pkgsrc/net/tigervnc/Makefile        Sun Nov  3 11:45:54 2019
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:22:30 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 11:45:54 rillig Exp $
 
-DISTNAME=      tigervnc-1.9.0
-PKGREVISION=   3
-CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=TigerVNC/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+DISTNAME=              tigervnc-1.9.0
+PKGREVISION=           3
+CATEGORIES=            net
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=TigerVNC/}
+GITHUB_TAG=            v${PKGVERSION_NOREV}
 XORG_SERVER_FILE=      xorg-server-1.17.2
 SITES.${XORG_SERVER_FILE}.tar.bz2=     ${MASTER_SITE_XORG:=xserver/}
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
+DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://tigervnc.org/
@@ -29,14 +29,14 @@ INSTALL_DIRS=       . unix/xserver/hw/vnc
 
 LDFLAGS+=      ${BUILDLINK_LDADD.gettext}
 
-CONFIGURE_ENV+=        ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
-OVERRIDE_GNU_CONFIG_SCRIPTS= yes
-LIBTOOL_OVERRIDE=unix/xserver/libtool
+CONFIGURE_ENV+=                        ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
+OVERRIDE_GNU_CONFIG_SCRIPTS=   yes
+LIBTOOL_OVERRIDE=              unix/xserver/libtool
 
 SUBST_CLASSES+=                hpath
 SUBST_STAGE.hpath=     pre-configure
 SUBST_MESSAGE.hpath=   fixing hardcoded paths
-SUBST_FILES.hpath=      unix/vncserver
+SUBST_FILES.hpath=     unix/vncserver
 SUBST_SED.hpath+=      -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
 SUBST_VARS.hpath+=     PREFIX X11BASE
 

Index: pkgsrc/net/tinyfugue/Makefile
diff -u pkgsrc/net/tinyfugue/Makefile:1.34 pkgsrc/net/tinyfugue/Makefile:1.35
--- pkgsrc/net/tinyfugue/Makefile:1.34  Thu May 23 19:23:11 2019
+++ pkgsrc/net/tinyfugue/Makefile       Sun Nov  3 11:45:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/05/23 19:23:11 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/03 11:45:54 rillig Exp $
 
 DISTNAME=      tf-40s1
 PKGNAME=       tf-4.0s1
@@ -16,9 +16,9 @@ MAKE_JOBS_SAFE=               no
 MAKE_FILE=     ${WRKSRC}/unix/Makefile
 MAKE_ENV+=     TFVER=${DISTNAME:S/^tf-//}
 
-PATCH_SITES=   http://discworld.imaginary.com/external/taffyd/
-PATCHFILES=    tf-40s1-mccp-patch.gz
-PATCH_DIST_STRIP=-p1
+PATCH_SITES=           http://discworld.imaginary.com/external/taffyd/
+PATCHFILES=            tf-40s1-mccp-patch.gz
+PATCH_DIST_STRIP=      -p1
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 

Index: pkgsrc/net/tkined/Makefile
diff -u pkgsrc/net/tkined/Makefile:1.33 pkgsrc/net/tkined/Makefile:1.34
--- pkgsrc/net/tkined/Makefile:1.33     Mon Mar 12 11:17:23 2018
+++ pkgsrc/net/tkined/Makefile  Sun Nov  3 11:45:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2018/03/12 11:17:23 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/03 11:45:55 rillig Exp $
 #
 
 DISTNAME=      scotty-2.1.11
@@ -11,11 +11,11 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.ibr.cs.tu-bs.de/projects/nm/tkined/welcome.html.orig
 COMMENT=       Graphical network discovery and monitoring tool based on scotty
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib  \
-               --with-tk-config=${BUILDLINK_PREFIX.tk}/lib     \
-               --enable-multicast --enable-gdmo
-CONFIGURE_ENV+=        TARGET=tkined
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib   \
+                       --with-tk-config=${BUILDLINK_PREFIX.tk}/lib     \
+                       --enable-multicast --enable-gdmo
+CONFIGURE_ENV+=                TARGET=tkined
 
 USE_LIBTOOL=   yes
 

Index: pkgsrc/net/tnftp/options.mk
diff -u pkgsrc/net/tnftp/options.mk:1.11 pkgsrc/net/tnftp/options.mk:1.12
--- pkgsrc/net/tnftp/options.mk:1.11    Wed Sep 30 08:25:37 2015
+++ pkgsrc/net/tnftp/options.mk Sun Nov  3 11:45:55 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.11 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.12 2019/11/03 11:45:55 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tnftp
-PKG_SUPPORTED_OPTIONS=         inet6 ssl socks
-PKG_SUGGESTED_OPTIONS=         inet6
+PKG_SUPPORTED_OPTIONS= inet6 ssl socks
+PKG_SUGGESTED_OPTIONS= inet6
 
 CHECK_BUILTIN.openssl:=        yes
 .include "../../security/openssl/builtin.mk"

Index: pkgsrc/net/tor/Makefile
diff -u pkgsrc/net/tor/Makefile:1.145 pkgsrc/net/tor/Makefile:1.146
--- pkgsrc/net/tor/Makefile:1.145       Sat Sep 21 23:57:17 2019
+++ pkgsrc/net/tor/Makefile     Sun Nov  3 11:45:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.145 2019/09/21 23:57:17 alnsn Exp $
+# $NetBSD: Makefile,v 1.146 2019/11/03 11:45:55 rillig Exp $
 
 DISTNAME=      tor-0.4.1.6
 CATEGORIES=    net security
@@ -54,7 +54,7 @@ FILES_SUBST+=         TOR_USER=${TOR_USER} TOR_
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples
 
-CHECK_PORTABILITY_SKIP+=contrib/*
+CHECK_PORTABILITY_SKIP+=       contrib/*
 
 .include "options.mk"
 

Index: pkgsrc/net/traceroute-as/Makefile
diff -u pkgsrc/net/traceroute-as/Makefile:1.12 pkgsrc/net/traceroute-as/Makefile:1.13
--- pkgsrc/net/traceroute-as/Makefile:1.12      Thu Apr 21 16:35:15 2016
+++ pkgsrc/net/traceroute-as/Makefile   Sun Nov  3 11:45:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/04/21 16:35:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:55 rillig Exp $
 #
 
 DISTNAME=      traceroute_991603.tar
@@ -18,9 +18,9 @@ PKG_LIBRARIES.*=      # empty
 PKG_SYSDEFS.SunOS=     -DSYSV
 PKG_SYSDEFS.*=         #empty
 
-MAKE_FLAGS+=   CC=${CC:Q} PKG_CFLAGS=${CFLAGS:M*:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q}
-MAKE_FLAGS+=   PKG_LIBRARIES=${PKG_LIBRARIES:Q} DESTMAN=${DESTDIR}${PREFIX}/${PKGMANDIR}
-INSTALL_PROGRAM_SUID= ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555
-MAKE_ENV+=     BSD_INSTALL_PROGRAM_SUID=${INSTALL_PROGRAM_SUID:Q}
+MAKE_FLAGS+=           CC=${CC:Q} PKG_CFLAGS=${CFLAGS:M*:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q}
+MAKE_FLAGS+=           PKG_LIBRARIES=${PKG_LIBRARIES:Q} DESTMAN=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALL_PROGRAM_SUID=  ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555
+MAKE_ENV+=             BSD_INSTALL_PROGRAM_SUID=${INSTALL_PROGRAM_SUID:Q}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/traceroute-nanog/Makefile
diff -u pkgsrc/net/traceroute-nanog/Makefile:1.10 pkgsrc/net/traceroute-nanog/Makefile:1.11
--- pkgsrc/net/traceroute-nanog/Makefile:1.10   Mon Apr 17 19:53:11 2017
+++ pkgsrc/net/traceroute-nanog/Makefile        Sun Nov  3 11:45:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/04/17 19:53:11 schwarz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:55 rillig Exp $
 
 DISTNAME=      traceroute-nanog_6.4.2.orig
 PKGNAME=       ${DISTNAME:S/.orig//:S/_/-/}
@@ -45,10 +45,10 @@ CPPFLAGS+=  -Dsocklen_t=int
 INSTALLATION_DIRS=     sbin ${PKGMANDIR}/man8
 
 do-build:
-               cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS}
+       cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS}
 
 do-install:
-               ${INSTALL_PROGRAM} ${WRKSRC}/traceroute-nanog ${DESTDIR}${PREFIX}/sbin
-               ${INSTALL_MAN} ${WRKSRC}/${PKGNAME}/debian/traceroute-nanog.genuine.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/traceroute-nanog.8
+       ${INSTALL_PROGRAM} ${WRKSRC}/traceroute-nanog ${DESTDIR}${PREFIX}/sbin
+       ${INSTALL_MAN} ${WRKSRC}/${PKGNAME}/debian/traceroute-nanog.genuine.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/traceroute-nanog.8
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/trickle/Makefile
diff -u pkgsrc/net/trickle/Makefile:1.27 pkgsrc/net/trickle/Makefile:1.28
--- pkgsrc/net/trickle/Makefile:1.27    Wed Sep  6 09:03:03 2017
+++ pkgsrc/net/trickle/Makefile Sun Nov  3 11:45:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2017/09/06 09:03:03 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/03 11:45:55 rillig Exp $
 #
 
 DISTNAME=      trickle-1.06
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=      --sysconfdir=${PKG_SYSC
 EGDIR=         ${PREFIX}/share/examples/trickle
 CONF_FILES=    ${EGDIR}/trickled.conf ${PKG_SYSCONFDIR}/trickled.conf
 
-RCD_SCRIPTS=   trickled
+RCD_SCRIPTS=           trickled
 INSTALLATION_DIRS+=    ${EGDIR}
 
 pre-install:

Index: pkgsrc/net/tsocks/Makefile
diff -u pkgsrc/net/tsocks/Makefile:1.18 pkgsrc/net/tsocks/Makefile:1.19
--- pkgsrc/net/tsocks/Makefile:1.18     Thu May 23 19:23:11 2019
+++ pkgsrc/net/tsocks/Makefile  Sun Nov  3 11:45:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/05/23 19:23:11 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:55 rillig Exp $
 #
 
 DISTNAME=      tsocks-1.8beta5
@@ -14,9 +14,9 @@ LICENSE=      gnu-gpl-v2
 MAKE_JOBS_SAFE=                no
 
 WRKSRC=                ${WRKDIR}/tsocks-1.8
-GNU_CONFIGURE=         YES
-USE_TOOLS+=            gmake
-USE_LIBTOOL=           yes
+GNU_CONFIGURE= YES
+USE_TOOLS+=    gmake
+USE_LIBTOOL=   yes
 
 CONFIGURE_ARGS+=       --with-conf=${PKG_SYSCONFDIR}/tsocks.conf
 

Index: pkgsrc/net/ttt/Makefile
diff -u pkgsrc/net/ttt/Makefile:1.32 pkgsrc/net/ttt/Makefile:1.33
--- pkgsrc/net/ttt/Makefile:1.32        Mon Mar 12 11:17:23 2018
+++ pkgsrc/net/ttt/Makefile     Sun Nov  3 11:45:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/03/12 11:17:23 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/03 11:45:56 rillig Exp $
 #
 
 DISTNAME=      ttt-1.8.2
@@ -10,12 +10,12 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.sonycsl.co.jp/person/kjc/software.html
 COMMENT=       Tele Traffic Tapper
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-tcl=${BUILDLINK_PREFIX.tcl}
 CONFIGURE_ARGS+=       --with-tk=${BUILDLINK_PREFIX.tk}
 
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
-INSTALL_TARGET=        install install-man
+INSTALL_TARGET=                install install-man
 INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX} \
                        exec_prefix=${DESTDIR}${PREFIX} \
                        mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
@@ -28,13 +28,13 @@ REPLACE_FILES.sys-BLTWISH=  ttt.tcl
 
 .include "../../mk/bsd.prefs.mk"
 
-CFLAGS+=       -DUSE_INTERP_RESULT
+CFLAGS+=               -DUSE_INTERP_RESULT
 CONFIGURE_ARGS+=       ttt_cv_prog_cflags=${CFLAGS:Q}
 
 .if ${OPSYS} == "NetBSD"
-.if empty(OS_VERSION:M1.[56]*)
+.  if empty(OS_VERSION:M1.[56]*)
 .include "../../mk/pthread.buildlink3.mk"
-.endif
+.  endif
 .endif
 
 .include "options.mk"

Index: pkgsrc/net/tvnjviewer/Makefile
diff -u pkgsrc/net/tvnjviewer/Makefile:1.1.1.1 pkgsrc/net/tvnjviewer/Makefile:1.2
--- pkgsrc/net/tvnjviewer/Makefile:1.1.1.1      Thu Apr 14 21:58:09 2016
+++ pkgsrc/net/tvnjviewer/Makefile      Sun Nov  3 11:45:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/04/14 21:58:09 abs Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:56 rillig Exp $
 
 DISTNAME=      tvnjviewer-2.7.2-bin
 PKGNAME=       ${DISTNAME:S:-bin::}
@@ -11,9 +11,9 @@ HOMEPAGE=     http://www.tightvnc.com/doc/ja
 COMMENT=       JAVA VNC viewer
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}
-USE_LANGUAGES= # none
-USE_JAVA=      run
+WRKSRC=                        ${WRKDIR}
+USE_LANGUAGES=         # none
+USE_JAVA=              run
 INSTALLATION_DIRS=     bin lib/java/tvnjviewer share/doc/tvnjviewer
 
 do-build:

Index: pkgsrc/net/ucspi-ssl/Makefile
diff -u pkgsrc/net/ucspi-ssl/Makefile:1.38 pkgsrc/net/ucspi-ssl/Makefile:1.39
--- pkgsrc/net/ucspi-ssl/Makefile:1.38  Tue Aug 20 00:14:25 2019
+++ pkgsrc/net/ucspi-ssl/Makefile       Sun Nov  3 11:45:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/08/20 00:14:25 schmonz Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/03 11:45:56 rillig Exp $
 #
 
 DISTNAME=              ucspi-ssl-0.10.11
@@ -52,30 +52,30 @@ do-test:
                ./package/rts
 
 do-install: do-install-sslperl
-.      for i in ${SSL_SCRIPTS}
+.for i in ${SSL_SCRIPTS}
          ${INSTALL_SCRIPT} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin
-.      endfor
+.endfor
 
-.      for i in ${SSL_PROGRAMS}
+.for i in ${SSL_PROGRAMS}
          ${INSTALL_PROGRAM} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin
-.      endfor
+.endfor
 
-.      for i in ${SSL_MAN1PAGES}
+.for i in ${SSL_MAN1PAGES}
          ${INSTALL_MAN} ${WRKSRC}/man/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.      endfor
+.endfor
 
-.      for i in ${SSL_MAN2PAGES}
+.for i in ${SSL_MAN2PAGES}
          ${INSTALL_MAN} ${WRKSRC}/man/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man2
-.      endfor
+.endfor
 
-.      for i in dh1024.pem
+.for i in dh1024.pem
          ${INSTALL_DATA} ${WRKSRC}/etc/${i} ${DESTDIR}${EGDIR}
-.      endfor
+.endfor
 
-.      for i in CERTS CHAIN-SSL CHANGES TLSVERSION_CIPHERSUITES TLS_1_3 TODO UCSPI-SSL
+.for i in CERTS CHAIN-SSL CHANGES TLSVERSION_CIPHERSUITES TLS_1_3 TODO UCSPI-SSL
          ${INSTALL_DATA} ${WRKSRC}/doc/${i} \
            ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-.      endfor
+.endfor
 
 .include "../../net/fehqlibs/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/net/ucspi-tcp/options.mk
diff -u pkgsrc/net/ucspi-tcp/options.mk:1.8 pkgsrc/net/ucspi-tcp/options.mk:1.9
--- pkgsrc/net/ucspi-tcp/options.mk:1.8 Thu Nov 15 13:46:07 2018
+++ pkgsrc/net/ucspi-tcp/options.mk     Sun Nov  3 11:45:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2018/11/15 13:46:07 schmonz Exp $
+# $NetBSD: options.mk,v 1.9 2019/11/03 11:45:56 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucspi-tcp
 PKG_SUPPORTED_OPTIONS+=        ucspi-tcp-nodefaultrbl
@@ -7,8 +7,8 @@ PKG_SUGGESTED_OPTIONS+= ucspi-tcp-nodefa
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mucspi-tcp-nodefaultrbl)
-NODEFAULTRBL_PATCH=            rblsmtpd-nodefaultrbl.patch
-PATCHFILES+=                   ${NODEFAULTRBL_PATCH}
-SITES.${NODEFAULTRBL_PATCH}=   http://pyropus.ca/software/misc/
+NODEFAULTRBL_PATCH=                    rblsmtpd-nodefaultrbl.patch
+PATCHFILES+=                           ${NODEFAULTRBL_PATCH}
+SITES.${NODEFAULTRBL_PATCH}=           http://pyropus.ca/software/misc/
 PATCH_DIST_STRIP.${NODEFAULTRBL_PATCH}=        -p1
 .endif

Index: pkgsrc/net/udns/Makefile
diff -u pkgsrc/net/udns/Makefile:1.9 pkgsrc/net/udns/Makefile:1.10
--- pkgsrc/net/udns/Makefile:1.9        Mon Feb 24 19:29:02 2014
+++ pkgsrc/net/udns/Makefile    Sun Nov  3 11:45:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/02/24 19:29:02 schnoebe Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:56 rillig Exp $
 
 DISTNAME=      udns-0.4
 CATEGORIES=    net
@@ -38,8 +38,8 @@ LDFLAGS.SunOS+=       -lsocket -lnsl
 
 # gcc on NetBSD botch's if (!<ptr>) tests at -O2. (or higher)
 .if ${OPSYS} == "NetBSD"
-. if ${MACHINE_ARCH} == "alpha"
+.  if ${MACHINE_ARCH} == "alpha"
 BUILDLINK_TRANSFORM+=  opt:-O[2-9]:-O1
 # BUILDLINK_TRANSFORM+=        rm:-O[2-9]
-. endif
+.  endif
 .endif

Index: pkgsrc/net/unbound/Makefile
diff -u pkgsrc/net/unbound/Makefile:1.70 pkgsrc/net/unbound/Makefile:1.71
--- pkgsrc/net/unbound/Makefile:1.70    Thu Oct  3 09:44:38 2019
+++ pkgsrc/net/unbound/Makefile Sun Nov  3 11:45:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2019/10/03 09:44:38 he Exp $
+# $NetBSD: Makefile,v 1.71 2019/11/03 11:45:56 rillig Exp $
 
 DISTNAME=      unbound-1.9.4
 CATEGORIES=    net
@@ -38,31 +38,31 @@ CHECK_BUILTIN.openssl=      no
 
 PLIST_VARS+=           sha2 gost
 .if defined(USE_BUILTIN.openssl) && !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
-PLIST_VARS.gost!=       \
-        if ${PKG_ADMIN} pmatch 'openssl>=1.0.0' ${BUILTIN_PKG.openssl}; then \
-                ${ECHO} "yes";                                          \
-        else                                                            \
-                ${ECHO} "no";                                           \
-        fi
-PLIST_VARS.sha2!=       \
-        if ${PKG_ADMIN} pmatch 'openssl>=0.9.8' ${BUILTIN_PKG.openssl}; then \
-                ${ECHO} "yes";                                          \
-        else                                                            \
-                ${ECHO} "no";                                           \
-        fi
+PLIST_VARS.gost!=      \
+       if ${PKG_ADMIN} pmatch 'openssl>=1.0.0' ${BUILTIN_PKG.openssl}; then \
+               ${ECHO} "yes";                                          \
+       else                                                            \
+               ${ECHO} "no";                                           \
+       fi
+PLIST_VARS.sha2!=      \
+       if ${PKG_ADMIN} pmatch 'openssl>=0.9.8' ${BUILTIN_PKG.openssl}; then \
+               ${ECHO} "yes";                                          \
+       else                                                            \
+               ${ECHO} "no";                                           \
+       fi
 .else
-PLIST_VARS.gost!=       \
-        if ${PKG_INFO} -qe 'openssl>=1.0.0'; then                       \
-                ${ECHO} yes;                                            \
-        else                                                            \
-                ${ECHO} no;                                             \
-        fi
-PLIST_VARS.sha2!=       \
-        if ${PKG_INFO} -qe 'openssl>=0.9.8'; then                       \
-                ${ECHO} yes;                                            \
-        else                                                            \
-                ${ECHO} no;                                             \
-        fi
+PLIST_VARS.gost!=      \
+       if ${PKG_INFO} -qe 'openssl>=1.0.0'; then                       \
+               ${ECHO} yes;                                            \
+       else                                                            \
+               ${ECHO} no;                                             \
+       fi
+PLIST_VARS.sha2!=      \
+       if ${PKG_INFO} -qe 'openssl>=0.9.8'; then                       \
+               ${ECHO} yes;                                            \
+       else                                                            \
+               ${ECHO} no;                                             \
+       fi
 .endif
 .if ${PLIST_VARS.gost} == "yes"
 CONFIGURE_ARGS+=       --enable-gost
@@ -82,12 +82,12 @@ SUBST_FILES.paths=  doc/example.conf doc/
 SUBST_SED.paths=       -e "s|/usr/local|${PREFIX}|"
 
 INSTALL_MAKE_FLAGS+=   \
-    configfile=${PREFIX}/share/examples/unbound/unbound.conf
+       configfile=${PREFIX}/share/examples/unbound/unbound.conf
 
 PKG_SYSCONFSUBDIR=     unbound
 
 CONF_FILES+=   share/examples/unbound/unbound.conf \
-       ${PKG_SYSCONFDIR}/unbound.conf
+               ${PKG_SYSCONFDIR}/unbound.conf
 
 RCD_SCRIPTS=   unbound
 SMF_METHODS=   unbound

Index: pkgsrc/net/unison2.48/Makefile
diff -u pkgsrc/net/unison2.48/Makefile:1.3 pkgsrc/net/unison2.48/Makefile:1.4
--- pkgsrc/net/unison2.48/Makefile:1.3  Mon Oct 28 20:04:21 2019
+++ pkgsrc/net/unison2.48/Makefile      Sun Nov  3 11:45:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/10/28 20:04:21 gdt Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:56 rillig Exp $
 
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 DISTNAME=      unison-2.48.15v4
@@ -17,11 +17,11 @@ LICENSE=    gnu-gpl-v3
 MAKE_JOBS_SAFE=        no
 
 .if (${MACHINE_ARCH} == "arm")
-BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=3.12.0nb2
+BUILDLINK_ABI_DEPENDS.ocaml+=          ocaml>=3.12.0nb2
 .else
-BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=3.11.2
+BUILDLINK_ABI_DEPENDS.ocaml+=          ocaml>=3.11.2
 .endif
-BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0
+BUILDLINK_API_DEPENDS.ocaml-lablgtk+=  ocaml-lablgtk>=2.16.0
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 USE_TOOLS+=    gmake

Index: pkgsrc/net/unison2.51/Makefile
diff -u pkgsrc/net/unison2.51/Makefile:1.17 pkgsrc/net/unison2.51/Makefile:1.18
--- pkgsrc/net/unison2.51/Makefile:1.17 Mon Oct 28 20:02:29 2019
+++ pkgsrc/net/unison2.51/Makefile      Sun Nov  3 11:45:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/10/28 20:02:29 gdt Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:56 rillig Exp $
 
 # This package is "unison-2.51.x" because 2.51 is the standard
 # approach, and hence uses the bare name.
@@ -18,7 +18,7 @@ LICENSE=      gnu-gpl-v3
 #MAKE_JOBS_SAFE=       no
 
 # docs: unison-manual.pdf/html/ps/dvi
-#WRKSRC=               ${WRKDIR}/src
+#WRKSRC=       ${WRKDIR}/src
 USE_TOOLS+=    gmake
 MAKE_FLAGS+=   CFLAGS="" -C src
 MAKE_ENV+=     HOME=${WRKDIR:Q}

Index: pkgsrc/net/upnpinspector/Makefile
diff -u pkgsrc/net/upnpinspector/Makefile:1.17 pkgsrc/net/upnpinspector/Makefile:1.18
--- pkgsrc/net/upnpinspector/Makefile:1.17      Mon Sep  2 13:19:50 2019
+++ pkgsrc/net/upnpinspector/Makefile   Sun Nov  3 11:45:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/09/02 13:19:50 adam Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:56 rillig Exp $
 
 DISTNAME=      UPnP-Inspector-0.2.2
 PKGREVISION=   4
@@ -15,7 +15,7 @@ DEPENDS+=     ${PYPKGPREFIX}-gtk2-[0-9]*:../
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/userppp/Makefile
diff -u pkgsrc/net/userppp/Makefile:1.25 pkgsrc/net/userppp/Makefile:1.26
--- pkgsrc/net/userppp/Makefile:1.25    Tue Oct 23 17:19:16 2012
+++ pkgsrc/net/userppp/Makefile Sun Nov  3 11:45:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/10/23 17:19:16 asau Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 11:45:57 rillig Exp $
 
 DISTNAME=              ppp-001107.src
 PKGNAME=               userppp-001107
@@ -17,14 +17,14 @@ MANCOMPRESSED_IF_MANZ=      YES
 
 PKG_SYSCONFSUBDIR=     ppp
 
-CFLAGS+=       -fno-strict-aliasing
+CFLAGS+=               -fno-strict-aliasing
 # fix build on -current for wrong is* arguments (char instead of unsigned char)
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
 SUBST_CLASSES+=                cfgdir
 SUBST_STAGE.cfgdir=    do-configure
 SUBST_FILES.cfgdir=    ppp/ppp.8 pppctl/pppctl.8
-SUBST_SED.cfgdir=      -e "s,/etc/ppp,${PKG_SYSCONFDIR},"
+SUBST_SED.cfgdir=      -e "s,/etc/ppp,${PKG_SYSCONFDIR},"
 SUBST_SED.cfgdir+=     -e "s,/usr/share,${PREFIX}/share,"
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/net/uucp/Makefile
diff -u pkgsrc/net/uucp/Makefile:1.20 pkgsrc/net/uucp/Makefile:1.21
--- pkgsrc/net/uucp/Makefile:1.20       Sun Nov 26 10:54:19 2017
+++ pkgsrc/net/uucp/Makefile    Sun Nov  3 11:45:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/11/26 10:54:19 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:57 rillig Exp $
 
 DISTNAME=      uucp-1.07
 PKGREVISION=   7
@@ -77,11 +77,11 @@ UUCPD_CPPFLAGS.${OPSYS}+=   -DSUPPORT_UTMP
 .if exists(/usr/include/utmpx.h)
 UUCPD_CPPFLAGS.${OPSYS}+=      -DSUPPORT_UTMPX
 .endif
-UUCPD_CPPFLAGS.Darwin= -DSUPPORT_UTMP
-UUCPD_CPPFLAGS.*=      # empty
-UUCPD_LIBS.Darwin=     # empty
-UUCPD_LIBS.*=          -lcrypt -lutil
-OPSYSVARS+=            UUCPD_CPPFLAGS UUCPD_LIBS
+UUCPD_CPPFLAGS.Darwin=         -DSUPPORT_UTMP
+UUCPD_CPPFLAGS.*=              # empty
+UUCPD_LIBS.Darwin=             # empty
+UUCPD_LIBS.*=                  -lcrypt -lutil
+OPSYSVARS+=                    UUCPD_CPPFLAGS UUCPD_LIBS
 
 INSTALLATION_DIRS=     bin libexec ${PKGMANDIR}/man8 share/examples/uucp
 

Index: pkgsrc/net/vnc/Makefile
diff -u pkgsrc/net/vnc/Makefile:1.60 pkgsrc/net/vnc/Makefile:1.61
--- pkgsrc/net/vnc/Makefile:1.60        Sun Aug 11 13:22:32 2019
+++ pkgsrc/net/vnc/Makefile     Sun Nov  3 11:45:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2019/08/11 13:22:32 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2019/11/03 11:45:57 rillig Exp $
 
 DISTNAME=              vnc-3.3.3r2
 PKGNAME=               vnc-3.3.3.2
@@ -24,11 +24,11 @@ BUILD_DEFS+=                IPV6_READY
 
 BUILD_TARGET=          World
 
-MAKE_ENV+= CC=${CC:Q}  #for make imake in Xvnc/config/imake
+MAKE_ENV+=     CC=${CC:Q}      #for make imake in Xvnc/config/imake
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.vnc
-PKG_SUPPORTED_OPTIONS=  inet6
-PKG_SUGGESTED_OPTIONS=  inet6
+PKG_OPTIONS_VAR=       PKG_OPTIONS.vnc
+PKG_SUPPORTED_OPTIONS= inet6
+PKG_SUGGESTED_OPTIONS= inet6
 
 .include "../../mk/bsd.options.mk"
 
@@ -58,7 +58,7 @@ INSTALLATION_DIRS=    bin share/doc/vnc
 .if ${OPSYS} == "SunOS"
 _WRAP_EXTRA_ARGS.CC+=  -D_POSIX_SOURCE
 CWRAPPERS_APPEND.cc+=  -D_POSIX_SOURCE
-SPECIAL_PERMS+=        bin/Xvnc ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 2555
+SPECIAL_PERMS+=                bin/Xvnc ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 2555
 .endif
 
 .if ${OS_VARIANT} == "SmartOS"

Index: pkgsrc/net/vnstat/Makefile
diff -u pkgsrc/net/vnstat/Makefile:1.18 pkgsrc/net/vnstat/Makefile:1.19
--- pkgsrc/net/vnstat/Makefile:1.18     Mon Mar 12 11:17:24 2018
+++ pkgsrc/net/vnstat/Makefile  Sun Nov  3 11:45:57 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2018/03/12 11:17:24 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:57 rillig Exp $
 
 DISTNAME=      vnstat-1.14
 PKGREVISION=   5
 CATEGORIES=    net
 MASTER_SITES=  http://humdi.net/vnstat/
-#DISTFILES=${DISTNAME}.tar.gz
+#DISTFILES=    ${DISTNAME}.tar.gz
 
 MAINTAINER=    sborrill%NetBSD.org@localhost
 HOMEPAGE=      http://humdi.net/vnstat/
@@ -32,7 +32,7 @@ SUBST_FILES.fix-etcpath+=     man/vnstat.1 m
 SUBST_FILES.fix-etcpath+=      man/vnstati.1
 SUBST_SED.fix-etcpath=         -e 's,/etc/,${PKG_SYSCONFDIR}/,g'
 
-CONF_FILES= ${VNSTAT_EGDIR}/vnstat.conf ${VNSTAT_CONFIG}
+CONF_FILES=    ${VNSTAT_EGDIR}/vnstat.conf ${VNSTAT_CONFIG}
 
 RCD_SCRIPTS=   vnstatd
 

Index: pkgsrc/net/vsftpd/Makefile
diff -u pkgsrc/net/vsftpd/Makefile:1.47 pkgsrc/net/vsftpd/Makefile:1.48
--- pkgsrc/net/vsftpd/Makefile:1.47     Wed Dec 26 11:11:23 2018
+++ pkgsrc/net/vsftpd/Makefile  Sun Nov  3 11:45:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2018/12/26 11:11:23 adam Exp $
+# $NetBSD: Makefile,v 1.48 2019/11/03 11:45:57 rillig Exp $
 
 DISTNAME=      vsftpd-3.0.3
 PKGREVISION=   1
@@ -39,17 +39,17 @@ MAKE_ENV+=          LIBS=${LIBS:Q}
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11"
-SUBST_CLASSES+=                dirfd
-SUBST_STAGE.dirfd=     pre-build
-SUBST_FILES.dirfd=     port/solaris_bogons.h
-SUBST_SED.dirfd=       -e '/dirfd_extras/d'
+SUBST_CLASSES+=                        dirfd
+SUBST_STAGE.dirfd=             pre-build
+SUBST_FILES.dirfd=             port/solaris_bogons.h
+SUBST_SED.dirfd=               -e '/dirfd_extras/d'
 .endif
 .if !empty(PKGSRC_COMPILER:Mclang)
-SUBST_CLASSES+=                idirafter
-SUBST_MESSAGE.idirafter=Fix buggy -idirafter for clang
-SUBST_STAGE.idirafter= pre-build
-SUBST_FILES.idirafter= Makefile
-SUBST_SED.idirafter=   -e 's,-idirafter ,-I,'
+SUBST_CLASSES+=                        idirafter
+SUBST_MESSAGE.idirafter=       Fix buggy -idirafter for clang
+SUBST_STAGE.idirafter=         pre-build
+SUBST_FILES.idirafter=         Makefile
+SUBST_SED.idirafter=           -e 's,-idirafter ,-I,'
 .endif
 
 VSFTPD_USER?=  vsftpd

Index: pkgsrc/net/wakeup/Makefile
diff -u pkgsrc/net/wakeup/Makefile:1.15 pkgsrc/net/wakeup/Makefile:1.16
--- pkgsrc/net/wakeup/Makefile:1.15     Tue Oct 23 17:19:18 2012
+++ pkgsrc/net/wakeup/Makefile  Sun Nov  3 11:45:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/23 17:19:18 asau Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:57 rillig Exp $
 #
 
 DISTNAME=      hpwake
@@ -11,7 +11,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.berens-partner.de/wann/computer/wol.html
 COMMENT=       Wakeup On LAN client for remote power-up of machines
 
-USE_TOOLS+=    gunzip
+USE_TOOLS+=            gunzip
 USE_BSD_MAKEFILE=      yes
 
 INSTALLATION_DIRS=     bin

Index: pkgsrc/net/walker/Makefile
diff -u pkgsrc/net/walker/Makefile:1.10 pkgsrc/net/walker/Makefile:1.11
--- pkgsrc/net/walker/Makefile:1.10     Sun Aug 11 13:22:32 2019
+++ pkgsrc/net/walker/Makefile  Sun Nov  3 11:45:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:22:32 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:57 rillig Exp $
 #
 
 DISTNAME=      walker-3.8
@@ -14,10 +14,10 @@ DEPENDS+=   p5-Net-DNS>=0.50:../../net/p5-
 DEPENDS+=      p5-Net-DNS-SEC>=0.12:../../security/p5-Net-DNS-SEC
 
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1 bin
-NO_BUILD=      yes
-REPLACE_PERL=  walker
-USE_LANGUAGES= # none
-USE_TOOLS+=    perl:run
+NO_BUILD=              yes
+REPLACE_PERL=          walker
+USE_LANGUAGES=         # none
+USE_TOOLS+=            perl:run
 
 do-install:
        ${INSTALL} ${WRKSRC}/walker ${DESTDIR}${PREFIX}/bin/

Index: pkgsrc/net/wget/options.mk
diff -u pkgsrc/net/wget/options.mk:1.12 pkgsrc/net/wget/options.mk:1.13
--- pkgsrc/net/wget/options.mk:1.12     Sun Nov  4 16:34:57 2018
+++ pkgsrc/net/wget/options.mk  Sun Nov  3 11:45:58 2019
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.12 2018/11/04 16:34:57 bsiegert Exp $
+# $NetBSD: options.mk,v 1.13 2019/11/03 11:45:58 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.wget
-PKG_SUPPORTED_OPTIONS= idn inet6 psl
+PKG_OPTIONS_VAR=               PKG_OPTIONS.wget
+PKG_SUPPORTED_OPTIONS=         idn inet6 psl
 PKG_OPTIONS_REQUIRED_GROUPS=   ssl
-PKG_OPTIONS_GROUP.ssl= gnutls openssl
-PKG_SUGGESTED_OPTIONS= idn inet6 openssl psl
+PKG_OPTIONS_GROUP.ssl=         gnutls openssl
+PKG_SUGGESTED_OPTIONS=         idn inet6 openssl psl
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/net/whoson/Makefile
diff -u pkgsrc/net/whoson/Makefile:1.12 pkgsrc/net/whoson/Makefile:1.13
--- pkgsrc/net/whoson/Makefile:1.12     Sat Dec 13 14:22:05 2014
+++ pkgsrc/net/whoson/Makefile  Sun Nov  3 11:45:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/12/13 14:22:05 mef Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:58 rillig Exp $
 #
 
 DISTNAME=              whoson-2.05
@@ -17,8 +17,8 @@ GNU_CONFIGURE=                yes
 WHOSOND_CHROOT?=       ${VARBASE}/chroot/whosond
 CONFIGURE_ARGS+=       --with-config="${PKG_SYSCONFDIR}/whoson.conf"
 
-RCD_SCRIPTS=           whosond
-OWN_DIRS+=             ${WHOSOND_CHROOT}
+RCD_SCRIPTS=   whosond
+OWN_DIRS+=     ${WHOSOND_CHROOT}
 EXDIR=         ${PREFIX}/share/examples/whoson
 CONF_FILES=    ${EXDIR}/whoson.conf ${PKG_SYSCONFDIR}/whoson.conf
 

Index: pkgsrc/net/wide-dhcpv6/Makefile
diff -u pkgsrc/net/wide-dhcpv6/Makefile:1.7 pkgsrc/net/wide-dhcpv6/Makefile:1.8
--- pkgsrc/net/wide-dhcpv6/Makefile:1.7 Tue Oct 23 17:19:19 2012
+++ pkgsrc/net/wide-dhcpv6/Makefile     Sun Nov  3 11:45:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 17:19:19 asau Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:58 rillig Exp $
 
 DISTNAME=      wide-dhcpv6-20080615
 CATEGORIES=    net
@@ -9,8 +9,8 @@ HOMEPAGE=       http://wide-dhcpv6.sourceforge
 COMMENT=       DHCP6 client, server and relay agent by WIDE project
 LICENSE=       modified-bsd
 
-USE_TOOLS+=    lex yacc
-GNU_CONFIGURE= yes
+USE_TOOLS+=            lex yacc
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --with-localdbdir=${VARBASE:Q}/db
 
@@ -27,11 +27,11 @@ INSTALLATION_DIRS=  ${PKGMANDIR}/man5 ${P
                        share/examples/wide-dhcpv6
 
 
-SUBST_CLASSES+=                fix-paths
-SUBST_STAGE.fix-paths= pre-configure
-SUBST_MESSAGE.fix-paths=Fixing absolute paths.
-SUBST_FILES.fix-paths= ${MAN5} ${MAN8}
-SUBST_SED.fix-paths=   -e 's,/usr/local/etc,${PKG_SYSCONFDIR:Q},g'
+SUBST_CLASSES+=                        fix-paths
+SUBST_STAGE.fix-paths=         pre-configure
+SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
+SUBST_FILES.fix-paths=         ${MAN5} ${MAN8}
+SUBST_SED.fix-paths=           -e 's,/usr/local/etc,${PKG_SYSCONFDIR:Q},g'
 
 SUBST_CLASSES+=                dprintf
 SUBST_STAGE.dprintf=   post-configure

Index: pkgsrc/net/wu-ftpd/Makefile
diff -u pkgsrc/net/wu-ftpd/Makefile:1.45 pkgsrc/net/wu-ftpd/Makefile:1.46
--- pkgsrc/net/wu-ftpd/Makefile:1.45    Mon Feb  4 09:34:49 2019
+++ pkgsrc/net/wu-ftpd/Makefile Sun Nov  3 11:45:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/02/04 09:34:49 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:58 rillig Exp $
 
 DISTNAME=      wu-ftpd-2.6.2
 PKGREVISION=   3
@@ -21,7 +21,7 @@ CONFLICTS+=   lukemftpd-[0-9]*
 GNU_CONFIGURE= YES
 USE_TOOLS+=    yacc
 
-CONFIGURE_ARGS+=--enable-quota --enable-noop --enable-skey
+CONFIGURE_ARGS+=       --enable-quota --enable-noop --enable-skey
 
 DIST_SUBDIR=           wu-ftpd
 

Index: pkgsrc/net/x2vnc/options.mk
diff -u pkgsrc/net/x2vnc/options.mk:1.3 pkgsrc/net/x2vnc/options.mk:1.4
--- pkgsrc/net/x2vnc/options.mk:1.3     Wed Mar  7 11:57:32 2018
+++ pkgsrc/net/x2vnc/options.mk Sun Nov  3 11:45:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/03/07 11:57:32 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/03 11:45:58 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.x2vnc
 
@@ -9,6 +9,6 @@ PKG_SUGGESTED_OPTIONS=
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdga)
-. include "../../x11/libXxf86dga/buildlink3.mk"
-. include "../../x11/xorgproto/buildlink3.mk"
+.  include "../../x11/libXxf86dga/buildlink3.mk"
+.  include "../../x11/xorgproto/buildlink3.mk"
 .endif

Index: pkgsrc/net/xtraceroute/Makefile
diff -u pkgsrc/net/xtraceroute/Makefile:1.60 pkgsrc/net/xtraceroute/Makefile:1.61
--- pkgsrc/net/xtraceroute/Makefile:1.60        Wed Sep  6 10:40:32 2017
+++ pkgsrc/net/xtraceroute/Makefile     Sun Nov  3 11:45:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2017/09/06 10:40:32 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2019/11/03 11:45:58 rillig Exp $
 #
 
 DISTNAME=      xtraceroute-0.8.14
@@ -17,9 +17,9 @@ USE_PKGLOCALEDIR=     yes
 USE_TOOLS+=            msgfmt
 USE_FEATURES=          snprintf
 
-CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
-CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE}
-CONFIGURE_ARGS+= --with-lib-MesaGL
+CONFIGURE_ARGS+=       --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
+CONFIGURE_ARGS+=       --with-GL-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=       --with-lib-MesaGL
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/net/xymon/options.mk
diff -u pkgsrc/net/xymon/options.mk:1.2 pkgsrc/net/xymon/options.mk:1.3
--- pkgsrc/net/xymon/options.mk:1.2     Thu May 10 21:58:38 2012
+++ pkgsrc/net/xymon/options.mk Sun Nov  3 11:45:58 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2012/05/10 21:58:38 spz Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:58 rillig Exp $
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.xymon
-PKG_SUPPORTED_OPTIONS=  ldap snmp ssl
-PKG_SUGGESTED_OPTIONS=  ldap ssl
+PKG_OPTIONS_VAR=       PKG_OPTIONS.xymon
+PKG_SUPPORTED_OPTIONS= ldap snmp ssl
+PKG_SUGGESTED_OPTIONS= ldap ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,9 +13,9 @@ PLIST_VARS+=          snmp
 CONFIGURE_ARGS+=       "--ldapinclude" "${BUILDLINK_PREFIX.openldap-client}/include"
 CONFIGURE_ARGS+=       "--ldaplib" "${BUILDLINK_PREFIX.openldap-client}/lib"
 CONFIGURE_ENV+=                ENABLELDAP=y
-.if !empty(PKG_OPTIONS:Mssl)
+.  if !empty(PKG_OPTIONS:Mssl)
 CONFIGURE_ENV+=                ENABLELDAPSSL=y
-.endif
+.  endif
 .include "../../databases/openldap-client/buildlink3.mk"
 .else
 CONFIGURE_ENV+=                ENABLELDAP=n

Index: pkgsrc/net/yaz/Makefile
diff -u pkgsrc/net/yaz/Makefile:1.74 pkgsrc/net/yaz/Makefile:1.75
--- pkgsrc/net/yaz/Makefile:1.74        Wed Apr  3 00:33:02 2019
+++ pkgsrc/net/yaz/Makefile     Sun Nov  3 11:45:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2019/04/03 00:33:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2019/11/03 11:45:58 rillig Exp $
 #
 
 DISTNAME=      yaz-4.1.6
@@ -17,9 +17,9 @@ LICENSE=      modified-bsd
 #../include/yaz/z-opac.h:37:2: error: unknown type name 'Z_External'
 MAKE_JOBS_SAFE=        no
 
-GNU_CONFIGURE= YES
-USE_LIBTOOL=   YES
-USE_TOOLS+=    pkg-config tclsh
+GNU_CONFIGURE=         YES
+USE_LIBTOOL=           YES
+USE_TOOLS+=            pkg-config tclsh
 CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.libiconv}
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=       --with-xml2=${BUILDLINK_PREFIX.libxml2}

Index: pkgsrc/net/ytalk/Makefile
diff -u pkgsrc/net/ytalk/Makefile:1.23 pkgsrc/net/ytalk/Makefile:1.24
--- pkgsrc/net/ytalk/Makefile:1.23      Mon Oct  9 08:53:56 2017
+++ pkgsrc/net/ytalk/Makefile   Sun Nov  3 11:45:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/10/09 08:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:59 rillig Exp $
 
 DISTNAME=      ytalk-3.3.0
 PKGREVISION=   1
@@ -13,7 +13,7 @@ CONFLICTS+=   ytalk-x11-[0-9]*
 
 GNU_CONFIGURE= yes
 
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=         ${PREFIX}/share/examples/ytalk
 CONF_FILES=    ${EGDIR}/ytalkrc ${PKG_SYSCONFDIR}/ytalkrc



Home | Main Index | Thread Index | Old Index