pkgsrc-Changes archive

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

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jan  7 13:04:44 UTC 2018

Modified Files:
        pkgsrc/archivers/karchive: buildlink3.mk
        pkgsrc/archivers/libcomprex: buildlink3.mk
        pkgsrc/archivers/lzo: buildlink3.mk
        pkgsrc/archivers/ocaml-zip: buildlink3.mk
        pkgsrc/archivers/unshield: buildlink3.mk
        pkgsrc/audio/SDL_mixer: buildlink3.mk
        pkgsrc/audio/SDL_sound: buildlink3.mk
        pkgsrc/audio/alsa-lib: buildlink3.mk
        pkgsrc/audio/audacious: buildlink3.mk
        pkgsrc/audio/buzztard: buildlink3.mk
        pkgsrc/audio/cdparanoia: buildlink3.mk
        pkgsrc/audio/cdplayer: buildlink3.mk
        pkgsrc/audio/celt: buildlink3.mk
        pkgsrc/audio/freealut: buildlink3.mk
        pkgsrc/audio/gsm: buildlink3.mk
        pkgsrc/audio/libao: buildlink3.mk
        pkgsrc/audio/libcdaudio: buildlink3.mk
        pkgsrc/audio/libdiscid: buildlink3.mk
        pkgsrc/audio/libid3tag: buildlink3.mk
        pkgsrc/audio/liblastfm: buildlink3.mk
        pkgsrc/audio/libmpcdec: buildlink3.mk
        pkgsrc/audio/libmusepack: buildlink3.mk
        pkgsrc/audio/libsbsms: buildlink3.mk
        pkgsrc/audio/libshout: buildlink3.mk
        pkgsrc/audio/libsidplay: buildlink3.mk
        pkgsrc/audio/libspiff: buildlink3.mk
        pkgsrc/audio/libvisual: buildlink3.mk
        pkgsrc/audio/libvorbis: buildlink3.mk
        pkgsrc/audio/libxspf: buildlink3.mk
        pkgsrc/audio/musepack: buildlink3.mk
        pkgsrc/audio/musicbrainz: buildlink3.mk
        pkgsrc/audio/opusfile: buildlink3.mk
        pkgsrc/audio/portaudio: buildlink3.mk
        pkgsrc/audio/pulseaudio: buildlink3.mk
        pkgsrc/audio/speexdsp: buildlink3.mk
        pkgsrc/audio/streamtuner: buildlink3.mk
        pkgsrc/benchmarks/google-benchmark: buildlink3.mk
        pkgsrc/biology/openbabel: buildlink3.mk
        pkgsrc/cad/iverilog: buildlink3.mk
        pkgsrc/cad/libwcalc: buildlink3.mk
        pkgsrc/chat/farstream: buildlink3.mk
        pkgsrc/chat/ktp-contact-list: buildlink3.mk
        pkgsrc/chat/libfolks: buildlink3.mk
        pkgsrc/chat/libpurple: buildlink3.mk
        pkgsrc/chat/loudmouth: buildlink3.mk
        pkgsrc/chat/meanwhile: buildlink3.mk
        pkgsrc/chat/telepathy-logger: buildlink3.mk
        pkgsrc/chat/telepathy-mission-control: buildlink3.mk
        pkgsrc/comms/asterisk: buildlink3.mk
        pkgsrc/comms/gnome-pilot: buildlink3.mk
        pkgsrc/comms/libsyncml: buildlink3.mk
        pkgsrc/comms/libticables2: buildlink3.mk
        pkgsrc/comms/libticonv: buildlink3.mk
        pkgsrc/comms/openobex: buildlink3.mk
        pkgsrc/comms/synce-rra: buildlink3.mk
        pkgsrc/converters/hs-aeson: buildlink3.mk
        pkgsrc/converters/libe-book: buildlink3.mk
        pkgsrc/converters/libmspub: buildlink3.mk
        pkgsrc/converters/orcus0.12: buildlink3.mk
        pkgsrc/converters/qrencode: buildlink3.mk
        pkgsrc/cross/avr-binutils: buildlink3.mk
        pkgsrc/cross/nios2-gcc: buildlink3.mk
        pkgsrc/databases/db: buildlink3.mk
        pkgsrc/databases/db3: buildlink3.mk
        pkgsrc/databases/libdbh2: buildlink3.mk
        pkgsrc/databases/mariadb55-client: buildlink3.mk
        pkgsrc/databases/ocaml-dbm: buildlink3.mk
        pkgsrc/databases/openldap-client: buildlink3.mk
        pkgsrc/databases/p5-DBI: buildlink3.mk
        pkgsrc/databases/poco-data: buildlink3.mk
        pkgsrc/databases/poco-data-sqlite: buildlink3.mk
        pkgsrc/databases/py-metakit: buildlink3.mk
        pkgsrc/databases/qdbm: buildlink3.mk
        pkgsrc/databases/qore-mysql-module: buildlink3.mk
        pkgsrc/databases/shared-mime-info: buildlink3.mk
        pkgsrc/databases/tdb: buildlink3.mk
        pkgsrc/databases/unixodbc: buildlink3.mk
        pkgsrc/databases/vsqlite++: buildlink3.mk
        pkgsrc/devel/GConf-ui: buildlink3.mk
        pkgsrc/devel/apel: buildlink3.mk
        pkgsrc/devel/apr-util: buildlink3.mk
        pkgsrc/devel/atk: buildlink3.mk
        pkgsrc/devel/binutils: buildlink3.mk
        pkgsrc/devel/boehm-gc: buildlink3.mk
        pkgsrc/devel/cdk: buildlink3.mk
        pkgsrc/devel/dlcompat: buildlink3.mk
        pkgsrc/devel/edcommon: buildlink3.mk
        pkgsrc/devel/editline: buildlink3.mk
        pkgsrc/devel/editorconfig-core: buildlink3.mk
        pkgsrc/devel/gettext-asprintf: buildlink3.mk
        pkgsrc/devel/gnustep-objc-lf2: buildlink3.mk
        pkgsrc/devel/go-check: buildlink3.mk
        pkgsrc/devel/go-ed25519: buildlink3.mk
        pkgsrc/devel/go-gitmap: buildlink3.mk
        pkgsrc/devel/go-goorgeous: buildlink3.mk
        pkgsrc/devel/go-goptlib: buildlink3.mk
        pkgsrc/devel/go-homedir: buildlink3.mk
        pkgsrc/devel/go-immutable-radix: buildlink3.mk
        pkgsrc/devel/go-jwalterweatherman: buildlink3.mk
        pkgsrc/devel/go-mapstructure: buildlink3.mk
        pkgsrc/devel/go-mow-cli: buildlink3.mk
        pkgsrc/devel/go-nbreader: buildlink3.mk
        pkgsrc/devel/go-protobuf: buildlink3.mk
        pkgsrc/devel/go-ratelimit: buildlink3.mk
        pkgsrc/devel/go-sanitized_anchor_name: buildlink3.mk
        pkgsrc/devel/go-shuffle: buildlink3.mk
        pkgsrc/devel/go-siphash: buildlink3.mk
        pkgsrc/devel/go-termbox: buildlink3.mk
        pkgsrc/devel/go-testify: buildlink3.mk
        pkgsrc/devel/go-tools: buildlink3.mk
        pkgsrc/devel/grantlee: buildlink3.mk
        pkgsrc/devel/gtl: buildlink3.mk
        pkgsrc/devel/guile-gnome: buildlink3.mk
        pkgsrc/devel/hdf5-c++: buildlink3.mk
        pkgsrc/devel/hs-ansi-terminal: buildlink3.mk
        pkgsrc/devel/hs-blaze-builder: buildlink3.mk
        pkgsrc/devel/hs-cpphs: buildlink3.mk
        pkgsrc/devel/hs-dlist: buildlink3.mk
        pkgsrc/devel/hs-extensible-exceptions: buildlink3.mk
        pkgsrc/devel/hs-mmorph: buildlink3.mk
        pkgsrc/devel/hs-monad-control: buildlink3.mk
        pkgsrc/devel/hs-random: buildlink3.mk
        pkgsrc/devel/hs-split: buildlink3.mk
        pkgsrc/devel/hs-tagged: buildlink3.mk
        pkgsrc/devel/hs-vault: buildlink3.mk
        pkgsrc/devel/hs-vector: buildlink3.mk
        pkgsrc/devel/iniparser: buildlink3.mk
        pkgsrc/devel/jemalloc: buildlink3.mk
        pkgsrc/devel/kcmutils: buildlink3.mk
        pkgsrc/devel/kdoctools: buildlink3.mk
        pkgsrc/devel/kidletime: buildlink3.mk
        pkgsrc/devel/kpackage: buildlink3.mk
        pkgsrc/devel/kservice: buildlink3.mk
        pkgsrc/devel/libFoundation: buildlink3.mk
        pkgsrc/devel/libappindicator3: buildlink3.mk
        pkgsrc/devel/libbonobo: buildlink3.mk
        pkgsrc/devel/libbonoboui: buildlink3.mk
        pkgsrc/devel/libdatrie: buildlink3.mk
        pkgsrc/devel/libdnsres: buildlink3.mk
        pkgsrc/devel/libdockapp: buildlink3.mk
        pkgsrc/devel/libffcall: buildlink3.mk
        pkgsrc/devel/libftdi1: buildlink3.mk
        pkgsrc/devel/libgee0.6: buildlink3.mk
        pkgsrc/devel/libglade: buildlink3.mk
        pkgsrc/devel/libgnome: buildlink3.mk
        pkgsrc/devel/libgnomeui: buildlink3.mk
        pkgsrc/devel/libgphoto2: buildlink3.mk
        pkgsrc/devel/libiberty: buildlink3.mk
        pkgsrc/devel/libkgapi: buildlink3.mk
        pkgsrc/devel/libmemmgr: buildlink3.mk
        pkgsrc/devel/libosip: buildlink3.mk
        pkgsrc/devel/libproplist: buildlink3.mk
        pkgsrc/devel/librfuncs: buildlink3.mk
        pkgsrc/devel/libsexymm: buildlink3.mk
        pkgsrc/devel/libslang: buildlink3.mk
        pkgsrc/devel/libslang2: buildlink3.mk
        pkgsrc/devel/libstroke: buildlink3.mk
        pkgsrc/devel/libtecla: buildlink3.mk
        pkgsrc/devel/libwnck3: buildlink3.mk
        pkgsrc/devel/linenoise: buildlink3.mk
        pkgsrc/devel/log4cplus: buildlink3.mk
        pkgsrc/devel/log4shib: buildlink3.mk
        pkgsrc/devel/m17n-lib: buildlink3.mk
        pkgsrc/devel/mell: buildlink3.mk
        pkgsrc/devel/mm-common: buildlink3.mk
        pkgsrc/devel/ncurses: buildlink3.mk
        pkgsrc/devel/ncursesw: buildlink3.mk
        pkgsrc/devel/netbsd-iscsi-lib: buildlink3.mk
        pkgsrc/devel/npapi-sdk: buildlink3.mk
        pkgsrc/devel/nspr: buildlink3.mk
        pkgsrc/devel/nss: buildlink3.mk
        pkgsrc/devel/ocaml-findlib: buildlink3.mk
        pkgsrc/devel/ocaml-lwt: buildlink3.mk
        pkgsrc/devel/ocaml-odn: buildlink3.mk
        pkgsrc/devel/ocaml-ppx_compare: buildlink3.mk
        pkgsrc/devel/ocaml-ppx_driver: buildlink3.mk
        pkgsrc/devel/ocaml-ppx_optcomp: buildlink3.mk
        pkgsrc/devel/ocaml-ppx_tools_versioned: buildlink3.mk
        pkgsrc/devel/ocaml-re: buildlink3.mk
        pkgsrc/devel/ocamlify: buildlink3.mk
        pkgsrc/devel/ocamlmod: buildlink3.mk
        pkgsrc/devel/p5-B-Hooks-OP-Annotation: buildlink3.mk
        pkgsrc/devel/p5-B-Hooks-OP-Check-EntersubForCV: buildlink3.mk
        pkgsrc/devel/p5-B-Hooks-Parser: buildlink3.mk
        pkgsrc/devel/p5-Event: buildlink3.mk
        pkgsrc/devel/p5-glib2: buildlink3.mk
        pkgsrc/devel/p5-pango: buildlink3.mk
        pkgsrc/devel/pdcurses: buildlink3.mk
        pkgsrc/devel/protobuf: buildlink3.mk
        pkgsrc/devel/pstreams: buildlink3.mk
        pkgsrc/devel/pth: buildlink3.mk
        pkgsrc/devel/pthread-sem: buildlink3.mk
        pkgsrc/devel/pthread-stublib: buildlink3.mk
        pkgsrc/devel/ptlib: buildlink3.mk
        pkgsrc/devel/py-boost: buildlink3.mk
        pkgsrc/devel/py-gobject: buildlink3.mk
        pkgsrc/devel/py-gobject-shared: buildlink3.mk
        pkgsrc/devel/qtscriptgenerator: buildlink3.mk
        pkgsrc/devel/readline: buildlink3.mk
        pkgsrc/devel/ruby-gnome2-gio: buildlink3.mk
        pkgsrc/devel/ruby-gnome2-pango: buildlink3.mk
        pkgsrc/devel/rx: buildlink3.mk
        pkgsrc/devel/scintilla: buildlink3.mk
        pkgsrc/devel/semantic: buildlink3.mk
        pkgsrc/devel/sofia-sip: buildlink3.mk
        pkgsrc/devel/sysexits: buildlink3.mk
        pkgsrc/devel/tcl-tclcl: buildlink3.mk
        pkgsrc/devel/xorg-util-macros: buildlink3.mk
        pkgsrc/devel/xulrunner192: buildlink3.mk
        pkgsrc/devel/xulrunner45: buildlink3.mk
        pkgsrc/editors/mule-ucs: buildlink3.mk
        pkgsrc/editors/speedbar: buildlink3.mk
        pkgsrc/emulators/cygwin_lib: buildlink3.mk
        pkgsrc/filesystems/py-fuse-bindings: buildlink3.mk
        pkgsrc/fonts/SDL2_ttf: buildlink3.mk
        pkgsrc/fonts/font-util: buildlink3.mk
        pkgsrc/fonts/gucharmap: buildlink3.mk
        pkgsrc/geography/gdal-lib: buildlink3.mk
        pkgsrc/geography/libchamplain012: buildlink3.mk
        pkgsrc/geography/shapelib: buildlink3.mk
        pkgsrc/graphics/MesaLib: buildlink3.mk
        pkgsrc/graphics/MesaLib7: buildlink3.mk
        pkgsrc/graphics/SDL_image: buildlink3.mk
        pkgsrc/graphics/compface: buildlink3.mk
        pkgsrc/graphics/evas-edb: buildlink3.mk
        pkgsrc/graphics/evas-eet: buildlink3.mk
        pkgsrc/graphics/evas-gif: buildlink3.mk
        pkgsrc/graphics/evas-jpeg: buildlink3.mk
        pkgsrc/graphics/evas-png: buildlink3.mk
        pkgsrc/graphics/evas-software-x11: buildlink3.mk
        pkgsrc/graphics/evas-tiff: buildlink3.mk
        pkgsrc/graphics/evas-xpm: buildlink3.mk
        pkgsrc/graphics/flickrnet: buildlink3.mk
        pkgsrc/graphics/freeglut: buildlink3.mk
        pkgsrc/graphics/freeimage: buildlink3.mk
        pkgsrc/graphics/freetype-lib: buildlink3.mk
        pkgsrc/graphics/freetype2: buildlink3.mk
        pkgsrc/graphics/gdk-pixbuf: buildlink3.mk
        pkgsrc/graphics/gdk-pixbuf2-xlib: buildlink3.mk
        pkgsrc/graphics/gle: buildlink3.mk
        pkgsrc/graphics/gnome-icon-theme: buildlink3.mk
        pkgsrc/graphics/go-image: buildlink3.mk
        pkgsrc/graphics/goocanvas: buildlink3.mk
        pkgsrc/graphics/gtkglext: buildlink3.mk
        pkgsrc/graphics/hicolor-icon-theme: buildlink3.mk
        pkgsrc/graphics/imlib-gtk: buildlink3.mk
        pkgsrc/graphics/jbig2dec: buildlink3.mk
        pkgsrc/graphics/kplotting: buildlink3.mk
        pkgsrc/graphics/libggiwmh: buildlink3.mk
        pkgsrc/graphics/libgnomecanvasmm: buildlink3.mk
        pkgsrc/graphics/libkdcraw: buildlink3.mk
        pkgsrc/graphics/libkexiv2: buildlink3.mk
        pkgsrc/graphics/libkface: buildlink3.mk
        pkgsrc/graphics/libksane: buildlink3.mk
        pkgsrc/graphics/libpuzzle: buildlink3.mk
        pkgsrc/graphics/libsixel: buildlink3.mk
        pkgsrc/graphics/mng: buildlink3.mk
        pkgsrc/graphics/openjpeg: buildlink3.mk
        pkgsrc/graphics/p5-Gnome2-Canvas: buildlink3.mk
        pkgsrc/graphics/p5-cairo: buildlink3.mk
        pkgsrc/graphics/plotutils: buildlink3.mk
        pkgsrc/graphics/py-cairo: buildlink3.mk
        pkgsrc/graphics/py-imaging: buildlink3.mk
        pkgsrc/graphics/py-imagingtk: buildlink3.mk
        pkgsrc/graphics/qore-glut-module: buildlink3.mk
        pkgsrc/graphics/quesoglc: buildlink3.mk
        pkgsrc/graphics/ruby-gnome2-gdk3: buildlink3.mk
        pkgsrc/graphics/sane-backends: buildlink3.mk
        pkgsrc/graphics/tango-icon-theme: buildlink3.mk
        pkgsrc/graphics/wm-icons: buildlink3.mk
        pkgsrc/graphics/xfce4-icon-theme: buildlink3.mk
        pkgsrc/ham/flxmlrpc: buildlink3.mk
        pkgsrc/ham/gnuradio-digital: buildlink3.mk
        pkgsrc/ham/gnuradio-trellis: buildlink3.mk
        pkgsrc/ham/gnuradio-vocoder: buildlink3.mk
        pkgsrc/ham/gnuradio-wavelet: buildlink3.mk
        pkgsrc/ham/hackrf: buildlink3.mk
        pkgsrc/ham/uhd: buildlink3.mk
        pkgsrc/inputmethod/canna-lib: buildlink3.mk
        pkgsrc/inputmethod/input-pad: buildlink3.mk
        pkgsrc/inputmethod/libchewing: buildlink3.mk
        pkgsrc/inputmethod/libhangul: buildlink3.mk
        pkgsrc/inputmethod/tomoe-gtk: buildlink3.mk
        pkgsrc/inputmethod/unicon-im: buildlink3.mk
        pkgsrc/lang/gcc-aux: buildlink3.mk
        pkgsrc/lang/gcc2: buildlink3.mk
        pkgsrc/lang/gcc3-c: buildlink3.mk
        pkgsrc/lang/gcc3-c++: buildlink3.mk
        pkgsrc/lang/gcc3-f77: buildlink3.mk
        pkgsrc/lang/gcc3-objc: buildlink3.mk
        pkgsrc/lang/gcc34: buildlink3.mk
        pkgsrc/lang/gcc49: buildlink3.mk
        pkgsrc/lang/gcc5: buildlink3.mk
        pkgsrc/lang/gcc5-aux: buildlink3.mk
        pkgsrc/lang/gcc5-libs: buildlink3.mk
        pkgsrc/lang/gcc6: buildlink3.mk
        pkgsrc/lang/gcc6-aux: buildlink3.mk
        pkgsrc/lang/gcc6-libs: buildlink3.mk
        pkgsrc/lang/gnat_util: buildlink3.mk
        pkgsrc/lang/libLLVM34: buildlink3.mk
        pkgsrc/lang/libunwind: buildlink3.mk
        pkgsrc/lang/llvm: buildlink3.mk
        pkgsrc/lang/lua: buildlink3.mk
        pkgsrc/lang/mono: buildlink3.mk
        pkgsrc/lang/mono2: buildlink3.mk
        pkgsrc/lang/ocaml: buildlink3.mk
        pkgsrc/lang/openjdk8: buildlink3.mk
        pkgsrc/lang/oracle-jdk8: buildlink3.mk
        pkgsrc/lang/ossp-js: buildlink3.mk
        pkgsrc/lang/ruby: buildlink3.mk
        pkgsrc/lang/sun-jdk6: buildlink3.mk
        pkgsrc/lang/sun-jdk7: buildlink3.mk
        pkgsrc/lang/sun-jre6: buildlink3.mk
        pkgsrc/lang/sun-jre7: buildlink3.mk
        pkgsrc/lang/tcl-otcl: buildlink3.mk
        pkgsrc/lang/vala: buildlink3.mk
        pkgsrc/mail/Pantomime: buildlink3.mk
        pkgsrc/mail/claws-mail: buildlink3.mk
        pkgsrc/mail/evolution: buildlink3.mk
        pkgsrc/mail/imap-uw: buildlink3.mk
        pkgsrc/mail/libesmtp: buildlink3.mk
        pkgsrc/mail/libetpan: buildlink3.mk
        pkgsrc/mail/libmilter: buildlink3.mk
        pkgsrc/mail/libsieve: buildlink3.mk
        pkgsrc/mail/libsylph: buildlink3.mk
        pkgsrc/mail/libytnef: buildlink3.mk
        pkgsrc/mail/opendmarc: buildlink3.mk
        pkgsrc/mail/perdition: buildlink3.mk
        pkgsrc/math/R: buildlink3.mk
        pkgsrc/math/analitza: buildlink3.mk
        pkgsrc/math/classias: buildlink3.mk
        pkgsrc/math/cln: buildlink3.mk
        pkgsrc/math/crfsuite: buildlink3.mk
        pkgsrc/math/go-stats: buildlink3.mk
        pkgsrc/math/gsl: buildlink3.mk
        pkgsrc/math/libixion: buildlink3.mk
        pkgsrc/math/liblbfgs: buildlink3.mk
        pkgsrc/math/lp_solve: buildlink3.mk
        pkgsrc/math/mpcomplex: buildlink3.mk
        pkgsrc/math/muparser: buildlink3.mk
        pkgsrc/math/nlopt: buildlink3.mk
        pkgsrc/math/py-Numeric: buildlink3.mk
        pkgsrc/math/qalculate: buildlink3.mk
        pkgsrc/math/scilab: buildlink3.mk
        pkgsrc/misc/Addresses: buildlink3.mk
        pkgsrc/misc/bbdb: buildlink3.mk
        pkgsrc/misc/go-genproto: buildlink3.mk
        pkgsrc/misc/libkdeedu: buildlink3.mk
        pkgsrc/multimedia/bsdav: buildlink3.mk
        pkgsrc/multimedia/farsight2: buildlink3.mk
        pkgsrc/multimedia/ffmpeg010: buildlink3.mk
        pkgsrc/multimedia/ffmpeg1: buildlink3.mk
        pkgsrc/multimedia/ffmpegthumbnailer: buildlink3.mk
        pkgsrc/multimedia/gnome-media: buildlink3.mk
        pkgsrc/multimedia/gst-plugins0.10-bad: buildlink3.mk
        pkgsrc/multimedia/gst-plugins1-bad: buildlink3.mk
        pkgsrc/multimedia/gst-plugins1-good: buildlink3.mk
        pkgsrc/multimedia/gst-plugins1-ugly: buildlink3.mk
        pkgsrc/multimedia/gstreamer0.10: buildlink3.mk
        pkgsrc/multimedia/libdvdcss: buildlink3.mk
        pkgsrc/multimedia/libdvdnav: buildlink3.mk
        pkgsrc/multimedia/libdvdplay: buildlink3.mk
        pkgsrc/multimedia/libflash: buildlink3.mk
        pkgsrc/multimedia/libkcddb: buildlink3.mk
        pkgsrc/multimedia/libmp4v2: buildlink3.mk
        pkgsrc/multimedia/libmpeg2: buildlink3.mk
        pkgsrc/multimedia/liboggz: buildlink3.mk
        pkgsrc/multimedia/libtheora: buildlink3.mk
        pkgsrc/multimedia/libva: buildlink3.mk
        pkgsrc/multimedia/libvdpau: buildlink3.mk
        pkgsrc/multimedia/mjpegtools: buildlink3.mk
        pkgsrc/multimedia/xine-lib: buildlink3.mk
        pkgsrc/multimedia/xvidcore: buildlink3.mk
        pkgsrc/net/SDL2_net: buildlink3.mk
        pkgsrc/net/aws-sdk-go: buildlink3.mk
        pkgsrc/net/flickcurl: buildlink3.mk
        pkgsrc/net/go-vultr: buildlink3.mk
        pkgsrc/net/gupnp-av: buildlink3.mk
        pkgsrc/net/gupnp-igd: buildlink3.mk
        pkgsrc/net/isc-dhcp4: buildlink3.mk
        pkgsrc/net/knewstuff: buildlink3.mk
        pkgsrc/net/libcares: buildlink3.mk
        pkgsrc/net/libfetch: buildlink3.mk
        pkgsrc/net/libgdata: buildlink3.mk
        pkgsrc/net/liblive: buildlink3.mk
        pkgsrc/net/libnipper: buildlink3.mk
        pkgsrc/net/libradius: buildlink3.mk
        pkgsrc/net/librsync: buildlink3.mk
        pkgsrc/net/mono-nat: buildlink3.mk
        pkgsrc/net/net-snmp: buildlink3.mk
        pkgsrc/net/netatalk22: buildlink3.mk
        pkgsrc/net/ocaml-ipaddr: buildlink3.mk
        pkgsrc/net/ocamlnet: buildlink3.mk
        pkgsrc/net/openh323: buildlink3.mk
        pkgsrc/net/py-irclib: buildlink3.mk
        pkgsrc/net/radiusclient-ng: buildlink3.mk
        pkgsrc/parallel/pvm3: buildlink3.mk
        pkgsrc/pkgtools/x11-links: buildlink3.mk
        pkgsrc/print/ghostscript: buildlink3.mk
        pkgsrc/print/kpathsea: buildlink3.mk
        pkgsrc/print/libpaper: buildlink3.mk
        pkgsrc/print/poppler-includes: buildlink3.mk
        pkgsrc/security/beecrypt: buildlink3.mk
        pkgsrc/security/cvm: buildlink3.mk
        pkgsrc/security/go-crypto: buildlink3.mk
        pkgsrc/security/go-oauth2: buildlink3.mk
        pkgsrc/security/gss: buildlink3.mk
        pkgsrc/security/hs-digest: buildlink3.mk
        pkgsrc/security/libcrack: buildlink3.mk
        pkgsrc/security/libglobalplatform: buildlink3.mk
        pkgsrc/security/libgnome-keyring: buildlink3.mk
        pkgsrc/security/libident: buildlink3.mk
        pkgsrc/security/libmcrypt: buildlink3.mk
        pkgsrc/security/liboauth: buildlink3.mk
        pkgsrc/security/libprelude-python: buildlink3.mk
        pkgsrc/security/libpreludedb-perl: buildlink3.mk
        pkgsrc/security/libressl: buildlink3.mk
        pkgsrc/security/libsecret: buildlink3.mk
        pkgsrc/security/nettle: buildlink3.mk
        pkgsrc/security/ocaml-ssl: buildlink3.mk
        pkgsrc/security/openssl: buildlink3.mk
        pkgsrc/security/openvas-libraries: buildlink3.mk
        pkgsrc/security/pakchois: buildlink3.mk
        pkgsrc/security/pcsc-lite: buildlink3.mk
        pkgsrc/security/pinentry: buildlink3.mk
        pkgsrc/security/policykit: buildlink3.mk
        pkgsrc/security/polkit-qt: buildlink3.mk
        pkgsrc/security/qore-ssh2-module: buildlink3.mk
        pkgsrc/security/seahorse: buildlink3.mk
        pkgsrc/security/sleuthkit: buildlink3.mk
        pkgsrc/security/ykclient: buildlink3.mk
        pkgsrc/sysutils/amanda-common: buildlink3.mk
        pkgsrc/sysutils/augeas: buildlink3.mk
        pkgsrc/sysutils/dbus: buildlink3.mk
        pkgsrc/sysutils/dbus-glib: buildlink3.mk
        pkgsrc/sysutils/deforaos-browser: buildlink3.mk
        pkgsrc/sysutils/desktop-file-utils: buildlink3.mk
        pkgsrc/sysutils/eventlog: buildlink3.mk
        pkgsrc/sysutils/fam: buildlink3.mk
        pkgsrc/sysutils/file: buildlink3.mk
        pkgsrc/sysutils/gnome-menus: buildlink3.mk
        pkgsrc/sysutils/gsettings-desktop-schemas: buildlink3.mk
        pkgsrc/sysutils/hal-info: buildlink3.mk
        pkgsrc/sysutils/libbaloo4: buildlink3.mk
        pkgsrc/sysutils/libdevkit-gobject: buildlink3.mk
        pkgsrc/sysutils/libgamin: buildlink3.mk
        pkgsrc/sysutils/libisofs: buildlink3.mk
        pkgsrc/sysutils/libnotify: buildlink3.mk
        pkgsrc/sysutils/libpciaccess: buildlink3.mk
        pkgsrc/sysutils/nautilus: buildlink3.mk
        pkgsrc/sysutils/pciutils: buildlink3.mk
        pkgsrc/sysutils/py-notify-python: buildlink3.mk
        pkgsrc/sysutils/vcdimager-devel: buildlink3.mk
        pkgsrc/textproc/aiksaurus: buildlink3.mk
        pkgsrc/textproc/cityhash: buildlink3.mk
        pkgsrc/textproc/gnome-spell: buildlink3.mk
        pkgsrc/textproc/go-prose: buildlink3.mk
        pkgsrc/textproc/go-runewidth: buildlink3.mk
        pkgsrc/textproc/go-sentences: buildlink3.mk
        pkgsrc/textproc/gtkspell: buildlink3.mk
        pkgsrc/textproc/hre: buildlink3.mk
        pkgsrc/textproc/hs-parsec: buildlink3.mk
        pkgsrc/textproc/iso-codes: buildlink3.mk
        pkgsrc/textproc/jansson: buildlink3.mk
        pkgsrc/textproc/json-glib: buildlink3.mk
        pkgsrc/textproc/kakasi: buildlink3.mk
        pkgsrc/textproc/libcroco: buildlink3.mk
        pkgsrc/textproc/libexttextcat: buildlink3.mk
        pkgsrc/textproc/libodfgen: buildlink3.mk
        pkgsrc/textproc/libpinyin: buildlink3.mk
        pkgsrc/textproc/libplist: buildlink3.mk
        pkgsrc/textproc/libunicode: buildlink3.mk
        pkgsrc/textproc/libxml++: buildlink3.mk
        pkgsrc/textproc/libxml++1: buildlink3.mk
        pkgsrc/textproc/lucene++: buildlink3.mk
        pkgsrc/textproc/ocaml-csv: buildlink3.mk
        pkgsrc/textproc/ocaml-easy-format: buildlink3.mk
        pkgsrc/textproc/ocaml-tyxml: buildlink3.mk
        pkgsrc/textproc/oniguruma: buildlink3.mk
        pkgsrc/textproc/opensp: buildlink3.mk
        pkgsrc/textproc/p5-Encode: buildlink3.mk
        pkgsrc/textproc/qore-json-module: buildlink3.mk
        pkgsrc/textproc/qore-yaml-module: buildlink3.mk
        pkgsrc/textproc/sablotron: buildlink3.mk
        pkgsrc/textproc/shared-desktop-ontologies: buildlink3.mk
        pkgsrc/textproc/source-highlight: buildlink3.mk
        pkgsrc/textproc/uriparser: buildlink3.mk
        pkgsrc/textproc/xmlada: buildlink3.mk
        pkgsrc/textproc/xmlcatmgr: buildlink3.mk
        pkgsrc/textproc/xmlrpc-c: buildlink3.mk
        pkgsrc/textproc/yaml-cpp: buildlink3.mk
        pkgsrc/textproc/yelp-xsl: buildlink3.mk
        pkgsrc/time/hs-timezone-olson: buildlink3.mk
        pkgsrc/wm/afterstep: buildlink3.mk
        pkgsrc/wm/i3: buildlink3.mk
        pkgsrc/wm/metacity: buildlink3.mk
        pkgsrc/www/apache24: buildlink3.mk
        pkgsrc/www/emacs-w3m: buildlink3.mk
        pkgsrc/www/epiphany: buildlink3.mk
        pkgsrc/www/go-toml-burntsushi: buildlink3.mk
        pkgsrc/www/go-toml-pelletier: buildlink3.mk
        pkgsrc/www/kdewebkit: buildlink3.mk
        pkgsrc/www/kjsembed: buildlink3.mk
        pkgsrc/www/libghttp: buildlink3.mk
        pkgsrc/www/libgtkhtml: buildlink3.mk
        pkgsrc/www/mono-xsp: buildlink3.mk
        pkgsrc/www/py-gdata: buildlink3.mk
        pkgsrc/www/uhttpmock: buildlink3.mk
        pkgsrc/x11/blt: buildlink3.mk
        pkgsrc/x11/deforaos-keyboard: buildlink3.mk
        pkgsrc/x11/dri3proto: buildlink3.mk
        pkgsrc/x11/eekboard: buildlink3.mk
        pkgsrc/x11/fixesproto: buildlink3.mk
        pkgsrc/x11/gnome-mag: buildlink3.mk
        pkgsrc/x11/gnome-panel: buildlink3.mk
        pkgsrc/x11/gtk: buildlink3.mk
        pkgsrc/x11/gtk+extra: buildlink3.mk
        pkgsrc/x11/gtk3: buildlink3.mk
        pkgsrc/x11/gtkglarea: buildlink3.mk
        pkgsrc/x11/keybinder: buildlink3.mk
        pkgsrc/x11/libICE: buildlink3.mk
        pkgsrc/x11/libSM: buildlink3.mk
        pkgsrc/x11/libX11: buildlink3.mk
        pkgsrc/x11/libXTrap: buildlink3.mk
        pkgsrc/x11/libXaw: buildlink3.mk
        pkgsrc/x11/libXaw3d: buildlink3.mk
        pkgsrc/x11/libXcursor: buildlink3.mk
        pkgsrc/x11/libXdmcp: buildlink3.mk
        pkgsrc/x11/libXevie: buildlink3.mk
        pkgsrc/x11/libXext: buildlink3.mk
        pkgsrc/x11/libXfixes: buildlink3.mk
        pkgsrc/x11/libXfont: buildlink3.mk
        pkgsrc/x11/libXfont2: buildlink3.mk
        pkgsrc/x11/libXft: buildlink3.mk
        pkgsrc/x11/libXi: buildlink3.mk
        pkgsrc/x11/libXinerama: buildlink3.mk
        pkgsrc/x11/libXmu: buildlink3.mk
        pkgsrc/x11/libXprintAppUtil: buildlink3.mk
        pkgsrc/x11/libXrandr: buildlink3.mk
        pkgsrc/x11/libXrender: buildlink3.mk
        pkgsrc/x11/libXt: buildlink3.mk
        pkgsrc/x11/libXxf86dga: buildlink3.mk
        pkgsrc/x11/libXxf86misc: buildlink3.mk
        pkgsrc/x11/libXxf86vm: buildlink3.mk
        pkgsrc/x11/libunique: buildlink3.mk
        pkgsrc/x11/libxkbfile: buildlink3.mk
        pkgsrc/x11/libxkbui: buildlink3.mk
        pkgsrc/x11/p5-Wx: buildlink3.mk
        pkgsrc/x11/plasma-framework: buildlink3.mk
        pkgsrc/x11/py-gnome2: buildlink3.mk
        pkgsrc/x11/py-gnome2-desktop: buildlink3.mk
        pkgsrc/x11/py-gtksourceview: buildlink3.mk
        pkgsrc/x11/py-qt4-qscintilla: buildlink3.mk
        pkgsrc/x11/py-wxWidgets: buildlink3.mk
        pkgsrc/x11/qt4-libs: buildlink3.mk
        pkgsrc/x11/qt4-qdbus: buildlink3.mk
        pkgsrc/x11/qt4-tools: buildlink3.mk
        pkgsrc/x11/qt5-mysql: buildlink3.mk
        pkgsrc/x11/qt5-odbc: buildlink3.mk
        pkgsrc/x11/qt5-psql: buildlink3.mk
        pkgsrc/x11/qt5-qtbase: buildlink3.mk
        pkgsrc/x11/qt5-qtdeclarative: buildlink3.mk
        pkgsrc/x11/qt5-qtmultimedia: buildlink3.mk
        pkgsrc/x11/qt5-qtserialport: buildlink3.mk
        pkgsrc/x11/qt5-qtsvg: buildlink3.mk
        pkgsrc/x11/qt5-qtwebchannel: buildlink3.mk
        pkgsrc/x11/qt5-qtxmlpatterns: buildlink3.mk
        pkgsrc/x11/qwtplot3d-qt4: buildlink3.mk
        pkgsrc/x11/renderproto: buildlink3.mk
        pkgsrc/x11/rep-gtk2: buildlink3.mk
        pkgsrc/x11/ruby-gnome2-gtk3: buildlink3.mk
        pkgsrc/x11/tk: buildlink3.mk
        pkgsrc/x11/tk85: buildlink3.mk
        pkgsrc/x11/trapproto: buildlink3.mk
        pkgsrc/x11/wxGTK30: buildlink3.mk
        pkgsrc/x11/xbitmaps: buildlink3.mk
        pkgsrc/x11/xcb-proto: buildlink3.mk
        pkgsrc/x11/xcb-util-keysyms: buildlink3.mk
        pkgsrc/x11/xextproto: buildlink3.mk
        pkgsrc/x11/xf86bigfontproto: buildlink3.mk
        pkgsrc/x11/xf86vidmodeproto: buildlink3.mk
        pkgsrc/x11/xproxymanagementprotocol: buildlink3.mk
        pkgsrc/x11/xview-lib: buildlink3.mk

Log Message:
Fix indentation in buildlink3.mk files.

The actual fix as been done by "pkglint -F */*/buildlink3.mk", and was
reviewed manually.

There are some .include lines that still are indented with zero spaces
although the surrounding .if is indented. This is existing practice.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/karchive/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/archivers/libcomprex/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/lzo/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/archivers/ocaml-zip/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/archivers/unshield/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/audio/SDL_mixer/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/audio/SDL_sound/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/alsa-lib/buildlink3.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/audio/audacious/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/buzztard/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/cdparanoia/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/cdplayer/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/celt/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/freealut/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/gsm/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/libao/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/libcdaudio/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/libdiscid/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/libid3tag/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/liblastfm/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/libmpcdec/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/libmusepack/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/libsbsms/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/libshout/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/libsidplay/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/libspiff/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/libvisual/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/libvorbis/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/libxspf/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/musepack/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/musicbrainz/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/opusfile/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/portaudio/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/pulseaudio/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/speexdsp/buildlink3.mk
cvs rdiff -u -r1.48 -r1.49 pkgsrc/audio/streamtuner/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/benchmarks/google-benchmark/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/biology/openbabel/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/iverilog/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/cad/libwcalc/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/farstream/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/ktp-contact-list/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/chat/libfolks/buildlink3.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/chat/libpurple/buildlink3.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/chat/loudmouth/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/meanwhile/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/chat/telepathy-logger/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 \
    pkgsrc/chat/telepathy-mission-control/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/asterisk/buildlink3.mk
cvs rdiff -u -r1.76 -r1.77 pkgsrc/comms/gnome-pilot/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/comms/libsyncml/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/libticables2/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/libticonv/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/comms/openobex/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/synce-rra/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/converters/hs-aeson/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/converters/libe-book/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/converters/libmspub/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/orcus0.12/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/qrencode/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cross/avr-binutils/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cross/nios2-gcc/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/db/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/db3/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/libdbh2/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mariadb55-client/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/ocaml-dbm/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/openldap-client/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/p5-DBI/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/poco-data/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/poco-data-sqlite/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/py-metakit/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/qdbm/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/qore-mysql-module/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/shared-mime-info/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/tdb/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/unixodbc/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/vsqlite++/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/GConf-ui/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/apel/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/apr-util/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/atk/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/binutils/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/boehm-gc/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/cdk/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/dlcompat/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/edcommon/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/editline/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/editorconfig-core/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/gettext-asprintf/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/gnustep-objc-lf2/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/go-check/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/go-ed25519/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/go-gitmap/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/go-goorgeous/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/go-goptlib/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/go-homedir/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/go-immutable-radix/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/go-jwalterweatherman/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/go-mapstructure/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/go-mow-cli/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/go-nbreader/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/go-protobuf/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/go-ratelimit/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/go-sanitized_anchor_name/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/go-shuffle/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/go-siphash/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/go-termbox/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/go-testify/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/go-tools/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/grantlee/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/gtl/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/guile-gnome/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hdf5-c++/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-ansi-terminal/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/hs-blaze-builder/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/hs-cpphs/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/hs-dlist/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/hs-extensible-exceptions/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/hs-mmorph/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-monad-control/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-random/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/hs-split/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/hs-tagged/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/hs-vault/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/hs-vector/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/iniparser/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/jemalloc/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/kcmutils/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/kdoctools/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/kidletime/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/kpackage/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/kservice/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libFoundation/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/libappindicator3/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/libbonobo/buildlink3.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/libbonoboui/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libdatrie/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/libdnsres/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/libdockapp/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libffcall/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libftdi1/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libgee0.6/buildlink3.mk
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/libglade/buildlink3.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/libgnome/buildlink3.mk
cvs rdiff -u -r1.64 -r1.65 pkgsrc/devel/libgnomeui/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/libgphoto2/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libiberty/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libkgapi/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libmemmgr/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/libosip/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/libproplist/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/librfuncs/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/libsexymm/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/libslang/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/libslang2/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/libstroke/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/libtecla/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/libwnck3/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/linenoise/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/log4cplus/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/log4shib/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/m17n-lib/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/mell/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/mm-common/buildlink3.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/ncurses/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ncursesw/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/netbsd-iscsi-lib/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/npapi-sdk/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/nspr/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/nss/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-findlib/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-lwt/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/ocaml-odn/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-ppx_compare/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-ppx_driver/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-ppx_optcomp/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-re/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocamlify/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocamlmod/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 \
    pkgsrc/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/p5-B-Hooks-Parser/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/p5-Event/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/p5-glib2/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/p5-pango/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/pdcurses/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/protobuf/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/pstreams/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/pth/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/pthread-sem/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/pthread-stublib/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ptlib/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-boost/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-gobject/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/py-gobject-shared/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/qtscriptgenerator/buildlink3.mk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/readline/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ruby-gnome2-gio/buildlink3.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/ruby-gnome2-pango/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/rx/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/scintilla/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/semantic/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/sofia-sip/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/sysexits/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/tcl-tclcl/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/xorg-util-macros/buildlink3.mk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/xulrunner192/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/xulrunner45/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/mule-ucs/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/speedbar/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/cygwin_lib/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/filesystems/py-fuse-bindings/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/SDL2_ttf/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/font-util/buildlink3.mk
cvs rdiff -u -r1.51 -r1.52 pkgsrc/fonts/gucharmap/buildlink3.mk
cvs rdiff -u -r1.47 -r1.48 pkgsrc/geography/gdal-lib/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/geography/libchamplain012/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/shapelib/buildlink3.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/MesaLib/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/MesaLib7/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/SDL_image/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/compface/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/evas-edb/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/evas-eet/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/evas-gif/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/evas-jpeg/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/evas-png/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/evas-software-x11/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/evas-tiff/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/evas-xpm/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/flickrnet/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/freeglut/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/freeimage/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/freetype-lib/buildlink3.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/freetype2/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/gdk-pixbuf/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/gdk-pixbuf2-xlib/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/gle/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/gnome-icon-theme/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/go-image/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/goocanvas/buildlink3.mk
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/gtkglext/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/hicolor-icon-theme/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/imlib-gtk/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/graphics/jbig2dec/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/kplotting/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/libggiwmh/buildlink3.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/libgnomecanvasmm/buildlink3.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/graphics/libkdcraw/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/libkexiv2/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/libkface/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/libksane/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/libpuzzle/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/libsixel/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/mng/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/openjpeg/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/p5-Gnome2-Canvas/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/p5-cairo/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/plotutils/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/py-cairo/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/py-imaging/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/py-imagingtk/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/qore-glut-module/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/quesoglc/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/ruby-gnome2-gdk3/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/sane-backends/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/graphics/tango-icon-theme/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/wm-icons/buildlink3.mk
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/xfce4-icon-theme/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/flxmlrpc/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/gnuradio-digital/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/gnuradio-trellis/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/gnuradio-vocoder/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/gnuradio-wavelet/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/hackrf/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/ham/uhd/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/inputmethod/canna-lib/buildlink3.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/inputmethod/input-pad/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/inputmethod/libchewing/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/inputmethod/libhangul/buildlink3.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/inputmethod/tomoe-gtk/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/inputmethod/unicon-im/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc-aux/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc2/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/gcc3-c/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/gcc3-c++/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/gcc3-f77/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/gcc3-objc/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/gcc34/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc49/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc5/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc5-aux/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc5-libs/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc6/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc6-aux/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc6-libs/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gnat_util/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/libLLVM34/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/libunwind/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/llvm/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/lua/buildlink3.mk
cvs rdiff -u -r1.57 -r1.58 pkgsrc/lang/mono/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/mono2/buildlink3.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/ocaml/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/openjdk8/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/oracle-jdk8/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ossp-js/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/ruby/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/sun-jdk6/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/sun-jdk7/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/sun-jre6/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/sun-jre7/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/tcl-otcl/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/vala/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/Pantomime/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/claws-mail/buildlink3.mk
cvs rdiff -u -r1.76 -r1.77 pkgsrc/mail/evolution/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/imap-uw/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/libesmtp/buildlink3.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/mail/libetpan/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/libmilter/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/libsieve/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/libsylph/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/libytnef/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/opendmarc/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/perdition/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/math/R/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/math/analitza/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/classias/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/math/cln/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/math/crfsuite/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/go-stats/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/gsl/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/libixion/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/math/liblbfgs/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/lp_solve/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/mpcomplex/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/muparser/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/nlopt/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/math/py-Numeric/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/math/qalculate/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/math/scilab/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/misc/Addresses/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/bbdb/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/go-genproto/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/misc/libkdeedu/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/bsdav/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/multimedia/farsight2/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg010/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg1/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/ffmpegthumbnailer/buildlink3.mk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/multimedia/gnome-media/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 \
    pkgsrc/multimedia/gst-plugins0.10-bad/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/gst-plugins1-bad/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/gst-plugins1-good/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/gst-plugins1-ugly/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/multimedia/gstreamer0.10/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/libdvdcss/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/libdvdnav/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/libdvdplay/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/libflash/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/libkcddb/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/libmp4v2/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/libmpeg2/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/liboggz/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/libtheora/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/libva/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/libvdpau/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/multimedia/mjpegtools/buildlink3.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/multimedia/xine-lib/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/xvidcore/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/SDL2_net/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/aws-sdk-go/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/flickcurl/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/go-vultr/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/gupnp-av/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/gupnp-igd/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/isc-dhcp4/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/knewstuff/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/libcares/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/libfetch/buildlink3.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/libgdata/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/liblive/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/libnipper/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/libradius/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/librsync/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/mono-nat/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/net-snmp/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk22/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/ocaml-ipaddr/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/ocamlnet/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/openh323/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-irclib/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/radiusclient-ng/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/parallel/pvm3/buildlink3.mk
cvs rdiff -u -r1.70 -r1.71 pkgsrc/pkgtools/x11-links/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/ghostscript/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/kpathsea/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/libpaper/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/poppler-includes/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/beecrypt/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/cvm/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/go-crypto/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/go-oauth2/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/gss/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/hs-digest/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/libcrack/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/libglobalplatform/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/libgnome-keyring/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/libident/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/libmcrypt/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/liboauth/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/security/libprelude-python/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/security/libpreludedb-perl/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/libressl/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/libsecret/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/nettle/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/ocaml-ssl/buildlink3.mk
cvs rdiff -u -r1.51 -r1.52 pkgsrc/security/openssl/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/openvas-libraries/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/pakchois/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/pcsc-lite/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/pinentry/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/policykit/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/polkit-qt/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/qore-ssh2-module/buildlink3.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/seahorse/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/sleuthkit/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/ykclient/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/amanda-common/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/augeas/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/dbus/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/dbus-glib/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/deforaos-browser/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/desktop-file-utils/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/sysutils/eventlog/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/fam/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/file/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/gnome-menus/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/gsettings-desktop-schemas/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/hal-info/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/libbaloo4/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/libdevkit-gobject/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/libgamin/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/libisofs/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/libnotify/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/libpciaccess/buildlink3.mk
cvs rdiff -u -r1.63 -r1.64 pkgsrc/sysutils/nautilus/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/pciutils/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/py-notify-python/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/vcdimager-devel/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/aiksaurus/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/cityhash/buildlink3.mk
cvs rdiff -u -r1.55 -r1.56 pkgsrc/textproc/gnome-spell/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/go-prose/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/go-runewidth/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/go-sentences/buildlink3.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/textproc/gtkspell/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/hre/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/hs-parsec/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/iso-codes/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/jansson/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/json-glib/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/kakasi/buildlink3.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/textproc/libcroco/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/textproc/libexttextcat/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/libodfgen/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/libpinyin/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/libplist/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/libunicode/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/libxml++/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/libxml++1/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/lucene++/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/ocaml-csv/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ocaml-easy-format/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/ocaml-tyxml/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/oniguruma/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/opensp/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/p5-Encode/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/qore-json-module/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/qore-yaml-module/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/sablotron/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 \
    pkgsrc/textproc/shared-desktop-ontologies/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/source-highlight/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/uriparser/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/xmlada/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/xmlcatmgr/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/xmlrpc-c/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/yaml-cpp/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/textproc/yelp-xsl/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/time/hs-timezone-olson/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/afterstep/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/i3/buildlink3.mk
cvs rdiff -u -r1.45 -r1.46 pkgsrc/wm/metacity/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/apache24/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/emacs-w3m/buildlink3.mk
cvs rdiff -u -r1.81 -r1.82 pkgsrc/www/epiphany/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/go-toml-burntsushi/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/go-toml-pelletier/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/kdewebkit/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/kjsembed/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/libghttp/buildlink3.mk
cvs rdiff -u -r1.47 -r1.48 pkgsrc/www/libgtkhtml/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/mono-xsp/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/py-gdata/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/uhttpmock/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/blt/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/deforaos-keyboard/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/dri3proto/buildlink3.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/eekboard/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/fixesproto/buildlink3.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/gnome-mag/buildlink3.mk
cvs rdiff -u -r1.82 -r1.83 pkgsrc/x11/gnome-panel/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/gtk/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/gtk+extra/buildlink3.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/gtk3/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/gtkglarea/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/keybinder/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libICE/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libSM/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/libX11/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXTrap/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXaw/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXaw3d/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXcursor/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXdmcp/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXevie/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/libXext/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXfixes/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXfont/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libXfont2/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXft/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libXi/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libXinerama/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXmu/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libXprintAppUtil/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/libXrandr/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXrender/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXt/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXxf86dga/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXxf86misc/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXxf86vm/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/libunique/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libxkbfile/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libxkbui/buildlink3.mk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/x11/p5-Wx/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/plasma-framework/buildlink3.mk
cvs rdiff -u -r1.59 -r1.60 pkgsrc/x11/py-gnome2/buildlink3.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/x11/py-gnome2-desktop/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/py-gtksourceview/buildlink3.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/py-qt4-qscintilla/buildlink3.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/py-wxWidgets/buildlink3.mk
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/qt4-libs/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/qt4-qdbus/buildlink3.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/qt4-tools/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt5-mysql/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt5-odbc/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt5-psql/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/qt5-qtbase/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/qt5-qtdeclarative/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt5-qtserialport/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt5-qtsvg/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt5-qtxmlpatterns/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/qwtplot3d-qt4/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/renderproto/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/rep-gtk2/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/ruby-gnome2-gtk3/buildlink3.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/tk/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/tk85/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/trapproto/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/wxGTK30/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xbitmaps/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xcb-proto/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xcb-util-keysyms/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/xextproto/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xf86bigfontproto/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86vidmodeproto/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xproxymanagementprotocol/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/xview-lib/buildlink3.mk

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

Modified files:

Index: pkgsrc/archivers/karchive/buildlink3.mk
diff -u pkgsrc/archivers/karchive/buildlink3.mk:1.7 pkgsrc/archivers/karchive/buildlink3.mk:1.8
--- pkgsrc/archivers/karchive/buildlink3.mk:1.7 Thu Nov 30 16:45:00 2017
+++ pkgsrc/archivers/karchive/buildlink3.mk     Sun Jan  7 13:03:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:00 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:03:53 rillig Exp $
 
 BUILDLINK_TREE+=       karchive
 
@@ -7,7 +7,7 @@ KARCHIVE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.karchive+=       karchive>=5.18.0
 BUILDLINK_ABI_DEPENDS.karchive?=       karchive>=5.25.0nb6
-BUILDLINK_PKGSRCDIR.karchive?= ../../archivers/karchive
+BUILDLINK_PKGSRCDIR.karchive?=         ../../archivers/karchive
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif # KARCHIVE_BUILDLINK3_MK

Index: pkgsrc/archivers/libcomprex/buildlink3.mk
diff -u pkgsrc/archivers/libcomprex/buildlink3.mk:1.24 pkgsrc/archivers/libcomprex/buildlink3.mk:1.25
--- pkgsrc/archivers/libcomprex/buildlink3.mk:1.24      Mon Jan  1 21:18:06 2018
+++ pkgsrc/archivers/libcomprex/buildlink3.mk   Sun Jan  7 13:03:53 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.24 2018/01/01 21:18:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:03:53 rillig Exp $
 
 BUILDLINK_TREE+=       libcomprex
 
 .if !defined(LIBCOMPREX_BUILDLINK3_MK)
 LIBCOMPREX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libcomprex+=             libcomprex>=0.3.2
+BUILDLINK_API_DEPENDS.libcomprex+=     libcomprex>=0.3.2
 BUILDLINK_ABI_DEPENDS.libcomprex+=     libcomprex>=0.3.3nb14
 BUILDLINK_PKGSRCDIR.libcomprex?=       ../../archivers/libcomprex
 

Index: pkgsrc/archivers/lzo/buildlink3.mk
diff -u pkgsrc/archivers/lzo/buildlink3.mk:1.7 pkgsrc/archivers/lzo/buildlink3.mk:1.8
--- pkgsrc/archivers/lzo/buildlink3.mk:1.7      Fri Mar 20 19:23:51 2009
+++ pkgsrc/archivers/lzo/buildlink3.mk  Sun Jan  7 13:03:53 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:03:53 rillig Exp $
 
 BUILDLINK_TREE+=       lzo
 
 .if !defined(LZO_BUILDLINK3_MK)
 LZO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lzo+=            lzo>=2.01
+BUILDLINK_API_DEPENDS.lzo+=    lzo>=2.01
 BUILDLINK_PKGSRCDIR.lzo?=      ../../archivers/lzo
 .endif # LZO_BUILDLINK3_MK
 

Index: pkgsrc/archivers/ocaml-zip/buildlink3.mk
diff -u pkgsrc/archivers/ocaml-zip/buildlink3.mk:1.3 pkgsrc/archivers/ocaml-zip/buildlink3.mk:1.4
--- pkgsrc/archivers/ocaml-zip/buildlink3.mk:1.3        Tue Jul 11 10:00:51 2017
+++ pkgsrc/archivers/ocaml-zip/buildlink3.mk    Sun Jan  7 13:03:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 10:00:51 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:53 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-zip
 
@@ -7,7 +7,7 @@ OCAML_ZIP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-zip+=      ocaml-zip>=1.05nb6
 BUILDLINK_ABI_DEPENDS.ocaml-zip+=      ocaml-zip>=1.07
-BUILDLINK_PKGSRCDIR.ocaml-zip?=        ../../archivers/ocaml-zip
+BUILDLINK_PKGSRCDIR.ocaml-zip?=                ../../archivers/ocaml-zip
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif # OCAML_ZIP_BUILDLINK3_MK

Index: pkgsrc/archivers/unshield/buildlink3.mk
diff -u pkgsrc/archivers/unshield/buildlink3.mk:1.1 pkgsrc/archivers/unshield/buildlink3.mk:1.2
--- pkgsrc/archivers/unshield/buildlink3.mk:1.1 Sat Mar 28 15:47:12 2009
+++ pkgsrc/archivers/unshield/buildlink3.mk     Sun Jan  7 13:03:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/03/28 15:47:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:53 rillig Exp $
 
 BUILDLINK_TREE+=       unshield
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        unshield
 UNSHIELD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.unshield+=       unshield>=0.5.1
-BUILDLINK_PKGSRCDIR.unshield?= ../../archivers/unshield
+BUILDLINK_PKGSRCDIR.unshield?=         ../../archivers/unshield
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif # UNSHIELD_BUILDLINK3_MK

Index: pkgsrc/audio/SDL_mixer/buildlink3.mk
diff -u pkgsrc/audio/SDL_mixer/buildlink3.mk:1.18 pkgsrc/audio/SDL_mixer/buildlink3.mk:1.19
--- pkgsrc/audio/SDL_mixer/buildlink3.mk:1.18   Sat Apr 25 14:20:17 2015
+++ pkgsrc/audio/SDL_mixer/buildlink3.mk        Sun Jan  7 13:03:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2015/04/25 14:20:17 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:03:53 rillig Exp $
 
 BUILDLINK_TREE+=       SDL_mixer
 
@@ -7,8 +7,8 @@ SDL_MIXER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL_mixer+=      SDL_mixer>=1.2.5nb2
 BUILDLINK_ABI_DEPENDS.SDL_mixer+=      SDL_mixer>=1.2.12nb6
-BUILDLINK_PKGSRCDIR.SDL_mixer?=        ../../audio/SDL_mixer
-BUILDLINK_INCDIRS.SDL_mixer?=  include/SDL
+BUILDLINK_PKGSRCDIR.SDL_mixer?=                ../../audio/SDL_mixer
+BUILDLINK_INCDIRS.SDL_mixer?=          include/SDL
 
 .include "../../devel/SDL/buildlink3.mk"
 .endif # SDL_MIXER_BUILDLINK3_MK

Index: pkgsrc/audio/SDL_sound/buildlink3.mk
diff -u pkgsrc/audio/SDL_sound/buildlink3.mk:1.19 pkgsrc/audio/SDL_sound/buildlink3.mk:1.20
--- pkgsrc/audio/SDL_sound/buildlink3.mk:1.19   Sat Apr 25 14:20:18 2015
+++ pkgsrc/audio/SDL_sound/buildlink3.mk        Sun Jan  7 13:03:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2015/04/25 14:20:18 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:03:53 rillig Exp $
 
 BUILDLINK_TREE+=       SDL_sound
 
@@ -7,7 +7,7 @@ SDL_SOUND_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL_sound+=      SDL_sound>=1.0.3
 BUILDLINK_ABI_DEPENDS.SDL_sound+=      SDL_sound>=1.0.3nb6
-BUILDLINK_PKGSRCDIR.SDL_sound?=        ../../audio/SDL_sound
+BUILDLINK_PKGSRCDIR.SDL_sound?=                ../../audio/SDL_sound
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libmikmod/buildlink3.mk"

Index: pkgsrc/audio/alsa-lib/buildlink3.mk
diff -u pkgsrc/audio/alsa-lib/buildlink3.mk:1.4 pkgsrc/audio/alsa-lib/buildlink3.mk:1.5
--- pkgsrc/audio/alsa-lib/buildlink3.mk:1.4     Sat Dec  3 20:14:05 2016
+++ pkgsrc/audio/alsa-lib/buildlink3.mk Sun Jan  7 13:03:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2016/12/03 20:14:05 wiedi Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:03:53 rillig Exp $
 
 BUILDLINK_TREE+=       alsa-lib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        alsa-lib
 ALSA_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.alsa-lib+=       alsa-lib>=1.0.18
-BUILDLINK_PKGSRCDIR.alsa-lib?= ../../audio/alsa-lib
+BUILDLINK_PKGSRCDIR.alsa-lib?=         ../../audio/alsa-lib
 
 CPPFLAGS.SunOS+=       -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t
 

Index: pkgsrc/audio/audacious/buildlink3.mk
diff -u pkgsrc/audio/audacious/buildlink3.mk:1.34 pkgsrc/audio/audacious/buildlink3.mk:1.35
--- pkgsrc/audio/audacious/buildlink3.mk:1.34   Thu Nov 23 17:19:40 2017
+++ pkgsrc/audio/audacious/buildlink3.mk        Sun Jan  7 13:03:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2017/11/23 17:19:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2018/01/07 13:03:54 rillig Exp $
 
 BUILDLINK_TREE+=       audacious
 
@@ -7,7 +7,7 @@ AUDACIOUS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.audacious+=      audacious>=3.5.1
 BUILDLINK_ABI_DEPENDS.audacious+=      audacious>=3.5.2nb6
-BUILDLINK_PKGSRCDIR.audacious?=        ../../audio/audacious
+BUILDLINK_PKGSRCDIR.audacious?=                ../../audio/audacious
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/audio/buzztard/buildlink3.mk
diff -u pkgsrc/audio/buzztard/buildlink3.mk:1.2 pkgsrc/audio/buzztard/buildlink3.mk:1.3
--- pkgsrc/audio/buzztard/buildlink3.mk:1.2     Thu Sep 10 20:19:18 2009
+++ pkgsrc/audio/buzztard/buildlink3.mk Sun Jan  7 13:03:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/09/10 20:19:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:54 rillig Exp $
 
 BUILDLINK_TREE+=       buzztard
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        buzztard
 BUZZTARD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.buzztard+=       buzztard>=0.5.0
-BUILDLINK_PKGSRCDIR.buzztard?= ../../audio/buzztard
+BUILDLINK_PKGSRCDIR.buzztard?=         ../../audio/buzztard
 
 .endif # BUZZTARD_BUILDLINK3_MK
 

Index: pkgsrc/audio/cdparanoia/buildlink3.mk
diff -u pkgsrc/audio/cdparanoia/buildlink3.mk:1.11 pkgsrc/audio/cdparanoia/buildlink3.mk:1.12
--- pkgsrc/audio/cdparanoia/buildlink3.mk:1.11  Mon May  7 01:53:13 2012
+++ pkgsrc/audio/cdparanoia/buildlink3.mk       Sun Jan  7 13:03:54 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 01:53:13 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:03:54 rillig Exp $
 
 BUILDLINK_TREE+=       cdparanoia
 
 .if !defined(CDPARANOIA_BUILDLINK3_MK)
 CDPARANOIA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.cdparanoia+=             cdparanoia>=3.0
+BUILDLINK_API_DEPENDS.cdparanoia+=     cdparanoia>=3.0
 BUILDLINK_ABI_DEPENDS.cdparanoia+=     cdparanoia>=3.0.9.8nb5
 BUILDLINK_PKGSRCDIR.cdparanoia?=       ../../audio/cdparanoia
 .endif # CDPARANOIA_BUILDLINK3_MK

Index: pkgsrc/audio/cdplayer/buildlink3.mk
diff -u pkgsrc/audio/cdplayer/buildlink3.mk:1.9 pkgsrc/audio/cdplayer/buildlink3.mk:1.10
--- pkgsrc/audio/cdplayer/buildlink3.mk:1.9     Mon May  7 01:53:13 2012
+++ pkgsrc/audio/cdplayer/buildlink3.mk Sun Jan  7 13:03:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/05/07 01:53:13 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:54 rillig Exp $
 
 BUILDLINK_TREE+=       cdplayer
 
@@ -7,7 +7,7 @@ CDPLAYER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cdplayer+=       cdplayer>=0.4.2
 BUILDLINK_ABI_DEPENDS.cdplayer+=       cdplayer>=0.4.2nb3
-BUILDLINK_PKGSRCDIR.cdplayer?= ../../audio/cdplayer
+BUILDLINK_PKGSRCDIR.cdplayer?=         ../../audio/cdplayer
 
 .include "../../audio/libcdaudio/buildlink3.mk"
 .include "../../audio/cddb-bundle/buildlink3.mk"

Index: pkgsrc/audio/celt/buildlink3.mk
diff -u pkgsrc/audio/celt/buildlink3.mk:1.3 pkgsrc/audio/celt/buildlink3.mk:1.4
--- pkgsrc/audio/celt/buildlink3.mk:1.3 Tue Aug 14 07:02:09 2012
+++ pkgsrc/audio/celt/buildlink3.mk     Sun Jan  7 13:03:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/08/14 07:02:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:54 rillig Exp $
 
 BUILDLINK_TREE+=       celt
 
@@ -8,7 +8,7 @@ CELT_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.celt+=   celt>=0.11.3
 BUILDLINK_PKGSRCDIR.celt?=     ../../audio/celt
 pkgbase:= celt
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.celt:Mogg)
 .  include "../../multimedia/libogg/buildlink3.mk"

Index: pkgsrc/audio/freealut/buildlink3.mk
diff -u pkgsrc/audio/freealut/buildlink3.mk:1.3 pkgsrc/audio/freealut/buildlink3.mk:1.4
--- pkgsrc/audio/freealut/buildlink3.mk:1.3     Sat Jul 16 00:15:31 2016
+++ pkgsrc/audio/freealut/buildlink3.mk Sun Jan  7 13:03:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/07/16 00:15:31 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:54 rillig Exp $
 
 BUILDLINK_TREE+=       freealut
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        freealut
 FREEALUT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.freealut+=       freealut>=1.1.0
-BUILDLINK_PKGSRCDIR.freealut?= ../../audio/freealut
+BUILDLINK_PKGSRCDIR.freealut?=         ../../audio/freealut
 
 .include "../../audio/openal-soft/buildlink3.mk"
 .endif # FREEALUT_BUILDLINK3_MK

Index: pkgsrc/audio/gsm/buildlink3.mk
diff -u pkgsrc/audio/gsm/buildlink3.mk:1.9 pkgsrc/audio/gsm/buildlink3.mk:1.10
--- pkgsrc/audio/gsm/buildlink3.mk:1.9  Fri Mar 20 19:23:53 2009
+++ pkgsrc/audio/gsm/buildlink3.mk      Sun Jan  7 13:03:54 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:54 rillig Exp $
 
 BUILDLINK_TREE+=       gsm
 
 .if !defined(GSM_BUILDLINK3_MK)
 GSM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gsm+=            gsm>=1.0.10
+BUILDLINK_API_DEPENDS.gsm+=    gsm>=1.0.10
 BUILDLINK_ABI_DEPENDS.gsm+=    gsm>=1.0.12
 BUILDLINK_PKGSRCDIR.gsm?=      ../../audio/gsm
 .endif # GSM_BUILDLINK3_MK

Index: pkgsrc/audio/libao/buildlink3.mk
diff -u pkgsrc/audio/libao/buildlink3.mk:1.15 pkgsrc/audio/libao/buildlink3.mk:1.16
--- pkgsrc/audio/libao/buildlink3.mk:1.15       Wed May 19 18:17:27 2010
+++ pkgsrc/audio/libao/buildlink3.mk    Sun Jan  7 13:03:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/05/19 18:17:27 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:03:54 rillig Exp $
 
 BUILDLINK_TREE+=       libao
 
@@ -9,20 +9,20 @@ BUILDLINK_API_DEPENDS.libao+= libao>=0.8
 BUILDLINK_ABI_DEPENDS.libao+=  libao>=1.0.0
 BUILDLINK_PKGSRCDIR.libao?=    ../../audio/libao
 
-.  if !defined(_LIBAO_BUILDING_PLUGIN)
-.    include "../../mk/bsd.fast.prefs.mk"
-.    if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix" && ${OPSYS} != "SunOS"
+.if !defined(_LIBAO_BUILDING_PLUGIN)
+.  include "../../mk/bsd.fast.prefs.mk"
+.  if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix" && ${OPSYS} != "SunOS"
 _LIBAO_DEFAULT_PLUGIN=         oss
-.    elif ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+.  elif ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
 _LIBAO_DEFAULT_PLUGIN=         sun
-.    else
+.  else
 _LIBAO_DEFAULT_PLUGIN=
-.    endif
+.  endif
 
-.    if !empty(_LIBAO_DEFAULT_PLUGIN)
+.  if !empty(_LIBAO_DEFAULT_PLUGIN)
 DEPENDS+=      libao-[a-z]*-[0-9]*:../../audio/libao-${_LIBAO_DEFAULT_PLUGIN}
-.    endif
 .  endif
+.endif
 
 .endif # LIBAO_BUILDLINK3_MK
 

Index: pkgsrc/audio/libcdaudio/buildlink3.mk
diff -u pkgsrc/audio/libcdaudio/buildlink3.mk:1.9 pkgsrc/audio/libcdaudio/buildlink3.mk:1.10
--- pkgsrc/audio/libcdaudio/buildlink3.mk:1.9   Fri Mar 20 19:23:54 2009
+++ pkgsrc/audio/libcdaudio/buildlink3.mk       Sun Jan  7 13:03:54 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:54 rillig Exp $
 
 BUILDLINK_TREE+=       libcdaudio
 
 .if !defined(LIBCDAUDIO_BUILDLINK3_MK)
 LIBCDAUDIO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libcdaudio+=             libcdaudio>=0.99.4nb1
+BUILDLINK_API_DEPENDS.libcdaudio+=     libcdaudio>=0.99.4nb1
 BUILDLINK_ABI_DEPENDS.libcdaudio+=     libcdaudio>=0.99.12nb1
 BUILDLINK_PKGSRCDIR.libcdaudio?=       ../../audio/libcdaudio
 .endif # LIBCDAUDIO_BUILDLINK3_MK

Index: pkgsrc/audio/libdiscid/buildlink3.mk
diff -u pkgsrc/audio/libdiscid/buildlink3.mk:1.3 pkgsrc/audio/libdiscid/buildlink3.mk:1.4
--- pkgsrc/audio/libdiscid/buildlink3.mk:1.3    Fri Nov 21 22:59:47 2014
+++ pkgsrc/audio/libdiscid/buildlink3.mk        Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/11/21 22:59:47 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libdiscid
 
@@ -7,7 +7,7 @@ LIBDISCID_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libdiscid+=      libdiscid>=0.1.0
 BUILDLINK_ABI_DEPENDS.libdiscid?=      libdiscid>=0.6.1
-BUILDLINK_PKGSRCDIR.libdiscid?=        ../../audio/libdiscid
+BUILDLINK_PKGSRCDIR.libdiscid?=                ../../audio/libdiscid
 .endif # LIBDISCID_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libdiscid

Index: pkgsrc/audio/libid3tag/buildlink3.mk
diff -u pkgsrc/audio/libid3tag/buildlink3.mk:1.9 pkgsrc/audio/libid3tag/buildlink3.mk:1.10
--- pkgsrc/audio/libid3tag/buildlink3.mk:1.9    Fri Mar 20 19:23:55 2009
+++ pkgsrc/audio/libid3tag/buildlink3.mk        Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libid3tag
 
@@ -7,7 +7,7 @@ LIBID3TAG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libid3tag+=      libid3tag>=0.15.0b
 BUILDLINK_ABI_DEPENDS.libid3tag+=      libid3tag>=0.15.1bnb1
-BUILDLINK_PKGSRCDIR.libid3tag?=        ../../audio/libid3tag
+BUILDLINK_PKGSRCDIR.libid3tag?=                ../../audio/libid3tag
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif # LIBID3TAG_BUILDLINK3_MK

Index: pkgsrc/audio/liblastfm/buildlink3.mk
diff -u pkgsrc/audio/liblastfm/buildlink3.mk:1.24 pkgsrc/audio/liblastfm/buildlink3.mk:1.25
--- pkgsrc/audio/liblastfm/buildlink3.mk:1.24   Sat Mar  5 11:27:40 2016
+++ pkgsrc/audio/liblastfm/buildlink3.mk        Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2016/03/05 11:27:40 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       liblastfm
 
@@ -7,7 +7,7 @@ LIBLASTFM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.liblastfm+=      liblastfm>=0.3.0
 BUILDLINK_ABI_DEPENDS.liblastfm+=      liblastfm>=0.3.3nb23
-BUILDLINK_PKGSRCDIR.liblastfm?=        ../../audio/liblastfm
+BUILDLINK_PKGSRCDIR.liblastfm?=                ../../audio/liblastfm
 
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../math/fftwf/buildlink3.mk"

Index: pkgsrc/audio/libmpcdec/buildlink3.mk
diff -u pkgsrc/audio/libmpcdec/buildlink3.mk:1.3 pkgsrc/audio/libmpcdec/buildlink3.mk:1.4
--- pkgsrc/audio/libmpcdec/buildlink3.mk:1.3    Fri Mar 20 19:23:55 2009
+++ pkgsrc/audio/libmpcdec/buildlink3.mk        Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libmpcdec
 
@@ -7,7 +7,7 @@ LIBMPCDEC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmpcdec+=      libmpcdec>=1.2.4
 BUILDLINK_ABI_DEPENDS.libmpcdec+=      libmpcdec>=1.2.6
-BUILDLINK_PKGSRCDIR.libmpcdec?=        ../../audio/libmpcdec
+BUILDLINK_PKGSRCDIR.libmpcdec?=                ../../audio/libmpcdec
 .endif # LIBMPCDEC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libmpcdec

Index: pkgsrc/audio/libmusepack/buildlink3.mk
diff -u pkgsrc/audio/libmusepack/buildlink3.mk:1.8 pkgsrc/audio/libmusepack/buildlink3.mk:1.9
--- pkgsrc/audio/libmusepack/buildlink3.mk:1.8  Fri Mar 20 19:23:56 2009
+++ pkgsrc/audio/libmusepack/buildlink3.mk      Sun Jan  7 13:03:55 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libmusepack
 
 .if !defined(LIBMUSEPACK_BUILDLINK3_MK)
 LIBMUSEPACK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libmusepack+=            libmusepack>=1.0.3
+BUILDLINK_API_DEPENDS.libmusepack+=    libmusepack>=1.0.3
 BUILDLINK_PKGSRCDIR.libmusepack?=      ../../audio/libmusepack
 .endif # LIBMUSEPACK_BUILDLINK3_MK
 

Index: pkgsrc/audio/libsbsms/buildlink3.mk
diff -u pkgsrc/audio/libsbsms/buildlink3.mk:1.1 pkgsrc/audio/libsbsms/buildlink3.mk:1.2
--- pkgsrc/audio/libsbsms/buildlink3.mk:1.1     Sun Apr 19 17:29:21 2015
+++ pkgsrc/audio/libsbsms/buildlink3.mk Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/04/19 17:29:21 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libsbsms
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libsbsms
 LIBSBSMS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsbsms+=       libsbsms>=2.0.2
-BUILDLINK_PKGSRCDIR.libsbsms?= ../../audio/libsbsms
+BUILDLINK_PKGSRCDIR.libsbsms?=         ../../audio/libsbsms
 .endif # LIBSBSMS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libsbsms

Index: pkgsrc/audio/libshout/buildlink3.mk
diff -u pkgsrc/audio/libshout/buildlink3.mk:1.12 pkgsrc/audio/libshout/buildlink3.mk:1.13
--- pkgsrc/audio/libshout/buildlink3.mk:1.12    Fri Nov 27 10:34:23 2015
+++ pkgsrc/audio/libshout/buildlink3.mk Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2015/11/27 10:34:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libshout
 
@@ -7,7 +7,7 @@ LIBSHOUT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libshout+=       libshout>=2.0
 BUILDLINK_ABI_DEPENDS.libshout+=       libshout>=2.0nb1
-BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout
+BUILDLINK_PKGSRCDIR.libshout?=         ../../audio/libshout
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"

Index: pkgsrc/audio/libsidplay/buildlink3.mk
diff -u pkgsrc/audio/libsidplay/buildlink3.mk:1.9 pkgsrc/audio/libsidplay/buildlink3.mk:1.10
--- pkgsrc/audio/libsidplay/buildlink3.mk:1.9   Fri Mar 20 19:23:56 2009
+++ pkgsrc/audio/libsidplay/buildlink3.mk       Sun Jan  7 13:03:55 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libsidplay
 
 .if !defined(LIBSIDPLAY_BUILDLINK3_MK)
 LIBSIDPLAY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libsidplay+=             libsidplay>=1.36.38
+BUILDLINK_API_DEPENDS.libsidplay+=     libsidplay>=1.36.38
 BUILDLINK_ABI_DEPENDS.libsidplay+=     libsidplay>=1.36.59nb2
 BUILDLINK_PKGSRCDIR.libsidplay?=       ../../audio/libsidplay
 .endif # LIBSIDPLAY_BUILDLINK3_MK

Index: pkgsrc/audio/libspiff/buildlink3.mk
diff -u pkgsrc/audio/libspiff/buildlink3.mk:1.4 pkgsrc/audio/libspiff/buildlink3.mk:1.5
--- pkgsrc/audio/libspiff/buildlink3.mk:1.4     Fri Mar 20 19:23:57 2009
+++ pkgsrc/audio/libspiff/buildlink3.mk Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libspiff
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libspiff
 LIBSPIFF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libspiff+=       libspiff>=1.0.0
-BUILDLINK_PKGSRCDIR.libspiff?= ../../audio/libspiff
+BUILDLINK_PKGSRCDIR.libspiff?=         ../../audio/libspiff
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/uriparser/buildlink3.mk"

Index: pkgsrc/audio/libvisual/buildlink3.mk
diff -u pkgsrc/audio/libvisual/buildlink3.mk:1.13 pkgsrc/audio/libvisual/buildlink3.mk:1.14
--- pkgsrc/audio/libvisual/buildlink3.mk:1.13   Mon May  7 01:53:14 2012
+++ pkgsrc/audio/libvisual/buildlink3.mk        Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2012/05/07 01:53:14 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libvisual
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libvisual
 LIBVISUAL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libvisual+=      libvisual>=0.4.0
-BUILDLINK_ABI_DEPENDS.libvisual+=              libvisual>=0.4.0nb3
+BUILDLINK_ABI_DEPENDS.libvisual+=      libvisual>=0.4.0nb3
 BUILDLINK_PKGSRCDIR.libvisual?=                ../../audio/libvisual
 
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/audio/libvorbis/buildlink3.mk
diff -u pkgsrc/audio/libvorbis/buildlink3.mk:1.11 pkgsrc/audio/libvorbis/buildlink3.mk:1.12
--- pkgsrc/audio/libvorbis/buildlink3.mk:1.11   Fri Mar 20 19:23:57 2009
+++ pkgsrc/audio/libvorbis/buildlink3.mk        Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libvorbis
 
@@ -7,7 +7,7 @@ LIBVORBIS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libvorbis+=      libvorbis>=1.0.1
 BUILDLINK_ABI_DEPENDS.libvorbis+=      libvorbis>=1.1.0nb1
-BUILDLINK_PKGSRCDIR.libvorbis?=        ../../audio/libvorbis
+BUILDLINK_PKGSRCDIR.libvorbis?=                ../../audio/libvorbis
 
 .include "../../multimedia/libogg/buildlink3.mk"
 .endif # LIBVORBIS_BUILDLINK3_MK

Index: pkgsrc/audio/libxspf/buildlink3.mk
diff -u pkgsrc/audio/libxspf/buildlink3.mk:1.1 pkgsrc/audio/libxspf/buildlink3.mk:1.2
--- pkgsrc/audio/libxspf/buildlink3.mk:1.1      Thu Oct  3 11:15:39 2013
+++ pkgsrc/audio/libxspf/buildlink3.mk  Sun Jan  7 13:03:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/10/03 11:15:39 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:55 rillig Exp $
 
 BUILDLINK_TREE+=       libspiff
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libspiff
 LIBSPIFF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libspiff+=       libxspf>=1.2.0
-BUILDLINK_PKGSRCDIR.libspiff?= ../../audio/libxspf
+BUILDLINK_PKGSRCDIR.libspiff?=         ../../audio/libxspf
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/uriparser/buildlink3.mk"

Index: pkgsrc/audio/musepack/buildlink3.mk
diff -u pkgsrc/audio/musepack/buildlink3.mk:1.1 pkgsrc/audio/musepack/buildlink3.mk:1.2
--- pkgsrc/audio/musepack/buildlink3.mk:1.1     Fri Apr 18 12:43:42 2014
+++ pkgsrc/audio/musepack/buildlink3.mk Sun Jan  7 13:03:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/04/18 12:43:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       musepack
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        musepack
 MUSEPACK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.musepack+=       musepack>=0rc475
-BUILDLINK_PKGSRCDIR.musepack?= ../../audio/musepack
+BUILDLINK_PKGSRCDIR.musepack?=         ../../audio/musepack
 
 .endif # MUSEPACK_BUILDLINK3_MK
 

Index: pkgsrc/audio/musicbrainz/buildlink3.mk
diff -u pkgsrc/audio/musicbrainz/buildlink3.mk:1.14 pkgsrc/audio/musicbrainz/buildlink3.mk:1.15
--- pkgsrc/audio/musicbrainz/buildlink3.mk:1.14 Fri Mar 20 19:23:58 2009
+++ pkgsrc/audio/musicbrainz/buildlink3.mk      Sun Jan  7 13:03:56 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:23:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       musicbrainz
 
 .if !defined(MUSICBRAINZ_BUILDLINK3_MK)
 MUSICBRAINZ_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.musicbrainz+=            musicbrainz>=2.0.2
+BUILDLINK_API_DEPENDS.musicbrainz+=    musicbrainz>=2.0.2
 BUILDLINK_ABI_DEPENDS.musicbrainz+=    musicbrainz>=2.1.2nb2
 BUILDLINK_PKGSRCDIR.musicbrainz?=      ../../audio/musicbrainz
 

Index: pkgsrc/audio/opusfile/buildlink3.mk
diff -u pkgsrc/audio/opusfile/buildlink3.mk:1.3 pkgsrc/audio/opusfile/buildlink3.mk:1.4
--- pkgsrc/audio/opusfile/buildlink3.mk:1.3     Mon Mar  7 19:36:57 2016
+++ pkgsrc/audio/opusfile/buildlink3.mk Sun Jan  7 13:03:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/03/07 19:36:57 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       opusfile
 
@@ -7,7 +7,7 @@ OPUSFILE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.opusfile+=       opusfile>=0.5
 BUILDLINK_ABI_DEPENDS.opusfile?=       opusfile>=0.7
-BUILDLINK_PKGSRCDIR.opusfile?= ../../audio/opusfile
+BUILDLINK_PKGSRCDIR.opusfile?=         ../../audio/opusfile
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"

Index: pkgsrc/audio/portaudio/buildlink3.mk
diff -u pkgsrc/audio/portaudio/buildlink3.mk:1.10 pkgsrc/audio/portaudio/buildlink3.mk:1.11
--- pkgsrc/audio/portaudio/buildlink3.mk:1.10   Mon May  7 01:53:15 2012
+++ pkgsrc/audio/portaudio/buildlink3.mk        Sun Jan  7 13:03:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:15 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       portaudio
 
@@ -7,7 +7,7 @@ PORTAUDIO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.portaudio+=      portaudio>=18.1
 BUILDLINK_ABI_DEPENDS.portaudio+=      portaudio>=18.1nb2
-BUILDLINK_PKGSRCDIR.portaudio?=        ../../audio/portaudio
+BUILDLINK_PKGSRCDIR.portaudio?=                ../../audio/portaudio
 .endif # PORTAUDIO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -portaudio

Index: pkgsrc/audio/pulseaudio/buildlink3.mk
diff -u pkgsrc/audio/pulseaudio/buildlink3.mk:1.28 pkgsrc/audio/pulseaudio/buildlink3.mk:1.29
--- pkgsrc/audio/pulseaudio/buildlink3.mk:1.28  Fri Sep  8 02:27:44 2017
+++ pkgsrc/audio/pulseaudio/buildlink3.mk       Sun Jan  7 13:03:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2017/09/08 02:27:44 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       pulseaudio
 
@@ -21,7 +21,7 @@ BUILDLINK_RPATHDIRS.pulseaudio+=      lib/pul
 _WRAP_EXTRA_ARGS.LIBTOOL+=     -L${PREFIX}/lib/pulseaudio
 
 pkgbase:= pulseaudio
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .include "../../mk/bsd.fast.prefs.mk"
 

Index: pkgsrc/audio/speexdsp/buildlink3.mk
diff -u pkgsrc/audio/speexdsp/buildlink3.mk:1.1 pkgsrc/audio/speexdsp/buildlink3.mk:1.2
--- pkgsrc/audio/speexdsp/buildlink3.mk:1.1     Sat Jan 17 00:16:12 2015
+++ pkgsrc/audio/speexdsp/buildlink3.mk Sun Jan  7 13:03:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/01/17 00:16:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       speexdsp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        speexdsp
 SPEEXDSP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.speexdsp+=       speexdsp>=1.2rc3
-BUILDLINK_PKGSRCDIR.speexdsp?= ../../audio/speexdsp
+BUILDLINK_PKGSRCDIR.speexdsp?=         ../../audio/speexdsp
 
 .include "../../audio/speex/buildlink3.mk"
 .endif # SPEEXDSP_BUILDLINK3_MK

Index: pkgsrc/audio/streamtuner/buildlink3.mk
diff -u pkgsrc/audio/streamtuner/buildlink3.mk:1.48 pkgsrc/audio/streamtuner/buildlink3.mk:1.49
--- pkgsrc/audio/streamtuner/buildlink3.mk:1.48 Mon Jan  1 21:18:06 2018
+++ pkgsrc/audio/streamtuner/buildlink3.mk      Sun Jan  7 13:03:56 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.48 2018/01/01 21:18:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.49 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       streamtuner
 
 .if !defined(STREAMTUNER_BUILDLINK3_MK)
 STREAMTUNER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.streamtuner+=            streamtuner>=0.99
+BUILDLINK_API_DEPENDS.streamtuner+=    streamtuner>=0.99
 BUILDLINK_ABI_DEPENDS.streamtuner+=    streamtuner>=0.99.99nb45
 BUILDLINK_PKGSRCDIR.streamtuner?=      ../../audio/streamtuner
 

Index: pkgsrc/benchmarks/google-benchmark/buildlink3.mk
diff -u pkgsrc/benchmarks/google-benchmark/buildlink3.mk:1.1 pkgsrc/benchmarks/google-benchmark/buildlink3.mk:1.2
--- pkgsrc/benchmarks/google-benchmark/buildlink3.mk:1.1        Mon Nov 21 18:20:30 2016
+++ pkgsrc/benchmarks/google-benchmark/buildlink3.mk    Sun Jan  7 13:03:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/11/21 18:20:30 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       google-benchmark
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=        google-benchmark
 GOOGLE_BENCHMARK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.google-benchmark+=       google-benchmark>=1.1.0
-BUILDLINK_DEPMETHOD.google-benchmark?= build
-BUILDLINK_PKGSRCDIR.google-benchmark?= ../../benchmarks/google-benchmark
+BUILDLINK_DEPMETHOD.google-benchmark?=         build
+BUILDLINK_PKGSRCDIR.google-benchmark?=         ../../benchmarks/google-benchmark
 .endif # GOOGLE_BENCHMARK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -google-benchmark

Index: pkgsrc/biology/openbabel/buildlink3.mk
diff -u pkgsrc/biology/openbabel/buildlink3.mk:1.2 pkgsrc/biology/openbabel/buildlink3.mk:1.3
--- pkgsrc/biology/openbabel/buildlink3.mk:1.2  Thu Jun 14 07:43:21 2012
+++ pkgsrc/biology/openbabel/buildlink3.mk      Sun Jan  7 13:03:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/06/14 07:43:21 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       openbabel
 
@@ -7,7 +7,7 @@ OPENBABEL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openbabel+=      openbabel>=2.3.0
 BUILDLINK_ABI_DEPENDS.openbabel?=      openbabel>=2.3.0nb4
-BUILDLINK_PKGSRCDIR.openbabel?=        ../../biology/openbabel
+BUILDLINK_PKGSRCDIR.openbabel?=                ../../biology/openbabel
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../math/eigen2/buildlink3.mk"

Index: pkgsrc/cad/iverilog/buildlink3.mk
diff -u pkgsrc/cad/iverilog/buildlink3.mk:1.1 pkgsrc/cad/iverilog/buildlink3.mk:1.2
--- pkgsrc/cad/iverilog/buildlink3.mk:1.1       Sat Oct  8 23:01:45 2016
+++ pkgsrc/cad/iverilog/buildlink3.mk   Sun Jan  7 13:03:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/10/08 23:01:45 kamil Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:56 rillig Exp $
 
 BUILDLINK_TREE+=       iverilog
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        iverilog
 IVERILOG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.iverilog+=       iverilog>=10.1.1
-BUILDLINK_PKGSRCDIR.iverilog?= ../../cad/iverilog
+BUILDLINK_PKGSRCDIR.iverilog?=         ../../cad/iverilog
 
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/cad/libwcalc/buildlink3.mk
diff -u pkgsrc/cad/libwcalc/buildlink3.mk:1.10 pkgsrc/cad/libwcalc/buildlink3.mk:1.11
--- pkgsrc/cad/libwcalc/buildlink3.mk:1.10      Mon May  7 01:53:16 2012
+++ pkgsrc/cad/libwcalc/buildlink3.mk   Sun Jan  7 13:03:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:16 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:03:56 rillig Exp $
 #
 
 BUILDLINK_TREE+=       libwcalc
@@ -8,7 +8,7 @@ LIBWCALC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libwcalc+=       libwcalc-1.0*
 BUILDLINK_ABI_DEPENDS.libwcalc+=       libwcalc>=1.0nb2
-BUILDLINK_PKGSRCDIR.libwcalc?= ../../cad/libwcalc
+BUILDLINK_PKGSRCDIR.libwcalc?=         ../../cad/libwcalc
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/chat/farstream/buildlink3.mk
diff -u pkgsrc/chat/farstream/buildlink3.mk:1.1 pkgsrc/chat/farstream/buildlink3.mk:1.2
--- pkgsrc/chat/farstream/buildlink3.mk:1.1     Tue Dec  1 12:59:52 2015
+++ pkgsrc/chat/farstream/buildlink3.mk Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/12/01 12:59:52 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       farstream
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        farstream
 FARSTREAM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.farstream+=      farstream>=0.2.7
-BUILDLINK_PKGSRCDIR.farstream?=        ../../chat/farstream
+BUILDLINK_PKGSRCDIR.farstream?=                ../../chat/farstream
 
 .endif # FARSTREAM_BUILDLINK3_MK
 

Index: pkgsrc/chat/ktp-contact-list/buildlink3.mk
diff -u pkgsrc/chat/ktp-contact-list/buildlink3.mk:1.1 pkgsrc/chat/ktp-contact-list/buildlink3.mk:1.2
--- pkgsrc/chat/ktp-contact-list/buildlink3.mk:1.1      Sun Jan 17 15:03:14 2016
+++ pkgsrc/chat/ktp-contact-list/buildlink3.mk  Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/01/17 15:03:14 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       ktp-contact-list
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ktp-contact-list
 KTP_CONTACT_LIST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ktp-contact-list+=       ktp-contact-list>=0.9.0
-BUILDLINK_PKGSRCDIR.ktp-contact-list?= ../../chat/ktp-contact-list
+BUILDLINK_PKGSRCDIR.ktp-contact-list?=         ../../chat/ktp-contact-list
 
 .endif # KTP_CONTACT_LIST_BUILDLINK3_MK
 

Index: pkgsrc/chat/libfolks/buildlink3.mk
diff -u pkgsrc/chat/libfolks/buildlink3.mk:1.8 pkgsrc/chat/libfolks/buildlink3.mk:1.9
--- pkgsrc/chat/libfolks/buildlink3.mk:1.8      Mon Oct 27 08:57:06 2014
+++ pkgsrc/chat/libfolks/buildlink3.mk  Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2014/10/27 08:57:06 jnemeth Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       libfolks
 
@@ -7,7 +7,7 @@ LIBFOLKS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libfolks+=       libfolks>=0.3.6
 BUILDLINK_ABI_DEPENDS.libfolks+=       libfolks>=0.4.2nb4
-BUILDLINK_PKGSRCDIR.libfolks?= ../../chat/libfolks
+BUILDLINK_PKGSRCDIR.libfolks?=         ../../chat/libfolks
 
 .include "../../devel/glib2/buildlink3.mk"
 #.include "../../devel/gobject-introspection/buildlink3.mk"

Index: pkgsrc/chat/libpurple/buildlink3.mk
diff -u pkgsrc/chat/libpurple/buildlink3.mk:1.43 pkgsrc/chat/libpurple/buildlink3.mk:1.44
--- pkgsrc/chat/libpurple/buildlink3.mk:1.43    Sat Mar 11 03:02:39 2017
+++ pkgsrc/chat/libpurple/buildlink3.mk Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.43 2017/03/11 03:02:39 khorben Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       libpurple
 
@@ -7,7 +7,7 @@ LIBPURPLE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpurple+=      libpurple>=2.11.0
 BUILDLINK_ABI_DEPENDS.libpurple+=      libpurple>=2.11.0
-BUILDLINK_PKGSRCDIR.libpurple?=        ../../chat/libpurple
+BUILDLINK_PKGSRCDIR.libpurple?=                ../../chat/libpurple
 
 pkgbase := libpurple
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/chat/loudmouth/buildlink3.mk
diff -u pkgsrc/chat/loudmouth/buildlink3.mk:1.22 pkgsrc/chat/loudmouth/buildlink3.mk:1.23
--- pkgsrc/chat/loudmouth/buildlink3.mk:1.22    Sat Sep 15 10:03:52 2012
+++ pkgsrc/chat/loudmouth/buildlink3.mk Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2012/09/15 10:03:52 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       loudmouth
 
@@ -7,7 +7,7 @@ LOUDMOUTH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.loudmouth+=      loudmouth>=1.0
 BUILDLINK_ABI_DEPENDS.loudmouth+=      loudmouth>=1.4.3nb6
-BUILDLINK_PKGSRCDIR.loudmouth?=        ../../chat/loudmouth
+BUILDLINK_PKGSRCDIR.loudmouth?=                ../../chat/loudmouth
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/chat/meanwhile/buildlink3.mk
diff -u pkgsrc/chat/meanwhile/buildlink3.mk:1.2 pkgsrc/chat/meanwhile/buildlink3.mk:1.3
--- pkgsrc/chat/meanwhile/buildlink3.mk:1.2     Fri Mar 20 19:24:01 2009
+++ pkgsrc/chat/meanwhile/buildlink3.mk Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       meanwhile
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        meanwhile
 MEANWHILE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.meanwhile+=      meanwhile>=1.0.2
-BUILDLINK_PKGSRCDIR.meanwhile?=        ../../chat/meanwhile
+BUILDLINK_PKGSRCDIR.meanwhile?=                ../../chat/meanwhile
 .endif # MEANWHILE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -meanwhile

Index: pkgsrc/chat/telepathy-logger/buildlink3.mk
diff -u pkgsrc/chat/telepathy-logger/buildlink3.mk:1.20 pkgsrc/chat/telepathy-logger/buildlink3.mk:1.21
--- pkgsrc/chat/telepathy-logger/buildlink3.mk:1.20     Thu Nov 30 16:45:00 2017
+++ pkgsrc/chat/telepathy-logger/buildlink3.mk  Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2017/11/30 16:45:00 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       telepathy-logger
 
@@ -7,7 +7,7 @@ TELEPATHY_LOGGER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.telepathy-logger+=       telepathy-logger>=0.1.4
 BUILDLINK_ABI_DEPENDS.telepathy-logger+=       telepathy-logger>=0.2.7nb21
-BUILDLINK_PKGSRCDIR.telepathy-logger?= ../../chat/telepathy-logger
+BUILDLINK_PKGSRCDIR.telepathy-logger?=         ../../chat/telepathy-logger
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"

Index: pkgsrc/chat/telepathy-mission-control/buildlink3.mk
diff -u pkgsrc/chat/telepathy-mission-control/buildlink3.mk:1.27 pkgsrc/chat/telepathy-mission-control/buildlink3.mk:1.28
--- pkgsrc/chat/telepathy-mission-control/buildlink3.mk:1.27    Sun Feb 12 06:24:37 2017
+++ pkgsrc/chat/telepathy-mission-control/buildlink3.mk Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2017/02/12 06:24:37 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       telepathy-mission-control
 
@@ -7,7 +7,7 @@ TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK:
 
 BUILDLINK_API_DEPENDS.telepathy-mission-control+=      telepathy-mission-control>=4.67
 BUILDLINK_ABI_DEPENDS.telepathy-mission-control+=      telepathy-mission-control>=4.67nb31
-BUILDLINK_PKGSRCDIR.telepathy-mission-control?=        ../../chat/telepathy-mission-control
+BUILDLINK_PKGSRCDIR.telepathy-mission-control?=                ../../chat/telepathy-mission-control
 
 .include "../../chat/libtelepathy/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"

Index: pkgsrc/comms/asterisk/buildlink3.mk
diff -u pkgsrc/comms/asterisk/buildlink3.mk:1.2 pkgsrc/comms/asterisk/buildlink3.mk:1.3
--- pkgsrc/comms/asterisk/buildlink3.mk:1.2     Tue Feb 21 05:25:13 2017
+++ pkgsrc/comms/asterisk/buildlink3.mk Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/02/21 05:25:13 cherry Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       asterisk
 
@@ -7,7 +7,7 @@ ASTERISK_BUILDLINK3_MK:=
 
 # Current user is comms/asterisk-chan-dongle, which is tied to v11.x
 BUILDLINK_API_DEPENDS.asterisk+=       asterisk>=11.25.1nb1<12
-BUILDLINK_PKGSRCDIR.asterisk?= ../../comms/asterisk
+BUILDLINK_PKGSRCDIR.asterisk?=         ../../comms/asterisk
 .endif # ASTERISK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -asterisk

Index: pkgsrc/comms/gnome-pilot/buildlink3.mk
diff -u pkgsrc/comms/gnome-pilot/buildlink3.mk:1.76 pkgsrc/comms/gnome-pilot/buildlink3.mk:1.77
--- pkgsrc/comms/gnome-pilot/buildlink3.mk:1.76 Thu Nov 30 16:45:00 2017
+++ pkgsrc/comms/gnome-pilot/buildlink3.mk      Sun Jan  7 13:03:57 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.76 2017/11/30 16:45:00 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.77 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       gnome-pilot
 
 .if !defined(GNOME_PILOT_BUILDLINK3_MK)
 GNOME_PILOT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnome-pilot+=            gnome-pilot>=2.0.12nb2
+BUILDLINK_API_DEPENDS.gnome-pilot+=    gnome-pilot>=2.0.12nb2
 BUILDLINK_ABI_DEPENDS.gnome-pilot+=    gnome-pilot>=2.0.17nb61
 BUILDLINK_PKGSRCDIR.gnome-pilot?=      ../../comms/gnome-pilot
 

Index: pkgsrc/comms/libsyncml/buildlink3.mk
diff -u pkgsrc/comms/libsyncml/buildlink3.mk:1.3 pkgsrc/comms/libsyncml/buildlink3.mk:1.4
--- pkgsrc/comms/libsyncml/buildlink3.mk:1.3    Thu Feb 16 17:22:39 2012
+++ pkgsrc/comms/libsyncml/buildlink3.mk        Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/02/16 17:22:39 hans Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       libsyncml
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libsyncml
 LIBSYNCML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsyncml+=      libsyncml>=0.4.5
-BUILDLINK_PKGSRCDIR.libsyncml?=        ../../comms/libsyncml
+BUILDLINK_PKGSRCDIR.libsyncml?=                ../../comms/libsyncml
 
 .include "../../textproc/wbxml2/buildlink3.mk"
 .endif # LIBSYNCML_BUILDLINK3_MK

Index: pkgsrc/comms/libticables2/buildlink3.mk
diff -u pkgsrc/comms/libticables2/buildlink3.mk:1.1 pkgsrc/comms/libticables2/buildlink3.mk:1.2
--- pkgsrc/comms/libticables2/buildlink3.mk:1.1 Sun May 26 22:57:53 2013
+++ pkgsrc/comms/libticables2/buildlink3.mk     Sun Jan  7 13:03:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/05/26 22:57:53 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:57 rillig Exp $
 
 BUILDLINK_TREE+=       libticables2
 
@@ -13,9 +13,9 @@ pkgbase := libticables2
 
 
 .if !empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb)
-.if empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb1)
+.  if empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb1)
 .include "../../devel/libusb/buildlink3.mk"
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb1)

Index: pkgsrc/comms/libticonv/buildlink3.mk
diff -u pkgsrc/comms/libticonv/buildlink3.mk:1.1 pkgsrc/comms/libticonv/buildlink3.mk:1.2
--- pkgsrc/comms/libticonv/buildlink3.mk:1.1    Sun May 26 22:59:06 2013
+++ pkgsrc/comms/libticonv/buildlink3.mk        Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/05/26 22:59:06 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       libticonv
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libticonv
 LIBTICONV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libticonv+=      libticonv>=1.1.3
-BUILDLINK_PKGSRCDIR.libticonv?=        ../../comms/libticonv
+BUILDLINK_PKGSRCDIR.libticonv?=                ../../comms/libticonv
 
 .include "../../devel/glib2/buildlink3.mk"
 .endif # LIBTICONV_BUILDLINK3_MK

Index: pkgsrc/comms/openobex/buildlink3.mk
diff -u pkgsrc/comms/openobex/buildlink3.mk:1.13 pkgsrc/comms/openobex/buildlink3.mk:1.14
--- pkgsrc/comms/openobex/buildlink3.mk:1.13    Fri Mar 15 08:10:04 2013
+++ pkgsrc/comms/openobex/buildlink3.mk Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2013/03/15 08:10:04 plunky Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       openobex
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        openobex
 OPENOBEX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openobex+=       openobex>=1.7
-BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex
+BUILDLINK_PKGSRCDIR.openobex?=         ../../comms/openobex
 
 .include "../../devel/libusb/buildlink3.mk"
 .endif # OPENOBEX_BUILDLINK3_MK

Index: pkgsrc/comms/synce-rra/buildlink3.mk
diff -u pkgsrc/comms/synce-rra/buildlink3.mk:1.1 pkgsrc/comms/synce-rra/buildlink3.mk:1.2
--- pkgsrc/comms/synce-rra/buildlink3.mk:1.1    Sat Mar 28 15:58:37 2009
+++ pkgsrc/comms/synce-rra/buildlink3.mk        Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/03/28 15:58:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       synce-rra
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        synce-rra
 SYNCE_RRA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.synce-rra+=      synce-rra>=0.9.1nb2
-BUILDLINK_PKGSRCDIR.synce-rra?=        ../../comms/synce-rra
+BUILDLINK_PKGSRCDIR.synce-rra?=                ../../comms/synce-rra
 
 .include "../../comms/synce-librapi2/buildlink3.mk"
 .include "../../comms/synce-libsynce/buildlink3.mk"

Index: pkgsrc/converters/hs-aeson/buildlink3.mk
diff -u pkgsrc/converters/hs-aeson/buildlink3.mk:1.17 pkgsrc/converters/hs-aeson/buildlink3.mk:1.18
--- pkgsrc/converters/hs-aeson/buildlink3.mk:1.17       Sun Jan 10 11:49:09 2016
+++ pkgsrc/converters/hs-aeson/buildlink3.mk    Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2016/01/10 11:49:09 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       hs-aeson
 
@@ -7,7 +7,7 @@ HS_AESON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-aeson+=       hs-aeson>=0.7.0
 BUILDLINK_ABI_DEPENDS.hs-aeson+=       hs-aeson>=0.7.0.6nb16
-BUILDLINK_PKGSRCDIR.hs-aeson?= ../../converters/hs-aeson
+BUILDLINK_PKGSRCDIR.hs-aeson?=         ../../converters/hs-aeson
 
 .include "../../textproc/hs-attoparsec/buildlink3.mk"
 .include "../../devel/hs-dlist/buildlink3.mk"

Index: pkgsrc/converters/libe-book/buildlink3.mk
diff -u pkgsrc/converters/libe-book/buildlink3.mk:1.9 pkgsrc/converters/libe-book/buildlink3.mk:1.10
--- pkgsrc/converters/libe-book/buildlink3.mk:1.9       Mon Jan  1 21:18:06 2018
+++ pkgsrc/converters/libe-book/buildlink3.mk   Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/01 21:18:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       libe-book
 
@@ -7,7 +7,7 @@ LIBE_BOOK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libe-book+=      libe-book>=0.0.2
 BUILDLINK_ABI_DEPENDS.libe-book?=      libe-book>=0.1.2nb14
-BUILDLINK_PKGSRCDIR.libe-book?=        ../../converters/libe-book
+BUILDLINK_PKGSRCDIR.libe-book?=                ../../converters/libe-book
 
 .include "../../converters/librevenge/buildlink3.mk"
 .include "../../converters/libwpd/buildlink3.mk"

Index: pkgsrc/converters/libmspub/buildlink3.mk
diff -u pkgsrc/converters/libmspub/buildlink3.mk:1.9 pkgsrc/converters/libmspub/buildlink3.mk:1.10
--- pkgsrc/converters/libmspub/buildlink3.mk:1.9        Mon Jan  1 21:18:06 2018
+++ pkgsrc/converters/libmspub/buildlink3.mk    Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/01 21:18:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       libmspub
 
@@ -7,7 +7,7 @@ LIBMSPUB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmspub+=       libmspub>=0.0.6
 BUILDLINK_ABI_DEPENDS.libmspub?=       libmspub>=0.1.2nb14
-BUILDLINK_PKGSRCDIR.libmspub?= ../../converters/libmspub
+BUILDLINK_PKGSRCDIR.libmspub?=         ../../converters/libmspub
 
 .include "../../converters/libwpd/buildlink3.mk"
 .include "../../converters/libwpg/buildlink3.mk"

Index: pkgsrc/converters/orcus0.12/buildlink3.mk
diff -u pkgsrc/converters/orcus0.12/buildlink3.mk:1.3 pkgsrc/converters/orcus0.12/buildlink3.mk:1.4
--- pkgsrc/converters/orcus0.12/buildlink3.mk:1.3       Tue Sep 20 10:52:53 2016
+++ pkgsrc/converters/orcus0.12/buildlink3.mk   Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/09/20 10:52:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       orcus012
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        orcus012
 ORCUS012_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.orcus012+=       orcus0.12>=0.12.0
-BUILDLINK_PKGSRCDIR.orcus012?= ../../converters/orcus0.12
+BUILDLINK_PKGSRCDIR.orcus012?=         ../../converters/orcus0.12
 
 .include "../../devel/mdds1.2/buildlink3.mk"
 .include "../../math/libixion/buildlink3.mk"

Index: pkgsrc/converters/qrencode/buildlink3.mk
diff -u pkgsrc/converters/qrencode/buildlink3.mk:1.3 pkgsrc/converters/qrencode/buildlink3.mk:1.4
--- pkgsrc/converters/qrencode/buildlink3.mk:1.3        Sun Dec 16 14:23:07 2012
+++ pkgsrc/converters/qrencode/buildlink3.mk    Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/12/16 14:23:07 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       qrencode
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        qrencode
 QRENCODE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qrencode+=       qrencode>=3.4.1
-BUILDLINK_PKGSRCDIR.qrencode?= ../../converters/qrencode
+BUILDLINK_PKGSRCDIR.qrencode?=         ../../converters/qrencode
 .endif # QRENCODE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -qrencode

Index: pkgsrc/cross/avr-binutils/buildlink3.mk
diff -u pkgsrc/cross/avr-binutils/buildlink3.mk:1.2 pkgsrc/cross/avr-binutils/buildlink3.mk:1.3
--- pkgsrc/cross/avr-binutils/buildlink3.mk:1.2 Thu Aug  8 03:29:59 2013
+++ pkgsrc/cross/avr-binutils/buildlink3.mk     Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/08/08 03:29:59 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       avr-binutils
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        avr-binutils
 AVR_BINUTILS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.avr-binutils+=   avr-binutils>=2.23
-BUILDLINK_PKGSRCDIR.avr-binutils?=             ../../cross/avr-binutils
+BUILDLINK_PKGSRCDIR.avr-binutils?=     ../../cross/avr-binutils
 #BUILDLINK_FNAME_TRANSFORM.avr-binutils+=      -e "s,${AVR_TARGET}/lib,lib/,g"
 
 .endif # AVR_BINUTILS_BUILDLINK3_MK

Index: pkgsrc/cross/nios2-gcc/buildlink3.mk
diff -u pkgsrc/cross/nios2-gcc/buildlink3.mk:1.1 pkgsrc/cross/nios2-gcc/buildlink3.mk:1.2
--- pkgsrc/cross/nios2-gcc/buildlink3.mk:1.1    Mon Nov 18 06:41:27 2013
+++ pkgsrc/cross/nios2-gcc/buildlink3.mk        Sun Jan  7 13:03:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/11/18 06:41:27 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       nios2-gcc
 
@@ -6,9 +6,9 @@ BUILDLINK_TREE+=        nios2-gcc
 NIOS2_GCC_BUILDLINK3_MK:=
 
 
-BUILDLINK_API_DEPENDS.nios2-gcc+=         nios2-gcc>=4.7.3
-BUILDLINK_PKGSRCDIR.nios2-gcc?=           ../../cross/nios2-gcc
-BUILDLINK_FNAME_TRANSFORM.nios2-gcc+=     -e "s,${NIOS2_TARGET}/lib,lib/,g"
+BUILDLINK_API_DEPENDS.nios2-gcc+=      nios2-gcc>=4.7.3
+BUILDLINK_PKGSRCDIR.nios2-gcc?=                ../../cross/nios2-gcc
+BUILDLINK_FNAME_TRANSFORM.nios2-gcc+=  -e "s,${NIOS2_TARGET}/lib,lib/,g"
 .endif # NIOS2-GCC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -nios2-gcc

Index: pkgsrc/databases/db/buildlink3.mk
diff -u pkgsrc/databases/db/buildlink3.mk:1.27 pkgsrc/databases/db/buildlink3.mk:1.28
--- pkgsrc/databases/db/buildlink3.mk:1.27      Sun Feb  5 12:16:56 2012
+++ pkgsrc/databases/db/buildlink3.mk   Sun Jan  7 13:03:58 2018
@@ -1,21 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.27 2012/02/05 12:16:56 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:03:58 rillig Exp $
 
 BUILDLINK_TREE+=       db2
 
 .if !defined(DB_BUILDLINK3_MK)
 DB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.db2+=            db>=2.7.3
+BUILDLINK_API_DEPENDS.db2+=    db>=2.7.3
 BUILDLINK_ABI_DEPENDS.db2+=    db>=2.7.7nb2
 BUILDLINK_PKGSRCDIR.db2?=      ../../databases/db
 BUILDLINK_INCDIRS.db2?=                include/db2
 BUILDLINK_LDADD.db2=           -ldb2
 
-.  include "../../mk/bsd.fast.prefs.mk"
-.  if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
+.include "../../mk/bsd.fast.prefs.mk"
+.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
 #BUILDLINK_LIBS.db2=           ${BUILDLINK_LDADD.db2}
 BUILDLINK_TRANSFORM+=          l:db:db2
-.  endif
+.endif
 .endif # DB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -db2

Index: pkgsrc/databases/db3/buildlink3.mk
diff -u pkgsrc/databases/db3/buildlink3.mk:1.23 pkgsrc/databases/db3/buildlink3.mk:1.24
--- pkgsrc/databases/db3/buildlink3.mk:1.23     Sun Feb  5 12:16:56 2012
+++ pkgsrc/databases/db3/buildlink3.mk  Sun Jan  7 13:03:59 2018
@@ -1,22 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.23 2012/02/05 12:16:56 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2018/01/07 13:03:59 rillig Exp $
 
 BUILDLINK_TREE+=       db3
 
 .if !defined(DB3_BUILDLINK3_MK)
 DB3_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.db3+=            db3>=2.9.2
+BUILDLINK_API_DEPENDS.db3+=    db3>=2.9.2
 BUILDLINK_ABI_DEPENDS.db3+=    db3>=3.11.2nb3
 BUILDLINK_PKGSRCDIR.db3?=      ../../databases/db3
 BUILDLINK_INCDIRS.db3?=                include/db3
 BUILDLINK_LDADD.db3=           -ldb3
 BUILDLINK_TRANSFORM+=          l:db-3:db3
 
-.  include "../../mk/bsd.fast.prefs.mk"
-.  if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
+.include "../../mk/bsd.fast.prefs.mk"
+.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
 #BUILDLINK_LIBS.db3=           ${BUILDLINK_LDADD.db3}
 BUILDLINK_TRANSFORM+=          l:db:db3
-.  endif
+.endif
 
 .include "../../mk/pthread.buildlink3.mk"
 .endif # DB3_BUILDLINK3_MK

Index: pkgsrc/databases/libdbh2/buildlink3.mk
diff -u pkgsrc/databases/libdbh2/buildlink3.mk:1.1 pkgsrc/databases/libdbh2/buildlink3.mk:1.2
--- pkgsrc/databases/libdbh2/buildlink3.mk:1.1  Mon Jan 19 02:07:41 2015
+++ pkgsrc/databases/libdbh2/buildlink3.mk      Sun Jan  7 13:03:59 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/01/19 02:07:41 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:59 rillig Exp $
 
 BUILDLINK_TREE+=       libdbh2
 
 .if !defined(LIBDBH2_BUILDLINK3_MK)
 LIBDBH2_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libdbh2+=                libdbh2>=5.0.16
+BUILDLINK_API_DEPENDS.libdbh2+=        libdbh2>=5.0.16
 BUILDLINK_PKGSRCDIR.libdbh2?=  ../../databases/libdbh2
 .endif # LIBDBH2_BUILDLINK3_MK
 

Index: pkgsrc/databases/mariadb55-client/buildlink3.mk
diff -u pkgsrc/databases/mariadb55-client/buildlink3.mk:1.5 pkgsrc/databases/mariadb55-client/buildlink3.mk:1.6
--- pkgsrc/databases/mariadb55-client/buildlink3.mk:1.5 Sat Mar  5 11:27:41 2016
+++ pkgsrc/databases/mariadb55-client/buildlink3.mk     Sun Jan  7 13:03:59 2018
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.5 2016/03/05 11:27:41 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:03:59 rillig Exp $
 
-# This buildlink file uses mysql-client and not mariadb-client, 
+# This buildlink file uses mysql-client and not mariadb-client,
 # because some packages depending on it expect BUILDLINK_*.mysql-client
 # to be set and will fail build if they get BUILDLINK_*.mariadb-client
 # instead.

Index: pkgsrc/databases/ocaml-dbm/buildlink3.mk
diff -u pkgsrc/databases/ocaml-dbm/buildlink3.mk:1.10 pkgsrc/databases/ocaml-dbm/buildlink3.mk:1.11
--- pkgsrc/databases/ocaml-dbm/buildlink3.mk:1.10       Fri Sep  8 09:51:19 2017
+++ pkgsrc/databases/ocaml-dbm/buildlink3.mk    Sun Jan  7 13:03:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2017/09/08 09:51:19 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:03:59 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-dbm
 
@@ -7,7 +7,7 @@ OCAML_DBM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-dbm+=      ocaml-dbm>=1.0
 BUILDLINK_ABI_DEPENDS.ocaml-dbm?=      ocaml-dbm>=1.0nb12
-BUILDLINK_PKGSRCDIR.ocaml-dbm?=        ../../databases/ocaml-dbm
+BUILDLINK_PKGSRCDIR.ocaml-dbm?=                ../../databases/ocaml-dbm
 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"

Index: pkgsrc/databases/openldap-client/buildlink3.mk
diff -u pkgsrc/databases/openldap-client/buildlink3.mk:1.18 pkgsrc/databases/openldap-client/buildlink3.mk:1.19
--- pkgsrc/databases/openldap-client/buildlink3.mk:1.18 Sat Mar  5 11:27:43 2016
+++ pkgsrc/databases/openldap-client/buildlink3.mk      Sun Jan  7 13:03:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2016/03/05 11:27:43 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:03:59 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -18,15 +18,15 @@ CHECK_BUILTIN.openldap-client:=     yes
 .include "../../databases/openldap-client/builtin.mk"
 CHECK_BUILTIN.openldap-client:=        no
 
-.  if empty(USE_BUILTIN.openldap-client:M[yY][eE][sS])
+.if empty(USE_BUILTIN.openldap-client:M[yY][eE][sS])
 pkgbase := openldap-client
-.    include "../../mk/pkg-build-options.mk"
+.  include "../../mk/pkg-build-options.mk"
 
-.    if !empty(PKG_BUILD_OPTIONS.openldap-client:Mkerberos) || \
+.  if !empty(PKG_BUILD_OPTIONS.openldap-client:Mkerberos) || \
         !empty(PKG_BUILD_OPTIONS.openldap-client:Msasl)
-.      include "../../security/cyrus-sasl/buildlink3.mk"
-.    endif
+.    include "../../security/cyrus-sasl/buildlink3.mk"
 .  endif
+.endif
 .include "../../security/openssl/buildlink3.mk"
 .endif # OPENLDAP_BUILDLINK3_MK
 

Index: pkgsrc/databases/p5-DBI/buildlink3.mk
diff -u pkgsrc/databases/p5-DBI/buildlink3.mk:1.21 pkgsrc/databases/p5-DBI/buildlink3.mk:1.22
--- pkgsrc/databases/p5-DBI/buildlink3.mk:1.21  Mon Jun  5 14:22:26 2017
+++ pkgsrc/databases/p5-DBI/buildlink3.mk       Sun Jan  7 13:03:59 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.21 2017/06/05 14:22:26 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:03:59 rillig Exp $
 
 BUILDLINK_TREE+=       p5-DBI
 
 .if !defined(P5_DBI_BUILDLINK3_MK)
 P5_DBI_BUILDLINK3_MK:=
 
-.  include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.612
 BUILDLINK_ABI_DEPENDS.p5-DBI?= p5-DBI>=1.636nb3

Index: pkgsrc/databases/poco-data/buildlink3.mk
diff -u pkgsrc/databases/poco-data/buildlink3.mk:1.10 pkgsrc/databases/poco-data/buildlink3.mk:1.11
--- pkgsrc/databases/poco-data/buildlink3.mk:1.10       Sat Mar  5 11:27:43 2016
+++ pkgsrc/databases/poco-data/buildlink3.mk    Sun Jan  7 13:03:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2016/03/05 11:27:43 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:03:59 rillig Exp $
 
 BUILDLINK_TREE+=       poco-data
 
@@ -7,7 +7,7 @@ POCO_DATA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poco-data+=      poco-data>=1.6.1
 BUILDLINK_ABI_DEPENDS.poco-data+=      poco-data>=1.6.1nb1
-BUILDLINK_PKGSRCDIR.poco-data?=        ../../databases/poco-data
+BUILDLINK_PKGSRCDIR.poco-data?=                ../../databases/poco-data
 
 .include "../../devel/poco/buildlink3.mk"
 .endif # POCO_DATA_BUILDLINK3_MK

Index: pkgsrc/databases/poco-data-sqlite/buildlink3.mk
diff -u pkgsrc/databases/poco-data-sqlite/buildlink3.mk:1.20 pkgsrc/databases/poco-data-sqlite/buildlink3.mk:1.21
--- pkgsrc/databases/poco-data-sqlite/buildlink3.mk:1.20        Thu Nov 30 16:45:01 2017
+++ pkgsrc/databases/poco-data-sqlite/buildlink3.mk     Sun Jan  7 13:03:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2017/11/30 16:45:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:03:59 rillig Exp $
 
 BUILDLINK_TREE+=       poco-data-sqlite
 
@@ -7,7 +7,7 @@ POCO_DATA_SQLITE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poco-data-sqlite+=       poco-data-sqlite>=1.6.1
 BUILDLINK_ABI_DEPENDS.poco-data-sqlite+=       poco-data-sqlite>=1.6.1nb6
-BUILDLINK_PKGSRCDIR.poco-data-sqlite?= ../../databases/poco-data-sqlite
+BUILDLINK_PKGSRCDIR.poco-data-sqlite?=         ../../databases/poco-data-sqlite
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../databases/poco-data/buildlink3.mk"

Index: pkgsrc/databases/py-metakit/buildlink3.mk
diff -u pkgsrc/databases/py-metakit/buildlink3.mk:1.9 pkgsrc/databases/py-metakit/buildlink3.mk:1.10
--- pkgsrc/databases/py-metakit/buildlink3.mk:1.9       Fri Mar 20 19:24:07 2009
+++ pkgsrc/databases/py-metakit/buildlink3.mk   Sun Jan  7 13:03:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:59 rillig Exp $
 
 BUILDLINK_TREE+=       pymetakit
 
@@ -9,7 +9,7 @@ PY_METAKIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pymetakit+=      ${PYPKGPREFIX}-metakit-[0-9]*
 BUILDLINK_ABI_DEPENDS.pymetakit+=      ${PYPKGPREFIX}-metakit>=2.4.9.3nb2
-BUILDLINK_PKGSRCDIR.pymetakit?=        ../../databases/py-metakit
+BUILDLINK_PKGSRCDIR.pymetakit?=                ../../databases/py-metakit
 .endif # PY_METAKIT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -pymetakit

Index: pkgsrc/databases/qdbm/buildlink3.mk
diff -u pkgsrc/databases/qdbm/buildlink3.mk:1.11 pkgsrc/databases/qdbm/buildlink3.mk:1.12
--- pkgsrc/databases/qdbm/buildlink3.mk:1.11    Fri Mar 20 19:24:07 2009
+++ pkgsrc/databases/qdbm/buildlink3.mk Sun Jan  7 13:03:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:03:59 rillig Exp $
 
 BUILDLINK_TREE+=       qdbm
 
@@ -11,11 +11,11 @@ BUILDLINK_PKGSRCDIR.qdbm?=  ../../databas
 
 .include "../../mk/pthread.buildlink3.mk"
 
-.  if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
 CONFIGURE_ARGS+=       --enable-pthread
 BUILDLINK_CFLAGS.qdbm+=        ${PTHREAD_CFLAGS}
 BUILDLINK_LDFLAGS.qdbm+=${PTHREAD_LDFLAGS}
-.  endif
+.endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/lzo/buildlink3.mk"

Index: pkgsrc/databases/qore-mysql-module/buildlink3.mk
diff -u pkgsrc/databases/qore-mysql-module/buildlink3.mk:1.5 pkgsrc/databases/qore-mysql-module/buildlink3.mk:1.6
--- pkgsrc/databases/qore-mysql-module/buildlink3.mk:1.5        Thu Oct 12 18:21:23 2017
+++ pkgsrc/databases/qore-mysql-module/buildlink3.mk    Sun Jan  7 13:03:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/10/12 18:21:23 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:03:59 rillig Exp $
 #
 
 BUILDLINK_TREE+=       qore-mysql-module
@@ -8,7 +8,7 @@ QORE_MYSQL_MODULE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qore-mysql-module+=      qore-mysql-module>=2.0.1
 BUILDLINK_ABI_DEPENDS.qore-mysql-module?=      qore-mysql-module>=2.0.1nb7
-BUILDLINK_PKGSRCDIR.qore-mysql-module?=        ../../databases/qore-mysql-module
+BUILDLINK_PKGSRCDIR.qore-mysql-module?=                ../../databases/qore-mysql-module
 
 .include "../../lang/qore/buildlink3.mk"
 .endif # QORE_MYSQL_MODULE_BUILDLINK3_MK

Index: pkgsrc/databases/shared-mime-info/buildlink3.mk
diff -u pkgsrc/databases/shared-mime-info/buildlink3.mk:1.15 pkgsrc/databases/shared-mime-info/buildlink3.mk:1.16
--- pkgsrc/databases/shared-mime-info/buildlink3.mk:1.15        Wed Mar  7 19:31:32 2012
+++ pkgsrc/databases/shared-mime-info/buildlink3.mk     Sun Jan  7 13:04:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2012/03/07 19:31:32 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       shared-mime-info
 
@@ -7,7 +7,7 @@ SHARED_MIME_INFO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.shared-mime-info+=       shared-mime-info>=0.15
 BUILDLINK_ABI_DEPENDS.shared-mime-info+=       shared-mime-info>=1.0nb1
-BUILDLINK_PKGSRCDIR.shared-mime-info?= ../../databases/shared-mime-info
+BUILDLINK_PKGSRCDIR.shared-mime-info?=         ../../databases/shared-mime-info
 
 BUILDLINK_TARGETS+=    shared-mime-info-buildlink-fake
 

Index: pkgsrc/databases/tdb/buildlink3.mk
diff -u pkgsrc/databases/tdb/buildlink3.mk:1.9 pkgsrc/databases/tdb/buildlink3.mk:1.10
--- pkgsrc/databases/tdb/buildlink3.mk:1.9      Fri Mar 20 19:24:08 2009
+++ pkgsrc/databases/tdb/buildlink3.mk  Sun Jan  7 13:04:00 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       tdb
 
 .if !defined(TDB_BUILDLINK3_MK)
 TDB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.tdb+=            tdb>=1.0.6
+BUILDLINK_API_DEPENDS.tdb+=    tdb>=1.0.6
 BUILDLINK_ABI_DEPENDS.tdb+=    tdb>=1.0.6nb2
 BUILDLINK_PKGSRCDIR.tdb?=      ../../databases/tdb
 .endif # TDB_BUILDLINK3_MK

Index: pkgsrc/databases/unixodbc/buildlink3.mk
diff -u pkgsrc/databases/unixodbc/buildlink3.mk:1.9 pkgsrc/databases/unixodbc/buildlink3.mk:1.10
--- pkgsrc/databases/unixodbc/buildlink3.mk:1.9 Sun Apr 26 11:37:07 2015
+++ pkgsrc/databases/unixodbc/buildlink3.mk     Sun Jan  7 13:04:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2015/04/26 11:37:07 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       unixodbc
 
@@ -7,7 +7,7 @@ UNIXODBC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.unixodbc+=       unixodbc>=2.3.2
 BUILDLINK_ABI_DEPENDS.unixodbc+=       unixodbc>=2.3.2
-BUILDLINK_PKGSRCDIR.unixodbc?= ../../databases/unixodbc
+BUILDLINK_PKGSRCDIR.unixodbc?=         ../../databases/unixodbc
 .endif # UNIXODBC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -unixodbc

Index: pkgsrc/databases/vsqlite++/buildlink3.mk
diff -u pkgsrc/databases/vsqlite++/buildlink3.mk:1.7 pkgsrc/databases/vsqlite++/buildlink3.mk:1.8
--- pkgsrc/databases/vsqlite++/buildlink3.mk:1.7        Thu Nov 30 16:45:01 2017
+++ pkgsrc/databases/vsqlite++/buildlink3.mk    Sun Jan  7 13:04:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       vsqlite++
 
@@ -7,7 +7,7 @@ VSQLITE++_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.vsqlite+++=      vsqlite++>=0.3.13
 BUILDLINK_ABI_DEPENDS.vsqlite++?=      vsqlite++>=0.3.13nb7
-BUILDLINK_PKGSRCDIR.vsqlite++?=        ../../databases/vsqlite++
+BUILDLINK_PKGSRCDIR.vsqlite++?=                ../../databases/vsqlite++
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .endif # VSQLITE++_BUILDLINK3_MK

Index: pkgsrc/devel/GConf-ui/buildlink3.mk
diff -u pkgsrc/devel/GConf-ui/buildlink3.mk:1.28 pkgsrc/devel/GConf-ui/buildlink3.mk:1.29
--- pkgsrc/devel/GConf-ui/buildlink3.mk:1.28    Sun Feb 12 06:24:37 2017
+++ pkgsrc/devel/GConf-ui/buildlink3.mk Sun Jan  7 13:04:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2017/02/12 06:24:37 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       GConf-ui
 
@@ -7,7 +7,7 @@ GCONF_UI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.GConf-ui+=       GConf-ui>=2.8.0.1
 BUILDLINK_ABI_DEPENDS.GConf-ui+=       GConf-ui>=2.32.4nb18
-BUILDLINK_PKGSRCDIR.GConf-ui?= ../../devel/GConf-ui
+BUILDLINK_PKGSRCDIR.GConf-ui?=         ../../devel/GConf-ui
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/devel/apel/buildlink3.mk
diff -u pkgsrc/devel/apel/buildlink3.mk:1.3 pkgsrc/devel/apel/buildlink3.mk:1.4
--- pkgsrc/devel/apel/buildlink3.mk:1.3 Fri Mar 20 19:24:09 2009
+++ pkgsrc/devel/apel/buildlink3.mk     Sun Jan  7 13:04:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:00 rillig Exp $
 #
 
 .include "../../editors/emacs/modules.mk"
@@ -6,7 +6,7 @@
 
 BUILDLINK_TREE+=       apel
 
-.if !defined(APEL_BUILDLINK3_MK)
+.  if !defined(APEL_BUILDLINK3_MK)
 APEL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.apel+=   ${EMACS_PKGNAME_PREFIX}apel>=10
@@ -14,12 +14,12 @@ BUILDLINK_PKGSRCDIR.apel?=  ../../devel/a
 
 BUILDLINK_CONTENTS_FILTER.apel=        ${EGREP} '.*\.el$$|.*\.elc$$'
 
-.else
+.  else
 
 # XEmacs has apel in xemacs-packages
 EMACS_MODULES+=                base
 
-.endif
+.  endif
 .endif # APEL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -apel

Index: pkgsrc/devel/apr-util/buildlink3.mk
diff -u pkgsrc/devel/apr-util/buildlink3.mk:1.17 pkgsrc/devel/apr-util/buildlink3.mk:1.18
--- pkgsrc/devel/apr-util/buildlink3.mk:1.17    Sat Mar  5 11:27:44 2016
+++ pkgsrc/devel/apr-util/buildlink3.mk Sun Jan  7 13:04:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2016/03/05 11:27:44 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       apr-util
 
@@ -7,7 +7,7 @@ APR_UTIL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.apr-util+=       apr-util>=1.2.8
 BUILDLINK_ABI_DEPENDS.apr-util+=       apr-util>=1.5.4nb4
-BUILDLINK_PKGSRCDIR.apr-util?= ../../devel/apr-util
+BUILDLINK_PKGSRCDIR.apr-util?=         ../../devel/apr-util
 
 BUILDLINK_FILES.apr-util+=     bin/apu-1-config
 BUILDLINK_FILES.apr-util+=     lib/aprutil.exp

Index: pkgsrc/devel/atk/buildlink3.mk
diff -u pkgsrc/devel/atk/buildlink3.mk:1.19 pkgsrc/devel/atk/buildlink3.mk:1.20
--- pkgsrc/devel/atk/buildlink3.mk:1.19 Mon Oct  8 20:19:31 2012
+++ pkgsrc/devel/atk/buildlink3.mk      Sun Jan  7 13:04:00 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/10/08 20:19:31 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       atk
 
 .if !defined(ATK_BUILDLINK3_MK)
 ATK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.atk+=            atk>=1.11.4
+BUILDLINK_API_DEPENDS.atk+=    atk>=1.11.4
 BUILDLINK_ABI_DEPENDS.atk+=    atk>=2.6.0
 BUILDLINK_PKGSRCDIR.atk?=      ../../devel/atk
 

Index: pkgsrc/devel/binutils/buildlink3.mk
diff -u pkgsrc/devel/binutils/buildlink3.mk:1.24 pkgsrc/devel/binutils/buildlink3.mk:1.25
--- pkgsrc/devel/binutils/buildlink3.mk:1.24    Mon Jul 23 12:24:34 2012
+++ pkgsrc/devel/binutils/buildlink3.mk Sun Jan  7 13:04:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2012/07/23 12:24:34 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       binutils
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=        binutils
 BINUTILS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.binutils+=       binutils>=2.22
-BUILDLINK_PKGSRCDIR.binutils?= ../../devel/binutils
-BUILDLINK_DEPMETHOD.binutils?= build
+BUILDLINK_PKGSRCDIR.binutils?=         ../../devel/binutils
+BUILDLINK_DEPMETHOD.binutils?=         build
 .endif # BINUTILS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -binutils

Index: pkgsrc/devel/boehm-gc/buildlink3.mk
diff -u pkgsrc/devel/boehm-gc/buildlink3.mk:1.14 pkgsrc/devel/boehm-gc/buildlink3.mk:1.15
--- pkgsrc/devel/boehm-gc/buildlink3.mk:1.14    Mon Apr 21 13:25:41 2014
+++ pkgsrc/devel/boehm-gc/buildlink3.mk Sun Jan  7 13:04:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2014/04/21 13:25:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       boehm-gc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        boehm-gc
 BOEHM_GC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.boehm-gc+=       boehm-gc>=7.4
-BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc
+BUILDLINK_PKGSRCDIR.boehm-gc?=         ../../devel/boehm-gc
 
 .include "../../devel/libatomic_ops/buildlink3.mk"
 .endif # BOEHM_GC_BUILDLINK3_MK

Index: pkgsrc/devel/cdk/buildlink3.mk
diff -u pkgsrc/devel/cdk/buildlink3.mk:1.10 pkgsrc/devel/cdk/buildlink3.mk:1.11
--- pkgsrc/devel/cdk/buildlink3.mk:1.10 Tue Aug 18 07:31:00 2015
+++ pkgsrc/devel/cdk/buildlink3.mk      Sun Jan  7 13:04:00 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.10 2015/08/18 07:31:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       cdk
 
 .if !defined(CDK_BUILDLINK3_MK)
 CDK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.cdk+=            cdk>=4.9.9nb1
+BUILDLINK_API_DEPENDS.cdk+=    cdk>=4.9.9nb1
 BUILDLINK_ABI_DEPENDS.cdk+=    cdk>=4.9.9nb5
 BUILDLINK_PKGSRCDIR.cdk?=      ../../devel/cdk
 

Index: pkgsrc/devel/dlcompat/buildlink3.mk
diff -u pkgsrc/devel/dlcompat/buildlink3.mk:1.13 pkgsrc/devel/dlcompat/buildlink3.mk:1.14
--- pkgsrc/devel/dlcompat/buildlink3.mk:1.13    Fri Mar 20 19:24:12 2009
+++ pkgsrc/devel/dlcompat/buildlink3.mk Sun Jan  7 13:04:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:00 rillig Exp $
 
 BUILDLINK_TREE+=       dlcompat
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=        dlcompat
 DLCOMPAT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.dlcompat+=       dlcompat>=20030629
-BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat
-BUILDLINK_LDFLAGS.dlcompat+=   -ldl
+BUILDLINK_PKGSRCDIR.dlcompat?=         ../../devel/dlcompat
+BUILDLINK_LDFLAGS.dlcompat+=           -ldl
 .endif # DLCOMPAT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -dlcompat

Index: pkgsrc/devel/edcommon/buildlink3.mk
diff -u pkgsrc/devel/edcommon/buildlink3.mk:1.10 pkgsrc/devel/edcommon/buildlink3.mk:1.11
--- pkgsrc/devel/edcommon/buildlink3.mk:1.10    Mon May  7 01:53:21 2012
+++ pkgsrc/devel/edcommon/buildlink3.mk Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:21 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       edcommon
 
@@ -7,7 +7,7 @@ EDCOMMON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.edcommon+=       edcommon>=32nb6
 BUILDLINK_ABI_DEPENDS.edcommon+=       edcommon>=32nb6
-BUILDLINK_PKGSRCDIR.edcommon?= ../../devel/edcommon
+BUILDLINK_PKGSRCDIR.edcommon?=         ../../devel/edcommon
 .endif # EDCOMMON_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -edcommon

Index: pkgsrc/devel/editline/buildlink3.mk
diff -u pkgsrc/devel/editline/buildlink3.mk:1.3 pkgsrc/devel/editline/buildlink3.mk:1.4
--- pkgsrc/devel/editline/buildlink3.mk:1.3     Sun Aug 11 07:42:51 2013
+++ pkgsrc/devel/editline/buildlink3.mk Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2013/08/11 07:42:51 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       editline
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        editline
 EDITLINE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.editline+=       editline>=3.0.20130712nb1
-BUILDLINK_PKGSRCDIR.editline?= ../../devel/editline
+BUILDLINK_PKGSRCDIR.editline?=         ../../devel/editline
 
 BUILDLINK_FILES.editline+=     include/history.h
 BUILDLINK_FILES.editline+=     include/readline.h

Index: pkgsrc/devel/editorconfig-core/buildlink3.mk
diff -u pkgsrc/devel/editorconfig-core/buildlink3.mk:1.1 pkgsrc/devel/editorconfig-core/buildlink3.mk:1.2
--- pkgsrc/devel/editorconfig-core/buildlink3.mk:1.1    Sun May 28 19:43:46 2017
+++ pkgsrc/devel/editorconfig-core/buildlink3.mk        Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/05/28 19:43:46 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       editorconfig-core
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        editorconfig-core
 EDITORCONFIG_CORE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.editorconfig-core+=      editorconfig-core>=0.12.1
-BUILDLINK_PKGSRCDIR.editorconfig-core?=        ../../devel/editorconfig-core
+BUILDLINK_PKGSRCDIR.editorconfig-core?=                ../../devel/editorconfig-core
 .endif # EDITORCONFIG_CORE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -editorconfig-core

Index: pkgsrc/devel/gettext-asprintf/buildlink3.mk
diff -u pkgsrc/devel/gettext-asprintf/buildlink3.mk:1.6 pkgsrc/devel/gettext-asprintf/buildlink3.mk:1.7
--- pkgsrc/devel/gettext-asprintf/buildlink3.mk:1.6     Tue Apr 12 17:41:28 2011
+++ pkgsrc/devel/gettext-asprintf/buildlink3.mk Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2011/04/12 17:41:28 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       gettext-asprintf
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        gettext-asprintf
 GETTEXT_ASPRINTF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gettext-asprintf+=       gettext-asprintf>=0.18
-BUILDLINK_PKGSRCDIR.gettext-asprintf?= ../../devel/gettext-asprintf
+BUILDLINK_PKGSRCDIR.gettext-asprintf?=         ../../devel/gettext-asprintf
 .endif # GETTEXT_ASPRINTF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gettext-asprintf

Index: pkgsrc/devel/gnustep-objc-lf2/buildlink3.mk
diff -u pkgsrc/devel/gnustep-objc-lf2/buildlink3.mk:1.10 pkgsrc/devel/gnustep-objc-lf2/buildlink3.mk:1.11
--- pkgsrc/devel/gnustep-objc-lf2/buildlink3.mk:1.10    Mon May  7 01:53:22 2012
+++ pkgsrc/devel/gnustep-objc-lf2/buildlink3.mk Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:22 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       gnustep-objc-lf2
 
@@ -7,9 +7,9 @@ GNUSTEP_OBJC_LF2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnustep-objc-lf2+=       gnustep-objc-lf2>=2.95.3.88nb3
 BUILDLINK_ABI_DEPENDS.gnustep-objc-lf2+=       gnustep-objc-lf2>=2.95.3.88nb3
-BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?= ../../devel/gnustep-objc-lf2
+BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?=         ../../devel/gnustep-objc-lf2
 BUILDLINK_FNAME_TRANSFORM.gnustep-objc-lf2?=   -e "s|include/objc_lf2/|include/objc/|g"
-BUILDLINK_TRANSFORM+=  l:objc:objc_lf2
+BUILDLINK_TRANSFORM+=                          l:objc:objc_lf2
 
 .include "../../devel/gnustep-make/buildlink3.mk"
 .endif # GNUSTEP_OBJC_LF2_BUILDLINK3_MK

Index: pkgsrc/devel/go-check/buildlink3.mk
diff -u pkgsrc/devel/go-check/buildlink3.mk:1.1 pkgsrc/devel/go-check/buildlink3.mk:1.2
--- pkgsrc/devel/go-check/buildlink3.mk:1.1     Sat Jan 16 23:56:23 2016
+++ pkgsrc/devel/go-check/buildlink3.mk Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/01/16 23:56:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       go-check
 
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-check=     ${EG
 BUILDLINK_DEPMETHOD.go-check?=         build
 
 BUILDLINK_API_DEPENDS.go-check+=       go-check>=1
-BUILDLINK_PKGSRCDIR.go-check?= ../../devel/go-check
+BUILDLINK_PKGSRCDIR.go-check?=         ../../devel/go-check
 .endif # GO_CHECK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -go-check

Index: pkgsrc/devel/go-ed25519/buildlink3.mk
diff -u pkgsrc/devel/go-ed25519/buildlink3.mk:1.1.1.1 pkgsrc/devel/go-ed25519/buildlink3.mk:1.2
--- pkgsrc/devel/go-ed25519/buildlink3.mk:1.1.1.1       Fri Sep 29 06:11:41 2017
+++ pkgsrc/devel/go-ed25519/buildlink3.mk       Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2017/09/29 06:11:41 alnsn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       go-ed25519
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-ed25519
 GO_ED25519_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-ed25519=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-ed25519?=               build
+BUILDLINK_DEPMETHOD.go-ed25519?=       build
 
 BUILDLINK_API_DEPENDS.go-ed25519+=     go-ed25519>=20171601
 BUILDLINK_PKGSRCDIR.go-ed25519?=       ../../devel/go-ed25519

Index: pkgsrc/devel/go-gitmap/buildlink3.mk
diff -u pkgsrc/devel/go-gitmap/buildlink3.mk:1.2 pkgsrc/devel/go-gitmap/buildlink3.mk:1.3
--- pkgsrc/devel/go-gitmap/buildlink3.mk:1.2    Fri Aug 25 16:49:13 2017
+++ pkgsrc/devel/go-gitmap/buildlink3.mk        Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       go-gitmap
 
@@ -8,7 +8,7 @@ GO_GITMAP_BUILDLINK3_MK:=
 BUILDLINK_CONTENTS_FILTER.go-gitmap=   ${EGREP} gopkg/
 BUILDLINK_DEPMETHOD.go-gitmap?=                build
 
-BUILDLINK_API_DEPENDS.go-gitmap+=              go-gitmap>=0.0
+BUILDLINK_API_DEPENDS.go-gitmap+=      go-gitmap>=0.0
 BUILDLINK_PKGSRCDIR.go-gitmap?=                ../../devel/go-gitmap
 
 .endif  # GO_GITMAP_BUILDLINK3_MK

Index: pkgsrc/devel/go-goorgeous/buildlink3.mk
diff -u pkgsrc/devel/go-goorgeous/buildlink3.mk:1.2 pkgsrc/devel/go-goorgeous/buildlink3.mk:1.3
--- pkgsrc/devel/go-goorgeous/buildlink3.mk:1.2 Fri Aug 25 16:49:13 2017
+++ pkgsrc/devel/go-goorgeous/buildlink3.mk     Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       go-goorgeous
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-goorgeous
 GO_GOORGEOUS_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-goorgeous=        ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-goorgeous?=             build
+BUILDLINK_DEPMETHOD.go-goorgeous?=     build
 
 BUILDLINK_API_DEPENDS.go-goorgeous+=           go-goorgeous>=0.0
 BUILDLINK_PKGSRCDIR.go-goorgeous?=             ../../devel/go-goorgeous

Index: pkgsrc/devel/go-goptlib/buildlink3.mk
diff -u pkgsrc/devel/go-goptlib/buildlink3.mk:1.1.1.1 pkgsrc/devel/go-goptlib/buildlink3.mk:1.2
--- pkgsrc/devel/go-goptlib/buildlink3.mk:1.1.1.1       Fri Sep 29 06:17:06 2017
+++ pkgsrc/devel/go-goptlib/buildlink3.mk       Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2017/09/29 06:17:06 alnsn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       go-goptlib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-goptlib
 GO_GOPTLIB_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-goptlib=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-goptlib?=               build
+BUILDLINK_DEPMETHOD.go-goptlib?=       build
 
 BUILDLINK_API_DEPENDS.go-goptlib+=     go-goptlib>=0.7
 BUILDLINK_PKGSRCDIR.go-goptlib?=       ../../devel/go-goptlib

Index: pkgsrc/devel/go-homedir/buildlink3.mk
diff -u pkgsrc/devel/go-homedir/buildlink3.mk:1.2 pkgsrc/devel/go-homedir/buildlink3.mk:1.3
--- pkgsrc/devel/go-homedir/buildlink3.mk:1.2   Fri Aug 25 16:49:13 2017
+++ pkgsrc/devel/go-homedir/buildlink3.mk       Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       go-homedir
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-homedir
 GO_HOMEDIR_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-homedir=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-homedir?=               build
+BUILDLINK_DEPMETHOD.go-homedir?=       build
 
 BUILDLINK_API_DEPENDS.go-homedir+=             go-homedir>=0.0
 BUILDLINK_PKGSRCDIR.go-homedir?=               ../../devel/go-homedir

Index: pkgsrc/devel/go-immutable-radix/buildlink3.mk
diff -u pkgsrc/devel/go-immutable-radix/buildlink3.mk:1.2 pkgsrc/devel/go-immutable-radix/buildlink3.mk:1.3
--- pkgsrc/devel/go-immutable-radix/buildlink3.mk:1.2   Fri Aug 25 16:49:13 2017
+++ pkgsrc/devel/go-immutable-radix/buildlink3.mk       Sun Jan  7 13:04:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:01 rillig Exp $
 
 BUILDLINK_TREE+=       go-immutable-radix
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-immutable-radix
 GO_IMMUTABLE_RADIX_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-immutable-radix=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-immutable-radix?=               build
+BUILDLINK_DEPMETHOD.go-immutable-radix?=       build
 
 BUILDLINK_API_DEPENDS.go-immutable-radix+=             go-immutable-radix>=0.0
 BUILDLINK_PKGSRCDIR.go-immutable-radix?=               ../../devel/go-immutable-radix

Index: pkgsrc/devel/go-jwalterweatherman/buildlink3.mk
diff -u pkgsrc/devel/go-jwalterweatherman/buildlink3.mk:1.2 pkgsrc/devel/go-jwalterweatherman/buildlink3.mk:1.3
--- pkgsrc/devel/go-jwalterweatherman/buildlink3.mk:1.2 Fri Aug 25 16:49:13 2017
+++ pkgsrc/devel/go-jwalterweatherman/buildlink3.mk     Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-jwalterweatherman
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-jwalterweatherman
 GO_JWALTERWEATHERMAN_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-jwalterweatherman=        ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-jwalterweatherman?=             build
+BUILDLINK_DEPMETHOD.go-jwalterweatherman?=     build
 
 BUILDLINK_API_DEPENDS.go-jwalterweatherman+=           go-jWalterWeatherman>=20170523
 BUILDLINK_PKGSRCDIR.go-jwalterweatherman?=             ../../devel/go-jwalterweatherman

Index: pkgsrc/devel/go-mapstructure/buildlink3.mk
diff -u pkgsrc/devel/go-mapstructure/buildlink3.mk:1.2 pkgsrc/devel/go-mapstructure/buildlink3.mk:1.3
--- pkgsrc/devel/go-mapstructure/buildlink3.mk:1.2      Fri Aug 25 16:49:13 2017
+++ pkgsrc/devel/go-mapstructure/buildlink3.mk  Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-mapstructure
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-mapstructure
 GO_MAPSTRUCTURE_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-mapstructure=     ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-mapstructure?=  build
+BUILDLINK_DEPMETHOD.go-mapstructure?=          build
 
 BUILDLINK_API_DEPENDS.go-mapstructure+=        go-mapstructure>=0.0
 BUILDLINK_PKGSRCDIR.go-mapstructure?=  ../../devel/go-mapstructure

Index: pkgsrc/devel/go-mow-cli/buildlink3.mk
diff -u pkgsrc/devel/go-mow-cli/buildlink3.mk:1.1 pkgsrc/devel/go-mow-cli/buildlink3.mk:1.2
--- pkgsrc/devel/go-mow-cli/buildlink3.mk:1.1   Sat Jul 16 13:03:42 2016
+++ pkgsrc/devel/go-mow-cli/buildlink3.mk       Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/07/16 13:03:42 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-mow-cli
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-mow-cli
 GO_MOW_CLI_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-mow-cli=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-mow-cli?=               build
+BUILDLINK_DEPMETHOD.go-mow-cli?=       build
 
 BUILDLINK_API_DEPENDS.go-mow-cli+=     go-mow-cli>=0.0.20160221
 BUILDLINK_PKGSRCDIR.go-mow-cli?=       ../../devel/go-mow-cli

Index: pkgsrc/devel/go-nbreader/buildlink3.mk
diff -u pkgsrc/devel/go-nbreader/buildlink3.mk:1.1 pkgsrc/devel/go-nbreader/buildlink3.mk:1.2
--- pkgsrc/devel/go-nbreader/buildlink3.mk:1.1  Tue Dec 29 21:47:48 2015
+++ pkgsrc/devel/go-nbreader/buildlink3.mk      Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/12/29 21:47:48 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-nbreader
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-nbreader
 GO_NBREADER_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-nbreader= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-nbreader?=              build
+BUILDLINK_DEPMETHOD.go-nbreader?=      build
 
 BUILDLINK_API_DEPENDS.go-nbreader+=    go-nbreader>=0.0.20150201
 BUILDLINK_PKGSRCDIR.go-nbreader?=      ../../devel/go-nbreader

Index: pkgsrc/devel/go-protobuf/buildlink3.mk
diff -u pkgsrc/devel/go-protobuf/buildlink3.mk:1.1 pkgsrc/devel/go-protobuf/buildlink3.mk:1.2
--- pkgsrc/devel/go-protobuf/buildlink3.mk:1.1  Sun Sep 11 08:02:30 2016
+++ pkgsrc/devel/go-protobuf/buildlink3.mk      Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/09/11 08:02:30 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-protobuf
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-protobuf
 GO_PROTOBUF_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-protobuf= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-protobuf?=              build
+BUILDLINK_DEPMETHOD.go-protobuf?=      build
 
 BUILDLINK_API_DEPENDS.go-protobuf+=    go-protobuf>=20160829
 BUILDLINK_PKGSRCDIR.go-protobuf?=      ../../devel/go-protobuf

Index: pkgsrc/devel/go-ratelimit/buildlink3.mk
diff -u pkgsrc/devel/go-ratelimit/buildlink3.mk:1.1 pkgsrc/devel/go-ratelimit/buildlink3.mk:1.2
--- pkgsrc/devel/go-ratelimit/buildlink3.mk:1.1 Sat Jul 16 12:51:46 2016
+++ pkgsrc/devel/go-ratelimit/buildlink3.mk     Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/07/16 12:51:46 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-ratelimit
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-ratelimit
 GO_RATELIMIT_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-ratelimit=        ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-ratelimit?=             build
+BUILDLINK_DEPMETHOD.go-ratelimit?=     build
 
 BUILDLINK_API_DEPENDS.go-ratelimit+=   go-ratelimit>=0.0.20151125
 BUILDLINK_PKGSRCDIR.go-ratelimit?=     ../../devel/go-ratelimit

Index: pkgsrc/devel/go-sanitized_anchor_name/buildlink3.mk
diff -u pkgsrc/devel/go-sanitized_anchor_name/buildlink3.mk:1.2 pkgsrc/devel/go-sanitized_anchor_name/buildlink3.mk:1.3
--- pkgsrc/devel/go-sanitized_anchor_name/buildlink3.mk:1.2     Fri Aug 25 16:49:14 2017
+++ pkgsrc/devel/go-sanitized_anchor_name/buildlink3.mk Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-sanitized_anchor_name
 
@@ -8,7 +8,7 @@ GO_SANITIZED_ANCHOR_NAME_BUILDLINK3_MK:=
 BUILDLINK_CONTENTS_FILTER.go-sanitized_anchor_name=    ${EGREP} gopkg/
 BUILDLINK_DEPMETHOD.go-sanitized_anchor_name?=         build
 
-BUILDLINK_API_DEPENDS.go-sanitized_anchor_name+=               go-sanitized_anchor_name>=0.0
+BUILDLINK_API_DEPENDS.go-sanitized_anchor_name+=       go-sanitized_anchor_name>=0.0
 BUILDLINK_PKGSRCDIR.go-sanitized_anchor_name?=         ../../devel/go-sanitized_anchor_name
 
 .endif  # GO_SANITIZED_ANCHOR_NAME_BUILDLINK3_MK

Index: pkgsrc/devel/go-shuffle/buildlink3.mk
diff -u pkgsrc/devel/go-shuffle/buildlink3.mk:1.2 pkgsrc/devel/go-shuffle/buildlink3.mk:1.3
--- pkgsrc/devel/go-shuffle/buildlink3.mk:1.2   Fri Aug 25 16:49:14 2017
+++ pkgsrc/devel/go-shuffle/buildlink3.mk       Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-shuffle
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-shuffle
 GO_SHUFFLE_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-shuffle=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-shuffle?=               build
+BUILDLINK_DEPMETHOD.go-shuffle?=       build
 
 BUILDLINK_API_DEPENDS.go-shuffle+=             go-shuffle>=0.0
 BUILDLINK_PKGSRCDIR.go-shuffle?=               ../../devel/go-shuffle

Index: pkgsrc/devel/go-siphash/buildlink3.mk
diff -u pkgsrc/devel/go-siphash/buildlink3.mk:1.1.1.1 pkgsrc/devel/go-siphash/buildlink3.mk:1.2
--- pkgsrc/devel/go-siphash/buildlink3.mk:1.1.1.1       Fri Sep 29 06:14:39 2017
+++ pkgsrc/devel/go-siphash/buildlink3.mk       Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2017/09/29 06:14:39 alnsn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-siphash
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-siphash
 GO_SIPHASH_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-siphash=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-siphash?=               build
+BUILDLINK_DEPMETHOD.go-siphash?=       build
 
 BUILDLINK_API_DEPENDS.go-siphash+=     go-siphash>=1.0.0
 BUILDLINK_PKGSRCDIR.go-siphash?=       ../../devel/go-siphash

Index: pkgsrc/devel/go-termbox/buildlink3.mk
diff -u pkgsrc/devel/go-termbox/buildlink3.mk:1.1 pkgsrc/devel/go-termbox/buildlink3.mk:1.2
--- pkgsrc/devel/go-termbox/buildlink3.mk:1.1   Sat Aug 20 09:30:41 2016
+++ pkgsrc/devel/go-termbox/buildlink3.mk       Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/08/20 09:30:41 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-termbox
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-termbox
 GO_TERMBOX_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-termbox=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-termbox?=               build
+BUILDLINK_DEPMETHOD.go-termbox?=       build
 
 BUILDLINK_API_DEPENDS.go-termbox+=     go-termbox>=20160808
 BUILDLINK_PKGSRCDIR.go-termbox?=       ../../devel/go-termbox

Index: pkgsrc/devel/go-testify/buildlink3.mk
diff -u pkgsrc/devel/go-testify/buildlink3.mk:1.1 pkgsrc/devel/go-testify/buildlink3.mk:1.2
--- pkgsrc/devel/go-testify/buildlink3.mk:1.1   Sat Jul 16 13:21:41 2016
+++ pkgsrc/devel/go-testify/buildlink3.mk       Sun Jan  7 13:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/07/16 13:21:41 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $
 
 BUILDLINK_TREE+=       go-testify
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-testify
 GO_TESTIFY_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-testify=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-testify?=               build
+BUILDLINK_DEPMETHOD.go-testify?=       build
 
 BUILDLINK_API_DEPENDS.go-testify+=     go-testify>=1.1.3
 BUILDLINK_PKGSRCDIR.go-testify?=       ../../devel/go-testify

Index: pkgsrc/devel/go-tools/buildlink3.mk
diff -u pkgsrc/devel/go-tools/buildlink3.mk:1.3 pkgsrc/devel/go-tools/buildlink3.mk:1.4
--- pkgsrc/devel/go-tools/buildlink3.mk:1.3     Mon Mar 20 22:53:45 2017
+++ pkgsrc/devel/go-tools/buildlink3.mk Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/03/20 22:53:45 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       go-tools
 
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-tools=     ${EG
 BUILDLINK_DEPMETHOD.go-tools?=         build
 
 BUILDLINK_API_DEPENDS.go-tools+=       go-tools>=1.8
-BUILDLINK_PKGSRCDIR.go-tools?= ../../devel/go-tools
+BUILDLINK_PKGSRCDIR.go-tools?=         ../../devel/go-tools
 
 .include "../../devel/google-api-go-client/buildlink3.mk"
 .include "../../security/go-crypto-acme/buildlink3.mk"

Index: pkgsrc/devel/grantlee/buildlink3.mk
diff -u pkgsrc/devel/grantlee/buildlink3.mk:1.4 pkgsrc/devel/grantlee/buildlink3.mk:1.5
--- pkgsrc/devel/grantlee/buildlink3.mk:1.4     Sat Mar  5 11:27:44 2016
+++ pkgsrc/devel/grantlee/buildlink3.mk Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2016/03/05 11:27:44 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       grantlee
 
@@ -7,7 +7,7 @@ GRANTLEE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.grantlee+=       grantlee>=0.3.0
 BUILDLINK_ABI_DEPENDS.grantlee?=       grantlee>=0.5.1nb2
-BUILDLINK_PKGSRCDIR.grantlee?= ../../devel/grantlee
+BUILDLINK_PKGSRCDIR.grantlee?=         ../../devel/grantlee
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .endif # GRANTLEE_BUILDLINK3_MK

Index: pkgsrc/devel/gtl/buildlink3.mk
diff -u pkgsrc/devel/gtl/buildlink3.mk:1.8 pkgsrc/devel/gtl/buildlink3.mk:1.9
--- pkgsrc/devel/gtl/buildlink3.mk:1.8  Fri Mar 20 19:24:15 2009
+++ pkgsrc/devel/gtl/buildlink3.mk      Sun Jan  7 13:04:03 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       gtl
 
 .if !defined(GTL_BUILDLINK3_MK)
 GTL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gtl+=            gtl>=1.2.0
+BUILDLINK_API_DEPENDS.gtl+=    gtl>=1.2.0
 BUILDLINK_PKGSRCDIR.gtl?=      ../../devel/gtl
 .endif # GTL_BUILDLINK3_MK
 

Index: pkgsrc/devel/guile-gnome/buildlink3.mk
diff -u pkgsrc/devel/guile-gnome/buildlink3.mk:1.4 pkgsrc/devel/guile-gnome/buildlink3.mk:1.5
--- pkgsrc/devel/guile-gnome/buildlink3.mk:1.4  Thu Sep 15 21:13:03 2016
+++ pkgsrc/devel/guile-gnome/buildlink3.mk      Sun Jan  7 13:04:03 2018
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.4 2016/09/15 21:13:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:03 rillig Exp $
 
-BUILDLINK_TREE+=        guile-gnome-platform
+BUILDLINK_TREE+=       guile-gnome-platform
 
 .if !defined(GUILE_GNOME_PLATFORM_BUILDLINK3_MK)
 GUILE_GNOME_PLATFORM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.guile-gnome-platform+=    guile-gnome-platform>=2.16.1nb10
-BUILDLINK_ABI_DEPENDS.guile-gnome-platform?=      guile-gnome-platform>=2.16.2nb3
-BUILDLINK_PKGSRCDIR.guile-gnome-platform?=      ../../devel/guile-gnome
+BUILDLINK_API_DEPENDS.guile-gnome-platform+=   guile-gnome-platform>=2.16.1nb10
+BUILDLINK_ABI_DEPENDS.guile-gnome-platform?=   guile-gnome-platform>=2.16.2nb3
+BUILDLINK_PKGSRCDIR.guile-gnome-platform?=     ../../devel/guile-gnome
 
 .include "../../devel/g-wrap/buildlink3.mk"
 .include "../../graphics/guile-cairo/buildlink3.mk"

Index: pkgsrc/devel/hdf5-c++/buildlink3.mk
diff -u pkgsrc/devel/hdf5-c++/buildlink3.mk:1.1 pkgsrc/devel/hdf5-c++/buildlink3.mk:1.2
--- pkgsrc/devel/hdf5-c++/buildlink3.mk:1.1     Fri Aug 21 16:42:25 2015
+++ pkgsrc/devel/hdf5-c++/buildlink3.mk Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/08/21 16:42:25 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       hdf5-c++
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        hdf5-c++
 HDF5_C++_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hdf5-c+++=       hdf5-c++>=1.8.14
-BUILDLINK_PKGSRCDIR.hdf5-c++?= ../../devel/hdf5-c++
+BUILDLINK_PKGSRCDIR.hdf5-c++?=         ../../devel/hdf5-c++
 
 .include "../../devel/hdf5/buildlink3.mk"
 .endif # HDF5_C++_BUILDLINK3_MK

Index: pkgsrc/devel/hs-ansi-terminal/buildlink3.mk
diff -u pkgsrc/devel/hs-ansi-terminal/buildlink3.mk:1.3 pkgsrc/devel/hs-ansi-terminal/buildlink3.mk:1.4
--- pkgsrc/devel/hs-ansi-terminal/buildlink3.mk:1.3     Thu Nov  6 13:00:44 2014
+++ pkgsrc/devel/hs-ansi-terminal/buildlink3.mk Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/11/06 13:00:44 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       hs-ansi-terminal
 
@@ -7,7 +7,7 @@ HS_ANSI_TERMINAL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-ansi-terminal+=       hs-ansi-terminal>=0.6.2
 BUILDLINK_ABI_DEPENDS.hs-ansi-terminal+=       hs-ansi-terminal>=0.6.2.1
-BUILDLINK_PKGSRCDIR.hs-ansi-terminal?= ../../devel/hs-ansi-terminal
+BUILDLINK_PKGSRCDIR.hs-ansi-terminal?=         ../../devel/hs-ansi-terminal
 .endif # HS_ANSI_TERMINAL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-ansi-terminal

Index: pkgsrc/devel/hs-blaze-builder/buildlink3.mk
diff -u pkgsrc/devel/hs-blaze-builder/buildlink3.mk:1.8 pkgsrc/devel/hs-blaze-builder/buildlink3.mk:1.9
--- pkgsrc/devel/hs-blaze-builder/buildlink3.mk:1.8     Sun Jan 10 11:49:09 2016
+++ pkgsrc/devel/hs-blaze-builder/buildlink3.mk Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2016/01/10 11:49:09 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       hs-blaze-builder
 
@@ -7,7 +7,7 @@ HS_BLAZE_BUILDER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-blaze-builder+=       hs-blaze-builder>=0.3.3
 BUILDLINK_ABI_DEPENDS.hs-blaze-builder+=       hs-blaze-builder>=0.3.3.3nb5
-BUILDLINK_PKGSRCDIR.hs-blaze-builder?= ../../devel/hs-blaze-builder
+BUILDLINK_PKGSRCDIR.hs-blaze-builder?=         ../../devel/hs-blaze-builder
 
 .include "../../devel/hs-text/buildlink3.mk"
 .endif # HS_BLAZE_BUILDER_BUILDLINK3_MK

Index: pkgsrc/devel/hs-cpphs/buildlink3.mk
diff -u pkgsrc/devel/hs-cpphs/buildlink3.mk:1.10 pkgsrc/devel/hs-cpphs/buildlink3.mk:1.11
--- pkgsrc/devel/hs-cpphs/buildlink3.mk:1.10    Sun Jan 10 11:49:09 2016
+++ pkgsrc/devel/hs-cpphs/buildlink3.mk Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2016/01/10 11:49:09 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       hs-cpphs
 
@@ -7,7 +7,7 @@ HS_CPPHS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-cpphs+=       hs-cpphs>=1.19.2
 BUILDLINK_ABI_DEPENDS.hs-cpphs+=       hs-cpphs>=1.19.2nb1
-BUILDLINK_PKGSRCDIR.hs-cpphs?= ../../devel/hs-cpphs
+BUILDLINK_PKGSRCDIR.hs-cpphs?=         ../../devel/hs-cpphs
 
 .include "../../textproc/hs-polyparse/buildlink3.mk"
 .endif # HS_CPPHS_BUILDLINK3_MK

Index: pkgsrc/devel/hs-dlist/buildlink3.mk
diff -u pkgsrc/devel/hs-dlist/buildlink3.mk:1.5 pkgsrc/devel/hs-dlist/buildlink3.mk:1.6
--- pkgsrc/devel/hs-dlist/buildlink3.mk:1.5     Mon Jan  4 12:21:11 2016
+++ pkgsrc/devel/hs-dlist/buildlink3.mk Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2016/01/04 12:21:11 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       hs-dlist
 
@@ -7,7 +7,7 @@ HS_DLIST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-dlist+=       hs-dlist>=0.7.1
 BUILDLINK_ABI_DEPENDS.hs-dlist+=       hs-dlist>=0.7.1.2
-BUILDLINK_PKGSRCDIR.hs-dlist?= ../../devel/hs-dlist
+BUILDLINK_PKGSRCDIR.hs-dlist?=         ../../devel/hs-dlist
 .endif # HS_DLIST_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-dlist

Index: pkgsrc/devel/hs-extensible-exceptions/buildlink3.mk
diff -u pkgsrc/devel/hs-extensible-exceptions/buildlink3.mk:1.2 pkgsrc/devel/hs-extensible-exceptions/buildlink3.mk:1.3
--- pkgsrc/devel/hs-extensible-exceptions/buildlink3.mk:1.2     Fri Aug 29 14:08:39 2014
+++ pkgsrc/devel/hs-extensible-exceptions/buildlink3.mk Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 14:08:39 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       hs-extensible-exceptions
 
@@ -7,7 +7,7 @@ HS_EXTENSIBLE_EXCEPTIONS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-extensible-exceptions+=       hs-extensible-exceptions>=0.1.1
 BUILDLINK_ABI_DEPENDS.hs-extensible-exceptions+=       hs-extensible-exceptions>=0.1.1.4
-BUILDLINK_PKGSRCDIR.hs-extensible-exceptions?= ../../devel/hs-extensible-exceptions
+BUILDLINK_PKGSRCDIR.hs-extensible-exceptions?=         ../../devel/hs-extensible-exceptions
 .endif # HS_EXTENSIBLE_EXCEPTIONS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-extensible-exceptions

Index: pkgsrc/devel/hs-mmorph/buildlink3.mk
diff -u pkgsrc/devel/hs-mmorph/buildlink3.mk:1.4 pkgsrc/devel/hs-mmorph/buildlink3.mk:1.5
--- pkgsrc/devel/hs-mmorph/buildlink3.mk:1.4    Sun Nov 23 12:52:32 2014
+++ pkgsrc/devel/hs-mmorph/buildlink3.mk        Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/11/23 12:52:32 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       hs-mmorph
 
@@ -7,7 +7,7 @@ HS_MMORPH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-mmorph+=      hs-mmorph>=1.0.4
 BUILDLINK_ABI_DEPENDS.hs-mmorph+=      hs-mmorph>=1.0.4nb1
-BUILDLINK_PKGSRCDIR.hs-mmorph?=        ../../devel/hs-mmorph
+BUILDLINK_PKGSRCDIR.hs-mmorph?=                ../../devel/hs-mmorph
 
 .include "../../devel/hs-transformers/buildlink3.mk"
 .endif # HS_MMORPH_BUILDLINK3_MK

Index: pkgsrc/devel/hs-monad-control/buildlink3.mk
diff -u pkgsrc/devel/hs-monad-control/buildlink3.mk:1.3 pkgsrc/devel/hs-monad-control/buildlink3.mk:1.4
--- pkgsrc/devel/hs-monad-control/buildlink3.mk:1.3     Sun Nov 23 12:52:32 2014
+++ pkgsrc/devel/hs-monad-control/buildlink3.mk Sun Jan  7 13:04:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/11/23 12:52:32 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:03 rillig Exp $
 
 BUILDLINK_TREE+=       hs-monad-control
 
@@ -7,7 +7,7 @@ HS_MONAD_CONTROL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-monad-control+=       hs-monad-control>=0.3.3
 BUILDLINK_ABI_DEPENDS.hs-monad-control+=       hs-monad-control>=0.3.3.0nb2
-BUILDLINK_PKGSRCDIR.hs-monad-control?= ../../devel/hs-monad-control
+BUILDLINK_PKGSRCDIR.hs-monad-control?=         ../../devel/hs-monad-control
 
 .include "../../devel/hs-transformers/buildlink3.mk"
 .include "../../devel/hs-transformers-base/buildlink3.mk"

Index: pkgsrc/devel/hs-random/buildlink3.mk
diff -u pkgsrc/devel/hs-random/buildlink3.mk:1.3 pkgsrc/devel/hs-random/buildlink3.mk:1.4
--- pkgsrc/devel/hs-random/buildlink3.mk:1.3    Tue Oct 21 21:27:51 2014
+++ pkgsrc/devel/hs-random/buildlink3.mk        Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/10/21 21:27:51 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       hs-random
 
@@ -7,7 +7,7 @@ HS_RANDOM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-random+=      hs-random>=1.1
 BUILDLINK_ABI_DEPENDS.hs-random+=      hs-random>=1.1
-BUILDLINK_PKGSRCDIR.hs-random?=        ../../devel/hs-random
+BUILDLINK_PKGSRCDIR.hs-random?=                ../../devel/hs-random
 .endif # HS_RANDOM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-random

Index: pkgsrc/devel/hs-split/buildlink3.mk
diff -u pkgsrc/devel/hs-split/buildlink3.mk:1.2 pkgsrc/devel/hs-split/buildlink3.mk:1.3
--- pkgsrc/devel/hs-split/buildlink3.mk:1.2     Fri Aug 29 14:08:39 2014
+++ pkgsrc/devel/hs-split/buildlink3.mk Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 14:08:39 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       hs-split
 
@@ -7,7 +7,7 @@ HS_SPLIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-split+=       hs-split>=0.2.2
 BUILDLINK_ABI_DEPENDS.hs-split+=       hs-split>=0.2.2
-BUILDLINK_PKGSRCDIR.hs-split?= ../../devel/hs-split
+BUILDLINK_PKGSRCDIR.hs-split?=         ../../devel/hs-split
 .endif # HS_SPLIT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-split

Index: pkgsrc/devel/hs-tagged/buildlink3.mk
diff -u pkgsrc/devel/hs-tagged/buildlink3.mk:1.2 pkgsrc/devel/hs-tagged/buildlink3.mk:1.3
--- pkgsrc/devel/hs-tagged/buildlink3.mk:1.2    Fri Aug 29 14:08:40 2014
+++ pkgsrc/devel/hs-tagged/buildlink3.mk        Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 14:08:40 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       hs-tagged
 
@@ -7,7 +7,7 @@ HS_TAGGED_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-tagged+=      hs-tagged>=0.7.2
 BUILDLINK_ABI_DEPENDS.hs-tagged+=      hs-tagged>=0.7.2
-BUILDLINK_PKGSRCDIR.hs-tagged?=        ../../devel/hs-tagged
+BUILDLINK_PKGSRCDIR.hs-tagged?=                ../../devel/hs-tagged
 .endif # HS_TAGGED_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-tagged

Index: pkgsrc/devel/hs-vault/buildlink3.mk
diff -u pkgsrc/devel/hs-vault/buildlink3.mk:1.10 pkgsrc/devel/hs-vault/buildlink3.mk:1.11
--- pkgsrc/devel/hs-vault/buildlink3.mk:1.10    Sun Jan 10 11:49:10 2016
+++ pkgsrc/devel/hs-vault/buildlink3.mk Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2016/01/10 11:49:10 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       hs-vault
 
@@ -7,7 +7,7 @@ HS_VAULT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-vault+=       hs-vault>=0.3.0
 BUILDLINK_ABI_DEPENDS.hs-vault+=       hs-vault>=0.3.0.3nb9
-BUILDLINK_PKGSRCDIR.hs-vault?= ../../devel/hs-vault
+BUILDLINK_PKGSRCDIR.hs-vault?=         ../../devel/hs-vault
 
 .include "../../devel/hs-hashable/buildlink3.mk"
 .include "../../devel/hs-unordered-containers/buildlink3.mk"

Index: pkgsrc/devel/hs-vector/buildlink3.mk
diff -u pkgsrc/devel/hs-vector/buildlink3.mk:1.7 pkgsrc/devel/hs-vector/buildlink3.mk:1.8
--- pkgsrc/devel/hs-vector/buildlink3.mk:1.7    Sun Dec 13 14:08:12 2015
+++ pkgsrc/devel/hs-vector/buildlink3.mk        Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/12/13 14:08:12 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       hs-vector
 
@@ -7,7 +7,7 @@ HS_VECTOR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-vector+=      hs-vector>=0.11.0
 BUILDLINK_ABI_DEPENDS.hs-vector+=      hs-vector>=0.11.0.0
-BUILDLINK_PKGSRCDIR.hs-vector?=        ../../devel/hs-vector
+BUILDLINK_PKGSRCDIR.hs-vector?=                ../../devel/hs-vector
 
 .include "../../devel/hs-primitive/buildlink3.mk"
 .endif # HS_VECTOR_BUILDLINK3_MK

Index: pkgsrc/devel/iniparser/buildlink3.mk
diff -u pkgsrc/devel/iniparser/buildlink3.mk:1.1 pkgsrc/devel/iniparser/buildlink3.mk:1.2
--- pkgsrc/devel/iniparser/buildlink3.mk:1.1    Fri Nov 22 11:49:42 2013
+++ pkgsrc/devel/iniparser/buildlink3.mk        Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/11/22 11:49:42 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       iniparser
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        iniparser
 INIPARSER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.iniparser+=      iniparser>=3.1
-BUILDLINK_PKGSRCDIR.iniparser?=        ../../devel/iniparser
+BUILDLINK_PKGSRCDIR.iniparser?=                ../../devel/iniparser
 .endif # INIPARSER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -iniparser

Index: pkgsrc/devel/jemalloc/buildlink3.mk
diff -u pkgsrc/devel/jemalloc/buildlink3.mk:1.1 pkgsrc/devel/jemalloc/buildlink3.mk:1.2
--- pkgsrc/devel/jemalloc/buildlink3.mk:1.1     Thu Feb 18 15:51:59 2016
+++ pkgsrc/devel/jemalloc/buildlink3.mk Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/02/18 15:51:59 gson Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       jemalloc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        jemalloc
 JEMALLOC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.jemalloc+=       jemalloc>=4.0.0
-BUILDLINK_PKGSRCDIR.jemalloc?= ../../devel/jemalloc
+BUILDLINK_PKGSRCDIR.jemalloc?=         ../../devel/jemalloc
 .endif # JEMALLOC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -jemalloc

Index: pkgsrc/devel/kcmutils/buildlink3.mk
diff -u pkgsrc/devel/kcmutils/buildlink3.mk:1.12 pkgsrc/devel/kcmutils/buildlink3.mk:1.13
--- pkgsrc/devel/kcmutils/buildlink3.mk:1.12    Thu Nov 30 16:45:01 2017
+++ pkgsrc/devel/kcmutils/buildlink3.mk Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       kcmutils
 
@@ -7,7 +7,7 @@ KCMUTILS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kcmutils+=       kcmutils>=5.21.0
 BUILDLINK_ABI_DEPENDS.kcmutils?=       kcmutils>=5.25.0nb11
-BUILDLINK_PKGSRCDIR.kcmutils?= ../../devel/kcmutils
+BUILDLINK_PKGSRCDIR.kcmutils?=         ../../devel/kcmutils
 
 .include "../../devel/kdeclarative/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/devel/kdoctools/buildlink3.mk
diff -u pkgsrc/devel/kdoctools/buildlink3.mk:1.7 pkgsrc/devel/kdoctools/buildlink3.mk:1.8
--- pkgsrc/devel/kdoctools/buildlink3.mk:1.7    Thu Nov 30 16:45:02 2017
+++ pkgsrc/devel/kdoctools/buildlink3.mk        Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:02 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       kdoctools
 
@@ -7,7 +7,7 @@ KDOCTOOLS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdoctools+=      kdoctools>=5.21.0
 BUILDLINK_ABI_DEPENDS.kdoctools?=      kdoctools>=5.25.0nb6
-BUILDLINK_PKGSRCDIR.kdoctools?=        ../../devel/kdoctools
+BUILDLINK_PKGSRCDIR.kdoctools?=                ../../devel/kdoctools
 
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/devel/kidletime/buildlink3.mk
diff -u pkgsrc/devel/kidletime/buildlink3.mk:1.7 pkgsrc/devel/kidletime/buildlink3.mk:1.8
--- pkgsrc/devel/kidletime/buildlink3.mk:1.7    Thu Nov 30 16:45:02 2017
+++ pkgsrc/devel/kidletime/buildlink3.mk        Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:02 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       kidletime
 
@@ -7,7 +7,7 @@ KIDLETIME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kidletime+=      kidletime>=5.18.0
 BUILDLINK_ABI_DEPENDS.kidletime?=      kidletime>=5.25.0nb6
-BUILDLINK_PKGSRCDIR.kidletime?=        ../../devel/kidletime
+BUILDLINK_PKGSRCDIR.kidletime?=                ../../devel/kidletime
 
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/devel/kpackage/buildlink3.mk
diff -u pkgsrc/devel/kpackage/buildlink3.mk:1.7 pkgsrc/devel/kpackage/buildlink3.mk:1.8
--- pkgsrc/devel/kpackage/buildlink3.mk:1.7     Thu Nov 30 16:45:02 2017
+++ pkgsrc/devel/kpackage/buildlink3.mk Sun Jan  7 13:04:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:02 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:04 rillig Exp $
 
 BUILDLINK_TREE+=       kpackage
 
@@ -7,7 +7,7 @@ KPACKAGE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kpackage+=       kpackage>=5.19.0
 BUILDLINK_ABI_DEPENDS.kpackage?=       kpackage>=5.25.0nb10
-BUILDLINK_PKGSRCDIR.kpackage?= ../../devel/kpackage
+BUILDLINK_PKGSRCDIR.kpackage?=         ../../devel/kpackage
 
 .include "../../archivers/karchive/buildlink3.mk"
 .include "../../devel/kconfig/buildlink3.mk"

Index: pkgsrc/devel/kservice/buildlink3.mk
diff -u pkgsrc/devel/kservice/buildlink3.mk:1.7 pkgsrc/devel/kservice/buildlink3.mk:1.8
--- pkgsrc/devel/kservice/buildlink3.mk:1.7     Thu Nov 30 16:45:03 2017
+++ pkgsrc/devel/kservice/buildlink3.mk Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:03 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       kservice
 
@@ -7,7 +7,7 @@ KSERVICE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kservice+=       kservice>=5.18.0
 BUILDLINK_ABI_DEPENDS.kservice?=       kservice>=5.25.0nb6
-BUILDLINK_PKGSRCDIR.kservice?= ../../devel/kservice
+BUILDLINK_PKGSRCDIR.kservice?=         ../../devel/kservice
 
 .include "../../devel/kconfig/buildlink3.mk"
 .include "../../devel/kcrash/buildlink3.mk"

Index: pkgsrc/devel/libFoundation/buildlink3.mk
diff -u pkgsrc/devel/libFoundation/buildlink3.mk:1.11 pkgsrc/devel/libFoundation/buildlink3.mk:1.12
--- pkgsrc/devel/libFoundation/buildlink3.mk:1.11       Sun Jun 14 22:58:00 2009
+++ pkgsrc/devel/libFoundation/buildlink3.mk    Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/06/14 22:58:00 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libFoundation
 
@@ -8,13 +8,13 @@ LIBFOUNDATION_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libFoundation+=  libFoundation>=1.1.7.168
 BUILDLINK_PKGSRCDIR.libFoundation?=    ../../devel/libFoundation
 
-FOUNDATION_LIB?=       fd
-ADDITIONAL_INCLUDE_DIRS+=-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU
+FOUNDATION_LIB?=               fd
+ADDITIONAL_INCLUDE_DIRS+=      -I${GNUSTEP_SYSTEM_ROOT}/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU
 .if !defined(NO_FOUNDATION_ENV)
-CONFIGURE_ENV+=                FOUNDATION_LIB=${FOUNDATION_LIB:Q}
-CONFIGURE_ENV+=                ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q}
-MAKE_ENV+=             FOUNDATION_LIB=${FOUNDATION_LIB:Q}
-MAKE_ENV+=             ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q}
+CONFIGURE_ENV+=                        FOUNDATION_LIB=${FOUNDATION_LIB:Q}
+CONFIGURE_ENV+=                        ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q}
+MAKE_ENV+=                     FOUNDATION_LIB=${FOUNDATION_LIB:Q}
+MAKE_ENV+=                     ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q}
 .endif
 
 .include "../../devel/gnustep-make/buildlink3.mk"

Index: pkgsrc/devel/libappindicator3/buildlink3.mk
diff -u pkgsrc/devel/libappindicator3/buildlink3.mk:1.5 pkgsrc/devel/libappindicator3/buildlink3.mk:1.6
--- pkgsrc/devel/libappindicator3/buildlink3.mk:1.5     Thu Nov 23 17:19:40 2017
+++ pkgsrc/devel/libappindicator3/buildlink3.mk Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/11/23 17:19:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libappindicator3
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libappindicator3
 LIBAPPINDICATOR3_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libappindicator3+=       libappindicator3>=12.10.0
-BUILDLINK_ABI_DEPENDS.libappindicator3?=               libappindicator3>=12.10.0nb4
+BUILDLINK_ABI_DEPENDS.libappindicator3?=       libappindicator3>=12.10.0nb4
 BUILDLINK_PKGSRCDIR.libappindicator3?=         ../../devel/libappindicator3
 
 .include "../../devel/libindicator3/buildlink3.mk"

Index: pkgsrc/devel/libbonobo/buildlink3.mk
diff -u pkgsrc/devel/libbonobo/buildlink3.mk:1.24 pkgsrc/devel/libbonobo/buildlink3.mk:1.25
--- pkgsrc/devel/libbonobo/buildlink3.mk:1.24   Sat Sep 15 10:04:12 2012
+++ pkgsrc/devel/libbonobo/buildlink3.mk        Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2012/09/15 10:04:12 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libbonobo
 
@@ -7,7 +7,7 @@ LIBBONOBO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libbonobo+=      libbonobo>=2.8.0
 BUILDLINK_ABI_DEPENDS.libbonobo+=      libbonobo>=2.32.0nb6
-BUILDLINK_PKGSRCDIR.libbonobo?=        ../../devel/libbonobo
+BUILDLINK_PKGSRCDIR.libbonobo?=                ../../devel/libbonobo
 
 BUILDLINK_FILES.libbonobo+=    share/idl/bonobo-2.0/*
 BUILDLINK_FILES.libbonobo+=    share/idl/bonobo-activation-2.0/*

Index: pkgsrc/devel/libbonoboui/buildlink3.mk
diff -u pkgsrc/devel/libbonoboui/buildlink3.mk:1.54 pkgsrc/devel/libbonoboui/buildlink3.mk:1.55
--- pkgsrc/devel/libbonoboui/buildlink3.mk:1.54 Thu Nov 23 17:19:40 2017
+++ pkgsrc/devel/libbonoboui/buildlink3.mk      Sun Jan  7 13:04:05 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.54 2017/11/23 17:19:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.55 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libbonoboui
 
 .if !defined(LIBBONOBOUI_BUILDLINK3_MK)
 LIBBONOBOUI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libbonoboui+=            libbonoboui>=2.8.0
+BUILDLINK_API_DEPENDS.libbonoboui+=    libbonoboui>=2.8.0
 BUILDLINK_ABI_DEPENDS.libbonoboui+=    libbonoboui>=2.24.4nb30
 BUILDLINK_PKGSRCDIR.libbonoboui?=      ../../devel/libbonoboui
 

Index: pkgsrc/devel/libdatrie/buildlink3.mk
diff -u pkgsrc/devel/libdatrie/buildlink3.mk:1.4 pkgsrc/devel/libdatrie/buildlink3.mk:1.5
--- pkgsrc/devel/libdatrie/buildlink3.mk:1.4    Thu Feb 27 12:42:05 2014
+++ pkgsrc/devel/libdatrie/buildlink3.mk        Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/02/27 12:42:05 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libdatrie
 
@@ -7,7 +7,7 @@ LIBDATRIE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libdatrie+=      libdatrie>=0.2.0
 BUILDLINK_ABI_DEPENDS.libdatrie+=      libdatrie>=0.2.7.1
-BUILDLINK_PKGSRCDIR.libdatrie?=        ../../devel/libdatrie
+BUILDLINK_PKGSRCDIR.libdatrie?=                ../../devel/libdatrie
 .endif # LIBDATRIE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libdatrie

Index: pkgsrc/devel/libdnsres/buildlink3.mk
diff -u pkgsrc/devel/libdnsres/buildlink3.mk:1.7 pkgsrc/devel/libdnsres/buildlink3.mk:1.8
--- pkgsrc/devel/libdnsres/buildlink3.mk:1.7    Mon May  7 01:53:23 2012
+++ pkgsrc/devel/libdnsres/buildlink3.mk        Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2012/05/07 01:53:23 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libdnsres
 
@@ -7,7 +7,7 @@ LIBDNSRES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libdnsres+=      libdnsres>=0.1a
 BUILDLINK_ABI_DEPENDS.libdnsres+=      libdnsres>=0.1anb4
-BUILDLINK_PKGSRCDIR.libdnsres?=        ../../devel/libdnsres
+BUILDLINK_PKGSRCDIR.libdnsres?=                ../../devel/libdnsres
 .endif # LIBDNSRES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libdnsres

Index: pkgsrc/devel/libdockapp/buildlink3.mk
diff -u pkgsrc/devel/libdockapp/buildlink3.mk:1.10 pkgsrc/devel/libdockapp/buildlink3.mk:1.11
--- pkgsrc/devel/libdockapp/buildlink3.mk:1.10  Fri Mar 20 19:24:17 2009
+++ pkgsrc/devel/libdockapp/buildlink3.mk       Sun Jan  7 13:04:05 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libdockapp
 
 .if !defined(LIBDOCKAPP_BUILDLINK3_MK)
 LIBDOCKAPP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libdockapp+=             libdockapp>=0.4.0
+BUILDLINK_API_DEPENDS.libdockapp+=     libdockapp>=0.4.0
 BUILDLINK_ABI_DEPENDS.libdockapp+=     libdockapp>=0.4.0nb2
 BUILDLINK_PKGSRCDIR.libdockapp?=       ../../devel/libdockapp
 

Index: pkgsrc/devel/libffcall/buildlink3.mk
diff -u pkgsrc/devel/libffcall/buildlink3.mk:1.1 pkgsrc/devel/libffcall/buildlink3.mk:1.2
--- pkgsrc/devel/libffcall/buildlink3.mk:1.1    Sun Sep 10 20:00:49 2017
+++ pkgsrc/devel/libffcall/buildlink3.mk        Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/09/10 20:00:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libffcall
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libffcall
 LIBFFCALL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libffcall+=      libffcall>=2.0
-BUILDLINK_PKGSRCDIR.libffcall?=        ../../devel/libffcall
+BUILDLINK_PKGSRCDIR.libffcall?=                ../../devel/libffcall
 .endif # LIBFFCALL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libffcall

Index: pkgsrc/devel/libftdi1/buildlink3.mk
diff -u pkgsrc/devel/libftdi1/buildlink3.mk:1.1 pkgsrc/devel/libftdi1/buildlink3.mk:1.2
--- pkgsrc/devel/libftdi1/buildlink3.mk:1.1     Tue Dec  3 01:40:14 2013
+++ pkgsrc/devel/libftdi1/buildlink3.mk Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/12/03 01:40:14 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libftdi1
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libftdi1
 LIBFTDI1_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libftdi1+=       libftdi1>=1.0
-BUILDLINK_PKGSRCDIR.libftdi1?= ../../devel/libftdi1
+BUILDLINK_PKGSRCDIR.libftdi1?=         ../../devel/libftdi1
 
 .include "../../devel/libusb/buildlink3.mk"
 .endif # LIBFTDI1_BUILDLINK3_MK

Index: pkgsrc/devel/libgee0.6/buildlink3.mk
diff -u pkgsrc/devel/libgee0.6/buildlink3.mk:1.1 pkgsrc/devel/libgee0.6/buildlink3.mk:1.2
--- pkgsrc/devel/libgee0.6/buildlink3.mk:1.1    Sat Oct 25 19:00:14 2014
+++ pkgsrc/devel/libgee0.6/buildlink3.mk        Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/25 19:00:14 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libgee0.6
 
@@ -8,7 +8,7 @@ LIBGEE0.6_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libgee0.6+=      libgee0.6>=0.5.3
 BUILDLINK_ABI_DEPENDS.libgee0.6+=      libgee0.6>=0.6.5nb1
 BUILDLINK_ABI_DEPENDS.libgee0.6+=      libgee0.6<0.8
-BUILDLINK_PKGSRCDIR.libgee0.6?=        ../../devel/libgee0.6
+BUILDLINK_PKGSRCDIR.libgee0.6?=                ../../devel/libgee0.6
 
 .include "../../devel/glib2/buildlink3.mk"
 .endif # LIBGEE0.6_BUILDLINK3_MK

Index: pkgsrc/devel/libglade/buildlink3.mk
diff -u pkgsrc/devel/libglade/buildlink3.mk:1.40 pkgsrc/devel/libglade/buildlink3.mk:1.41
--- pkgsrc/devel/libglade/buildlink3.mk:1.40    Sun Feb 12 06:24:40 2017
+++ pkgsrc/devel/libglade/buildlink3.mk Sun Jan  7 13:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.40 2017/02/12 06:24:40 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.41 2018/01/07 13:04:05 rillig Exp $
 
 BUILDLINK_TREE+=       libglade
 
@@ -7,7 +7,7 @@ LIBGLADE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libglade+=       libglade>=2.3.6
 BUILDLINK_ABI_DEPENDS.libglade+=       libglade>=2.6.4nb25
-BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade
+BUILDLINK_PKGSRCDIR.libglade?=         ../../devel/libglade
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/devel/libgnome/buildlink3.mk
diff -u pkgsrc/devel/libgnome/buildlink3.mk:1.54 pkgsrc/devel/libgnome/buildlink3.mk:1.55
--- pkgsrc/devel/libgnome/buildlink3.mk:1.54    Thu Nov 23 17:19:40 2017
+++ pkgsrc/devel/libgnome/buildlink3.mk Sun Jan  7 13:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.54 2017/11/23 17:19:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.55 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libgnome
 
@@ -7,7 +7,7 @@ LIBGNOME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgnome+=       libgnome>=2.8.0
 BUILDLINK_ABI_DEPENDS.libgnome+=       libgnome>=2.32.1nb28
-BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome
+BUILDLINK_PKGSRCDIR.libgnome?=         ../../devel/libgnome
 
 .include "../../mk/bsd.fast.prefs.mk"
 

Index: pkgsrc/devel/libgnomeui/buildlink3.mk
diff -u pkgsrc/devel/libgnomeui/buildlink3.mk:1.64 pkgsrc/devel/libgnomeui/buildlink3.mk:1.65
--- pkgsrc/devel/libgnomeui/buildlink3.mk:1.64  Thu Nov 23 17:19:41 2017
+++ pkgsrc/devel/libgnomeui/buildlink3.mk       Sun Jan  7 13:04:06 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.64 2017/11/23 17:19:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.65 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libgnomeui
 
 .if !defined(LIBGNOMEUI_BUILDLINK3_MK)
 LIBGNOMEUI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libgnomeui+=             libgnomeui>=2.8.0
+BUILDLINK_API_DEPENDS.libgnomeui+=     libgnomeui>=2.8.0
 BUILDLINK_ABI_DEPENDS.libgnomeui+=     libgnomeui>=2.24.5nb36
 BUILDLINK_PKGSRCDIR.libgnomeui?=       ../../devel/libgnomeui
 

Index: pkgsrc/devel/libgphoto2/buildlink3.mk
diff -u pkgsrc/devel/libgphoto2/buildlink3.mk:1.19 pkgsrc/devel/libgphoto2/buildlink3.mk:1.20
--- pkgsrc/devel/libgphoto2/buildlink3.mk:1.19  Mon Oct  5 04:47:02 2015
+++ pkgsrc/devel/libgphoto2/buildlink3.mk       Sun Jan  7 13:04:06 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.19 2015/10/05 04:47:02 richard Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libgphoto2
 
 .if !defined(LIBGPHOTO2_BUILDLINK3_MK)
 LIBGPHOTO2_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libgphoto2+=             libgphoto2>=2.1.2
+BUILDLINK_API_DEPENDS.libgphoto2+=     libgphoto2>=2.1.2
 BUILDLINK_ABI_DEPENDS.libgphoto2+=     libgphoto2>=2.4.7nb3
 BUILDLINK_PKGSRCDIR.libgphoto2?=       ../../devel/libgphoto2
 

Index: pkgsrc/devel/libiberty/buildlink3.mk
diff -u pkgsrc/devel/libiberty/buildlink3.mk:1.9 pkgsrc/devel/libiberty/buildlink3.mk:1.10
--- pkgsrc/devel/libiberty/buildlink3.mk:1.9    Mon May  7 01:53:24 2012
+++ pkgsrc/devel/libiberty/buildlink3.mk        Sun Jan  7 13:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/05/07 01:53:24 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libiberty
 
@@ -7,8 +7,8 @@ LIBIBERTY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libiberty+=      libiberty>=1.0nb1
 BUILDLINK_ABI_DEPENDS.libiberty+=      libiberty>=1.0nb2
-BUILDLINK_PKGSRCDIR.libiberty?=        ../../devel/libiberty
-BUILDLINK_DEPMETHOD.libiberty?= build
+BUILDLINK_PKGSRCDIR.libiberty?=                ../../devel/libiberty
+BUILDLINK_DEPMETHOD.libiberty?=                build
 .endif # LIBIBERTY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libiberty

Index: pkgsrc/devel/libkgapi/buildlink3.mk
diff -u pkgsrc/devel/libkgapi/buildlink3.mk:1.1 pkgsrc/devel/libkgapi/buildlink3.mk:1.2
--- pkgsrc/devel/libkgapi/buildlink3.mk:1.1     Thu Nov 13 11:13:45 2014
+++ pkgsrc/devel/libkgapi/buildlink3.mk Sun Jan  7 13:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/11/13 11:13:45 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libkgapi
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libkgapi
 LIBKGAPI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libkgapi+=       libkgapi>=2.2.0
-BUILDLINK_PKGSRCDIR.libkgapi?= ../../devel/libkgapi
+BUILDLINK_PKGSRCDIR.libkgapi?=         ../../devel/libkgapi
 
 .endif # LIBKGAPI_BUILDLINK3_MK
 

Index: pkgsrc/devel/libmemmgr/buildlink3.mk
diff -u pkgsrc/devel/libmemmgr/buildlink3.mk:1.6 pkgsrc/devel/libmemmgr/buildlink3.mk:1.7
--- pkgsrc/devel/libmemmgr/buildlink3.mk:1.6    Fri Mar 20 19:24:20 2009
+++ pkgsrc/devel/libmemmgr/buildlink3.mk        Sun Jan  7 13:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libmemmgr
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=        libmemmgr
 LIBMEMMGR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmemmgr+=      libmemmgr>=1.04
-BUILDLINK_PKGSRCDIR.libmemmgr?=        ../../devel/libmemmgr
-BUILDLINK_DEPMETHOD.libmemmgr?=        build
+BUILDLINK_PKGSRCDIR.libmemmgr?=                ../../devel/libmemmgr
+BUILDLINK_DEPMETHOD.libmemmgr?=                build
 
 .include "../../devel/libetm/buildlink3.mk"
 .endif # LIBMEMMGR_BUILDLINK3_MK

Index: pkgsrc/devel/libosip/buildlink3.mk
diff -u pkgsrc/devel/libosip/buildlink3.mk:1.12 pkgsrc/devel/libosip/buildlink3.mk:1.13
--- pkgsrc/devel/libosip/buildlink3.mk:1.12     Mon Dec 19 13:04:45 2011
+++ pkgsrc/devel/libosip/buildlink3.mk  Sun Jan  7 13:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2011/12/19 13:04:45 schwarz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libosip2
 
@@ -7,7 +7,7 @@ LIBOSIP2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libosip2+=       libosip2>=3.6.0
 BUILDLINK_ABI_DEPENDS.libosip2+=       libosip2>=3.6.0
-BUILDLINK_PKGSRCDIR.libosip2?= ../../devel/libosip
+BUILDLINK_PKGSRCDIR.libosip2?=         ../../devel/libosip
 .endif # LIBOSIP2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libosip2

Index: pkgsrc/devel/libproplist/buildlink3.mk
diff -u pkgsrc/devel/libproplist/buildlink3.mk:1.8 pkgsrc/devel/libproplist/buildlink3.mk:1.9
--- pkgsrc/devel/libproplist/buildlink3.mk:1.8  Fri Mar 20 19:24:21 2009
+++ pkgsrc/devel/libproplist/buildlink3.mk      Sun Jan  7 13:04:06 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libproplist
 
 .if !defined(LIBPROPLIST_BUILDLINK3_MK)
 LIBPROPLIST_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libproplist+=            libproplist>=0.10.1
+BUILDLINK_API_DEPENDS.libproplist+=    libproplist>=0.10.1
 BUILDLINK_ABI_DEPENDS.libproplist+=    libproplist>=0.10.1nb1
 BUILDLINK_PKGSRCDIR.libproplist?=      ../../devel/libproplist
 .endif # LIBPROPLIST_BUILDLINK3_MK

Index: pkgsrc/devel/librfuncs/buildlink3.mk
diff -u pkgsrc/devel/librfuncs/buildlink3.mk:1.11 pkgsrc/devel/librfuncs/buildlink3.mk:1.12
--- pkgsrc/devel/librfuncs/buildlink3.mk:1.11   Mon Aug 30 17:27:11 2010
+++ pkgsrc/devel/librfuncs/buildlink3.mk        Sun Jan  7 13:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2010/08/30 17:27:11 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       librfuncs
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        librfuncs
 LIBRFUNCS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.librfuncs+=      librfuncs>=1.0.4
-BUILDLINK_PKGSRCDIR.librfuncs?=        ../../devel/librfuncs
+BUILDLINK_PKGSRCDIR.librfuncs?=                ../../devel/librfuncs
 .endif # LIBRFUNCS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -librfuncs

Index: pkgsrc/devel/libsexymm/buildlink3.mk
diff -u pkgsrc/devel/libsexymm/buildlink3.mk:1.28 pkgsrc/devel/libsexymm/buildlink3.mk:1.29
--- pkgsrc/devel/libsexymm/buildlink3.mk:1.28   Sun Feb 12 06:24:41 2017
+++ pkgsrc/devel/libsexymm/buildlink3.mk        Sun Jan  7 13:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2017/02/12 06:24:41 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libsexymm
 
@@ -7,7 +7,7 @@ LIBSEXYMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsexymm+=      libsexymm>=0.1.9
 BUILDLINK_ABI_DEPENDS.libsexymm+=      libsexymm>=0.1.9nb26
-BUILDLINK_PKGSRCDIR.libsexymm?=        ../../devel/libsexymm
+BUILDLINK_PKGSRCDIR.libsexymm?=                ../../devel/libsexymm
 
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"

Index: pkgsrc/devel/libslang/buildlink3.mk
diff -u pkgsrc/devel/libslang/buildlink3.mk:1.18 pkgsrc/devel/libslang/buildlink3.mk:1.19
--- pkgsrc/devel/libslang/buildlink3.mk:1.18    Fri Mar 20 19:24:22 2009
+++ pkgsrc/devel/libslang/buildlink3.mk Sun Jan  7 13:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:06 rillig Exp $
 
 BUILDLINK_TREE+=       libslang
 
@@ -7,7 +7,7 @@ LIBSLANG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libslang+=       libslang>=1.4.9nb1
 BUILDLINK_ABI_DEPENDS.libslang+=       libslang>=1.4.9nb4
-BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
+BUILDLINK_PKGSRCDIR.libslang?=         ../../devel/libslang
 .endif # LIBSLANG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libslang

Index: pkgsrc/devel/libslang2/buildlink3.mk
diff -u pkgsrc/devel/libslang2/buildlink3.mk:1.8 pkgsrc/devel/libslang2/buildlink3.mk:1.9
--- pkgsrc/devel/libslang2/buildlink3.mk:1.8    Sat Feb 16 11:17:57 2013
+++ pkgsrc/devel/libslang2/buildlink3.mk        Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2013/02/16 11:17:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       libslang2
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libslang2?=       ../../de
 BUILDLINK_FNAME_TRANSFORM.libslang2+=  -e 's|include/slang2/|include/|g'
 BUILDLINK_TRANSFORM+=          l:slang:slang2
 pkgbase:=      libslang2
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.libslang2:Mpng)
 .  include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/devel/libstroke/buildlink3.mk
diff -u pkgsrc/devel/libstroke/buildlink3.mk:1.14 pkgsrc/devel/libstroke/buildlink3.mk:1.15
--- pkgsrc/devel/libstroke/buildlink3.mk:1.14   Wed Aug 22 20:39:48 2012
+++ pkgsrc/devel/libstroke/buildlink3.mk        Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2012/08/22 20:39:48 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       libstroke
 
@@ -7,7 +7,7 @@ LIBSTROKE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libstroke+=      libstroke>=0.5.1
 BUILDLINK_ABI_DEPENDS.libstroke+=      libstroke>=0.5.1nb4
-BUILDLINK_PKGSRCDIR.libstroke?=        ../../devel/libstroke
+BUILDLINK_PKGSRCDIR.libstroke?=                ../../devel/libstroke
 
 .endif # LIBSTROKE_BUILDLINK3_MK
 

Index: pkgsrc/devel/libtecla/buildlink3.mk
diff -u pkgsrc/devel/libtecla/buildlink3.mk:1.8 pkgsrc/devel/libtecla/buildlink3.mk:1.9
--- pkgsrc/devel/libtecla/buildlink3.mk:1.8     Mon May  7 01:53:25 2012
+++ pkgsrc/devel/libtecla/buildlink3.mk Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2012/05/07 01:53:25 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       libtecla
 
@@ -7,7 +7,7 @@ LIBTECLA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libtecla+=       libtecla>=1.5.0
 BUILDLINK_ABI_DEPENDS.libtecla+=       libtecla>=1.6.1nb1
-BUILDLINK_PKGSRCDIR.libtecla?= ../../devel/libtecla
+BUILDLINK_PKGSRCDIR.libtecla?=         ../../devel/libtecla
 .endif # LIBTECLA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libtecla

Index: pkgsrc/devel/libwnck3/buildlink3.mk
diff -u pkgsrc/devel/libwnck3/buildlink3.mk:1.14 pkgsrc/devel/libwnck3/buildlink3.mk:1.15
--- pkgsrc/devel/libwnck3/buildlink3.mk:1.14    Thu Nov 23 17:19:41 2017
+++ pkgsrc/devel/libwnck3/buildlink3.mk Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2017/11/23 17:19:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       libwnck3
 
@@ -7,7 +7,7 @@ LIBWNCK3_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libwnck3+=       libwnck3>=3.2.1
 BUILDLINK_ABI_DEPENDS.libwnck3?=       libwnck3>=3.24.1nb1
-BUILDLINK_PKGSRCDIR.libwnck3?= ../../devel/libwnck3
+BUILDLINK_PKGSRCDIR.libwnck3?=         ../../devel/libwnck3
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/devel/linenoise/buildlink3.mk
diff -u pkgsrc/devel/linenoise/buildlink3.mk:1.1 pkgsrc/devel/linenoise/buildlink3.mk:1.2
--- pkgsrc/devel/linenoise/buildlink3.mk:1.1    Sun Sep 18 16:47:55 2016
+++ pkgsrc/devel/linenoise/buildlink3.mk        Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/09/18 16:47:55 kamil Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       linenoise
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        linenoise
 LINENOISE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.linenoise+=      linenoise>=1.0
-BUILDLINK_PKGSRCDIR.linenoise?=        ../../devel/linenoise
+BUILDLINK_PKGSRCDIR.linenoise?=                ../../devel/linenoise
 .endif # LINENOISE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -linenoise

Index: pkgsrc/devel/log4cplus/buildlink3.mk
diff -u pkgsrc/devel/log4cplus/buildlink3.mk:1.2 pkgsrc/devel/log4cplus/buildlink3.mk:1.3
--- pkgsrc/devel/log4cplus/buildlink3.mk:1.2    Tue Jul  2 08:59:03 2013
+++ pkgsrc/devel/log4cplus/buildlink3.mk        Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/07/02 08:59:03 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       log4cplus
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        log4cplus
 LOG4CPLUS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.log4cplus+=      log4cplus>=1.1.0
-BUILDLINK_PKGSRCDIR.log4cplus?=        ../../devel/log4cplus
+BUILDLINK_PKGSRCDIR.log4cplus?=                ../../devel/log4cplus
 .endif # LOG4CPLUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -log4cplus

Index: pkgsrc/devel/log4shib/buildlink3.mk
diff -u pkgsrc/devel/log4shib/buildlink3.mk:1.1.1.1 pkgsrc/devel/log4shib/buildlink3.mk:1.2
--- pkgsrc/devel/log4shib/buildlink3.mk:1.1.1.1 Mon Mar 15 08:18:53 2010
+++ pkgsrc/devel/log4shib/buildlink3.mk Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/03/15 08:18:53 pettai Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:07 rillig Exp $
 #
 
 BUILDLINK_TREE+=       log4shib
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        log4shib
 LOG4SHIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.log4shib+=       log4shib>=1.0.4
-BUILDLINK_PKGSRCDIR.log4shib?= ../../devel/log4shib
+BUILDLINK_PKGSRCDIR.log4shib?=         ../../devel/log4shib
 .endif # LOG4SHIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -log4shib

Index: pkgsrc/devel/m17n-lib/buildlink3.mk
diff -u pkgsrc/devel/m17n-lib/buildlink3.mk:1.21 pkgsrc/devel/m17n-lib/buildlink3.mk:1.22
--- pkgsrc/devel/m17n-lib/buildlink3.mk:1.21    Tue Feb 28 15:19:59 2017
+++ pkgsrc/devel/m17n-lib/buildlink3.mk Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2017/02/28 15:19:59 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       m17n-lib
 
@@ -7,7 +7,7 @@ M17N_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.m17n-lib+=       m17n-lib>=1.5.1
 BUILDLINK_ABI_DEPENDS.m17n-lib+=       m17n-lib>=1.7.0nb5
-BUILDLINK_PKGSRCDIR.m17n-lib?= ../../devel/m17n-lib
+BUILDLINK_PKGSRCDIR.m17n-lib?=         ../../devel/m17n-lib
 
 pkgbase := m17n-lib
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/devel/mell/buildlink3.mk
diff -u pkgsrc/devel/mell/buildlink3.mk:1.3 pkgsrc/devel/mell/buildlink3.mk:1.4
--- pkgsrc/devel/mell/buildlink3.mk:1.3 Fri Mar 20 19:24:24 2009
+++ pkgsrc/devel/mell/buildlink3.mk     Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:07 rillig Exp $
 
 .include "../../editors/emacs/modules.mk"
 
@@ -10,7 +10,7 @@ MELL_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.mell+=   ${EMACS_PKGNAME_PREFIX}mell>=1.0.0
 BUILDLINK_PKGSRCDIR.mell?=     ../../devel/mell
 
-BUILDLINK_CONTENTS_FILTER.mell= ${EGREP} '.*\.el$$|.*\.elc$$'
+BUILDLINK_CONTENTS_FILTER.mell=        ${EGREP} '.*\.el$$|.*\.elc$$'
 .endif # MELL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -mell

Index: pkgsrc/devel/mm-common/buildlink3.mk
diff -u pkgsrc/devel/mm-common/buildlink3.mk:1.1 pkgsrc/devel/mm-common/buildlink3.mk:1.2
--- pkgsrc/devel/mm-common/buildlink3.mk:1.1    Sun Jul  7 15:04:28 2013
+++ pkgsrc/devel/mm-common/buildlink3.mk        Sun Jan  7 13:04:07 2018
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/07/07 15:04:28 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       mm-common
 
 .if !defined(MM_COMMON_BUILDLINK3_MK)
 MM_COMMON_BUILDLINK3_MK:=
 
-BUILDLINK_DEPMETHOD.mm-common?= build
+BUILDLINK_DEPMETHOD.mm-common?=        build
 
 BUILDLINK_API_DEPENDS.mm-common+=      mm-common>=0.9.6
-BUILDLINK_PKGSRCDIR.mm-common?=        ../../devel/mm-common
+BUILDLINK_PKGSRCDIR.mm-common?=                ../../devel/mm-common
 .endif # MM_COMMON_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -mm-common

Index: pkgsrc/devel/ncurses/buildlink3.mk
diff -u pkgsrc/devel/ncurses/buildlink3.mk:1.46 pkgsrc/devel/ncurses/buildlink3.mk:1.47
--- pkgsrc/devel/ncurses/buildlink3.mk:1.46     Mon Aug 17 17:10:31 2015
+++ pkgsrc/devel/ncurses/buildlink3.mk  Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.46 2015/08/17 17:10:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.47 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       ncurses
 
@@ -26,15 +26,15 @@ BUILDLINK_INCDIRS.ncurses+= include/ncur
 # a native library), so unless this file is being included by ncursesw
 # don't allow ncursesw to be used by causing linkage failure.
 #
-.  include "../../mk/bsd.fast.prefs.mk"
-.  if !empty(PKGPATH:Mdevel/ncursesw)
+.include "../../mk/bsd.fast.prefs.mk"
+.if !empty(PKGPATH:Mdevel/ncursesw)
 BUILDLINK_TRANSFORM+=          l:curses:${BUILDLINK_LIBNAME.ncurses}
-.  elif empty(BUILDLINK_TREE:Mncursesw)
+.elif empty(BUILDLINK_TREE:Mncursesw)
 BUILDLINK_TRANSFORM+=          l:ncursesw:__nonexistent__
 BUILDLINK_TRANSFORM+=          l:curses:${BUILDLINK_LIBNAME.ncurses}
-.  else
+.else
 BUILDLINK_TRANSFORM+=          l:curses:${BUILDLINK_LIBNAME.ncursesw}
-.  endif
+.endif
 
 .PHONY: buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h
 .PHONY: buildlink-ncurses-term-h

Index: pkgsrc/devel/ncursesw/buildlink3.mk
diff -u pkgsrc/devel/ncursesw/buildlink3.mk:1.7 pkgsrc/devel/ncursesw/buildlink3.mk:1.8
--- pkgsrc/devel/ncursesw/buildlink3.mk:1.7     Mon Aug 17 17:10:32 2015
+++ pkgsrc/devel/ncursesw/buildlink3.mk Sun Jan  7 13:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/08/17 17:10:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:07 rillig Exp $
 
 BUILDLINK_TREE+=       ncursesw
 
@@ -13,18 +13,18 @@ BUILDLINK_LIBNAME.ncursesw= ncursesw
 BUILDLINK_LDADD.ncursesw=      ${BUILDLINK_LIBNAME.ncursesw:S/^/-l/:S/^-l$//}
 
 CHECK_BUILTIN.ncursesw:=       yes
-.  include "builtin.mk"
+.include "builtin.mk"
 CHECK_BUILTIN.ncursesw:=       no
-.  if defined(IS_BUILTIN.ncursesw) && !empty(IS_BUILTIN.ncursesw:M[nN][oO])
+.if defined(IS_BUILTIN.ncursesw) && !empty(IS_BUILTIN.ncursesw:M[nN][oO])
 PKG_BUILD_DEPENDS.ncurses!=    \
        echo "";                \
        ${PKG_INFO} -qn ncursesw 2> /dev/null \
        || { cd ../../devel/ncursesw && ${MAKE} ${MAKEFLAGS} show-depends; }
-.    for d in ${PKG_BUILD_DEPENDS.ncurses:Mncurses[-><]*}
+.  for d in ${PKG_BUILD_DEPENDS.ncurses:Mncurses[-><]*}
 BUILDLINK_API_DEPENDS.ncurses+=        ${d}
-.    endfor
+.  endfor
 USE_NCURSES=                   yes
-.  endif
+.endif
 
 .include "../../devel/ncurses/buildlink3.mk"
 .endif # NCURSESW_BUILDLINK3_MK

Index: pkgsrc/devel/netbsd-iscsi-lib/buildlink3.mk
diff -u pkgsrc/devel/netbsd-iscsi-lib/buildlink3.mk:1.3 pkgsrc/devel/netbsd-iscsi-lib/buildlink3.mk:1.4
--- pkgsrc/devel/netbsd-iscsi-lib/buildlink3.mk:1.3     Thu Oct  6 14:19:25 2011
+++ pkgsrc/devel/netbsd-iscsi-lib/buildlink3.mk Sun Jan  7 13:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2011/10/06 14:19:25 sborrill Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:08 rillig Exp $
 
 BUILDLINK_TREE+=       netbsd-iscsi-lib
 
@@ -7,7 +7,7 @@ NETBSD_ISCSI_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.netbsd-iscsi-lib+=       netbsd-iscsi-lib>=20111006
 BUILDLINK_ABI_DEPENDS.netbsd-iscsi-lib+=       netbsd-iscsi-lib>=20111006
-BUILDLINK_PKGSRCDIR.netbsd-iscsi-lib?= ../../devel/netbsd-iscsi-lib
+BUILDLINK_PKGSRCDIR.netbsd-iscsi-lib?=         ../../devel/netbsd-iscsi-lib
 .endif # NETBSD_ISCSI_LIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -netbsd-iscsi-lib

Index: pkgsrc/devel/npapi-sdk/buildlink3.mk
diff -u pkgsrc/devel/npapi-sdk/buildlink3.mk:1.1.1.1 pkgsrc/devel/npapi-sdk/buildlink3.mk:1.2
--- pkgsrc/devel/npapi-sdk/buildlink3.mk:1.1.1.1        Sat Dec 17 14:11:07 2011
+++ pkgsrc/devel/npapi-sdk/buildlink3.mk        Sun Jan  7 13:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/12/17 14:11:07 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:08 rillig Exp $
 #
 
 BUILDLINK_TREE+=       npapi-sdk
@@ -6,9 +6,9 @@ BUILDLINK_TREE+=        npapi-sdk
 .if !defined(NPAPI_SDK_BUILDLINK3_MK)
 NPAPI_SDK_BUILDLINK3_MK:=
 
-BUILDLINK_DEPMETHOD.npapi-sdk?=        build
+BUILDLINK_DEPMETHOD.npapi-sdk?=                build
 BUILDLINK_API_DEPENDS.npapi-sdk+=      npapi-sdk>=0.27
-BUILDLINK_PKGSRCDIR.npapi-sdk?=        ../../devel/npapi-sdk
+BUILDLINK_PKGSRCDIR.npapi-sdk?=                ../../devel/npapi-sdk
 .endif # NPAPI_SDK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -npapi-sdk

Index: pkgsrc/devel/nspr/buildlink3.mk
diff -u pkgsrc/devel/nspr/buildlink3.mk:1.24 pkgsrc/devel/nspr/buildlink3.mk:1.25
--- pkgsrc/devel/nspr/buildlink3.mk:1.24        Mon Oct 13 09:14:29 2014
+++ pkgsrc/devel/nspr/buildlink3.mk     Sun Jan  7 13:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2014/10/13 09:14:29 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:08 rillig Exp $
 
 BUILDLINK_TREE+=       nspr
 
@@ -8,9 +8,9 @@ NSPR_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.9.3.2
 BUILDLINK_PKGSRCDIR.nspr?=     ../../devel/nspr
 
-BUILDLINK_FILES.nspr+=          lib/nspr/*
-BUILDLINK_FILES.nspr+=          include/nspr/*
-BUILDLINK_FILES.nspr+=          include/nspr/obsolete/*
+BUILDLINK_FILES.nspr+= lib/nspr/*
+BUILDLINK_FILES.nspr+= include/nspr/*
+BUILDLINK_FILES.nspr+= include/nspr/obsolete/*
 
 BUILDLINK_LIBDIRS.nspr+=       lib/nspr
 BUILDLINK_RPATHDIRS.nspr+=     lib/nspr

Index: pkgsrc/devel/nss/buildlink3.mk
diff -u pkgsrc/devel/nss/buildlink3.mk:1.20 pkgsrc/devel/nss/buildlink3.mk:1.21
--- pkgsrc/devel/nss/buildlink3.mk:1.20 Sat Sep 14 10:29:22 2013
+++ pkgsrc/devel/nss/buildlink3.mk      Sun Jan  7 13:04:08 2018
@@ -1,4 +1,5 @@
-# $NetBSD: buildlink3.mk,v 1.20 2013/09/14 10:29:22 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:08 rillig Exp $
+
 BUILDLINK_TREE+=       nss
 
 .if !defined(NSS_BUILDLINK3_MK)

Index: pkgsrc/devel/ocaml-findlib/buildlink3.mk
diff -u pkgsrc/devel/ocaml-findlib/buildlink3.mk:1.7 pkgsrc/devel/ocaml-findlib/buildlink3.mk:1.8
--- pkgsrc/devel/ocaml-findlib/buildlink3.mk:1.7        Tue Jul 11 09:57:11 2017
+++ pkgsrc/devel/ocaml-findlib/buildlink3.mk    Sun Jan  7 13:04:08 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/07/11 09:57:11 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:08 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-findlib
 
 .if !defined(OCAML_FINDLIB_BUILDLINK3_MK)
 OCAML_FINDLIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-findlib+=ocaml-findlib>=1.2
-BUILDLINK_ABI_DEPENDS.ocaml-findlib+=ocaml-findlib>=1.7.3
+BUILDLINK_API_DEPENDS.ocaml-findlib+=  ocaml-findlib>=1.2
+BUILDLINK_ABI_DEPENDS.ocaml-findlib+=  ocaml-findlib>=1.7.3
 BUILDLINK_PKGSRCDIR.ocaml-findlib?=    ../../devel/ocaml-findlib
 
 BUILDLINK_TARGETS+=    ocaml-findlib-wrappers ocaml-findlib-ldconf

Index: pkgsrc/devel/ocaml-lwt/buildlink3.mk
diff -u pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.6 pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.7
--- pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.6    Fri Sep  8 16:54:31 2017
+++ pkgsrc/devel/ocaml-lwt/buildlink3.mk        Sun Jan  7 13:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2017/09/08 16:54:31 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:08 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-lwt
 
@@ -7,7 +7,7 @@ OCAML_LWT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-lwt+=      ocaml-lwt>=3.0.0
 BUILDLINK_ABI_DEPENDS.ocaml-lwt+=      ocaml-lwt>=3.1.0nb1
-BUILDLINK_PKGSRCDIR.ocaml-lwt?=        ../../devel/ocaml-lwt
+BUILDLINK_PKGSRCDIR.ocaml-lwt?=                ../../devel/ocaml-lwt
 
 #.include "../../devel/libev/buildlink3.mk"
 .endif # OCAMLLWT_BUILDLINK3_MK

Index: pkgsrc/devel/ocaml-odn/buildlink3.mk
diff -u pkgsrc/devel/ocaml-odn/buildlink3.mk:1.10 pkgsrc/devel/ocaml-odn/buildlink3.mk:1.11
--- pkgsrc/devel/ocaml-odn/buildlink3.mk:1.10   Fri Sep  8 09:51:21 2017
+++ pkgsrc/devel/ocaml-odn/buildlink3.mk        Sun Jan  7 13:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2017/09/08 09:51:21 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:08 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-odn
 
@@ -7,7 +7,7 @@ OCAML_ODN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-odn+=      ocaml-odn>=0.0.11
 BUILDLINK_ABI_DEPENDS.ocaml-odn?=      ocaml-odn>=0.0.11nb9
-BUILDLINK_PKGSRCDIR.ocaml-odn?=        ../../devel/ocaml-odn
+BUILDLINK_PKGSRCDIR.ocaml-odn?=                ../../devel/ocaml-odn
 
 .include "../../lang/ocaml/buildlink3.mk"
 .endif # OCAML_ODN_BUILDLINK3_MK

Index: pkgsrc/devel/ocaml-ppx_compare/buildlink3.mk
diff -u pkgsrc/devel/ocaml-ppx_compare/buildlink3.mk:1.1 pkgsrc/devel/ocaml-ppx_compare/buildlink3.mk:1.2
--- pkgsrc/devel/ocaml-ppx_compare/buildlink3.mk:1.1    Wed Oct 11 13:51:55 2017
+++ pkgsrc/devel/ocaml-ppx_compare/buildlink3.mk        Sun Jan  7 13:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/10/11 13:51:55 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:08 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-ppx_compare
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-ppx_compare
 OCAML_PPX_COMPARE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ppx_compare+=      ocaml-ppx_compare>=0.9.0
-BUILDLINK_PKGSRCDIR.ocaml-ppx_compare?=        ../../devel/ocaml-ppx_compare
+BUILDLINK_PKGSRCDIR.ocaml-ppx_compare?=                ../../devel/ocaml-ppx_compare
 .endif # OCAML_PPX_COMPARE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -ocaml-ppx_compare

Index: pkgsrc/devel/ocaml-ppx_driver/buildlink3.mk
diff -u pkgsrc/devel/ocaml-ppx_driver/buildlink3.mk:1.3 pkgsrc/devel/ocaml-ppx_driver/buildlink3.mk:1.4
--- pkgsrc/devel/ocaml-ppx_driver/buildlink3.mk:1.3     Fri Jul 21 13:45:42 2017
+++ pkgsrc/devel/ocaml-ppx_driver/buildlink3.mk Sun Jan  7 13:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/21 13:45:42 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:08 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-ppx_driver
 
@@ -7,7 +7,7 @@ OCAML_PPX_DRIVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ppx_driver+=       ocaml-ppx_driver>=0.9.0
 BUILDLINK_ABI_DEPENDS.ocaml-ppx_driver+=       ocaml-ppx_driver>=0.9.0
-BUILDLINK_PKGSRCDIR.ocaml-ppx_driver?= ../../devel/ocaml-ppx_driver
+BUILDLINK_PKGSRCDIR.ocaml-ppx_driver?=         ../../devel/ocaml-ppx_driver
 
 #.include "../../devel/ocaml-ppx_optcomp/buildlink3.mk"
 .endif # OCAML_PPX_DRIVER_BUILDLINK3_MK

Index: pkgsrc/devel/ocaml-ppx_optcomp/buildlink3.mk
diff -u pkgsrc/devel/ocaml-ppx_optcomp/buildlink3.mk:1.3 pkgsrc/devel/ocaml-ppx_optcomp/buildlink3.mk:1.4
--- pkgsrc/devel/ocaml-ppx_optcomp/buildlink3.mk:1.3    Fri Jul 21 13:34:18 2017
+++ pkgsrc/devel/ocaml-ppx_optcomp/buildlink3.mk        Sun Jan  7 13:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/21 13:34:18 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:08 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-ppx_optcomp
 
@@ -7,7 +7,7 @@ OCAML_PPX_OPTCOMP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ppx_optcomp+=      ocaml-ppx_optcomp>=0.9.0
 BUILDLINK_ABI_DEPENDS.ocaml-ppx_optcomp+=      ocaml-ppx_optcomp>=0.9.0
-BUILDLINK_PKGSRCDIR.ocaml-ppx_optcomp?=        ../../devel/ocaml-ppx_optcomp
+BUILDLINK_PKGSRCDIR.ocaml-ppx_optcomp?=                ../../devel/ocaml-ppx_optcomp
 
 .include "../../devel/ocaml-ppx_core/buildlink3.mk"
 #.include "../../devel/ocaml-ppx_tools/buildlink3.mk"

Index: pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk
diff -u pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk:1.1 pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk:1.2
--- pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk:1.1    Sun Jul 23 14:42:08 2017
+++ pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk        Sun Jan  7 13:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/07/23 14:42:08 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:08 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-ppx_tools_versioned
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-ppx_tools_version
 OCAML_PPX_TOOLS_VERSIONED_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ppx_tools_versioned+=      ocaml-ppx_tools_versioned>=5.0.1
-BUILDLINK_PKGSRCDIR.ocaml-ppx_tools_versioned?=        ../../devel/ocaml-ppx_tools_versioned
+BUILDLINK_PKGSRCDIR.ocaml-ppx_tools_versioned?=                ../../devel/ocaml-ppx_tools_versioned
 .endif # OCAML_PPX_TOOLS_VERSIONED_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -ocaml-ppx_tools_versioned

Index: pkgsrc/devel/ocaml-re/buildlink3.mk
diff -u pkgsrc/devel/ocaml-re/buildlink3.mk:1.4 pkgsrc/devel/ocaml-re/buildlink3.mk:1.5
--- pkgsrc/devel/ocaml-re/buildlink3.mk:1.4     Thu Sep 28 09:15:24 2017
+++ pkgsrc/devel/ocaml-re/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/09/28 09:15:24 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-re
 
@@ -7,7 +7,7 @@ OCAML_RE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-re+=       ocaml-re>=1.6.0
 BUILDLINK_ABI_DEPENDS.ocaml-re+=       ocaml-re>=1.7.1nb2
-BUILDLINK_PKGSRCDIR.ocaml-re?= ../../devel/ocaml-re
+BUILDLINK_PKGSRCDIR.ocaml-re?=         ../../devel/ocaml-re
 .endif # OCAML_RE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -ocaml-re

Index: pkgsrc/devel/ocamlify/buildlink3.mk
diff -u pkgsrc/devel/ocamlify/buildlink3.mk:1.3 pkgsrc/devel/ocamlify/buildlink3.mk:1.4
--- pkgsrc/devel/ocamlify/buildlink3.mk:1.3     Tue Jul 11 14:19:22 2017
+++ pkgsrc/devel/ocamlify/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 14:19:22 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       ocamlify
 
@@ -7,7 +7,7 @@ OCAMLIFY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocamlify+=       ocamlify>=0.0.2nb1
 BUILDLINK_ABI_DEPENDS.ocamlify+=       ocamlify>=0.0.2nb5
-BUILDLINK_PKGSRCDIR.ocamlify?= ../../devel/ocamlify
+BUILDLINK_PKGSRCDIR.ocamlify?=         ../../devel/ocamlify
 .endif # OCAMLIFY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -ocamlify

Index: pkgsrc/devel/ocamlmod/buildlink3.mk
diff -u pkgsrc/devel/ocamlmod/buildlink3.mk:1.3 pkgsrc/devel/ocamlmod/buildlink3.mk:1.4
--- pkgsrc/devel/ocamlmod/buildlink3.mk:1.3     Tue Jul 11 14:11:14 2017
+++ pkgsrc/devel/ocamlmod/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 14:11:14 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       ocamlmod
 
@@ -7,7 +7,7 @@ OCAMLMOD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocamlmod+=       ocamlmod>=0.0.7nb1
 BUILDLINK_ABI_DEPENDS.ocamlmod+=       ocamlmod>=0.0.8
-BUILDLINK_PKGSRCDIR.ocamlmod?= ../../devel/ocamlmod
+BUILDLINK_PKGSRCDIR.ocamlmod?=         ../../devel/ocamlmod
 .endif # OCAMLMOD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -ocamlmod

Index: pkgsrc/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk
diff -u pkgsrc/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk:1.4 pkgsrc/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk:1.5
--- pkgsrc/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk:1.4     Mon Jun  5 14:22:36 2017
+++ pkgsrc/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/06/05 14:22:36 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       p5-B-Hooks-OP-Annotation
 
@@ -7,8 +7,8 @@ P5_B_HOOKS_OP_ANNOTATION_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Annotation+=       p5-B-Hooks-OP-Annotation>=0.43
 BUILDLINK_ABI_DEPENDS.p5-B-Hooks-OP-Annotation?=       p5-B-Hooks-OP-Annotation>=0.44nb7
-BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Annotation?= ../../devel/p5-B-Hooks-OP-Annotation
-BUILDLINK_INCDIRS.p5-B-Hooks-OP-Annotation?=   ${PERL5_SUB_INSTALLVENDORARCH}/B/Hooks/OP/Annotation
+BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Annotation?=         ../../devel/p5-B-Hooks-OP-Annotation
+BUILDLINK_INCDIRS.p5-B-Hooks-OP-Annotation?=           ${PERL5_SUB_INSTALLVENDORARCH}/B/Hooks/OP/Annotation
 BUILDLINK_CONTENTS_FILTER.p5-B-Hooks-OP-Annotation?=   ${GREP} '${PERL5_SUB_INSTALLVENDORARCH}/B/Hooks/OP/Annotation'
 
 .include "../../lang/perl5/buildlink3.mk"

Index: pkgsrc/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk
diff -u pkgsrc/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk:1.1.1.1 pkgsrc/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk:1.2
--- pkgsrc/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk:1.1.1.1        Tue Nov 15 16:05:35 2011
+++ pkgsrc/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk        Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/11/15 16:05:35 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       p5-B-Hooks-OP-Check-EntersubForCV
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        p5-B-Hooks-OP-Check-Ent
 P5_B_HOOKS_OP_CHECK_ENTERSUBFORCV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Check-EntersubForCV+=      p5-B-Hooks-OP-Check-EntersubForCV>=0.08
-BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Check-EntersubForCV?=        ../../devel/p5-B-Hooks-OP-Check-EntersubForCV
+BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Check-EntersubForCV?=                ../../devel/p5-B-Hooks-OP-Check-EntersubForCV
 .endif # P5_B_HOOKS_OP_CHECK_ENTERSUBFORCV_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -p5-B-Hooks-OP-Check-EntersubForCV

Index: pkgsrc/devel/p5-B-Hooks-Parser/buildlink3.mk
diff -u pkgsrc/devel/p5-B-Hooks-Parser/buildlink3.mk:1.3 pkgsrc/devel/p5-B-Hooks-Parser/buildlink3.mk:1.4
--- pkgsrc/devel/p5-B-Hooks-Parser/buildlink3.mk:1.3    Mon Oct 19 10:14:52 2009
+++ pkgsrc/devel/p5-B-Hooks-Parser/buildlink3.mk        Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/10/19 10:14:52 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       p5-B-Hooks-Parser
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        p5-B-Hooks-Parser
 P5_B_HOOKS_PARSER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-B-Hooks-Parser+=      p5-B-Hooks-Parser>=0.08
-BUILDLINK_PKGSRCDIR.p5-B-Hooks-Parser?=        ../../devel/p5-B-Hooks-Parser
+BUILDLINK_PKGSRCDIR.p5-B-Hooks-Parser?=                ../../devel/p5-B-Hooks-Parser
 .endif # P5_B_HOOKS_PARSER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -p5-B-Hooks-Parser

Index: pkgsrc/devel/p5-Event/buildlink3.mk
diff -u pkgsrc/devel/p5-Event/buildlink3.mk:1.4 pkgsrc/devel/p5-Event/buildlink3.mk:1.5
--- pkgsrc/devel/p5-Event/buildlink3.mk:1.4     Mon Jun  5 14:22:55 2017
+++ pkgsrc/devel/p5-Event/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/06/05 14:22:55 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       p5-Event
 
@@ -7,7 +7,7 @@ P5_EVENT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-Event+=       p5-Event>=1.13
 BUILDLINK_ABI_DEPENDS.p5-Event?=       p5-Event>=1.26nb2
-BUILDLINK_PKGSRCDIR.p5-Event?= ../../devel/p5-Event
+BUILDLINK_PKGSRCDIR.p5-Event?=         ../../devel/p5-Event
 
 .include "../../lang/perl5/buildlink3.mk"
 .endif # P5_EVENT_BUILDLINK3_MK

Index: pkgsrc/devel/p5-glib2/buildlink3.mk
diff -u pkgsrc/devel/p5-glib2/buildlink3.mk:1.15 pkgsrc/devel/p5-glib2/buildlink3.mk:1.16
--- pkgsrc/devel/p5-glib2/buildlink3.mk:1.15    Sat Sep 15 10:04:18 2012
+++ pkgsrc/devel/p5-glib2/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2012/09/15 10:04:18 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       p5-glib2
 
@@ -7,7 +7,7 @@ P5_GLIB2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-glib2+=       p5-glib2>=1.103
 BUILDLINK_ABI_DEPENDS.p5-glib2+=       p5-glib2>=1.262nb1
-BUILDLINK_PKGSRCDIR.p5-glib2?= ../../devel/p5-glib2
+BUILDLINK_PKGSRCDIR.p5-glib2?=         ../../devel/p5-glib2
 
 .include "../../devel/glib2/buildlink3.mk"
 .endif # P5_GLIB2_BUILDLINK3_MK

Index: pkgsrc/devel/p5-pango/buildlink3.mk
diff -u pkgsrc/devel/p5-pango/buildlink3.mk:1.23 pkgsrc/devel/p5-pango/buildlink3.mk:1.24
--- pkgsrc/devel/p5-pango/buildlink3.mk:1.23    Sun Feb 12 06:24:41 2017
+++ pkgsrc/devel/p5-pango/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2017/02/12 06:24:41 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       p5-pango
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        p5-pango
 P5_PANGO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-pango+=       p5-pango>=1.200
-BUILDLINK_ABI_DEPENDS.p5-pango+=               p5-pango>=1.227nb2
+BUILDLINK_ABI_DEPENDS.p5-pango+=       p5-pango>=1.227nb2
 BUILDLINK_PKGSRCDIR.p5-pango?=         ../../devel/p5-pango
 
 .include "../../devel/pango/buildlink3.mk"

Index: pkgsrc/devel/pdcurses/buildlink3.mk
diff -u pkgsrc/devel/pdcurses/buildlink3.mk:1.7 pkgsrc/devel/pdcurses/buildlink3.mk:1.8
--- pkgsrc/devel/pdcurses/buildlink3.mk:1.7     Tue Aug 18 07:31:00 2015
+++ pkgsrc/devel/pdcurses/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/08/18 07:31:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       pdcurses
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        pdcurses
 PDCURSES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pdcurses+=       pdcurses>=3.3
-BUILDLINK_ABI_DEPENDS.pdcurses?=               pdcurses>=3.3nb2
+BUILDLINK_ABI_DEPENDS.pdcurses?=       pdcurses>=3.3nb2
 BUILDLINK_PKGSRCDIR.pdcurses?=         ../../devel/pdcurses
 
 BUILDLINK_LIBNAME.pdcurses=    XCurses
@@ -15,10 +15,10 @@ BUILDLINK_LDADD.pdcurses?=  ${BUILDLINK_L
 # _PKG_USE_CURSES is defined by curses.buildlink3.mk to indicate that
 # the headers and libraries should be usable as <curses.h> and -lcurses.
 #
-.  if defined(_PKG_USE_CURSES)
+.if defined(_PKG_USE_CURSES)
 BUILDLINK_INCDIRS.pdcurses+=   include/xcurses
-BUILDLINK_TRANSFORM+=          l:curses:XCurses
-.  endif
+BUILDLINK_TRANSFORM+=          l:curses:XCurses
+.endif
 
 .include "../../mk/xaw.buildlink3.mk"
 

Index: pkgsrc/devel/protobuf/buildlink3.mk
diff -u pkgsrc/devel/protobuf/buildlink3.mk:1.3 pkgsrc/devel/protobuf/buildlink3.mk:1.4
--- pkgsrc/devel/protobuf/buildlink3.mk:1.3     Sat Aug  6 11:40:14 2016
+++ pkgsrc/devel/protobuf/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/08/06 11:40:14 kamil Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       protobuf
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        protobuf
 PROTOBUF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.protobuf+=       protobuf>=3.0.0
-BUILDLINK_PKGSRCDIR.protobuf?= ../../devel/protobuf
+BUILDLINK_PKGSRCDIR.protobuf?=         ../../devel/protobuf
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif # PROTOBUF_BUILDLINK3_MK

Index: pkgsrc/devel/pstreams/buildlink3.mk
diff -u pkgsrc/devel/pstreams/buildlink3.mk:1.1.1.1 pkgsrc/devel/pstreams/buildlink3.mk:1.2
--- pkgsrc/devel/pstreams/buildlink3.mk:1.1.1.1 Sat Oct 29 10:39:31 2011
+++ pkgsrc/devel/pstreams/buildlink3.mk Sun Jan  7 13:04:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/10/29 10:39:31 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:09 rillig Exp $
 
 BUILDLINK_TREE+=       pstreams
 
@@ -8,7 +8,7 @@ PSTREAMS_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.pstreams?= build
 
 BUILDLINK_API_DEPENDS.pstreams+=       pstreams>=0.7.0
-BUILDLINK_PKGSRCDIR.pstreams?= ../../devel/pstreams
+BUILDLINK_PKGSRCDIR.pstreams?=         ../../devel/pstreams
 .endif # PSTREAMS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -pstreams

Index: pkgsrc/devel/pth/buildlink3.mk
diff -u pkgsrc/devel/pth/buildlink3.mk:1.11 pkgsrc/devel/pth/buildlink3.mk:1.12
--- pkgsrc/devel/pth/buildlink3.mk:1.11 Wed Sep 14 16:52:19 2011
+++ pkgsrc/devel/pth/buildlink3.mk      Sun Jan  7 13:04:10 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.11 2011/09/14 16:52:19 hans Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       pth
 
 .if !defined(PTH_BUILDLINK3_MK)
 PTH_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.pth+=            pth>=2.0.0
+BUILDLINK_API_DEPENDS.pth+=    pth>=2.0.0
 BUILDLINK_ABI_DEPENDS.pth+=    pth>=2.0.0nb2
 BUILDLINK_PKGSRCDIR.pth?=      ../../devel/pth
 

Index: pkgsrc/devel/pthread-sem/buildlink3.mk
diff -u pkgsrc/devel/pthread-sem/buildlink3.mk:1.8 pkgsrc/devel/pthread-sem/buildlink3.mk:1.9
--- pkgsrc/devel/pthread-sem/buildlink3.mk:1.8  Fri Mar 20 19:24:27 2009
+++ pkgsrc/devel/pthread-sem/buildlink3.mk      Sun Jan  7 13:04:10 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       pthread-sem
 
 .if !defined(PTHREAD_SEM_BUILDLINK3_MK)
 PTHREAD_SEM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.pthread-sem+=            pthread-sem>=1.0
+BUILDLINK_API_DEPENDS.pthread-sem+=    pthread-sem>=1.0
 BUILDLINK_PKGSRCDIR.pthread-sem?=      ../../devel/pthread-sem
 .endif # PTHREAD_SEM_BUILDLINK3_MK
 

Index: pkgsrc/devel/pthread-stublib/buildlink3.mk
diff -u pkgsrc/devel/pthread-stublib/buildlink3.mk:1.7 pkgsrc/devel/pthread-stublib/buildlink3.mk:1.8
--- pkgsrc/devel/pthread-stublib/buildlink3.mk:1.7      Wed Feb 25 20:41:44 2015
+++ pkgsrc/devel/pthread-stublib/buildlink3.mk  Sun Jan  7 13:04:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/02/25 20:41:44 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       pthread-stublib
 
@@ -8,7 +8,7 @@ PTHREAD_STUBLIB_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.pthread-stublib+=        pthread-stublib>=1.0
 BUILDLINK_PKGSRCDIR.pthread-stublib?=  ../../devel/pthread-stublib
 
-IS_BUILTIN.pthread-stublib=no
+IS_BUILTIN.pthread-stublib=    no
 .endif # PTHREAD_STUBLIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -pthread-stublib

Index: pkgsrc/devel/ptlib/buildlink3.mk
diff -u pkgsrc/devel/ptlib/buildlink3.mk:1.15 pkgsrc/devel/ptlib/buildlink3.mk:1.16
--- pkgsrc/devel/ptlib/buildlink3.mk:1.15       Sat Mar  5 11:27:46 2016
+++ pkgsrc/devel/ptlib/buildlink3.mk    Sun Jan  7 13:04:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2016/03/05 11:27:46 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       ptlib
 
@@ -9,8 +9,8 @@ BUILDLINK_API_DEPENDS.ptlib+=   ptlib>=2.6
 BUILDLINK_ABI_DEPENDS.ptlib+=  ptlib>=2.10.7nb10
 BUILDLINK_PKGSRCDIR.ptlib?=    ../../devel/ptlib
 
-PTLIB_CONFIG?=     ${BUILDLINK_PREFIX.ptlib}/bin/ptlib-config
-CONFIGURE_ENV+=    PTLIB_CONFIG=${PTLIB_CONFIG:Q}
+PTLIB_CONFIG?= ${BUILDLINK_PREFIX.ptlib}/bin/ptlib-config
+CONFIGURE_ENV+=        PTLIB_CONFIG=${PTLIB_CONFIG:Q}
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"

Index: pkgsrc/devel/py-boost/buildlink3.mk
diff -u pkgsrc/devel/py-boost/buildlink3.mk:1.9 pkgsrc/devel/py-boost/buildlink3.mk:1.10
--- pkgsrc/devel/py-boost/buildlink3.mk:1.9     Mon Jan  1 20:36:09 2018
+++ pkgsrc/devel/py-boost/buildlink3.mk Sun Jan  7 13:04:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/01 20:36:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       py-boost
 
@@ -10,7 +10,7 @@ PY_BOOST_BUILDLINK3_MK:=
 # Use a dependency pattern that guarantees the proper ABI.
 BUILDLINK_API_DEPENDS.py-boost+=       ${PYPKGPREFIX}-boost-1.66.*
 BUILDLINK_ABI_DEPENDS.py-boost+=       ${PYPKGPREFIX}-boost-1.66.*
-BUILDLINK_PKGSRCDIR.py-boost?= ../../devel/py-boost
+BUILDLINK_PKGSRCDIR.py-boost?=         ../../devel/py-boost
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .endif # PY_BOOST_BUILDLINK3_MK

Index: pkgsrc/devel/py-gobject/buildlink3.mk
diff -u pkgsrc/devel/py-gobject/buildlink3.mk:1.13 pkgsrc/devel/py-gobject/buildlink3.mk:1.14
--- pkgsrc/devel/py-gobject/buildlink3.mk:1.13  Sat Sep 15 10:04:19 2012
+++ pkgsrc/devel/py-gobject/buildlink3.mk       Sun Jan  7 13:04:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2012/09/15 10:04:19 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       pygobject
 
@@ -9,7 +9,7 @@ PY_GOBJECT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pygobject+=      ${PYPKGPREFIX}-gobject>=2.10.1nb1
 BUILDLINK_ABI_DEPENDS.pygobject+=      ${PYPKGPREFIX}-gobject>=2.28.6nb6
-BUILDLINK_PKGSRCDIR.pygobject?=        ../../devel/py-gobject
+BUILDLINK_PKGSRCDIR.pygobject?=                ../../devel/py-gobject
 
 .include "../../devel/py-gobject-shared/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/devel/py-gobject-shared/buildlink3.mk
diff -u pkgsrc/devel/py-gobject-shared/buildlink3.mk:1.11 pkgsrc/devel/py-gobject-shared/buildlink3.mk:1.12
--- pkgsrc/devel/py-gobject-shared/buildlink3.mk:1.11   Sat Sep 15 10:04:19 2012
+++ pkgsrc/devel/py-gobject-shared/buildlink3.mk        Sun Jan  7 13:04:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/09/15 10:04:19 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       py-gobject-shared
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        py-gobject-shared
 PY_GOBJECT_SHARED_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-gobject-shared+=      py-gobject-shared>=2.10.1
-BUILDLINK_ABI_DEPENDS.py-gobject-shared+=              py-gobject-shared>=2.28.6nb5
+BUILDLINK_ABI_DEPENDS.py-gobject-shared+=      py-gobject-shared>=2.28.6nb5
 BUILDLINK_PKGSRCDIR.py-gobject-shared?=                ../../devel/py-gobject-shared
 BUILDLINK_DEPMETHOD.py-gobject-shared?=                build
 

Index: pkgsrc/devel/qtscriptgenerator/buildlink3.mk
diff -u pkgsrc/devel/qtscriptgenerator/buildlink3.mk:1.24 pkgsrc/devel/qtscriptgenerator/buildlink3.mk:1.25
--- pkgsrc/devel/qtscriptgenerator/buildlink3.mk:1.24   Sat Mar  5 11:27:46 2016
+++ pkgsrc/devel/qtscriptgenerator/buildlink3.mk        Sun Jan  7 13:04:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2016/03/05 11:27:46 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       qtscriptgenerator
 
@@ -7,7 +7,7 @@ QTSCRIPTGENERATOR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qtscriptgenerator+=      qtscriptgenerator>=0.1.0
 BUILDLINK_ABI_DEPENDS.qtscriptgenerator+=      qtscriptgenerator>=0.2.0nb9
-BUILDLINK_PKGSRCDIR.qtscriptgenerator?=        ../../devel/qtscriptgenerator
+BUILDLINK_PKGSRCDIR.qtscriptgenerator?=                ../../devel/qtscriptgenerator
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .endif # QTSCRIPTGENERATOR_BUILDLINK3_MK

Index: pkgsrc/devel/readline/buildlink3.mk
diff -u pkgsrc/devel/readline/buildlink3.mk:1.33 pkgsrc/devel/readline/buildlink3.mk:1.34
--- pkgsrc/devel/readline/buildlink3.mk:1.33    Wed Feb 23 11:00:17 2011
+++ pkgsrc/devel/readline/buildlink3.mk Sun Jan  7 13:04:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2011/02/23 11:00:17 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       readline
 
@@ -18,7 +18,7 @@ BUILDLINK_FNAME_TRANSFORM.readline+=  -e 
 # Many GNU configure scripts don't check for the correct terminal library
 # when testing for -lreadline.  If BROKEN_READLINE_DETECTION is set to
 # "yes", then automatically add the right one.
-.  include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 BROKEN_READLINE_DETECTION?=    no
 .if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS])
 BUILDLINK_TRANSFORM+=          l:readline:readline:${BUILDLINK_LIBNAME.termcap}

Index: pkgsrc/devel/ruby-gnome2-gio/buildlink3.mk
diff -u pkgsrc/devel/ruby-gnome2-gio/buildlink3.mk:1.1 pkgsrc/devel/ruby-gnome2-gio/buildlink3.mk:1.2
--- pkgsrc/devel/ruby-gnome2-gio/buildlink3.mk:1.1      Thu Feb  7 13:41:55 2013
+++ pkgsrc/devel/ruby-gnome2-gio/buildlink3.mk  Sun Jan  7 13:04:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/02/07 13:41:55 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       ruby-gnome2-gio
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ruby-gnome2-gio
 RUBY_GNOME2_GIO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ruby-gnome2-gio+=        ${RUBY_PKGPREFIX}-gnome2-gio>=1.2.0
-BUILDLINK_PKGSRCDIR.ruby-gnome2-gio?=          ../../devel/ruby-gnome2-gio
+BUILDLINK_PKGSRCDIR.ruby-gnome2-gio?=  ../../devel/ruby-gnome2-gio
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/ruby/buildlink3.mk"

Index: pkgsrc/devel/ruby-gnome2-pango/buildlink3.mk
diff -u pkgsrc/devel/ruby-gnome2-pango/buildlink3.mk:1.43 pkgsrc/devel/ruby-gnome2-pango/buildlink3.mk:1.44
--- pkgsrc/devel/ruby-gnome2-pango/buildlink3.mk:1.43   Wed Feb 15 00:43:11 2017
+++ pkgsrc/devel/ruby-gnome2-pango/buildlink3.mk        Sun Jan  7 13:04:10 2018
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.43 2017/02/15 00:43:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       ruby-gnome2-pango
 
 .if !defined(RUBY_GNOME2_PANGO_BUILDLINK3_MK)
 RUBY_GNOME2_PANGO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango+=${RUBY_PKGPREFIX}-gnome2-pango>=3.1.1nb2
-BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?=        ../../devel/ruby-gnome2-pango
+BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=      ${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango+=      ${RUBY_PKGPREFIX}-gnome2-pango>=3.1.1nb2
+BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?=                ../../devel/ruby-gnome2-pango
 
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"

Index: pkgsrc/devel/rx/buildlink3.mk
diff -u pkgsrc/devel/rx/buildlink3.mk:1.7 pkgsrc/devel/rx/buildlink3.mk:1.8
--- pkgsrc/devel/rx/buildlink3.mk:1.7   Fri Mar 20 19:24:29 2009
+++ pkgsrc/devel/rx/buildlink3.mk       Sun Jan  7 13:04:10 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:10 rillig Exp $
 
 BUILDLINK_TREE+=       rx
 
 .if !defined(RX_BUILDLINK3_MK)
 RX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.rx+=             rx>=1.5
+BUILDLINK_API_DEPENDS.rx+=     rx>=1.5
 BUILDLINK_PKGSRCDIR.rx?=       ../../devel/rx
 .endif # RX_BUILDLINK3_MK
 

Index: pkgsrc/devel/scintilla/buildlink3.mk
diff -u pkgsrc/devel/scintilla/buildlink3.mk:1.12 pkgsrc/devel/scintilla/buildlink3.mk:1.13
--- pkgsrc/devel/scintilla/buildlink3.mk:1.12   Sat Feb 16 11:18:47 2013
+++ pkgsrc/devel/scintilla/buildlink3.mk        Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2013/02/16 11:18:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:11 rillig Exp $
 
 BUILDLINK_TREE+=       scintilla
 
@@ -9,7 +9,7 @@ BUILDLINK_DEPMETHOD.scintilla?= build
 
 BUILDLINK_API_DEPENDS.scintilla+=      scintilla>=2.23
 BUILDLINK_ABI_DEPENDS.scintilla+=      scintilla>=2.29nb7
-BUILDLINK_PKGSRCDIR.scintilla?=        ../../devel/scintilla
+BUILDLINK_PKGSRCDIR.scintilla?=                ../../devel/scintilla
 
 #.include "../../x11/gtk2/buildlink3.mk"
 .endif # SCINTILLA_BUILDLINK3_MK

Index: pkgsrc/devel/semantic/buildlink3.mk
diff -u pkgsrc/devel/semantic/buildlink3.mk:1.2 pkgsrc/devel/semantic/buildlink3.mk:1.3
--- pkgsrc/devel/semantic/buildlink3.mk:1.2     Fri Mar 20 19:24:29 2009
+++ pkgsrc/devel/semantic/buildlink3.mk Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:11 rillig Exp $
 #
 
 BUILDLINK_TREE+=       semantic
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        semantic
 SEMANTIC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.semantic+=       ${EMACS_PKGNAME_PREFIX}semantic>=10
-BUILDLINK_PKGSRCDIR.semantic?= ../../devel/semantic
+BUILDLINK_PKGSRCDIR.semantic?=         ../../devel/semantic
 
 BUILDLINK_CONTENTS_FILTER.semantic=    ${EGREP} '.*\.el$$|.*\.elc$$'
 .endif # SEMANTIC_BUILDLINK3_MK

Index: pkgsrc/devel/sofia-sip/buildlink3.mk
diff -u pkgsrc/devel/sofia-sip/buildlink3.mk:1.4 pkgsrc/devel/sofia-sip/buildlink3.mk:1.5
--- pkgsrc/devel/sofia-sip/buildlink3.mk:1.4    Sat Mar  5 11:27:46 2016
+++ pkgsrc/devel/sofia-sip/buildlink3.mk        Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2016/03/05 11:27:46 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:11 rillig Exp $
 
 BUILDLINK_TREE+=       sofia-sip
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        sofia-sip
 SOFIA_SIP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sofia-sip+=      sofia-sip>=1.12.10
-BUILDLINK_ABI_DEPENDS.sofia-sip?=              sofia-sip>=1.12.11nb3
+BUILDLINK_ABI_DEPENDS.sofia-sip?=      sofia-sip>=1.12.11nb3
 BUILDLINK_PKGSRCDIR.sofia-sip?=                ../../devel/sofia-sip
 
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/devel/sysexits/buildlink3.mk
diff -u pkgsrc/devel/sysexits/buildlink3.mk:1.7 pkgsrc/devel/sysexits/buildlink3.mk:1.8
--- pkgsrc/devel/sysexits/buildlink3.mk:1.7     Fri Mar 20 19:24:30 2009
+++ pkgsrc/devel/sysexits/buildlink3.mk Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:11 rillig Exp $
 
 BUILDLINK_TREE+=       sysexits
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=        sysexits
 SYSEXITS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sysexits+=       sysexits>=1.1
-BUILDLINK_DEPMETHOD.sysexits?= build
-BUILDLINK_PKGSRCDIR.sysexits?= ../../devel/sysexits
+BUILDLINK_DEPMETHOD.sysexits?=         build
+BUILDLINK_PKGSRCDIR.sysexits?=         ../../devel/sysexits
 .endif # SYSEXITS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -sysexits

Index: pkgsrc/devel/tcl-tclcl/buildlink3.mk
diff -u pkgsrc/devel/tcl-tclcl/buildlink3.mk:1.14 pkgsrc/devel/tcl-tclcl/buildlink3.mk:1.15
--- pkgsrc/devel/tcl-tclcl/buildlink3.mk:1.14   Sat Jan 11 14:42:00 2014
+++ pkgsrc/devel/tcl-tclcl/buildlink3.mk        Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2014/01/11 14:42:00 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:11 rillig Exp $
 
 BUILDLINK_TREE+=       tcl-tclcl
 
@@ -7,7 +7,7 @@ TCL_TCLCL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tcl-tclcl+=      tcl-tclcl>=1.15
 BUILDLINK_ABI_DEPENDS.tcl-tclcl+=      tcl-tclcl>=1.19nb5
-BUILDLINK_PKGSRCDIR.tcl-tclcl?=        ../../devel/tcl-tclcl
+BUILDLINK_PKGSRCDIR.tcl-tclcl?=                ../../devel/tcl-tclcl
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../lang/tcl-otcl/buildlink3.mk"

Index: pkgsrc/devel/xorg-util-macros/buildlink3.mk
diff -u pkgsrc/devel/xorg-util-macros/buildlink3.mk:1.2 pkgsrc/devel/xorg-util-macros/buildlink3.mk:1.3
--- pkgsrc/devel/xorg-util-macros/buildlink3.mk:1.2     Sun Apr 29 11:30:23 2012
+++ pkgsrc/devel/xorg-util-macros/buildlink3.mk Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/04/29 11:30:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:11 rillig Exp $
 
 BUILDLINK_TREE+=       xorg-util-macros
 
@@ -7,7 +7,7 @@ XORG_UTIL_MACROS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xorg-util-macros+=       xorg-util-macros>=1.17
 BUILDLINK_ABI_DEPENDS.xorg-util-macros+=       xorg-util-macros>=1.17
-BUILDLINK_PKGSRCDIR.xorg-util-macros?= ../../devel/xorg-util-macros
+BUILDLINK_PKGSRCDIR.xorg-util-macros?=         ../../devel/xorg-util-macros
 
 BUILDLINK_DEPMETHOD.xorg-util-macros?= build
 .endif # XORG_UTIL_MACROS_BUILDLINK3_MK

Index: pkgsrc/devel/xulrunner192/buildlink3.mk
diff -u pkgsrc/devel/xulrunner192/buildlink3.mk:1.33 pkgsrc/devel/xulrunner192/buildlink3.mk:1.34
--- pkgsrc/devel/xulrunner192/buildlink3.mk:1.33        Thu Nov 23 17:19:41 2017
+++ pkgsrc/devel/xulrunner192/buildlink3.mk     Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2017/11/23 17:19:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2018/01/07 13:04:11 rillig Exp $
 
 BUILDLINK_TREE+=       xulrunner192
 
@@ -17,8 +17,8 @@ BUILDLINK_PKGSRCDIR.xulrunner192?=    ../..
 pkgbase := xulrunner192
 .include "../../mk/pkg-build-options.mk"
 .if !empty(PKG_BUILD_OPTIONS.xulrunner192:Mgnome)
-. include "../../devel/libgnomeui/buildlink3.mk"
-. include "../../sysutils/gnome-vfs/buildlink3.mk"
+.  include "../../devel/libgnomeui/buildlink3.mk"
+.  include "../../sysutils/gnome-vfs/buildlink3.mk"
 .endif
 .endif # XULRUNNER192_BUILDLINK3_MK
 

Index: pkgsrc/devel/xulrunner45/buildlink3.mk
diff -u pkgsrc/devel/xulrunner45/buildlink3.mk:1.5 pkgsrc/devel/xulrunner45/buildlink3.mk:1.6
--- pkgsrc/devel/xulrunner45/buildlink3.mk:1.5  Thu Nov 23 17:19:41 2017
+++ pkgsrc/devel/xulrunner45/buildlink3.mk      Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/11/23 17:19:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:11 rillig Exp $
 
 BUILDLINK_TREE+=       xulrunner45
 
@@ -21,8 +21,8 @@ BUILDLINK_FNAME_TRANSFORM.xulrunner45+=       
 pkgbase := xulrunner45
 .include "../../mk/pkg-build-options.mk"
 .if !empty(PKG_BUILD_OPTIONS.xulrunner45:Mgnome)
-. include "../../devel/libgnomeui/buildlink3.mk"
-. include "../../sysutils/gnome-vfs/buildlink3.mk"
+.  include "../../devel/libgnomeui/buildlink3.mk"
+.  include "../../sysutils/gnome-vfs/buildlink3.mk"
 .endif
 .include "../../devel/nspr/buildlink3.mk"
 .endif # XULRUNNER45_BUILDLINK3_MK

Index: pkgsrc/editors/mule-ucs/buildlink3.mk
diff -u pkgsrc/editors/mule-ucs/buildlink3.mk:1.4 pkgsrc/editors/mule-ucs/buildlink3.mk:1.5
--- pkgsrc/editors/mule-ucs/buildlink3.mk:1.4   Thu Apr 14 18:23:40 2011
+++ pkgsrc/editors/mule-ucs/buildlink3.mk       Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2011/04/14 18:23:40 hans Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:11 rillig Exp $
 #
 
 #
@@ -11,15 +11,15 @@
 
 BUILDLINK_TREE+=       mule-ucs
 
-.if !defined(MULE_UCS_BUILDLINK3_MK)
+.  if !defined(MULE_UCS_BUILDLINK3_MK)
 MULE_UCS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mule-ucs+=       ${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84
-BUILDLINK_PKGSRCDIR.mule-ucs?= ../../editors/mule-ucs
+BUILDLINK_PKGSRCDIR.mule-ucs?=         ../../editors/mule-ucs
 
 BUILDLINK_CONTENTS_FILTER.mule-ucs=    ${EGREP} '.*\.el$$|.*\.elc$$'
 
-.endif # MULE_UCS_BUILDLINK3_MK
+.  endif # MULE_UCS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -mule-ucs
 .endif

Index: pkgsrc/editors/speedbar/buildlink3.mk
diff -u pkgsrc/editors/speedbar/buildlink3.mk:1.2 pkgsrc/editors/speedbar/buildlink3.mk:1.3
--- pkgsrc/editors/speedbar/buildlink3.mk:1.2   Fri Mar 20 19:24:32 2009
+++ pkgsrc/editors/speedbar/buildlink3.mk       Sun Jan  7 13:04:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:11 rillig Exp $
 #
 
 BUILDLINK_TREE+=       speedbar
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        speedbar
 SPEEDBAR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.speedbar+=       ${EMACS_PKGNAME_PREFIX}speedbar>=0.14rc0
-BUILDLINK_PKGSRCDIR.speedbar?= ../../editors/speedbar
+BUILDLINK_PKGSRCDIR.speedbar?=         ../../editors/speedbar
 
 BUILDLINK_CONTENTS_FILTER.speedbar=    ${EGREP} '.*\.el$$|.*\.elc$$'
 .endif # SPEEDBAR_BUILDLINK3_MK

Index: pkgsrc/emulators/cygwin_lib/buildlink3.mk
diff -u pkgsrc/emulators/cygwin_lib/buildlink3.mk:1.6 pkgsrc/emulators/cygwin_lib/buildlink3.mk:1.7
--- pkgsrc/emulators/cygwin_lib/buildlink3.mk:1.6       Fri Mar 20 19:24:32 2009
+++ pkgsrc/emulators/cygwin_lib/buildlink3.mk   Sun Jan  7 13:04:11 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:11 rillig Exp $
 
 BUILDLINK_TREE+=       cygwin_lib
 
 .if !defined(CYGWIN_LIB_BUILDLINK3_MK)
 CYGWIN_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.cygwin_lib+=             cygwin_lib>=1.5.11.1
+BUILDLINK_API_DEPENDS.cygwin_lib+=     cygwin_lib>=1.5.11.1
 BUILDLINK_PKGSRCDIR.cygwin_lib?=       ../../emulators/cygwin_lib
 .endif # CYGWIN_LIB_BUILDLINK3_MK
 

Index: pkgsrc/filesystems/py-fuse-bindings/buildlink3.mk
diff -u pkgsrc/filesystems/py-fuse-bindings/buildlink3.mk:1.3 pkgsrc/filesystems/py-fuse-bindings/buildlink3.mk:1.4
--- pkgsrc/filesystems/py-fuse-bindings/buildlink3.mk:1.3       Fri Mar 20 19:24:33 2009
+++ pkgsrc/filesystems/py-fuse-bindings/buildlink3.mk   Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       py-fuse-bindings
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        py-fuse-bindings
 PY_FUSE_BINDINGS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-fuse-bindings+=       ${PYPKGPREFIX}-fuse-bindings>=0.2pre1
-BUILDLINK_PKGSRCDIR.py-fuse-bindings?= ../../filesystems/py-fuse-bindings
+BUILDLINK_PKGSRCDIR.py-fuse-bindings?=         ../../filesystems/py-fuse-bindings
 .endif # PY_FUSE_BINDINGS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -py-fuse-bindings

Index: pkgsrc/fonts/SDL2_ttf/buildlink3.mk
diff -u pkgsrc/fonts/SDL2_ttf/buildlink3.mk:1.5 pkgsrc/fonts/SDL2_ttf/buildlink3.mk:1.6
--- pkgsrc/fonts/SDL2_ttf/buildlink3.mk:1.5     Sun Jan 17 15:21:34 2016
+++ pkgsrc/fonts/SDL2_ttf/buildlink3.mk Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2016/01/17 15:21:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       SDL2_ttf
 
@@ -7,7 +7,7 @@ SDL2_TTF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL2_ttf+=       SDL2_ttf>=2.0.12
 BUILDLINK_ABI_DEPENDS.SDL2_ttf+=       SDL2_ttf>=2.0.12nb2
-BUILDLINK_PKGSRCDIR.SDL2_ttf?= ../../fonts/SDL2_ttf
+BUILDLINK_PKGSRCDIR.SDL2_ttf?=         ../../fonts/SDL2_ttf
 
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/fonts/font-util/buildlink3.mk
diff -u pkgsrc/fonts/font-util/buildlink3.mk:1.3 pkgsrc/fonts/font-util/buildlink3.mk:1.4
--- pkgsrc/fonts/font-util/buildlink3.mk:1.3    Sat Aug  8 23:18:58 2009
+++ pkgsrc/fonts/font-util/buildlink3.mk        Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/08 23:18:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       font-util
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        font-util
 FONT_UTIL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.font-util+=      font-util>=1.0.1
-BUILDLINK_PKGSRCDIR.font-util?=        ../../fonts/font-util
+BUILDLINK_PKGSRCDIR.font-util?=                ../../fonts/font-util
 
 BUILDLINK_DEPMETHOD.font-util?=        build
 .endif # FONT_UTIL_BUILDLINK3_MK

Index: pkgsrc/fonts/gucharmap/buildlink3.mk
diff -u pkgsrc/fonts/gucharmap/buildlink3.mk:1.51 pkgsrc/fonts/gucharmap/buildlink3.mk:1.52
--- pkgsrc/fonts/gucharmap/buildlink3.mk:1.51   Sun Feb 12 06:24:43 2017
+++ pkgsrc/fonts/gucharmap/buildlink3.mk        Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2017/02/12 06:24:43 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       gucharmap
 
@@ -7,7 +7,7 @@ GUCHARMAP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gucharmap+=      gucharmap>=2.24.1
 BUILDLINK_ABI_DEPENDS.gucharmap+=      gucharmap>=2.32.1nb22
-BUILDLINK_PKGSRCDIR.gucharmap?=        ../../fonts/gucharmap
+BUILDLINK_PKGSRCDIR.gucharmap?=                ../../fonts/gucharmap
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/geography/gdal-lib/buildlink3.mk
diff -u pkgsrc/geography/gdal-lib/buildlink3.mk:1.47 pkgsrc/geography/gdal-lib/buildlink3.mk:1.48
--- pkgsrc/geography/gdal-lib/buildlink3.mk:1.47        Mon Jan  1 21:18:08 2018
+++ pkgsrc/geography/gdal-lib/buildlink3.mk     Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.47 2018/01/01 21:18:08 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.48 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       gdal-lib
 
@@ -7,7 +7,7 @@ GDAL_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gdal-lib+=       gdal-lib>=1.6.1
 BUILDLINK_ABI_DEPENDS.gdal-lib+=       gdal-lib>=2.0.3nb8
-BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib
+BUILDLINK_PKGSRCDIR.gdal-lib?=         ../../geography/gdal-lib
 
 pkgbase := gdal-lib
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/geography/libchamplain012/buildlink3.mk
diff -u pkgsrc/geography/libchamplain012/buildlink3.mk:1.10 pkgsrc/geography/libchamplain012/buildlink3.mk:1.11
--- pkgsrc/geography/libchamplain012/buildlink3.mk:1.10 Thu Nov 30 16:45:03 2017
+++ pkgsrc/geography/libchamplain012/buildlink3.mk      Sun Jan  7 13:04:12 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.10 2017/11/30 16:45:03 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       libchamplain012
 
 .if !defined(LIBCHAMPLAIN012_BUILDLINK3_MK)
 LIBCHAMPLAIN012_BUILDLINK3_MK:=
 
-BUILDLINK_ABI_DEPENDS.libchamplain012+= libchamplain012>=0.12.10nb11
+BUILDLINK_ABI_DEPENDS.libchamplain012+=        libchamplain012>=0.12.10nb11
 BUILDLINK_API_DEPENDS.libchamplain012+=        libchamplain012>=0.12.9
 BUILDLINK_PKGSRCDIR.libchamplain012?=  ../../geography/libchamplain012
 

Index: pkgsrc/geography/shapelib/buildlink3.mk
diff -u pkgsrc/geography/shapelib/buildlink3.mk:1.6 pkgsrc/geography/shapelib/buildlink3.mk:1.7
--- pkgsrc/geography/shapelib/buildlink3.mk:1.6 Fri Mar 20 19:24:35 2009
+++ pkgsrc/geography/shapelib/buildlink3.mk     Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       shapelib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        shapelib
 SHAPELIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.shapelib+=       shapelib>=1.2.10
-BUILDLINK_PKGSRCDIR.shapelib?= ../../geography/shapelib
+BUILDLINK_PKGSRCDIR.shapelib?=         ../../geography/shapelib
 .endif # SHAPELIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -shapelib

Index: pkgsrc/graphics/MesaLib/buildlink3.mk
diff -u pkgsrc/graphics/MesaLib/buildlink3.mk:1.54 pkgsrc/graphics/MesaLib/buildlink3.mk:1.55
--- pkgsrc/graphics/MesaLib/buildlink3.mk:1.54  Sun Sep 27 21:58:03 2015
+++ pkgsrc/graphics/MesaLib/buildlink3.mk       Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.54 2015/09/27 21:58:03 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.55 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       MesaLib
 
@@ -14,9 +14,9 @@ BUILDLINK_PKGSRCDIR.MesaLib?= ../../grap
 .if ${X11_TYPE} == "modular"
 BUILDLINK_ABI_DEPENDS.MesaLib+=        MesaLib>=10.5.3
 # This is needed to avoid linking conflicting libstdc++ versions
-.if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++)
-GCC_REQD+=     4.2
-.endif
+.  if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++)
+GCC_REQD+=                     4.2
+.  endif
 .endif
 
 # See <http://developer.apple.com/qa/qa2007/qa1567.html>.

Index: pkgsrc/graphics/MesaLib7/buildlink3.mk
diff -u pkgsrc/graphics/MesaLib7/buildlink3.mk:1.2 pkgsrc/graphics/MesaLib7/buildlink3.mk:1.3
--- pkgsrc/graphics/MesaLib7/buildlink3.mk:1.2  Fri Sep 25 00:40:11 2015
+++ pkgsrc/graphics/MesaLib7/buildlink3.mk      Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/09/25 00:40:11 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       MesaLib7
 
@@ -8,7 +8,7 @@ MESALIB7_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.MesaLib7+=       MesaLib7>=7.11.2
 BUILDLINK_PKGSRCDIR.MesaLib7?=         ../../graphics/MesaLib7
 BUILDLINK_FNAME_TRANSFORM.MesaLib7+=   -e 's|MesaLib7/||'
-BUILDLINK_RPATHDIRS+=  MesaLib7/lib
+BUILDLINK_RPATHDIRS+=                  MesaLib7/lib
 
 .include "../../mk/bsd.fast.prefs.mk"
 

Index: pkgsrc/graphics/SDL_image/buildlink3.mk
diff -u pkgsrc/graphics/SDL_image/buildlink3.mk:1.25 pkgsrc/graphics/SDL_image/buildlink3.mk:1.26
--- pkgsrc/graphics/SDL_image/buildlink3.mk:1.25        Sat Apr 25 14:23:07 2015
+++ pkgsrc/graphics/SDL_image/buildlink3.mk     Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2015/04/25 14:23:07 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       SDL_image
 
@@ -7,8 +7,8 @@ SDL_IMAGE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL_image+=      SDL_image>=1.2.3nb1
 BUILDLINK_ABI_DEPENDS.SDL_image+=      SDL_image>=1.2.12nb6
-BUILDLINK_PKGSRCDIR.SDL_image?=        ../../graphics/SDL_image
-BUILDLINK_INCDIRS.SDL_image?=  include/SDL
+BUILDLINK_PKGSRCDIR.SDL_image?=                ../../graphics/SDL_image
+BUILDLINK_INCDIRS.SDL_image?=          include/SDL
 
 .include "../../devel/SDL/buildlink3.mk"
 .endif # SDL_IMAGE_BUILDLINK3_MK

Index: pkgsrc/graphics/compface/buildlink3.mk
diff -u pkgsrc/graphics/compface/buildlink3.mk:1.9 pkgsrc/graphics/compface/buildlink3.mk:1.10
--- pkgsrc/graphics/compface/buildlink3.mk:1.9  Mon May  7 01:53:33 2012
+++ pkgsrc/graphics/compface/buildlink3.mk      Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/05/07 01:53:33 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       compface
 
@@ -7,7 +7,7 @@ COMPFACE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.compface+=       compface>=1.4
 BUILDLINK_ABI_DEPENDS.compface+=       compface>=1.5.1nb1
-BUILDLINK_PKGSRCDIR.compface?= ../../graphics/compface
+BUILDLINK_PKGSRCDIR.compface?=         ../../graphics/compface
 .endif # COMPFACE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -compface

Index: pkgsrc/graphics/evas-edb/buildlink3.mk
diff -u pkgsrc/graphics/evas-edb/buildlink3.mk:1.3 pkgsrc/graphics/evas-edb/buildlink3.mk:1.4
--- pkgsrc/graphics/evas-edb/buildlink3.mk:1.3  Sat Mar  5 11:27:48 2016
+++ pkgsrc/graphics/evas-edb/buildlink3.mk      Sun Jan  7 13:04:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:12 rillig Exp $
 
 BUILDLINK_TREE+=       evas-edb
 
@@ -7,7 +7,7 @@ EVAS_EDB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evas-edb+=       evas-edb>=1.7.7
 BUILDLINK_ABI_DEPENDS.evas-edb?=       evas-edb>=1.7.7nb2
-BUILDLINK_PKGSRCDIR.evas-edb?= ../../graphics/evas-edb
+BUILDLINK_PKGSRCDIR.evas-edb?=         ../../graphics/evas-edb
 
 .include "../../databases/edb/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"

Index: pkgsrc/graphics/evas-eet/buildlink3.mk
diff -u pkgsrc/graphics/evas-eet/buildlink3.mk:1.3 pkgsrc/graphics/evas-eet/buildlink3.mk:1.4
--- pkgsrc/graphics/evas-eet/buildlink3.mk:1.3  Sat Mar  5 11:27:48 2016
+++ pkgsrc/graphics/evas-eet/buildlink3.mk      Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       evas-eet
 
@@ -7,7 +7,7 @@ EVAS_EET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evas-eet+=       evas-eet>=1.7.7
 BUILDLINK_ABI_DEPENDS.evas-eet?=       evas-eet>=1.7.7nb2
-BUILDLINK_PKGSRCDIR.evas-eet?= ../../graphics/evas-eet
+BUILDLINK_PKGSRCDIR.evas-eet?=         ../../graphics/evas-eet
 
 .include "../../devel/eet/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"

Index: pkgsrc/graphics/evas-gif/buildlink3.mk
diff -u pkgsrc/graphics/evas-gif/buildlink3.mk:1.6 pkgsrc/graphics/evas-gif/buildlink3.mk:1.7
--- pkgsrc/graphics/evas-gif/buildlink3.mk:1.6  Sat Mar  5 11:27:48 2016
+++ pkgsrc/graphics/evas-gif/buildlink3.mk      Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2016/03/05 11:27:48 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       evas-gif
 
@@ -7,7 +7,7 @@ EVAS_GIF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evas-gif+=       evas-gif>=1.7.7
 BUILDLINK_ABI_DEPENDS.evas-gif?=       evas-gif>=1.7.7nb5
-BUILDLINK_PKGSRCDIR.evas-gif?= ../../graphics/evas-gif
+BUILDLINK_PKGSRCDIR.evas-gif?=         ../../graphics/evas-gif
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"

Index: pkgsrc/graphics/evas-jpeg/buildlink3.mk
diff -u pkgsrc/graphics/evas-jpeg/buildlink3.mk:1.3 pkgsrc/graphics/evas-jpeg/buildlink3.mk:1.4
--- pkgsrc/graphics/evas-jpeg/buildlink3.mk:1.3 Sat Mar  5 11:27:48 2016
+++ pkgsrc/graphics/evas-jpeg/buildlink3.mk     Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       evas-jpeg
 
@@ -7,7 +7,7 @@ EVAS_JPEG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evas-jpeg+=      evas-jpeg>=1.7.7
 BUILDLINK_ABI_DEPENDS.evas-jpeg?=      evas-jpeg>=1.7.7nb2
-BUILDLINK_PKGSRCDIR.evas-jpeg?=        ../../graphics/evas-jpeg
+BUILDLINK_PKGSRCDIR.evas-jpeg?=                ../../graphics/evas-jpeg
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"

Index: pkgsrc/graphics/evas-png/buildlink3.mk
diff -u pkgsrc/graphics/evas-png/buildlink3.mk:1.3 pkgsrc/graphics/evas-png/buildlink3.mk:1.4
--- pkgsrc/graphics/evas-png/buildlink3.mk:1.3  Sat Mar  5 11:27:48 2016
+++ pkgsrc/graphics/evas-png/buildlink3.mk      Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       evas-png
 
@@ -7,7 +7,7 @@ EVAS_PNG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evas-png+=       evas-png>=1.7.7
 BUILDLINK_ABI_DEPENDS.evas-png?=       evas-png>=1.7.7nb2
-BUILDLINK_PKGSRCDIR.evas-png?= ../../graphics/evas-png
+BUILDLINK_PKGSRCDIR.evas-png?=         ../../graphics/evas-png
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"

Index: pkgsrc/graphics/evas-software-x11/buildlink3.mk
diff -u pkgsrc/graphics/evas-software-x11/buildlink3.mk:1.6 pkgsrc/graphics/evas-software-x11/buildlink3.mk:1.7
--- pkgsrc/graphics/evas-software-x11/buildlink3.mk:1.6 Sun Jun 16 18:56:05 2013
+++ pkgsrc/graphics/evas-software-x11/buildlink3.mk     Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/06/16 18:56:05 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       evas-software-x11
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        evas-software-x11
 EVAS_SOFTWARE_X11_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evas-software-x11+=      evas-software-x11>=1.7.0alpha
-BUILDLINK_PKGSRCDIR.evas-software-x11?=        ../../graphics/evas-software-x11
+BUILDLINK_PKGSRCDIR.evas-software-x11?=                ../../graphics/evas-software-x11
 
 .include "../../x11/libX11/buildlink3.mk"
 .endif # EVAS_SOFTWARE_X11_BUILDLINK3_MK

Index: pkgsrc/graphics/evas-tiff/buildlink3.mk
diff -u pkgsrc/graphics/evas-tiff/buildlink3.mk:1.3 pkgsrc/graphics/evas-tiff/buildlink3.mk:1.4
--- pkgsrc/graphics/evas-tiff/buildlink3.mk:1.3 Sat Mar  5 11:27:48 2016
+++ pkgsrc/graphics/evas-tiff/buildlink3.mk     Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       evas-tiff
 
@@ -7,7 +7,7 @@ EVAS_TIFF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evas-tiff+=      evas-tiff>=1.7.7
 BUILDLINK_ABI_DEPENDS.evas-tiff?=      evas-tiff>=1.7.7nb2
-BUILDLINK_PKGSRCDIR.evas-tiff?=        ../../graphics/evas-tiff
+BUILDLINK_PKGSRCDIR.evas-tiff?=                ../../graphics/evas-tiff
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"

Index: pkgsrc/graphics/evas-xpm/buildlink3.mk
diff -u pkgsrc/graphics/evas-xpm/buildlink3.mk:1.3 pkgsrc/graphics/evas-xpm/buildlink3.mk:1.4
--- pkgsrc/graphics/evas-xpm/buildlink3.mk:1.3  Sat Mar  5 11:27:48 2016
+++ pkgsrc/graphics/evas-xpm/buildlink3.mk      Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       evas-xpm
 
@@ -7,7 +7,7 @@ EVAS_XPM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evas-xpm+=       evas-xpm>=1.7.7
 BUILDLINK_ABI_DEPENDS.evas-xpm?=       evas-xpm>=1.7.7nb2
-BUILDLINK_PKGSRCDIR.evas-xpm?= ../../graphics/evas-xpm
+BUILDLINK_PKGSRCDIR.evas-xpm?=         ../../graphics/evas-xpm
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"

Index: pkgsrc/graphics/flickrnet/buildlink3.mk
diff -u pkgsrc/graphics/flickrnet/buildlink3.mk:1.1 pkgsrc/graphics/flickrnet/buildlink3.mk:1.2
--- pkgsrc/graphics/flickrnet/buildlink3.mk:1.1 Sat May 23 09:01:20 2015
+++ pkgsrc/graphics/flickrnet/buildlink3.mk     Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/05/23 09:01:20 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       flickrnet
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        flickrnet
 FLICKRNET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.flickrnet+=      flickrnet>=3.16
-BUILDLINK_PKGSRCDIR.flickrnet?=        ../../graphics/flickrnet
+BUILDLINK_PKGSRCDIR.flickrnet?=                ../../graphics/flickrnet
 BUILDLINK_CONTENTS_FILTER.flickrnet=   ${EGREP} '(^lib/)'
 
 .endif # FLICKRNET_BUILDLINK3_MK

Index: pkgsrc/graphics/freeglut/buildlink3.mk
diff -u pkgsrc/graphics/freeglut/buildlink3.mk:1.11 pkgsrc/graphics/freeglut/buildlink3.mk:1.12
--- pkgsrc/graphics/freeglut/buildlink3.mk:1.11 Sat Apr 25 14:23:10 2015
+++ pkgsrc/graphics/freeglut/buildlink3.mk      Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2015/04/25 14:23:10 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       freeglut
 
@@ -7,7 +7,7 @@ FREEGLUT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.freeglut+=       freeglut>=2.2.0
 BUILDLINK_ABI_DEPENDS.freeglut+=       freeglut>=2.8.1nb1
-BUILDLINK_PKGSRCDIR.freeglut?= ../../graphics/freeglut
+BUILDLINK_PKGSRCDIR.freeglut?=         ../../graphics/freeglut
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"

Index: pkgsrc/graphics/freeimage/buildlink3.mk
diff -u pkgsrc/graphics/freeimage/buildlink3.mk:1.1 pkgsrc/graphics/freeimage/buildlink3.mk:1.2
--- pkgsrc/graphics/freeimage/buildlink3.mk:1.1 Thu Feb 12 22:40:05 2015
+++ pkgsrc/graphics/freeimage/buildlink3.mk     Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/02/12 22:40:05 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       freeimage
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        freeimage
 FREEIMAGE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.freeimage+=      freeimage>=3.16.0
-BUILDLINK_PKGSRCDIR.freeimage?=        ../../graphics/freeimage
+BUILDLINK_PKGSRCDIR.freeimage?=                ../../graphics/freeimage
 .endif # FREEIMAGE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -freeimage

Index: pkgsrc/graphics/freetype-lib/buildlink3.mk
diff -u pkgsrc/graphics/freetype-lib/buildlink3.mk:1.17 pkgsrc/graphics/freetype-lib/buildlink3.mk:1.18
--- pkgsrc/graphics/freetype-lib/buildlink3.mk:1.17     Mon May  7 01:53:33 2012
+++ pkgsrc/graphics/freetype-lib/buildlink3.mk  Sun Jan  7 13:04:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2012/05/07 01:53:33 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:13 rillig Exp $
 
 BUILDLINK_TREE+=       freetype
 
@@ -6,9 +6,9 @@ BUILDLINK_TREE+=        freetype
 FREETYPE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.freetype+=       freetype-lib>=1.3.1nb1
-BUILDLINK_ABI_DEPENDS.freetype+=freetype-lib>=1.3.1nb2
+BUILDLINK_ABI_DEPENDS.freetype+=       freetype-lib>=1.3.1nb2
 BUILDLINK_ABI_DEPENDS.freetype+=       freetype-lib>=1.5nb1
-BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib
+BUILDLINK_PKGSRCDIR.freetype?=         ../../graphics/freetype-lib
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .endif # FREETYPE_BUILDLINK3_MK

Index: pkgsrc/graphics/freetype2/buildlink3.mk
diff -u pkgsrc/graphics/freetype2/buildlink3.mk:1.46 pkgsrc/graphics/freetype2/buildlink3.mk:1.47
--- pkgsrc/graphics/freetype2/buildlink3.mk:1.46        Sat Jul  9 12:23:16 2016
+++ pkgsrc/graphics/freetype2/buildlink3.mk     Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.46 2016/07/09 12:23:16 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.47 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       freetype2
 
@@ -27,7 +27,7 @@ CHECK_BUILTIN.freetype2:=     yes
 CHECK_BUILTIN.freetype2:=      no
 
 .  if empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
-.  include "../../graphics/png/buildlink3.mk"
+.    include "../../graphics/png/buildlink3.mk"
 .  endif
 .endif
 

Index: pkgsrc/graphics/gdk-pixbuf/buildlink3.mk
diff -u pkgsrc/graphics/gdk-pixbuf/buildlink3.mk:1.24 pkgsrc/graphics/gdk-pixbuf/buildlink3.mk:1.25
--- pkgsrc/graphics/gdk-pixbuf/buildlink3.mk:1.24       Wed Aug  3 10:22:14 2016
+++ pkgsrc/graphics/gdk-pixbuf/buildlink3.mk    Sun Jan  7 13:04:14 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.24 2016/08/03 10:22:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       gdk-pixbuf
 
 .if !defined(GDK_PIXBUF_BUILDLINK3_MK)
 GDK_PIXBUF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gdk-pixbuf+=             gdk-pixbuf>=0.22.0nb2
+BUILDLINK_API_DEPENDS.gdk-pixbuf+=     gdk-pixbuf>=0.22.0nb2
 BUILDLINK_ABI_DEPENDS.gdk-pixbuf+=     gdk-pixbuf>=0.22.0nb20
 BUILDLINK_PKGSRCDIR.gdk-pixbuf?=       ../../graphics/gdk-pixbuf
 BUILDLINK_CPPFLAGS.gdk-pixbuf+= \

Index: pkgsrc/graphics/gdk-pixbuf2-xlib/buildlink3.mk
diff -u pkgsrc/graphics/gdk-pixbuf2-xlib/buildlink3.mk:1.8 pkgsrc/graphics/gdk-pixbuf2-xlib/buildlink3.mk:1.9
--- pkgsrc/graphics/gdk-pixbuf2-xlib/buildlink3.mk:1.8  Wed Aug  3 10:22:14 2016
+++ pkgsrc/graphics/gdk-pixbuf2-xlib/buildlink3.mk      Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2016/08/03 10:22:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       gdk-pixbuf2-xlib
 
@@ -7,7 +7,7 @@ GDK_PIXBUF2_XLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gdk-pixbuf2-xlib+=       gdk-pixbuf2-xlib>=2.22.1
 BUILDLINK_ABI_DEPENDS.gdk-pixbuf2-xlib+=       gdk-pixbuf2-xlib>=2.34.0nb1
-BUILDLINK_PKGSRCDIR.gdk-pixbuf2-xlib?= ../../graphics/gdk-pixbuf2-xlib
+BUILDLINK_PKGSRCDIR.gdk-pixbuf2-xlib?=         ../../graphics/gdk-pixbuf2-xlib
 
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/graphics/gle/buildlink3.mk
diff -u pkgsrc/graphics/gle/buildlink3.mk:1.13 pkgsrc/graphics/gle/buildlink3.mk:1.14
--- pkgsrc/graphics/gle/buildlink3.mk:1.13      Sat Apr 25 14:23:11 2015
+++ pkgsrc/graphics/gle/buildlink3.mk   Sun Jan  7 13:04:14 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.13 2015/04/25 14:23:11 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       gle
 
 .if !defined(GLE_BUILDLINK3_MK)
 GLE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gle+=            gle>=3.0.3
+BUILDLINK_API_DEPENDS.gle+=    gle>=3.0.3
 BUILDLINK_ABI_DEPENDS.gle+=    gle>=3.1.0nb4
 BUILDLINK_PKGSRCDIR.gle?=      ../../graphics/gle
 

Index: pkgsrc/graphics/gnome-icon-theme/buildlink3.mk
diff -u pkgsrc/graphics/gnome-icon-theme/buildlink3.mk:1.21 pkgsrc/graphics/gnome-icon-theme/buildlink3.mk:1.22
--- pkgsrc/graphics/gnome-icon-theme/buildlink3.mk:1.21 Wed Jun 14 16:23:09 2017
+++ pkgsrc/graphics/gnome-icon-theme/buildlink3.mk      Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2017/06/14 16:23:09 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       gnome-icon-theme
 
@@ -7,7 +7,7 @@ GNOME_ICON_THEME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-icon-theme+=       gnome-icon-theme>=2.8.0
 BUILDLINK_ABI_DEPENDS.gnome-icon-theme+=       gnome-icon-theme>=2.12.1nb2
-BUILDLINK_PKGSRCDIR.gnome-icon-theme?= ../../graphics/gnome-icon-theme
+BUILDLINK_PKGSRCDIR.gnome-icon-theme?=         ../../graphics/gnome-icon-theme
 
 # intltool-{extract,merge,update} are Perl scripts included in the sources
 # of packages that use gnome-icon-theme and are executed during build.
@@ -19,10 +19,10 @@ USE_TOOLS+= perl
 .if !defined(GNOME_ICON_THEME_DEPEND_ONLY)
 ICON_THEMES=   yes
 
-.if !defined(NOOP_GTK_UPDATE_ICON_CACHE)
+.  if !defined(NOOP_GTK_UPDATE_ICON_CACHE)
 NOOP_GTK_UPDATE_ICON_CACHE=
-TOOLS_NOOP+=           gtk-update-icon-cache
-.endif
+TOOLS_NOOP+=                   gtk-update-icon-cache
+.  endif
 
 .endif  # GNOME_ICON_THEME_DEPEND_ONLY
 .endif # GNOME_ICON_THEME_BUILDLINK3_MK

Index: pkgsrc/graphics/go-image/buildlink3.mk
diff -u pkgsrc/graphics/go-image/buildlink3.mk:1.1 pkgsrc/graphics/go-image/buildlink3.mk:1.2
--- pkgsrc/graphics/go-image/buildlink3.mk:1.1  Thu Aug 17 02:02:56 2017
+++ pkgsrc/graphics/go-image/buildlink3.mk      Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 02:02:56 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       go-image
 
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-image= ${EG
 BUILDLINK_DEPMETHOD.go-image?= build
 
 BUILDLINK_API_DEPENDS.go-image+=       go-image>=20170405
-BUILDLINK_PKGSRCDIR.go-image?= ../../graphics/go-image
+BUILDLINK_PKGSRCDIR.go-image?=         ../../graphics/go-image
 
 .include "../../textproc/go-text/buildlink3.mk"
 .endif # GO_IMAGE_BUILDLINK3_MK

Index: pkgsrc/graphics/goocanvas/buildlink3.mk
diff -u pkgsrc/graphics/goocanvas/buildlink3.mk:1.27 pkgsrc/graphics/goocanvas/buildlink3.mk:1.28
--- pkgsrc/graphics/goocanvas/buildlink3.mk:1.27        Sun Feb 12 06:24:44 2017
+++ pkgsrc/graphics/goocanvas/buildlink3.mk     Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2017/02/12 06:24:44 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:14 rillig Exp $
 #
 
 BUILDLINK_TREE+=       goocanvas
@@ -8,7 +8,7 @@ GOOCANVAS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.goocanvas+=      goocanvas>=0.12
 BUILDLINK_ABI_DEPENDS.goocanvas+=      goocanvas>=1.0.0nb20
-BUILDLINK_PKGSRCDIR.goocanvas?=        ../../graphics/goocanvas
+BUILDLINK_PKGSRCDIR.goocanvas?=                ../../graphics/goocanvas
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"

Index: pkgsrc/graphics/gtkglext/buildlink3.mk
diff -u pkgsrc/graphics/gtkglext/buildlink3.mk:1.42 pkgsrc/graphics/gtkglext/buildlink3.mk:1.43
--- pkgsrc/graphics/gtkglext/buildlink3.mk:1.42 Sun Feb 12 06:24:44 2017
+++ pkgsrc/graphics/gtkglext/buildlink3.mk      Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.42 2017/02/12 06:24:44 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.43 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       gtkglext
 
@@ -7,7 +7,7 @@ GTKGLEXT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtkglext+=       gtkglext>=1.2.0
 BUILDLINK_ABI_DEPENDS.gtkglext+=       gtkglext>=1.2.0nb33
-BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext
+BUILDLINK_PKGSRCDIR.gtkglext?=         ../../graphics/gtkglext
 
 .include "../../devel/pangox-compat/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"

Index: pkgsrc/graphics/hicolor-icon-theme/buildlink3.mk
diff -u pkgsrc/graphics/hicolor-icon-theme/buildlink3.mk:1.20 pkgsrc/graphics/hicolor-icon-theme/buildlink3.mk:1.21
--- pkgsrc/graphics/hicolor-icon-theme/buildlink3.mk:1.20       Wed Jun 14 16:23:09 2017
+++ pkgsrc/graphics/hicolor-icon-theme/buildlink3.mk    Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2017/06/14 16:23:09 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       hicolor-icon-theme
 
@@ -7,7 +7,7 @@ HICOLOR_ICON_THEME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hicolor-icon-theme+=     hicolor-icon-theme>=0.4
 BUILDLINK_ABI_DEPENDS.hicolor-icon-theme+=     hicolor-icon-theme>=0.9nb1
-BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme
+BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=       ../../graphics/hicolor-icon-theme
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -15,10 +15,10 @@ BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=
 
 ICON_THEMES=   yes
 
-.if !defined(NOOP_GTK_UPDATE_ICON_CACHE)
+.  if !defined(NOOP_GTK_UPDATE_ICON_CACHE)
 NOOP_GTK_UPDATE_ICON_CACHE=
-TOOLS_NOOP+=           gtk-update-icon-cache
-.endif
+TOOLS_NOOP+=                   gtk-update-icon-cache
+.  endif
 
 .endif # HICOLOR_ICON_THEME_DEPEND_ONLY
 .endif # HICOLOR_ICON_THEME_BUILDLINK3_MK

Index: pkgsrc/graphics/imlib-gtk/buildlink3.mk
diff -u pkgsrc/graphics/imlib-gtk/buildlink3.mk:1.8 pkgsrc/graphics/imlib-gtk/buildlink3.mk:1.9
--- pkgsrc/graphics/imlib-gtk/buildlink3.mk:1.8 Thu May 15 14:41:51 2014
+++ pkgsrc/graphics/imlib-gtk/buildlink3.mk     Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2014/05/15 14:41:51 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       imlib-gtk
 
@@ -7,7 +7,7 @@ IMLIB_GTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.imlib-gtk+=      imlib-gtk>=1.9.15
 BUILDLINK_ABI_DEPENDS.imlib-gtk+=      imlib-gtk>=1.9.15nb6
-BUILDLINK_PKGSRCDIR.imlib-gtk?=        ../../graphics/imlib-gtk
+BUILDLINK_PKGSRCDIR.imlib-gtk?=                ../../graphics/imlib-gtk
 
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"

Index: pkgsrc/graphics/jbig2dec/buildlink3.mk
diff -u pkgsrc/graphics/jbig2dec/buildlink3.mk:1.1.1.1 pkgsrc/graphics/jbig2dec/buildlink3.mk:1.2
--- pkgsrc/graphics/jbig2dec/buildlink3.mk:1.1.1.1      Thu Sep  9 02:13:50 2010
+++ pkgsrc/graphics/jbig2dec/buildlink3.mk      Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/09/09 02:13:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       jbig2dec
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        jbig2dec
 JBIG2DEC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.jbig2dec+=       jbig2dec>=0.11
-BUILDLINK_PKGSRCDIR.jbig2dec?= ../../graphics/jbig2dec
+BUILDLINK_PKGSRCDIR.jbig2dec?=         ../../graphics/jbig2dec
 .endif # JBIG2DEC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -jbig2dec

Index: pkgsrc/graphics/kplotting/buildlink3.mk
diff -u pkgsrc/graphics/kplotting/buildlink3.mk:1.7 pkgsrc/graphics/kplotting/buildlink3.mk:1.8
--- pkgsrc/graphics/kplotting/buildlink3.mk:1.7 Thu Nov 30 16:45:04 2017
+++ pkgsrc/graphics/kplotting/buildlink3.mk     Sun Jan  7 13:04:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:04 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:14 rillig Exp $
 
 BUILDLINK_TREE+=       kplotting
 
@@ -7,7 +7,7 @@ KPLOTTING_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kplotting+=      kplotting>=5.21.0
 BUILDLINK_ABI_DEPENDS.kplotting?=      kplotting>=5.25.0nb6
-BUILDLINK_PKGSRCDIR.kplotting?=        ../../graphics/kplotting
+BUILDLINK_PKGSRCDIR.kplotting?=                ../../graphics/kplotting
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif # KPLOTTING_BUILDLINK3_MK

Index: pkgsrc/graphics/libggiwmh/buildlink3.mk
diff -u pkgsrc/graphics/libggiwmh/buildlink3.mk:1.9 pkgsrc/graphics/libggiwmh/buildlink3.mk:1.10
--- pkgsrc/graphics/libggiwmh/buildlink3.mk:1.9 Mon Aug 17 17:11:19 2015
+++ pkgsrc/graphics/libggiwmh/buildlink3.mk     Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2015/08/17 17:11:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       libggiwmh
 
@@ -7,7 +7,7 @@ LIBGGIWMH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libggiwmh+=      libggiwmh>=0.2.0
 BUILDLINK_ABI_DEPENDS.libggiwmh+=      libggiwmh>=0.3.2nb1
-BUILDLINK_PKGSRCDIR.libggiwmh?=        ../../graphics/libggiwmh
+BUILDLINK_PKGSRCDIR.libggiwmh?=                ../../graphics/libggiwmh
 
 .include "../../graphics/libggi/buildlink3.mk"
 .endif # LIBGGIWMH_BUILDLINK3_MK

Index: pkgsrc/graphics/libgnomecanvasmm/buildlink3.mk
diff -u pkgsrc/graphics/libgnomecanvasmm/buildlink3.mk:1.35 pkgsrc/graphics/libgnomecanvasmm/buildlink3.mk:1.36
--- pkgsrc/graphics/libgnomecanvasmm/buildlink3.mk:1.35 Sun Feb 12 06:24:45 2017
+++ pkgsrc/graphics/libgnomecanvasmm/buildlink3.mk      Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2017/02/12 06:24:45 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       libgnomecanvasmm
 
@@ -7,7 +7,7 @@ LIBGNOMECANVASMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgnomecanvasmm+=       libgnomecanvasmm>=2.10.0
 BUILDLINK_ABI_DEPENDS.libgnomecanvasmm+=       libgnomecanvasmm>=2.26.0nb25
-BUILDLINK_PKGSRCDIR.libgnomecanvasmm?= ../../graphics/libgnomecanvasmm
+BUILDLINK_PKGSRCDIR.libgnomecanvasmm?=         ../../graphics/libgnomecanvasmm
 
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"

Index: pkgsrc/graphics/libkdcraw/buildlink3.mk
diff -u pkgsrc/graphics/libkdcraw/buildlink3.mk:1.44 pkgsrc/graphics/libkdcraw/buildlink3.mk:1.45
--- pkgsrc/graphics/libkdcraw/buildlink3.mk:1.44        Mon Jan  1 21:18:08 2018
+++ pkgsrc/graphics/libkdcraw/buildlink3.mk     Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.44 2018/01/01 21:18:08 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.45 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       libkdcraw
 
@@ -7,7 +7,7 @@ LIBKDCRAW_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libkdcraw+=      libkdcraw>=4.8.0
 BUILDLINK_ABI_DEPENDS.libkdcraw?=      libkdcraw>=15.08.3nb6
-BUILDLINK_PKGSRCDIR.libkdcraw?=        ../../graphics/libkdcraw
+BUILDLINK_PKGSRCDIR.libkdcraw?=                ../../graphics/libkdcraw
 
 .include "../../x11/kdelibs4/buildlink3.mk"
 .endif # LIBKDCRAW_BUILDLINK3_MK

Index: pkgsrc/graphics/libkexiv2/buildlink3.mk
diff -u pkgsrc/graphics/libkexiv2/buildlink3.mk:1.19 pkgsrc/graphics/libkexiv2/buildlink3.mk:1.20
--- pkgsrc/graphics/libkexiv2/buildlink3.mk:1.19        Mon Mar 19 23:12:19 2012
+++ pkgsrc/graphics/libkexiv2/buildlink3.mk     Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/03/19 23:12:19 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       libkexiv2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libkexiv2
 LIBKEXIV2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libkexiv2+=      libkexiv2>=4.8.0
-BUILDLINK_PKGSRCDIR.libkexiv2?=        ../../graphics/libkexiv2
+BUILDLINK_PKGSRCDIR.libkexiv2?=                ../../graphics/libkexiv2
 
 .endif # LIBKEXIV2_BUILDLINK3_MK
 

Index: pkgsrc/graphics/libkface/buildlink3.mk
diff -u pkgsrc/graphics/libkface/buildlink3.mk:1.28 pkgsrc/graphics/libkface/buildlink3.mk:1.29
--- pkgsrc/graphics/libkface/buildlink3.mk:1.28 Mon Jan  1 21:18:09 2018
+++ pkgsrc/graphics/libkface/buildlink3.mk      Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2018/01/01 21:18:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       libkface
 
@@ -7,7 +7,7 @@ LIBKFACE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libkface+=       libkface>=2.5.0
 BUILDLINK_ABI_DEPENDS.libkface?=       libkface>=4.13.0nb7
-BUILDLINK_PKGSRCDIR.libkface?= ../../graphics/libkface
+BUILDLINK_PKGSRCDIR.libkface?=         ../../graphics/libkface
 
 .include "../../graphics/opencv/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"

Index: pkgsrc/graphics/libksane/buildlink3.mk
diff -u pkgsrc/graphics/libksane/buildlink3.mk:1.28 pkgsrc/graphics/libksane/buildlink3.mk:1.29
--- pkgsrc/graphics/libksane/buildlink3.mk:1.28 Mon Jan  1 21:18:09 2018
+++ pkgsrc/graphics/libksane/buildlink3.mk      Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2018/01/01 21:18:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       libksane
 
@@ -7,7 +7,7 @@ LIBKSANE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libksane+=       libksane>=4.8.0
 BUILDLINK_ABI_DEPENDS.libksane?=       libksane>=15.08.3nb6
-BUILDLINK_PKGSRCDIR.libksane?= ../../graphics/libksane
+BUILDLINK_PKGSRCDIR.libksane?=         ../../graphics/libksane
 
 .include "../../x11/kdelibs4/buildlink3.mk"
 .endif # LIBKSANE_BUILDLINK3_MK

Index: pkgsrc/graphics/libpuzzle/buildlink3.mk
diff -u pkgsrc/graphics/libpuzzle/buildlink3.mk:1.17 pkgsrc/graphics/libpuzzle/buildlink3.mk:1.18
--- pkgsrc/graphics/libpuzzle/buildlink3.mk:1.17        Tue Feb 28 15:19:59 2017
+++ pkgsrc/graphics/libpuzzle/buildlink3.mk     Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2017/02/28 15:19:59 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       libpuzzle
 
@@ -7,7 +7,7 @@ LIBPUZZLE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpuzzle+=      libpuzzle>=0.9
 BUILDLINK_ABI_DEPENDS.libpuzzle+=      libpuzzle>=0.11nb16
-BUILDLINK_PKGSRCDIR.libpuzzle?=        ../../graphics/libpuzzle
+BUILDLINK_PKGSRCDIR.libpuzzle?=                ../../graphics/libpuzzle
 
 .include "../../graphics/gd/buildlink3.mk"
 .endif # LIBPUZZLE_BUILDLINK3_MK

Index: pkgsrc/graphics/libsixel/buildlink3.mk
diff -u pkgsrc/graphics/libsixel/buildlink3.mk:1.3 pkgsrc/graphics/libsixel/buildlink3.mk:1.4
--- pkgsrc/graphics/libsixel/buildlink3.mk:1.3  Sun Aug 21 11:17:44 2016
+++ pkgsrc/graphics/libsixel/buildlink3.mk      Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/08/21 11:17:44 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:15 rillig Exp $
 #
 
 BUILDLINK_TREE+=       libsixel
@@ -8,7 +8,7 @@ LIBSIXEL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsixel+=       libsixel>=1.7.0
 BUILDLINK_ABI_DEPENDS.libsixel+=       libsixel>=1.7.0
-BUILDLINK_PKGSRCDIR.libsixel?= ../../graphics/libsixel
+BUILDLINK_PKGSRCDIR.libsixel?=         ../../graphics/libsixel
 .endif # LIBSIXEL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libsixel

Index: pkgsrc/graphics/mng/buildlink3.mk
diff -u pkgsrc/graphics/mng/buildlink3.mk:1.16 pkgsrc/graphics/mng/buildlink3.mk:1.17
--- pkgsrc/graphics/mng/buildlink3.mk:1.16      Wed Oct  9 17:38:26 2013
+++ pkgsrc/graphics/mng/buildlink3.mk   Sun Jan  7 13:04:15 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.16 2013/10/09 17:38:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       mng
 
 .if !defined(MNG_BUILDLINK3_MK)
 MNG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mng+=            mng>=1.0.0
+BUILDLINK_API_DEPENDS.mng+=    mng>=1.0.0
 BUILDLINK_ABI_DEPENDS.mng+=    mng>=2.0.2
 BUILDLINK_PKGSRCDIR.mng?=      ../../graphics/mng
 

Index: pkgsrc/graphics/openjpeg/buildlink3.mk
diff -u pkgsrc/graphics/openjpeg/buildlink3.mk:1.4 pkgsrc/graphics/openjpeg/buildlink3.mk:1.5
--- pkgsrc/graphics/openjpeg/buildlink3.mk:1.4  Thu May 15 14:14:54 2014
+++ pkgsrc/graphics/openjpeg/buildlink3.mk      Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/05/15 14:14:54 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       openjpeg
 
@@ -7,7 +7,7 @@ OPENJPEG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openjpeg+=       openjpeg>=2.1.0
 BUILDLINK_ABI_DEPENDS.openjpeg+=       openjpeg>=2.1.0
-BUILDLINK_PKGSRCDIR.openjpeg?= ../../graphics/openjpeg
+BUILDLINK_PKGSRCDIR.openjpeg?=         ../../graphics/openjpeg
 .endif # OPENJPEG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -openjpeg

Index: pkgsrc/graphics/p5-Gnome2-Canvas/buildlink3.mk
diff -u pkgsrc/graphics/p5-Gnome2-Canvas/buildlink3.mk:1.25 pkgsrc/graphics/p5-Gnome2-Canvas/buildlink3.mk:1.26
--- pkgsrc/graphics/p5-Gnome2-Canvas/buildlink3.mk:1.25 Sun Feb 12 06:24:45 2017
+++ pkgsrc/graphics/p5-Gnome2-Canvas/buildlink3.mk      Sun Jan  7 13:04:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2017/02/12 06:24:45 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2018/01/07 13:04:15 rillig Exp $
 
 BUILDLINK_TREE+=       p5-Gnome2-Canvas
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        p5-Gnome2-Canvas
 P5_GNOME2_CANVAS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-Gnome2-Canvas+=       p5-Gnome2-Canvas>=1.002
-BUILDLINK_ABI_DEPENDS.p5-Gnome2-Canvas+=               p5-Gnome2-Canvas>=1.002nb29
+BUILDLINK_ABI_DEPENDS.p5-Gnome2-Canvas+=       p5-Gnome2-Canvas>=1.002nb29
 BUILDLINK_PKGSRCDIR.p5-Gnome2-Canvas?=         ../../graphics/p5-Gnome2-Canvas
 
 .include "../../graphics/libgnomecanvas/buildlink3.mk"

Index: pkgsrc/graphics/p5-cairo/buildlink3.mk
diff -u pkgsrc/graphics/p5-cairo/buildlink3.mk:1.15 pkgsrc/graphics/p5-cairo/buildlink3.mk:1.16
--- pkgsrc/graphics/p5-cairo/buildlink3.mk:1.15 Sat Apr 25 14:23:17 2015
+++ pkgsrc/graphics/p5-cairo/buildlink3.mk      Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2015/04/25 14:23:17 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       p5-cairo
 
@@ -7,7 +7,7 @@ P5_CAIRO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-cairo+=       p5-cairo>=1.023
 BUILDLINK_ABI_DEPENDS.p5-cairo+=       p5-cairo>=1.104nb3
-BUILDLINK_PKGSRCDIR.p5-cairo?= ../../graphics/p5-cairo
+BUILDLINK_PKGSRCDIR.p5-cairo?=         ../../graphics/p5-cairo
 
 .include "../../graphics/cairo/buildlink3.mk"
 .endif # P5_CAIRO_BUILDLINK3_MK

Index: pkgsrc/graphics/plotutils/buildlink3.mk
diff -u pkgsrc/graphics/plotutils/buildlink3.mk:1.17 pkgsrc/graphics/plotutils/buildlink3.mk:1.18
--- pkgsrc/graphics/plotutils/buildlink3.mk:1.17        Sat Feb 16 11:17:56 2013
+++ pkgsrc/graphics/plotutils/buildlink3.mk     Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2013/02/16 11:17:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       plotutils
 
@@ -7,7 +7,7 @@ PLOTUTILS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.plotutils+=      plotutils>=2.4.1nb2
 BUILDLINK_ABI_DEPENDS.plotutils+=      plotutils>=2.6nb4
-BUILDLINK_PKGSRCDIR.plotutils?=        ../../graphics/plotutils
+BUILDLINK_PKGSRCDIR.plotutils?=                ../../graphics/plotutils
 
 pkgbase := plotutils
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/graphics/py-cairo/buildlink3.mk
diff -u pkgsrc/graphics/py-cairo/buildlink3.mk:1.24 pkgsrc/graphics/py-cairo/buildlink3.mk:1.25
--- pkgsrc/graphics/py-cairo/buildlink3.mk:1.24 Sat Apr 25 14:23:17 2015
+++ pkgsrc/graphics/py-cairo/buildlink3.mk      Sun Jan  7 13:04:16 2018
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.24 2015/04/25 14:23:17 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       py-cairo
 
 .if !defined(PY_CAIRO_BUILDLINK3_MK)
 PY_CAIRO_BUILDLINK3_MK:=
 
-.  include "../../lang/python/pyversion.mk"
+.include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-cairo+=       ${PYPKGPREFIX}-cairo>=1.10.0
 BUILDLINK_ABI_DEPENDS.py-cairo?=       ${PYPKGPREFIX}-cairo>=1.10.0nb4
-BUILDLINK_PKGSRCDIR.py-cairo?= ../../graphics/py-cairo
+BUILDLINK_PKGSRCDIR.py-cairo?=         ../../graphics/py-cairo
 
 .include "../../graphics/cairo/buildlink3.mk"
 .endif # PY_CAIRO_BUILDLINK3_MK

Index: pkgsrc/graphics/py-imaging/buildlink3.mk
diff -u pkgsrc/graphics/py-imaging/buildlink3.mk:1.18 pkgsrc/graphics/py-imaging/buildlink3.mk:1.19
--- pkgsrc/graphics/py-imaging/buildlink3.mk:1.18       Sat Feb 16 12:07:26 2013
+++ pkgsrc/graphics/py-imaging/buildlink3.mk    Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2013/02/16 12:07:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       pyimaging
 
@@ -9,7 +9,7 @@ PY_IMAGING_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pyimaging+=      ${PYPKGPREFIX}-imaging>=1.1.4
 BUILDLINK_ABI_DEPENDS.pyimaging+=      ${PYPKGPREFIX}-imaging>=1.1.7nb5
-BUILDLINK_PKGSRCDIR.pyimaging?=        ../../graphics/py-imaging
+BUILDLINK_PKGSRCDIR.pyimaging?=                ../../graphics/py-imaging
 
 .include "../../mk/jpeg.buildlink3.mk"
 .endif # PY_IMAGING_BUILDLINK3_MK

Index: pkgsrc/graphics/py-imagingtk/buildlink3.mk
diff -u pkgsrc/graphics/py-imagingtk/buildlink3.mk:1.6 pkgsrc/graphics/py-imagingtk/buildlink3.mk:1.7
--- pkgsrc/graphics/py-imagingtk/buildlink3.mk:1.6      Tue Jun  4 22:16:25 2013
+++ pkgsrc/graphics/py-imagingtk/buildlink3.mk  Sun Jan  7 13:04:16 2018
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/06/04 22:16:25 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       py-imagingtk
 
 .if !defined(PY_IMAGINGTK_BUILDLINK3_MK)
 PY_IMAGINGTK_BUILDLINK3_MK:=
+
 .include "../../lang/python/pyversion.mk"
 
 # guesstimate

Index: pkgsrc/graphics/qore-glut-module/buildlink3.mk
diff -u pkgsrc/graphics/qore-glut-module/buildlink3.mk:1.4 pkgsrc/graphics/qore-glut-module/buildlink3.mk:1.5
--- pkgsrc/graphics/qore-glut-module/buildlink3.mk:1.4  Thu Oct 12 18:21:24 2017
+++ pkgsrc/graphics/qore-glut-module/buildlink3.mk      Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/10/12 18:21:24 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:16 rillig Exp $
 #
 
 BUILDLINK_TREE+=       qore-glut-module
@@ -8,7 +8,7 @@ QORE_GLUT_MODULE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qore-glut-module+=       qore-glut-module>=0.0.3
 BUILDLINK_ABI_DEPENDS.qore-glut-module?=       qore-glut-module>=0.0.3nb7
-BUILDLINK_PKGSRCDIR.qore-glut-module?= ../../graphics/qore-glut-module
+BUILDLINK_PKGSRCDIR.qore-glut-module?=         ../../graphics/qore-glut-module
 
 .include "../../graphics/qore-opengl-module/buildlink3.mk"
 .endif # QORE_GLUT_MODULE_BUILDLINK3_MK

Index: pkgsrc/graphics/quesoglc/buildlink3.mk
diff -u pkgsrc/graphics/quesoglc/buildlink3.mk:1.2 pkgsrc/graphics/quesoglc/buildlink3.mk:1.3
--- pkgsrc/graphics/quesoglc/buildlink3.mk:1.2  Fri Mar 20 19:24:44 2009
+++ pkgsrc/graphics/quesoglc/buildlink3.mk      Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       quesoglc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        quesoglc
 QUESOGLC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.quesoglc+=       quesoglc>=0.7.1
-BUILDLINK_PKGSRCDIR.quesoglc?= ../../graphics/quesoglc
+BUILDLINK_PKGSRCDIR.quesoglc?=         ../../graphics/quesoglc
 .endif # QUESOGLC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -quesoglc

Index: pkgsrc/graphics/ruby-gnome2-gdk3/buildlink3.mk
diff -u pkgsrc/graphics/ruby-gnome2-gdk3/buildlink3.mk:1.16 pkgsrc/graphics/ruby-gnome2-gdk3/buildlink3.mk:1.17
--- pkgsrc/graphics/ruby-gnome2-gdk3/buildlink3.mk:1.16 Thu Nov 23 17:19:42 2017
+++ pkgsrc/graphics/ruby-gnome2-gdk3/buildlink3.mk      Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2017/11/23 17:19:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       ruby-gnome2-gdk3
 
@@ -7,7 +7,7 @@ RUBY_GNOME2_GDK3_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ruby-gnome2-gdk3+=       ${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2
 BUILDLINK_ABI_DEPENDS.ruby-gnome2-gdk3+=       ruby23-gnome2-gdk3>=3.1.9nb1
-BUILDLINK_PKGSRCDIR.ruby-gnome2-gdk3?= ../../graphics/ruby-gnome2-gdk3
+BUILDLINK_PKGSRCDIR.ruby-gnome2-gdk3?=         ../../graphics/ruby-gnome2-gdk3
 
 .include "../../x11/gtk3/buildlink3.mk"
 .endif # RUBY_GNOME2_GDK3_BUILDLINK3_MK

Index: pkgsrc/graphics/sane-backends/buildlink3.mk
diff -u pkgsrc/graphics/sane-backends/buildlink3.mk:1.19 pkgsrc/graphics/sane-backends/buildlink3.mk:1.20
--- pkgsrc/graphics/sane-backends/buildlink3.mk:1.19    Sat Apr  9 14:19:25 2016
+++ pkgsrc/graphics/sane-backends/buildlink3.mk Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2016/04/09 14:19:25 richard Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       sane-backends
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.sane-backends?=   ../.
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-. include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .endif # SANE_BACKENDS_BUILDLINK3_MK

Index: pkgsrc/graphics/tango-icon-theme/buildlink3.mk
diff -u pkgsrc/graphics/tango-icon-theme/buildlink3.mk:1.1.1.1 pkgsrc/graphics/tango-icon-theme/buildlink3.mk:1.2
--- pkgsrc/graphics/tango-icon-theme/buildlink3.mk:1.1.1.1      Sun Nov 29 21:47:36 2009
+++ pkgsrc/graphics/tango-icon-theme/buildlink3.mk      Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/11/29 21:47:36 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       tango-icon-theme
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        tango-icon-theme
 TANGO_ICON_THEME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tango-icon-theme+=       tango-icon-theme>=0.8.90
-BUILDLINK_PKGSRCDIR.tango-icon-theme?= ../../graphics/tango-icon-theme
+BUILDLINK_PKGSRCDIR.tango-icon-theme?=         ../../graphics/tango-icon-theme
 .endif # TANGO_ICON_THEME_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -tango-icon-theme

Index: pkgsrc/graphics/wm-icons/buildlink3.mk
diff -u pkgsrc/graphics/wm-icons/buildlink3.mk:1.1 pkgsrc/graphics/wm-icons/buildlink3.mk:1.2
--- pkgsrc/graphics/wm-icons/buildlink3.mk:1.1  Mon Dec 28 15:08:54 2015
+++ pkgsrc/graphics/wm-icons/buildlink3.mk      Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/12/28 15:08:54 tsutsui Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       wm-icons
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        wm-icons
 WM_ICONS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wm-icons+=       wm-icons>=0.4.0
-BUILDLINK_PKGSRCDIR.wm-icons?= ../../graphics/wm-icons
+BUILDLINK_PKGSRCDIR.wm-icons?=         ../../graphics/wm-icons
 .endif # WM_ICONS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -wm-icons

Index: pkgsrc/graphics/xfce4-icon-theme/buildlink3.mk
diff -u pkgsrc/graphics/xfce4-icon-theme/buildlink3.mk:1.42 pkgsrc/graphics/xfce4-icon-theme/buildlink3.mk:1.43
--- pkgsrc/graphics/xfce4-icon-theme/buildlink3.mk:1.42 Sun Feb 12 06:24:45 2017
+++ pkgsrc/graphics/xfce4-icon-theme/buildlink3.mk      Sun Jan  7 13:04:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.42 2017/02/12 06:24:45 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.43 2018/01/07 13:04:16 rillig Exp $
 
 BUILDLINK_TREE+=       xfce4-icon-theme
 
@@ -7,7 +7,7 @@ XFCE4_ICON_THEME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-icon-theme+=       xfce4-icon-theme>=4.4.3
 BUILDLINK_ABI_DEPENDS.xfce4-icon-theme+=       xfce4-icon-theme>=4.4.3nb22
-BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme
+BUILDLINK_PKGSRCDIR.xfce4-icon-theme?=         ../../graphics/xfce4-icon-theme
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"

Index: pkgsrc/ham/flxmlrpc/buildlink3.mk
diff -u pkgsrc/ham/flxmlrpc/buildlink3.mk:1.1 pkgsrc/ham/flxmlrpc/buildlink3.mk:1.2
--- pkgsrc/ham/flxmlrpc/buildlink3.mk:1.1       Fri May  5 00:05:40 2017
+++ pkgsrc/ham/flxmlrpc/buildlink3.mk   Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/05/05 00:05:40 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       flxmlrpc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        flxmlrpc
 FLXMLRPC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.flxmlrpc+=       flxmlrpc>=0.1.4
-BUILDLINK_PKGSRCDIR.flxmlrpc?= ../../ham/flxmlrpc
+BUILDLINK_PKGSRCDIR.flxmlrpc?=         ../../ham/flxmlrpc
 
 .endif # FLXMLRPC_BUILDLINK3_MK
 

Index: pkgsrc/ham/gnuradio-digital/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-digital/buildlink3.mk:1.1 pkgsrc/ham/gnuradio-digital/buildlink3.mk:1.2
--- pkgsrc/ham/gnuradio-digital/buildlink3.mk:1.1       Mon Oct 13 12:51:09 2014
+++ pkgsrc/ham/gnuradio-digital/buildlink3.mk   Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:09 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       gnuradio-digital
 
@@ -7,7 +7,7 @@ GNURADIO_DIGITAL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-digital+=       gnuradio-digital>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-digital+=       gnuradio-digital>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-digital?= ../../ham/gnuradio-digital
+BUILDLINK_PKGSRCDIR.gnuradio-digital?=         ../../ham/gnuradio-digital
 .endif # GNURADIO_DIGITAL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gnuradio-digital

Index: pkgsrc/ham/gnuradio-trellis/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-trellis/buildlink3.mk:1.1 pkgsrc/ham/gnuradio-trellis/buildlink3.mk:1.2
--- pkgsrc/ham/gnuradio-trellis/buildlink3.mk:1.1       Mon Oct 13 12:51:10 2014
+++ pkgsrc/ham/gnuradio-trellis/buildlink3.mk   Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       gnuradio-trellis
 
@@ -7,7 +7,7 @@ GNURADIO_TRELLIS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-trellis+=       gnuradio-trellis>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-trellis+=       gnuradio-trellis>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-trellis?= ../../ham/gnuradio-trellis
+BUILDLINK_PKGSRCDIR.gnuradio-trellis?=         ../../ham/gnuradio-trellis
 .endif # GNURADIO_TRELLIS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gnuradio-trellis

Index: pkgsrc/ham/gnuradio-vocoder/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-vocoder/buildlink3.mk:1.1 pkgsrc/ham/gnuradio-vocoder/buildlink3.mk:1.2
--- pkgsrc/ham/gnuradio-vocoder/buildlink3.mk:1.1       Mon Oct 13 12:51:10 2014
+++ pkgsrc/ham/gnuradio-vocoder/buildlink3.mk   Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       gnuradio-vocoder
 
@@ -7,7 +7,7 @@ GNURADIO_VOCODER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-vocoder+=       gnuradio-vocoder>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-vocoder+=       gnuradio-vocoder>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-vocoder?= ../../ham/gnuradio-vocoder
+BUILDLINK_PKGSRCDIR.gnuradio-vocoder?=         ../../ham/gnuradio-vocoder
 .endif # GNURADIO_VOCODER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gnuradio-vocoder

Index: pkgsrc/ham/gnuradio-wavelet/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-wavelet/buildlink3.mk:1.1 pkgsrc/ham/gnuradio-wavelet/buildlink3.mk:1.2
--- pkgsrc/ham/gnuradio-wavelet/buildlink3.mk:1.1       Mon Oct 13 12:51:10 2014
+++ pkgsrc/ham/gnuradio-wavelet/buildlink3.mk   Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       gnuradio-wavelet
 
@@ -7,7 +7,7 @@ GNURADIO_WAVELET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-wavelet+=       gnuradio-wavelet>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-wavelet+=       gnuradio-wavelet>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-wavelet?= ../../ham/gnuradio-wavelet
+BUILDLINK_PKGSRCDIR.gnuradio-wavelet?=         ../../ham/gnuradio-wavelet
 .endif # GNURADIO_WAVELET_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gnuradio-wavelet

Index: pkgsrc/ham/hackrf/buildlink3.mk
diff -u pkgsrc/ham/hackrf/buildlink3.mk:1.1 pkgsrc/ham/hackrf/buildlink3.mk:1.2
--- pkgsrc/ham/hackrf/buildlink3.mk:1.1 Mon Oct 13 13:46:23 2014
+++ pkgsrc/ham/hackrf/buildlink3.mk     Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 13:46:23 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       hackrf
 
@@ -7,7 +7,7 @@ HACKRF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hackrf+= hackrf>=0.1
 BUILDLINK_ABI_DEPENDS.hackrf+= hackrf>=0.1
-BUILDLINK_PKGSRCDIR.hackrf?=           ../../ham/hackrf
+BUILDLINK_PKGSRCDIR.hackrf?=   ../../ham/hackrf
 .endif # HACKRF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hackrf

Index: pkgsrc/ham/uhd/buildlink3.mk
diff -u pkgsrc/ham/uhd/buildlink3.mk:1.3 pkgsrc/ham/uhd/buildlink3.mk:1.4
--- pkgsrc/ham/uhd/buildlink3.mk:1.3    Mon Jul 31 21:09:27 2017
+++ pkgsrc/ham/uhd/buildlink3.mk        Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/31 21:09:27 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       uhd
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.uhd+=     uhd>=2.22
 BUILDLINK_PKGSRCDIR.uhd?=      ../../ham/uhd
 
 # gnuradio-uhd FindUHD.cmake uses this env var as a hint for finding uhd
-CONFIGURE_ENV+=                UHD_DIR=${BUILDLINK_DIR:Q}
+CONFIGURE_ENV+=                UHD_DIR=${BUILDLINK_DIR}
 
 .endif # UHD_BUILDLINK3_MK
 

Index: pkgsrc/inputmethod/canna-lib/buildlink3.mk
diff -u pkgsrc/inputmethod/canna-lib/buildlink3.mk:1.8 pkgsrc/inputmethod/canna-lib/buildlink3.mk:1.9
--- pkgsrc/inputmethod/canna-lib/buildlink3.mk:1.8      Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna-lib/buildlink3.mk  Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2015/10/18 03:58:31 tsutsui Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       Canna-lib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        Canna-lib
 CANNA_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.Canna-lib+=      Canna-lib>=3.7pl3
-BUILDLINK_PKGSRCDIR.Canna-lib?=        ../../inputmethod/canna-lib
+BUILDLINK_PKGSRCDIR.Canna-lib?=                ../../inputmethod/canna-lib
 .endif # CANNA_LIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -Canna-lib

Index: pkgsrc/inputmethod/input-pad/buildlink3.mk
diff -u pkgsrc/inputmethod/input-pad/buildlink3.mk:1.29 pkgsrc/inputmethod/input-pad/buildlink3.mk:1.30
--- pkgsrc/inputmethod/input-pad/buildlink3.mk:1.29     Thu Nov 23 17:19:42 2017
+++ pkgsrc/inputmethod/input-pad/buildlink3.mk  Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2017/11/23 17:19:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2018/01/07 13:04:17 rillig Exp $
 #
 
 BUILDLINK_TREE+=       input-pad
@@ -8,7 +8,7 @@ INPUT_PAD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.input-pad+=      input-pad>=1.0.2
 BUILDLINK_ABI_DEPENDS.input-pad?=      input-pad>=1.0.3nb7
-BUILDLINK_PKGSRCDIR.input-pad?=        ../../inputmethod/input-pad
+BUILDLINK_PKGSRCDIR.input-pad?=                ../../inputmethod/input-pad
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/inputmethod/libchewing/buildlink3.mk
diff -u pkgsrc/inputmethod/libchewing/buildlink3.mk:1.15 pkgsrc/inputmethod/libchewing/buildlink3.mk:1.16
--- pkgsrc/inputmethod/libchewing/buildlink3.mk:1.15    Thu Nov 30 16:45:04 2017
+++ pkgsrc/inputmethod/libchewing/buildlink3.mk Sun Jan  7 13:04:17 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.15 2017/11/30 16:45:04 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       libchewing
 
 .if !defined(LIBCHEWING_BUILDLINK3_MK)
 LIBCHEWING_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libchewing+=             libchewing>=0.3.2
+BUILDLINK_API_DEPENDS.libchewing+=     libchewing>=0.3.2
 BUILDLINK_ABI_DEPENDS.libchewing+=     libchewing>=0.4.0nb8
 BUILDLINK_PKGSRCDIR.libchewing?=       ../../inputmethod/libchewing
 

Index: pkgsrc/inputmethod/libhangul/buildlink3.mk
diff -u pkgsrc/inputmethod/libhangul/buildlink3.mk:1.4 pkgsrc/inputmethod/libhangul/buildlink3.mk:1.5
--- pkgsrc/inputmethod/libhangul/buildlink3.mk:1.4      Thu Nov 10 10:40:11 2011
+++ pkgsrc/inputmethod/libhangul/buildlink3.mk  Sun Jan  7 13:04:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2011/11/10 10:40:11 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=       libhangul
 
@@ -7,7 +7,7 @@ LIBHANGUL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libhangul+=      libhangul>=0.0.4
 BUILDLINK_ABI_DEPENDS.libhangul+=      libhangul>=0.1.0
-BUILDLINK_PKGSRCDIR.libhangul?=        ../../inputmethod/libhangul
+BUILDLINK_PKGSRCDIR.libhangul?=                ../../inputmethod/libhangul
 .endif # LIBHANGUL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libhangul

Index: pkgsrc/inputmethod/tomoe-gtk/buildlink3.mk
diff -u pkgsrc/inputmethod/tomoe-gtk/buildlink3.mk:1.29 pkgsrc/inputmethod/tomoe-gtk/buildlink3.mk:1.30
--- pkgsrc/inputmethod/tomoe-gtk/buildlink3.mk:1.29     Sun Feb 12 06:24:46 2017
+++ pkgsrc/inputmethod/tomoe-gtk/buildlink3.mk  Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2017/02/12 06:24:46 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2018/01/07 13:04:18 rillig Exp $
 
 BUILDLINK_TREE+=       tomoe-gtk
 
@@ -7,7 +7,7 @@ TOMOE_GTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tomoe-gtk+=      tomoe-gtk>=0.6.0
 BUILDLINK_ABI_DEPENDS.tomoe-gtk+=      tomoe-gtk>=0.6.0nb28
-BUILDLINK_PKGSRCDIR.tomoe-gtk?=        ../../inputmethod/tomoe-gtk
+BUILDLINK_PKGSRCDIR.tomoe-gtk?=                ../../inputmethod/tomoe-gtk
 
 .include "../../inputmethod/tomoe/buildlink3.mk"
 .include "../../fonts/gucharmap/buildlink3.mk"

Index: pkgsrc/inputmethod/unicon-im/buildlink3.mk
diff -u pkgsrc/inputmethod/unicon-im/buildlink3.mk:1.8 pkgsrc/inputmethod/unicon-im/buildlink3.mk:1.9
--- pkgsrc/inputmethod/unicon-im/buildlink3.mk:1.8      Fri Mar 20 19:24:47 2009
+++ pkgsrc/inputmethod/unicon-im/buildlink3.mk  Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:18 rillig Exp $
 
 BUILDLINK_TREE+=       unicon-im
 
@@ -7,7 +7,7 @@ UNICON_IM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.unicon-im+=      unicon-im>=1.2nb2
 BUILDLINK_ABI_DEPENDS.unicon-im+=      unicon-im>=1.2nb4
-BUILDLINK_PKGSRCDIR.unicon-im?=        ../../inputmethod/unicon-im
+BUILDLINK_PKGSRCDIR.unicon-im?=                ../../inputmethod/unicon-im
 
 .include "../../devel/pth/buildlink3.mk"
 .endif # UNICON_IM_BUILDLINK3_MK

Index: pkgsrc/lang/gcc-aux/buildlink3.mk
diff -u pkgsrc/lang/gcc-aux/buildlink3.mk:1.4 pkgsrc/lang/gcc-aux/buildlink3.mk:1.5
--- pkgsrc/lang/gcc-aux/buildlink3.mk:1.4       Wed Apr 30 16:24:39 2014
+++ pkgsrc/lang/gcc-aux/buildlink3.mk   Sun Jan  7 13:04:18 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/04/30 16:24:39 marino Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:18 rillig Exp $
 
-BUILDLINK_TREE+= gcc-aux
+BUILDLINK_TREE+=       gcc-aux
 
 .if !defined(GCC_AUX_BUILDLINK3_MK)
 GCC_AUX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcc-aux+= gcc-aux>=20140422
-BUILDLINK_PKGSRCDIR.gcc-aux?= ../../lang/gcc-aux
+BUILDLINK_API_DEPENDS.gcc-aux+=        gcc-aux>=20140422
+BUILDLINK_PKGSRCDIR.gcc-aux?=  ../../lang/gcc-aux
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
@@ -21,4 +21,4 @@ pkgbase := gcc-aux
 .endif
 .endif
 
-BUILDLINK_TREE+= -gcc-aux
+BUILDLINK_TREE+=       -gcc-aux

Index: pkgsrc/lang/gcc2/buildlink3.mk
diff -u pkgsrc/lang/gcc2/buildlink3.mk:1.1 pkgsrc/lang/gcc2/buildlink3.mk:1.2
--- pkgsrc/lang/gcc2/buildlink3.mk:1.1  Sat Apr 25 10:32:07 2015
+++ pkgsrc/lang/gcc2/buildlink3.mk      Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/04/25 10:32:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:18 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -15,11 +15,11 @@ BUILDLINK_LIBDIRS.gcc2?=            \
        ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc2}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
+.if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc2+=     full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc2?=     build
-.  endif
+.endif
 .endif # GCC2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gcc2

Index: pkgsrc/lang/gcc3-c/buildlink3.mk
diff -u pkgsrc/lang/gcc3-c/buildlink3.mk:1.19 pkgsrc/lang/gcc3-c/buildlink3.mk:1.20
--- pkgsrc/lang/gcc3-c/buildlink3.mk:1.19       Sat Sep  6 08:20:29 2014
+++ pkgsrc/lang/gcc3-c/buildlink3.mk    Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2014/09/06 08:20:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:18 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -7,34 +7,34 @@ BUILDLINK_TREE+=      gcc3-c
 .if !defined(GCC3_C_BUILDLINK3_MK)
 GCC3_C_BUILDLINK3_MK:=
 
-.  include "../../mk/bsd.prefs.mk"
-.  if defined(GCC3_INSTALLTO_SUBPREFIX)
+.include "../../mk/bsd.prefs.mk"
+.if defined(GCC3_INSTALLTO_SUBPREFIX)
 #
 # "gcc3" is the directory named in pkgsrc/lang/gcc3-c/Makefile.common"
 # as GCC3_DEFAULT_SUBPREFIX.
 #
-.    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
+.  if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
-.    endif
 .  endif
+.endif
 BUILDLINK_API_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c>=3.0
 BUILDLINK_ABI_DEPENDS.gcc3-c+= gcc3-c>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-c?=   ../../lang/gcc3-c
 BUILDLINK_GCC3_LIBDIRS=                lib
-.  if defined(GCC3_INSTALLTO_SUBPREFIX)
+.if defined(GCC3_INSTALLTO_SUBPREFIX)
 BUILDLINK_GCC3_LIBDIRS+=       ${GCC3_INSTALLTO_SUBPREFIX}/lib
-.  else
+.else
 BUILDLINK_GCC3_LIBDIRS+=       gcc3/lib
-.  endif
+.endif
 BUILDLINK_GCC3_LIBDIRS+=       ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///}
 BUILDLINK_LIBDIRS.gcc3-c+=     ${BUILDLINK_GCC3_LIBDIRS}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
+.if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-c+=   full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3-c?=   build
-.  endif
+.endif
 .endif # GCC3_C_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gcc3-c

Index: pkgsrc/lang/gcc3-c++/buildlink3.mk
diff -u pkgsrc/lang/gcc3-c++/buildlink3.mk:1.20 pkgsrc/lang/gcc3-c++/buildlink3.mk:1.21
--- pkgsrc/lang/gcc3-c++/buildlink3.mk:1.20     Sat Sep  6 08:20:28 2014
+++ pkgsrc/lang/gcc3-c++/buildlink3.mk  Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:28 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -7,23 +7,23 @@ BUILDLINK_TREE+=      gcc3-cxx
 .if !defined(GCC3_CXX_BUILDLINK3_MK)
 GCC3_CXX_BUILDLINK3_MK:=
 
-.  if defined(GCC3_INSTALLTO_SUBPREFIX)
-.    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
-.    endif
+.if defined(GCC3_INSTALLTO_SUBPREFIX)
+.  if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
+GCC3_PKGMODIF=                         _${GCC3_INSTALLTO_SUBPREFIX}
 .  endif
+.endif
 BUILDLINK_API_DEPENDS.gcc3-cxx+=       gcc3${GCC3_PKGMODIF}-c++>=3.0
 BUILDLINK_ABI_DEPENDS.gcc3-cxx+=       gcc3-c++>=3.3.5nb1
-BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++
+BUILDLINK_PKGSRCDIR.gcc3-cxx?=         ../../lang/gcc3-c++
 BUILDLINK_LIBDIRS.gcc3-cxx?=   \
        lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
+.if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-cxx+= full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3-cxx?= build
-.  endif
+.endif
 .endif # GCC3_CXX_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gcc3-cxx

Index: pkgsrc/lang/gcc3-f77/buildlink3.mk
diff -u pkgsrc/lang/gcc3-f77/buildlink3.mk:1.20 pkgsrc/lang/gcc3-f77/buildlink3.mk:1.21
--- pkgsrc/lang/gcc3-f77/buildlink3.mk:1.20     Sat Sep  6 08:20:29 2014
+++ pkgsrc/lang/gcc3-f77/buildlink3.mk  Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -7,23 +7,23 @@ BUILDLINK_TREE+=      gcc3-f77
 .if !defined(GCC3_F77_BUILDLINK3_MK)
 GCC3_F77_BUILDLINK3_MK:=
 
-.  if defined(GCC3_INSTALLTO_SUBPREFIX)
-.    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
-.    endif
+.if defined(GCC3_INSTALLTO_SUBPREFIX)
+.  if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
+GCC3_PKGMODIF=                         _${GCC3_INSTALLTO_SUBPREFIX}
 .  endif
+.endif
 BUILDLINK_API_DEPENDS.gcc3-f77+=       gcc3${GCC3_PKGMODIF}-f77>=3.0
 BUILDLINK_ABI_DEPENDS.gcc3-f77+=       gcc3-f77>=3.3.5nb2
-BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77
+BUILDLINK_PKGSRCDIR.gcc3-f77?=         ../../lang/gcc3-f77
 BUILDLINK_LIBDIRS.gcc3-f77?=   \
        lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
+.if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-f77+= full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3-f77?= build
-.  endif
+.endif
 .endif # GCC3_F77_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gcc3-f77

Index: pkgsrc/lang/gcc3-objc/buildlink3.mk
diff -u pkgsrc/lang/gcc3-objc/buildlink3.mk:1.20 pkgsrc/lang/gcc3-objc/buildlink3.mk:1.21
--- pkgsrc/lang/gcc3-objc/buildlink3.mk:1.20    Sat Sep  6 08:20:29 2014
+++ pkgsrc/lang/gcc3-objc/buildlink3.mk Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -7,23 +7,23 @@ BUILDLINK_TREE+=      gcc3-objc
 .if !defined(GCC3_OBJC_BUILDLINK3_MK)
 GCC3_OBJC_BUILDLINK3_MK:=
 
-.  if defined(GCC3_INSTALLTO_SUBPREFIX)
-.    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
-.    endif
+.if defined(GCC3_INSTALLTO_SUBPREFIX)
+.  if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
+GCC3_PKGMODIF=                         _${GCC3_INSTALLTO_SUBPREFIX}
 .  endif
+.endif
 BUILDLINK_API_DEPENDS.gcc3-objc+=      gcc3${GCC3_PKGMODIF}-objc>=3.0
 BUILDLINK_ABI_DEPENDS.gcc3-objc+=      gcc3-objc>=3.3.5nb1
-BUILDLINK_PKGSRCDIR.gcc3-objc?=        ../../lang/gcc3-objc
+BUILDLINK_PKGSRCDIR.gcc3-objc?=                ../../lang/gcc3-objc
 BUILDLINK_LIBDIRS.gcc3-objc?=  \
        lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
+.if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-objc+=        full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3-objc?=        build
-.  endif
+.endif
 .endif # GCC3_OBJC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gcc3-objc

Index: pkgsrc/lang/gcc34/buildlink3.mk
diff -u pkgsrc/lang/gcc34/buildlink3.mk:1.23 pkgsrc/lang/gcc34/buildlink3.mk:1.24
--- pkgsrc/lang/gcc34/buildlink3.mk:1.23        Wed Nov 25 12:51:16 2015
+++ pkgsrc/lang/gcc34/buildlink3.mk     Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2015/11/25 12:51:16 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2018/01/07 13:04:18 rillig Exp $
 
 BUILDLINK_TREE+=       gcc34
 
@@ -12,12 +12,12 @@ BUILDLINK_API_DEPENDS.gcc34+=       gcc34>=3.4
 BUILDLINK_ABI_DEPENDS.gcc34+=  gcc34>=3.4.6nb4
 BUILDLINK_PKGSRCDIR.gcc34?=    ../../lang/gcc34
 
-.  if exists(${_GCC34_PREFIX}/bin/gcc)
+.if exists(${_GCC34_PREFIX}/bin/gcc)
 # logic for detecting the ADA compiler
-gcc34_GNAT1!=${_GCC34_PREFIX}/bin/gcc -print-prog-name=gnat1
-.    if exists(${gcc34_GNAT1})
+gcc34_GNAT1!=  ${_GCC34_PREFIX}/bin/gcc -print-prog-name=gnat1
+.  if exists(${gcc34_GNAT1})
 BUILDLINK_ENV+=        ADAC=${_GCC34_PREFIX}/bin/gcc
-.    endif
+.  endif
 
 # add libraries
 BUILDLINK_LIBDIRS.gcc34+=      ${_GCC34_SUBDIR}/lib
@@ -26,18 +26,18 @@ BUILDLINK_LIBDIRS.gcc34+=   ${_GCC34_SUBDI
 gcc34_GCC_ARCHDIR!=    ${DIRNAME} `${_GCC34_PREFIX}/bin/gcc --print-libgcc-file-name`
 
 # add the architecture dep libraries
-.    if empty(gcc34_GCC_ARCHDIR:M*not_found*)
+.  if empty(gcc34_GCC_ARCHDIR:M*not_found*)
 BUILDLINK_LIBDIRS.gcc34+=      ${gcc34_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/
 
 # add the ada libraries
-.      if exists(${gcc34_GNAT1})
+.    if exists(${gcc34_GNAT1})
 BUILDLINK_LIBDIRS.gcc34+=      ${gcc34_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/adalib
-.      endif
+.    endif
 
 # add the header files
 BUILDLINK_INCDIRS.gcc34+=      ${_GCC34_SUBDIR}/include ${gcc34_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/include
-.    endif
 .  endif
+.endif
 
 BUILDLINK_FILES_CMD.gcc34=     \
        (cd  ${BUILDLINK_PREFIX.gcc34} &&       \
@@ -52,11 +52,11 @@ _USE_GCC_SHLIB= yes
 .endif
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
+.if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc34+=    full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc34?=    build
-.  endif
+.endif
 
 .include "../../mk/pthread.buildlink3.mk"
 pkgbase := gcc34

Index: pkgsrc/lang/gcc49/buildlink3.mk
diff -u pkgsrc/lang/gcc49/buildlink3.mk:1.3 pkgsrc/lang/gcc49/buildlink3.mk:1.4
--- pkgsrc/lang/gcc49/buildlink3.mk:1.3 Wed Nov 25 12:51:17 2015
+++ pkgsrc/lang/gcc49/buildlink3.mk     Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/11/25 12:51:17 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:18 rillig Exp $
 
 BUILDLINK_TREE+=       gcc49
 
@@ -29,4 +29,5 @@ pkgbase := gcc49
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GCC49_BUILDLINK3_MK
+
 BUILDLINK_TREE+=       -gcc49

Index: pkgsrc/lang/gcc5/buildlink3.mk
diff -u pkgsrc/lang/gcc5/buildlink3.mk:1.2 pkgsrc/lang/gcc5/buildlink3.mk:1.3
--- pkgsrc/lang/gcc5/buildlink3.mk:1.2  Wed Nov 25 12:51:17 2015
+++ pkgsrc/lang/gcc5/buildlink3.mk      Sun Jan  7 13:04:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/11/25 12:51:17 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:18 rillig Exp $
 
 BUILDLINK_TREE+=       gcc5
 
@@ -30,4 +30,5 @@ pkgbase := gcc5
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GCC5_BUILDLINK3_MK
+
 BUILDLINK_TREE+=       -gcc5

Index: pkgsrc/lang/gcc5-aux/buildlink3.mk
diff -u pkgsrc/lang/gcc5-aux/buildlink3.mk:1.2 pkgsrc/lang/gcc5-aux/buildlink3.mk:1.3
--- pkgsrc/lang/gcc5-aux/buildlink3.mk:1.2      Sat Nov 26 18:23:25 2016
+++ pkgsrc/lang/gcc5-aux/buildlink3.mk  Sun Jan  7 13:04:18 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/11/26 18:23:25 marino Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:18 rillig Exp $
 
-BUILDLINK_TREE+= gcc5-aux
+BUILDLINK_TREE+=       gcc5-aux
 
 .if !defined(GCC5_AUX_BUILDLINK3_MK)
 GCC5_AUX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gcc5-aux+= gcc5-aux>=20150422
-BUILDLINK_PKGSRCDIR.gcc5-aux?= ../../lang/gcc5-aux
+BUILDLINK_PKGSRCDIR.gcc5-aux?= ../../lang/gcc5-aux
 BUILDLINK_DEPMETHOD.gcc5-aux?= build
 
 .include "../../converters/libiconv/buildlink3.mk"
@@ -19,4 +19,4 @@ pkgbase := gcc5-aux
 
 .endif
 
-BUILDLINK_TREE+= -gcc5-aux
+BUILDLINK_TREE+=       -gcc5-aux

Index: pkgsrc/lang/gcc5-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc5-libs/buildlink3.mk:1.2 pkgsrc/lang/gcc5-libs/buildlink3.mk:1.3
--- pkgsrc/lang/gcc5-libs/buildlink3.mk:1.2     Mon Jan  1 18:16:37 2018
+++ pkgsrc/lang/gcc5-libs/buildlink3.mk Sun Jan  7 13:04:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:19 rillig Exp $
 
 BUILDLINK_TREE+=       gcc5-libs
 
@@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.gcc5-libs+=     gcc5-l
 BUILDLINK_API_DEPENDS.gcc5-libs+=      {gcc5,gcc5-libs}>=5.1.0
 .endif
 BUILDLINK_PKGSRCDIR.gcc5-libs=         ../../lang/gcc5-libs
-BUILDLINK_DEPMETHOD.gcc5-libs?=        full
+BUILDLINK_DEPMETHOD.gcc5-libs?=                full
 
 BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_PREFIX.gcc5-libs}/gcc5
 

Index: pkgsrc/lang/gcc6/buildlink3.mk
diff -u pkgsrc/lang/gcc6/buildlink3.mk:1.1 pkgsrc/lang/gcc6/buildlink3.mk:1.2
--- pkgsrc/lang/gcc6/buildlink3.mk:1.1  Mon Sep 12 22:13:54 2016
+++ pkgsrc/lang/gcc6/buildlink3.mk      Sun Jan  7 13:04:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/09/12 22:13:54 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:19 rillig Exp $
 
 BUILDLINK_TREE+=       gcc6
 
@@ -28,4 +28,5 @@ pkgbase := gcc6
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GCC6_BUILDLINK3_MK
+
 BUILDLINK_TREE+=       -gcc6

Index: pkgsrc/lang/gcc6-aux/buildlink3.mk
diff -u pkgsrc/lang/gcc6-aux/buildlink3.mk:1.1 pkgsrc/lang/gcc6-aux/buildlink3.mk:1.2
--- pkgsrc/lang/gcc6-aux/buildlink3.mk:1.1      Tue Dec 13 01:19:20 2016
+++ pkgsrc/lang/gcc6-aux/buildlink3.mk  Sun Jan  7 13:04:19 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/12/13 01:19:20 marino Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:19 rillig Exp $
 
-BUILDLINK_TREE+= gcc6-aux
+BUILDLINK_TREE+=       gcc6-aux
 
 .if !defined(GCC5_AUX_BUILDLINK3_MK)
 GCC5_AUX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gcc6-aux+= gcc6-aux>=20160822
-BUILDLINK_PKGSRCDIR.gcc6-aux?= ../../lang/gcc6-aux
+BUILDLINK_PKGSRCDIR.gcc6-aux?= ../../lang/gcc6-aux
 BUILDLINK_DEPMETHOD.gcc6-aux?= build
 
 .include "../../converters/libiconv/buildlink3.mk"
@@ -19,4 +19,4 @@ pkgbase := gcc6-aux
 
 .endif
 
-BUILDLINK_TREE+= -gcc6-aux
+BUILDLINK_TREE+=       -gcc6-aux

Index: pkgsrc/lang/gcc6-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc6-libs/buildlink3.mk:1.2 pkgsrc/lang/gcc6-libs/buildlink3.mk:1.3
--- pkgsrc/lang/gcc6-libs/buildlink3.mk:1.2     Mon Jan  1 18:16:37 2018
+++ pkgsrc/lang/gcc6-libs/buildlink3.mk Sun Jan  7 13:04:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:19 rillig Exp $
 
 BUILDLINK_TREE+=       gcc6-libs
 
@@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.gcc6-libs+=     gcc6-l
 BUILDLINK_API_DEPENDS.gcc6-libs+=      {gcc6,gcc6-libs}>=6.1.0
 .endif
 BUILDLINK_PKGSRCDIR.gcc6-libs=         ../../lang/gcc6-libs
-BUILDLINK_DEPMETHOD.gcc6-libs?=        full
+BUILDLINK_DEPMETHOD.gcc6-libs?=                full
 
 BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_PREFIX.gcc6-libs}/gcc6
 

Index: pkgsrc/lang/gnat_util/buildlink3.mk
diff -u pkgsrc/lang/gnat_util/buildlink3.mk:1.1 pkgsrc/lang/gnat_util/buildlink3.mk:1.2
--- pkgsrc/lang/gnat_util/buildlink3.mk:1.1     Wed Apr 30 16:25:20 2014
+++ pkgsrc/lang/gnat_util/buildlink3.mk Sun Jan  7 13:04:19 2018
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/04/30 16:25:20 marino Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:19 rillig Exp $
 
-BUILDLINK_TREE+= gnat_util
+BUILDLINK_TREE+=       gnat_util
 
 .if !defined(GNAT_UTIL_BUILDLINK3_MK)
 GNAT_UTIL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnat_util+=      gnat_util>=20140422
-BUILDLINK_PKGSRCDIR.gnat_util?=        ../../lang/gnat_util
+BUILDLINK_PKGSRCDIR.gnat_util?=                ../../lang/gnat_util
 
 .endif
 
-BUILDLINK_TREE+= -gnat_util
+BUILDLINK_TREE+=       -gnat_util

Index: pkgsrc/lang/libLLVM34/buildlink3.mk
diff -u pkgsrc/lang/libLLVM34/buildlink3.mk:1.2 pkgsrc/lang/libLLVM34/buildlink3.mk:1.3
--- pkgsrc/lang/libLLVM34/buildlink3.mk:1.2     Mon Apr  6 17:25:05 2015
+++ pkgsrc/lang/libLLVM34/buildlink3.mk Sun Jan  7 13:04:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/04/06 17:25:05 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:19 rillig Exp $
 
 BUILDLINK_TREE+=       libLLVM34
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libLLVM34+=       libLLV
 BUILDLINK_PKGSRCDIR.libLLVM34?=                ../../lang/libLLVM34
 BUILDLINK_INCDIRS.libLLVM34?=          include/libLLVM34
 BUILDLINK_LIBDIRS.libLLVM34?=          lib/libLLVM34
-LLVM_CONFIG_PATH?=     ${BUILDLINK_PREFIX.libLLVM34}/libexec/libLLVM34/llvm-config
+LLVM_CONFIG_PATH?=                     ${BUILDLINK_PREFIX.libLLVM34}/libexec/libLLVM34/llvm-config
 
 .endif # LIBLLVM34_BUILDLINK3_MK
 

Index: pkgsrc/lang/libunwind/buildlink3.mk
diff -u pkgsrc/lang/libunwind/buildlink3.mk:1.3 pkgsrc/lang/libunwind/buildlink3.mk:1.4
--- pkgsrc/lang/libunwind/buildlink3.mk:1.3     Tue Jul 11 19:47:37 2017
+++ pkgsrc/lang/libunwind/buildlink3.mk Sun Jan  7 13:04:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 19:47:37 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:19 rillig Exp $
 
 BUILDLINK_TREE+=       libunwind
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libunwind
 LIBUNWIND_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libunwind+=      libunwind>=4.0.1
-BUILDLINK_PKGSRCDIR.libunwind?=        ../../lang/libunwind
+BUILDLINK_PKGSRCDIR.libunwind?=                ../../lang/libunwind
 
 .include "../../lang/llvm/buildlink3.mk"
 .endif # LIBUNWIND_BUILDLINK3_MK

Index: pkgsrc/lang/llvm/buildlink3.mk
diff -u pkgsrc/lang/llvm/buildlink3.mk:1.5 pkgsrc/lang/llvm/buildlink3.mk:1.6
--- pkgsrc/lang/llvm/buildlink3.mk:1.5  Tue Jul 11 19:47:37 2017
+++ pkgsrc/lang/llvm/buildlink3.mk      Sun Jan  7 13:04:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/07/11 19:47:37 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:19 rillig Exp $
 
 BUILDLINK_TREE+=       llvm
 
@@ -12,9 +12,9 @@ LLVM_CONFIG_PATH?=            ${BUILDLINK_PREFIX.l
 
 pkgbase := llvm
 .include "../../mk/pkg-build-options.mk"
-.  if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo)
+.if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo)
 .include "../../mk/terminfo.buildlink3.mk"
-.  endif
+.endif
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif # LLVM_BUILDLINK3_MK

Index: pkgsrc/lang/lua/buildlink3.mk
diff -u pkgsrc/lang/lua/buildlink3.mk:1.18 pkgsrc/lang/lua/buildlink3.mk:1.19
--- pkgsrc/lang/lua/buildlink3.mk:1.18  Mon Jul 20 11:30:54 2015
+++ pkgsrc/lang/lua/buildlink3.mk       Sun Jan  7 13:04:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2015/07/20 11:30:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:19 rillig Exp $
 #
 # This is a fake buildlink3.mk file. It figures out the Lua version
 # and then includes the real buildlink3.mk file for that Lua version.
@@ -14,7 +14,7 @@ BUILDLINK_PREFIX.lua= ${BUILDLINK_PREFIX
 .if !defined(LUA_BUILDLINK3_MK)
 LUA_BUILDLINK3_MK:=
 
-BUILDLINK_TARGETS+=     buildlink-bin-unversioned
+BUILDLINK_TARGETS+=    buildlink-bin-unversioned
 
 buildlink-bin-unversioned:
        ${LN} -s ${BUILDLINK_DIR}/lib/pkgconfig/lua-${_LUA_DOT_VERSION}.pc ${BUILDLINK_DIR}/lib/pkgconfig/lua.pc

Index: pkgsrc/lang/mono/buildlink3.mk
diff -u pkgsrc/lang/mono/buildlink3.mk:1.57 pkgsrc/lang/mono/buildlink3.mk:1.58
--- pkgsrc/lang/mono/buildlink3.mk:1.57 Thu Nov 30 16:45:04 2017
+++ pkgsrc/lang/mono/buildlink3.mk      Sun Jan  7 13:04:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.57 2017/11/30 16:45:04 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.58 2018/01/07 13:04:19 rillig Exp $
 
 BUILDLINK_TREE+=       mono
 
@@ -8,7 +8,7 @@ MONO_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.mono+=   mono>=4
 BUILDLINK_ABI_DEPENDS.mono?=   mono>=4.0.4.1nb9
 BUILDLINK_PKGSRCDIR.mono?=     ../../lang/mono
-ALL_ENV+=                      MONO_SHARED_DIR=${WRKDIR:Q}
+ALL_ENV+=                      MONO_SHARED_DIR=${WRKDIR}
 BUILDLINK_CONTENTS_FILTER.mono=        ${EGREP} '(^include/|^lib/)'
 
 .include "../../textproc/icu/buildlink3.mk"

Index: pkgsrc/lang/mono2/buildlink3.mk
diff -u pkgsrc/lang/mono2/buildlink3.mk:1.10 pkgsrc/lang/mono2/buildlink3.mk:1.11
--- pkgsrc/lang/mono2/buildlink3.mk:1.10        Thu Nov 30 16:45:04 2017
+++ pkgsrc/lang/mono2/buildlink3.mk     Sun Jan  7 13:04:19 2018
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.10 2017/11/30 16:45:04 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:19 rillig Exp $
 
 BUILDLINK_TREE+=       mono
 
 .if !defined(MONO_BUILDLINK3_MK)
 MONO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mono+=   mono>=2.8<3
-BUILDLINK_ABI_DEPENDS.mono+=   mono>=2.10.9nb22
-BUILDLINK_PKGSRCDIR.mono?=     ../../lang/mono2
-ALL_ENV+=                      MONO_SHARED_DIR=${WRKDIR:Q}
+BUILDLINK_API_DEPENDS.mono+=           mono>=2.8<3
+BUILDLINK_ABI_DEPENDS.mono+=           mono>=2.10.9nb22
+BUILDLINK_PKGSRCDIR.mono?=             ../../lang/mono2
+ALL_ENV+=                              MONO_SHARED_DIR=${WRKDIR}
 BUILDLINK_CONTENTS_FILTER.mono+=       ${EGREP} '(^include/|^lib/)'
 
 .include "../../textproc/icu/buildlink3.mk"

Index: pkgsrc/lang/ocaml/buildlink3.mk
diff -u pkgsrc/lang/ocaml/buildlink3.mk:1.41 pkgsrc/lang/ocaml/buildlink3.mk:1.42
--- pkgsrc/lang/ocaml/buildlink3.mk:1.41        Fri Sep  8 09:12:44 2017
+++ pkgsrc/lang/ocaml/buildlink3.mk     Sun Jan  7 13:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2017/09/08 09:12:44 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.0
 BUILDLINK_PKGSRCDIR.ocaml?=    ../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=   build
 
-BUILDLINK_PASSTHRU_DIRS+=     ${BUILDLINK_PREFIX.ocaml}/lib/ocaml
+BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_PREFIX.ocaml}/lib/ocaml
 
 BUILDLINK_TARGETS+=    ocaml-wrappers
 OCAML_WRAPPERS=                ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \
@@ -23,8 +23,8 @@ ocaml-wrappers:
        for w in ${OCAML_WRAPPERS}; do                                  \
                ${SED}  -e 's|@SH@|'${SH:Q}'|g'                         \
                        -e 's|@OCAML_PREFIX@|${BUILDLINK_PREFIX.ocaml}|g' \
-                       -e 's|@CFLAGS@|'${CFLAGS:Q}'|g'                 \
-                       -e 's|@LDFLAGS@|'${LDFLAGS:Q}'|g'               \
+                       -e 's|@CFLAGS@|'${CFLAGS:M*:Q}'|g'                      \
+                       -e 's|@LDFLAGS@|'${LDFLAGS:M*:Q}'|g'            \
                        -e 's|@WRAPPEE@|'$$w'|g'                        \
                        < ${.CURDIR}/../../lang/ocaml/files/wrapper.sh  \
                        > ${BUILDLINK_DIR}/bin/"$$w";                   \

Index: pkgsrc/lang/openjdk8/buildlink3.mk
diff -u pkgsrc/lang/openjdk8/buildlink3.mk:1.3 pkgsrc/lang/openjdk8/buildlink3.mk:1.4
--- pkgsrc/lang/openjdk8/buildlink3.mk:1.3      Thu Aug  3 12:34:03 2017
+++ pkgsrc/lang/openjdk8/buildlink3.mk  Sun Jan  7 13:04:20 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/08/03 12:34:03 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       openjdk8
 
 .if !defined(OPENJDK8_BUILDLINK3_MK)
 OPENJDK8_BUILDLINK3_MK:=
 
-LIBDIR_ARCH=   ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
+LIBDIR_ARCH=                   ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
 BUILDLINK_LIBDIRS.openjdk8+=   java/openjdk8/jre/lib/${LIBDIR_ARCH}/server
 BUILDLINK_LIBDIRS.openjdk8+=   java/openjdk8/jre/lib/${LIBDIR_ARCH}
 

Index: pkgsrc/lang/oracle-jdk8/buildlink3.mk
diff -u pkgsrc/lang/oracle-jdk8/buildlink3.mk:1.1 pkgsrc/lang/oracle-jdk8/buildlink3.mk:1.2
--- pkgsrc/lang/oracle-jdk8/buildlink3.mk:1.1   Sat May 30 09:51:11 2015
+++ pkgsrc/lang/oracle-jdk8/buildlink3.mk       Sun Jan  7 13:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/05/30 09:51:11 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       oracle-jdk8
 
@@ -8,7 +8,7 @@ ORACLE_JDK8_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.oracle-jdk8+=    oracle-jdk8-[0-9]*
 BUILDLINK_ABI_DEPENDS.oracle-jdk8+=    oracle-jdk8>=8.0.45
 BUILDLINK_PKGSRCDIR.oracle-jdk8?=      ../../lang/oracle-jdk8
-BUILDLINK_DEPMETHOD.oracle-jdk8?= build
+BUILDLINK_DEPMETHOD.oracle-jdk8?=      build
 
 BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_JAVA_PREFIX.oracle-jre8}
 

Index: pkgsrc/lang/ossp-js/buildlink3.mk
diff -u pkgsrc/lang/ossp-js/buildlink3.mk:1.4 pkgsrc/lang/ossp-js/buildlink3.mk:1.5
--- pkgsrc/lang/ossp-js/buildlink3.mk:1.4       Fri Mar 20 19:24:51 2009
+++ pkgsrc/lang/ossp-js/buildlink3.mk   Sun Jan  7 13:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       ossp-js
 
@@ -7,7 +7,7 @@ OSSP_JS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ossp-js+=        ossp-js>=1.6.20070208nb1
 BUILDLINK_PKGSRCDIR.ossp-js?=  ../../lang/ossp-js
-.  include "../../lang/ossp-js/libm.mk"
+.include "../../lang/ossp-js/libm.mk"
 
 .include "../../mk/dlopen.buildlink3.mk"
 .endif # OSSP_JS_BUILDLINK3_MK

Index: pkgsrc/lang/ruby/buildlink3.mk
diff -u pkgsrc/lang/ruby/buildlink3.mk:1.18 pkgsrc/lang/ruby/buildlink3.mk:1.19
--- pkgsrc/lang/ruby/buildlink3.mk:1.18 Thu Mar 13 17:06:42 2014
+++ pkgsrc/lang/ruby/buildlink3.mk      Sun Jan  7 13:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2014/03/13 17:06:42 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       ${RUBY_BASE}
 
@@ -13,13 +13,13 @@ BUILDLINK_API_DEPENDS.${RUBY_BASE}+=        ${R
 BUILDLINK_ABI_DEPENDS.${RUBY_BASE}+=   ${RUBY_BASE}>=${RUBY_ABI_VERSION}
 BUILDLINK_PKGSRCDIR.${RUBY_BASE}?=     ${RUBY_SRCDIR}
 BUILDLINK_FILES.${RUBY_BASE}+=         lib/libruby${RUBY_SUFFIX}.*
-BUILDLINK_FILES.${RUBY_BASE}+= lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
+BUILDLINK_FILES.${RUBY_BASE}+=         lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
 
 BUILDLINK_TARGETS+=    buildlink-bin-ruby
 
 buildlink-bin-ruby:
        ${RUN} \
-       f=${BUILDLINK_PREFIX.${RUBY_BASE}:Q}"/bin/ruby${RUBY_SUFFIX}"; \
+       f=${BUILDLINK_PREFIX.${RUBY_BASE}}"/bin/ruby${RUBY_SUFFIX}"; \
        if ${TEST} -f $$f; then \
                ${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \
        fi

Index: pkgsrc/lang/sun-jdk6/buildlink3.mk
diff -u pkgsrc/lang/sun-jdk6/buildlink3.mk:1.6 pkgsrc/lang/sun-jdk6/buildlink3.mk:1.7
--- pkgsrc/lang/sun-jdk6/buildlink3.mk:1.6      Thu Feb 28 23:03:58 2013
+++ pkgsrc/lang/sun-jdk6/buildlink3.mk  Sun Jan  7 13:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/02/28 23:03:58 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       sun-jdk6
 
@@ -7,8 +7,8 @@ SUN_JDK6_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sun-jdk6+=       sun-jdk6-[0-9]*
 BUILDLINK_ABI_DEPENDS.sun-jdk6+=       sun-jdk6>=6.0.4
-BUILDLINK_PKGSRCDIR.sun-jdk6?= ../../lang/sun-jdk6
-BUILDLINK_DEPMETHOD.sun-jdk6?= build
+BUILDLINK_PKGSRCDIR.sun-jdk6?=         ../../lang/sun-jdk6
+BUILDLINK_DEPMETHOD.sun-jdk6?=         build
 
 BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_JAVA_PREFIX.sun-jre6}
 

Index: pkgsrc/lang/sun-jdk7/buildlink3.mk
diff -u pkgsrc/lang/sun-jdk7/buildlink3.mk:1.3 pkgsrc/lang/sun-jdk7/buildlink3.mk:1.4
--- pkgsrc/lang/sun-jdk7/buildlink3.mk:1.3      Wed Oct 16 16:48:55 2013
+++ pkgsrc/lang/sun-jdk7/buildlink3.mk  Sun Jan  7 13:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2013/10/16 16:48:55 richard Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       sun-jdk7
 
@@ -7,8 +7,8 @@ SUN_JDK7_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sun-jdk7+=       sun-jdk7-[0-9]*
 BUILDLINK_ABI_DEPENDS.sun-jdk7+=       sun-jdk7>=7.0.9
-BUILDLINK_PKGSRCDIR.sun-jdk7?= ../../lang/sun-jdk7
-BUILDLINK_DEPMETHOD.sun-jdk7?= build
+BUILDLINK_PKGSRCDIR.sun-jdk7?=         ../../lang/sun-jdk7
+BUILDLINK_DEPMETHOD.sun-jdk7?=         build
 
 BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_JAVA_PREFIX.sun-jre7}
 

Index: pkgsrc/lang/sun-jre6/buildlink3.mk
diff -u pkgsrc/lang/sun-jre6/buildlink3.mk:1.6 pkgsrc/lang/sun-jre6/buildlink3.mk:1.7
--- pkgsrc/lang/sun-jre6/buildlink3.mk:1.6      Mon May  7 01:53:43 2012
+++ pkgsrc/lang/sun-jre6/buildlink3.mk  Sun Jan  7 13:04:20 2018
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.6 2012/05/07 01:53:43 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       sun-jre6
 
 .if !defined(SUN_JRE6_BUILDLINK3_MK)
 SUN_JRE6_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.sun-jre6+=               sun-jre6-[0-9]*
-BUILDLINK_ABI_DEPENDS.sun-jre6+=               sun-jre6>=6.0.4
+BUILDLINK_API_DEPENDS.sun-jre6+=       sun-jre6-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jre6+=       sun-jre6>=6.0.4
 BUILDLINK_PKGSRCDIR.sun-jre6?=         ../../lang/sun-jre6
-BUILDLINK_JAVA_PREFIX.sun-jre6=        ${PREFIX}/java/sun-6
+BUILDLINK_JAVA_PREFIX.sun-jre6=                ${PREFIX}/java/sun-6
 
 UNLIMIT_RESOURCES+=    datasize        # Must be at least 131204
 .endif # SUN_JRE6_BUILDLINK3_MK

Index: pkgsrc/lang/sun-jre7/buildlink3.mk
diff -u pkgsrc/lang/sun-jre7/buildlink3.mk:1.2 pkgsrc/lang/sun-jre7/buildlink3.mk:1.3
--- pkgsrc/lang/sun-jre7/buildlink3.mk:1.2      Wed Oct 16 16:47:29 2013
+++ pkgsrc/lang/sun-jre7/buildlink3.mk  Sun Jan  7 13:04:20 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/10/16 16:47:29 richard Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       sun-jre7
 
 .if !defined(SUN_JRE7_BUILDLINK3_MK)
 SUN_JRE7_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.sun-jre7+=               sun-jre7-[0-9]*
-BUILDLINK_ABI_DEPENDS.sun-jre7+=               sun-jre7>=7.0.9
+BUILDLINK_API_DEPENDS.sun-jre7+=       sun-jre7-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jre7+=       sun-jre7>=7.0.9
 BUILDLINK_PKGSRCDIR.sun-jre7?=         ../../lang/sun-jre7
 
 CHECK_BUILTIN.sun-jre7:=       yes

Index: pkgsrc/lang/tcl-otcl/buildlink3.mk
diff -u pkgsrc/lang/tcl-otcl/buildlink3.mk:1.13 pkgsrc/lang/tcl-otcl/buildlink3.mk:1.14
--- pkgsrc/lang/tcl-otcl/buildlink3.mk:1.13     Sat Jan 11 14:42:01 2014
+++ pkgsrc/lang/tcl-otcl/buildlink3.mk  Sun Jan  7 13:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2014/01/11 14:42:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       tcl-otcl
 
@@ -7,7 +7,7 @@ TCL_OTCL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tcl-otcl+=       tcl-otcl>=1.8
 BUILDLINK_ABI_DEPENDS.tcl-otcl+=       tcl-otcl>=1.14nb4
-BUILDLINK_PKGSRCDIR.tcl-otcl?= ../../lang/tcl-otcl
+BUILDLINK_PKGSRCDIR.tcl-otcl?=         ../../lang/tcl-otcl
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"

Index: pkgsrc/lang/vala/buildlink3.mk
diff -u pkgsrc/lang/vala/buildlink3.mk:1.16 pkgsrc/lang/vala/buildlink3.mk:1.17
--- pkgsrc/lang/vala/buildlink3.mk:1.16 Tue Oct  3 12:31:54 2017
+++ pkgsrc/lang/vala/buildlink3.mk      Sun Jan  7 13:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2017/10/03 12:31:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       vala
 
@@ -8,8 +8,8 @@ VALA_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.vala+=   vala>=0.38
 BUILDLINK_PKGSRCDIR.vala?=     ../../lang/vala
 
-VALAC=${LOCALBASE}/bin/valac-0.38
-VAPIGEN=${LOCALBASE}/bin/vapigen-0.38
+VALAC=         ${LOCALBASE}/bin/valac-0.38
+VAPIGEN=       ${LOCALBASE}/bin/vapigen-0.38
 .if defined(GNU_CONFIGURE)
 CONFIGURE_ENV+=        VALAC=${VALAC} VAPIGEN=${VAPIGEN}
 .endif

Index: pkgsrc/mail/Pantomime/buildlink3.mk
diff -u pkgsrc/mail/Pantomime/buildlink3.mk:1.21 pkgsrc/mail/Pantomime/buildlink3.mk:1.22
--- pkgsrc/mail/Pantomime/buildlink3.mk:1.21    Thu Nov 30 16:45:04 2017
+++ pkgsrc/mail/Pantomime/buildlink3.mk Sun Jan  7 13:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2017/11/30 16:45:04 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:20 rillig Exp $
 
 BUILDLINK_TREE+=       Pantomime
 
@@ -7,12 +7,12 @@ PANTOMIME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.Pantomime+=      Pantomime>1.1.9
 BUILDLINK_ABI_DEPENDS.Pantomime+=      Pantomime>=1.2.0nb12
-BUILDLINK_PKGSRCDIR.Pantomime?=        ../../mail/Pantomime
+BUILDLINK_PKGSRCDIR.Pantomime?=                ../../mail/Pantomime
 
 .include "../../devel/gnustep-make/gnustep.mk"
 
 BUILDLINK_INCDIRS.Pantomime+=  lib/GNUstep/Frameworks/Pantomime.framework/Headers
-BUILDLINK_FILES.Pantomime+=    include/Pantomime/*.h
+BUILDLINK_FILES.Pantomime+=    include/Pantomime/*.h
 
 .include "../../devel/gnustep-base/buildlink3.mk"
 .endif # PANTOMIME_BUILDLINK3_MK

Index: pkgsrc/mail/claws-mail/buildlink3.mk
diff -u pkgsrc/mail/claws-mail/buildlink3.mk:1.12 pkgsrc/mail/claws-mail/buildlink3.mk:1.13
--- pkgsrc/mail/claws-mail/buildlink3.mk:1.12   Fri Apr  3 12:34:44 2015
+++ pkgsrc/mail/claws-mail/buildlink3.mk        Sun Jan  7 13:04:21 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.12 2015/04/03 12:34:44 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       claws-mail
 
 .if !defined(CLAWS_MAIL_BUILDLINK3_MK)
 CLAWS_MAIL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0
+BUILDLINK_API_DEPENDS.claws-mail+=     claws-mail>=3.7.0
 BUILDLINK_ABI_DEPENDS.claws-mail+=     claws-mail>=3.11.1
 BUILDLINK_PKGSRCDIR.claws-mail?=       ../../mail/claws-mail
 

Index: pkgsrc/mail/evolution/buildlink3.mk
diff -u pkgsrc/mail/evolution/buildlink3.mk:1.76 pkgsrc/mail/evolution/buildlink3.mk:1.77
--- pkgsrc/mail/evolution/buildlink3.mk:1.76    Thu Nov 30 16:45:05 2017
+++ pkgsrc/mail/evolution/buildlink3.mk Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.76 2017/11/30 16:45:05 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.77 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       evolution
 
@@ -7,7 +7,7 @@ EVOLUTION_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evolution+=      evolution>=2.8.0
 BUILDLINK_ABI_DEPENDS.evolution+=      evolution>=2.32.3nb47
-BUILDLINK_PKGSRCDIR.evolution?=        ../../mail/evolution
+BUILDLINK_PKGSRCDIR.evolution?=                ../../mail/evolution
 
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"

Index: pkgsrc/mail/imap-uw/buildlink3.mk
diff -u pkgsrc/mail/imap-uw/buildlink3.mk:1.21 pkgsrc/mail/imap-uw/buildlink3.mk:1.22
--- pkgsrc/mail/imap-uw/buildlink3.mk:1.21      Sat Mar  5 11:27:50 2016
+++ pkgsrc/mail/imap-uw/buildlink3.mk   Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2016/03/05 11:27:50 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       imap-uw
 
@@ -10,9 +10,9 @@ IMAP_UW_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.imap-uw+=        imap-uw>=2007dnb1
 BUILDLINK_ABI_DEPENDS.imap-uw+=        imap-uw>=2007fnb3
 BUILDLINK_PKGSRCDIR.imap-uw?=  ../../mail/imap-uw
-. if ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin"
 BUILDLINK_LDFLAGS.imap-uw+=    -flat_namespace
-. endif
+.endif
 
 .include "../../security/openssl/buildlink3.mk"
 .endif # IMAP_UW_BUILDLINK3_MK

Index: pkgsrc/mail/libesmtp/buildlink3.mk
diff -u pkgsrc/mail/libesmtp/buildlink3.mk:1.18 pkgsrc/mail/libesmtp/buildlink3.mk:1.19
--- pkgsrc/mail/libesmtp/buildlink3.mk:1.18     Sat Mar  5 11:27:50 2016
+++ pkgsrc/mail/libesmtp/buildlink3.mk  Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2016/03/05 11:27:50 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       libesmtp
 
@@ -7,7 +7,7 @@ LIBESMTP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libesmtp+=       libesmtp>=1.0rc1nb1
 BUILDLINK_ABI_DEPENDS.libesmtp+=       libesmtp>=1.0.6nb3
-BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp
+BUILDLINK_PKGSRCDIR.libesmtp?=         ../../mail/libesmtp
 
 LIBESMTP=      -lesmtp
 

Index: pkgsrc/mail/libetpan/buildlink3.mk
diff -u pkgsrc/mail/libetpan/buildlink3.mk:1.35 pkgsrc/mail/libetpan/buildlink3.mk:1.36
--- pkgsrc/mail/libetpan/buildlink3.mk:1.35     Mon Jan  1 21:18:09 2018
+++ pkgsrc/mail/libetpan/buildlink3.mk  Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2018/01/01 21:18:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       libetpan
 
@@ -7,7 +7,7 @@ LIBETPAN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libetpan+=       libetpan>=1.0
 BUILDLINK_ABI_DEPENDS.libetpan+=       libetpan>=1.8nb2
-BUILDLINK_PKGSRCDIR.libetpan?= ../../mail/libetpan
+BUILDLINK_PKGSRCDIR.libetpan?=         ../../mail/libetpan
 
 BDB_ACCEPTED?= db4 db5 db6
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/mail/libmilter/buildlink3.mk
diff -u pkgsrc/mail/libmilter/buildlink3.mk:1.8 pkgsrc/mail/libmilter/buildlink3.mk:1.9
--- pkgsrc/mail/libmilter/buildlink3.mk:1.8     Fri Mar 20 19:24:55 2009
+++ pkgsrc/mail/libmilter/buildlink3.mk Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       libmilter
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=        libmilter
 LIBMILTER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmilter+=      libmilter>=8.14
-BUILDLINK_PKGSRCDIR.libmilter?=        ../../mail/libmilter
-BUILDLINK_DEPMETHOD.libmilter?=        build
+BUILDLINK_PKGSRCDIR.libmilter?=                ../../mail/libmilter
+BUILDLINK_DEPMETHOD.libmilter?=                build
 
 PTHREAD_OPTS+=         require
 

Index: pkgsrc/mail/libsieve/buildlink3.mk
diff -u pkgsrc/mail/libsieve/buildlink3.mk:1.2 pkgsrc/mail/libsieve/buildlink3.mk:1.3
--- pkgsrc/mail/libsieve/buildlink3.mk:1.2      Fri Mar 20 19:24:55 2009
+++ pkgsrc/mail/libsieve/buildlink3.mk  Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       libsieve
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libsieve
 LIBSIEVE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsieve+=       libsieve>=2.2.5
-BUILDLINK_PKGSRCDIR.libsieve?= ../../mail/libsieve
+BUILDLINK_PKGSRCDIR.libsieve?=         ../../mail/libsieve
 .endif # LIBSIEVE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libsieve

Index: pkgsrc/mail/libsylph/buildlink3.mk
diff -u pkgsrc/mail/libsylph/buildlink3.mk:1.12 pkgsrc/mail/libsylph/buildlink3.mk:1.13
--- pkgsrc/mail/libsylph/buildlink3.mk:1.12     Sat Mar  5 11:27:50 2016
+++ pkgsrc/mail/libsylph/buildlink3.mk  Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2016/03/05 11:27:50 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       libsylph
 
@@ -7,7 +7,7 @@ LIBSYLPH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsylph+=       libsylph>=0.3.0
 BUILDLINK_ABI_DEPENDS.libsylph+=       libsylph>=1.1.0nb4
-BUILDLINK_PKGSRCDIR.libsylph?= ../../mail/libsylph
+BUILDLINK_PKGSRCDIR.libsylph?=         ../../mail/libsylph
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/mail/libytnef/buildlink3.mk
diff -u pkgsrc/mail/libytnef/buildlink3.mk:1.3 pkgsrc/mail/libytnef/buildlink3.mk:1.4
--- pkgsrc/mail/libytnef/buildlink3.mk:1.3      Thu Aug 17 09:49:47 2017
+++ pkgsrc/mail/libytnef/buildlink3.mk  Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/08/17 09:49:47 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       libytnef
 
@@ -7,7 +7,7 @@ LIBYTNEF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libytnef+=       libytnef>=1.5
 BUILDLINK_ABI_DEPENDS.libytnef?=       libytnef>=1.9.2
-BUILDLINK_PKGSRCDIR.libytnef?= ../../mail/libytnef
+BUILDLINK_PKGSRCDIR.libytnef?=         ../../mail/libytnef
 .endif # LIBYTNEF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libytnef

Index: pkgsrc/mail/opendmarc/buildlink3.mk
diff -u pkgsrc/mail/opendmarc/buildlink3.mk:1.2 pkgsrc/mail/opendmarc/buildlink3.mk:1.3
--- pkgsrc/mail/opendmarc/buildlink3.mk:1.2     Sat Mar  5 11:27:50 2016
+++ pkgsrc/mail/opendmarc/buildlink3.mk Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/03/05 11:27:50 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       opendmarc
 
@@ -7,7 +7,7 @@ OPENDMARC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.opendmarc+=      opendmarc>=1.1.3nb2
 BUILDLINK_ABI_DEPENDS.opendmarc?=      opendmarc>=1.3.1nb2
-BUILDLINK_PKGSRCDIR.opendmarc?=        ../../mail/opendmarc
+BUILDLINK_PKGSRCDIR.opendmarc?=                ../../mail/opendmarc
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mail/libmilter/buildlink3.mk"

Index: pkgsrc/mail/perdition/buildlink3.mk
diff -u pkgsrc/mail/perdition/buildlink3.mk:1.9 pkgsrc/mail/perdition/buildlink3.mk:1.10
--- pkgsrc/mail/perdition/buildlink3.mk:1.9     Fri Apr 22 13:42:44 2011
+++ pkgsrc/mail/perdition/buildlink3.mk Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2011/04/22 13:42:44 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       perdition
 
@@ -7,7 +7,7 @@ PERDITION_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.perdition+=      perdition>=1.17
 BUILDLINK_ABI_DEPENDS.perdition+=      perdition>=1.18nb1
-BUILDLINK_PKGSRCDIR.perdition?=        ../../mail/perdition
+BUILDLINK_PKGSRCDIR.perdition?=                ../../mail/perdition
 
 # The following are included in Makefile.common for "configure"'s sake.
 #.include "../../devel/popt/buildlink3.mk"

Index: pkgsrc/math/R/buildlink3.mk
diff -u pkgsrc/math/R/buildlink3.mk:1.11 pkgsrc/math/R/buildlink3.mk:1.12
--- pkgsrc/math/R/buildlink3.mk:1.11    Fri Apr 21 13:14:04 2017
+++ pkgsrc/math/R/buildlink3.mk Sun Jan  7 13:04:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2017/04/21 13:14:04 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:21 rillig Exp $
 
 BUILDLINK_TREE+=       R
 
@@ -7,7 +7,7 @@ R_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.R+=      R>=1.7.0
 BUILDLINK_ABI_DEPENDS.R+=      R>=2.2.1nb2
-BUILDLINK_PKGSRCDIR.R?=        ../../math/R
+BUILDLINK_PKGSRCDIR.R?=                ../../math/R
 .endif # R_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"

Index: pkgsrc/math/analitza/buildlink3.mk
diff -u pkgsrc/math/analitza/buildlink3.mk:1.28 pkgsrc/math/analitza/buildlink3.mk:1.29
--- pkgsrc/math/analitza/buildlink3.mk:1.28     Mon Jan  1 21:18:09 2018
+++ pkgsrc/math/analitza/buildlink3.mk  Sun Jan  7 13:04:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2018/01/01 21:18:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       analitza
 
@@ -7,7 +7,7 @@ ANALITZA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.analitza+=       analitza>=4.8.0
 BUILDLINK_ABI_DEPENDS.analitza?=       analitza>=4.14.3nb11
-BUILDLINK_PKGSRCDIR.analitza?= ../../math/analitza
+BUILDLINK_PKGSRCDIR.analitza?=         ../../math/analitza
 
 .include "../../x11/kdelibs4/buildlink3.mk"
 .endif # ANALITZA_BUILDLINK3_MK

Index: pkgsrc/math/classias/buildlink3.mk
diff -u pkgsrc/math/classias/buildlink3.mk:1.1 pkgsrc/math/classias/buildlink3.mk:1.2
--- pkgsrc/math/classias/buildlink3.mk:1.1      Fri Jul 22 02:45:44 2016
+++ pkgsrc/math/classias/buildlink3.mk  Sun Jan  7 13:04:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/07/22 02:45:44 cheusov Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       classias
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        classias
 CLASSIAS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.classias+=       classias>=1.1.0
-BUILDLINK_PKGSRCDIR.classias?= ../../math/classias
+BUILDLINK_PKGSRCDIR.classias?=         ../../math/classias
 .endif # CLASSIAS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -classias

Index: pkgsrc/math/cln/buildlink3.mk
diff -u pkgsrc/math/cln/buildlink3.mk:1.11 pkgsrc/math/cln/buildlink3.mk:1.12
--- pkgsrc/math/cln/buildlink3.mk:1.11  Sun Nov 20 05:40:27 2011
+++ pkgsrc/math/cln/buildlink3.mk       Sun Jan  7 13:04:22 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.11 2011/11/20 05:40:27 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       cln
 
 .if !defined(CLN_BUILDLINK3_MK)
 CLN_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.cln+=            cln>=1.1.6
+BUILDLINK_API_DEPENDS.cln+=    cln>=1.1.6
 BUILDLINK_ABI_DEPENDS.cln+=    cln>=1.3.2nb1
 BUILDLINK_PKGSRCDIR.cln?=      ../../math/cln
 

Index: pkgsrc/math/crfsuite/buildlink3.mk
diff -u pkgsrc/math/crfsuite/buildlink3.mk:1.1.1.1 pkgsrc/math/crfsuite/buildlink3.mk:1.2
--- pkgsrc/math/crfsuite/buildlink3.mk:1.1.1.1  Wed Oct 29 23:13:21 2014
+++ pkgsrc/math/crfsuite/buildlink3.mk  Sun Jan  7 13:04:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2014/10/29 23:13:21 cheusov Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       crfsuite
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        crfsuite
 CRFSUITE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.crfsuite+=       crfsuite>=0.12
-BUILDLINK_PKGSRCDIR.crfsuite?= ../../math/crfsuite
+BUILDLINK_PKGSRCDIR.crfsuite?=         ../../math/crfsuite
 .endif # CRFSUITE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -crfsuite

Index: pkgsrc/math/go-stats/buildlink3.mk
diff -u pkgsrc/math/go-stats/buildlink3.mk:1.2 pkgsrc/math/go-stats/buildlink3.mk:1.3
--- pkgsrc/math/go-stats/buildlink3.mk:1.2      Fri Aug 25 16:49:14 2017
+++ pkgsrc/math/go-stats/buildlink3.mk  Sun Jan  7 13:04:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       go-stats
 
@@ -8,7 +8,7 @@ GO_STATS_BUILDLINK3_MK:=
 BUILDLINK_CONTENTS_FILTER.go-stats=    ${EGREP} gopkg/
 BUILDLINK_DEPMETHOD.go-stats?=         build
 
-BUILDLINK_API_DEPENDS.go-stats+=               go-stats>=0.0
+BUILDLINK_API_DEPENDS.go-stats+=       go-stats>=0.0
 BUILDLINK_PKGSRCDIR.go-stats?=         ../../math/go-stats
 
 .endif  # GO_STATS_BUILDLINK3_MK

Index: pkgsrc/math/gsl/buildlink3.mk
diff -u pkgsrc/math/gsl/buildlink3.mk:1.8 pkgsrc/math/gsl/buildlink3.mk:1.9
--- pkgsrc/math/gsl/buildlink3.mk:1.8   Fri Mar 20 19:24:57 2009
+++ pkgsrc/math/gsl/buildlink3.mk       Sun Jan  7 13:04:22 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       gsl
 
 .if !defined(GSL_BUILDLINK3_MK)
 GSL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gsl+=            gsl>=1.4
+BUILDLINK_API_DEPENDS.gsl+=    gsl>=1.4
 BUILDLINK_ABI_DEPENDS.gsl+=    gsl>=1.5nb1
 BUILDLINK_PKGSRCDIR.gsl?=      ../../math/gsl
 .endif # GSL_BUILDLINK3_MK

Index: pkgsrc/math/libixion/buildlink3.mk
diff -u pkgsrc/math/libixion/buildlink3.mk:1.1 pkgsrc/math/libixion/buildlink3.mk:1.2
--- pkgsrc/math/libixion/buildlink3.mk:1.1      Tue Sep 20 10:43:02 2016
+++ pkgsrc/math/libixion/buildlink3.mk  Sun Jan  7 13:04:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/09/20 10:43:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       libixion
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libixion
 LIBIXION_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libixion+=       libixion>=0.12.1
-BUILDLINK_PKGSRCDIR.libixion?= ../../math/libixion
+BUILDLINK_PKGSRCDIR.libixion?=         ../../math/libixion
 
 .include "../../devel/mdds1.2/buildlink3.mk"
 .endif # LIBIXION_BUILDLINK3_MK

Index: pkgsrc/math/liblbfgs/buildlink3.mk
diff -u pkgsrc/math/liblbfgs/buildlink3.mk:1.1.1.1 pkgsrc/math/liblbfgs/buildlink3.mk:1.2
--- pkgsrc/math/liblbfgs/buildlink3.mk:1.1.1.1  Wed Oct 29 23:10:29 2014
+++ pkgsrc/math/liblbfgs/buildlink3.mk  Sun Jan  7 13:04:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2014/10/29 23:10:29 cheusov Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       liblbfgs
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        liblbfgs
 LIBLBFGS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.liblbfgs+=       liblbfgs>=1.10
-BUILDLINK_PKGSRCDIR.liblbfgs?= ../../math/liblbfgs
+BUILDLINK_PKGSRCDIR.liblbfgs?=         ../../math/liblbfgs
 .endif # LIBLBFGS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -liblbfgs

Index: pkgsrc/math/lp_solve/buildlink3.mk
diff -u pkgsrc/math/lp_solve/buildlink3.mk:1.1 pkgsrc/math/lp_solve/buildlink3.mk:1.2
--- pkgsrc/math/lp_solve/buildlink3.mk:1.1      Sun May  8 11:52:40 2011
+++ pkgsrc/math/lp_solve/buildlink3.mk  Sun Jan  7 13:04:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2011/05/08 11:52:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       lp_solve
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        lp_solve
 LP_SOLVE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.lp_solve+=       lp_solve>=5.5.2.0
-BUILDLINK_PKGSRCDIR.lp_solve?= ../../math/lp_solve
+BUILDLINK_PKGSRCDIR.lp_solve?=         ../../math/lp_solve
 .endif # LP_SOLVE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -lp_solve

Index: pkgsrc/math/mpcomplex/buildlink3.mk
diff -u pkgsrc/math/mpcomplex/buildlink3.mk:1.3 pkgsrc/math/mpcomplex/buildlink3.mk:1.4
--- pkgsrc/math/mpcomplex/buildlink3.mk:1.3     Sun Feb 23 15:32:10 2014
+++ pkgsrc/math/mpcomplex/buildlink3.mk Sun Jan  7 13:04:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/02/23 15:32:10 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       mpcomplex
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        mpcomplex
 MPCOMPLEX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mpcomplex+=      mpcomplex>=0.8.2
-BUILDLINK_PKGSRCDIR.mpcomplex?=        ../../math/mpcomplex
+BUILDLINK_PKGSRCDIR.mpcomplex?=                ../../math/mpcomplex
 
 BUILDLINK_API_DEPENDS.gmp+=    gmp>=4.3.2
 .include "../../devel/gmp/buildlink3.mk"

Index: pkgsrc/math/muparser/buildlink3.mk
diff -u pkgsrc/math/muparser/buildlink3.mk:1.2 pkgsrc/math/muparser/buildlink3.mk:1.3
--- pkgsrc/math/muparser/buildlink3.mk:1.2      Wed Aug 15 17:38:49 2012
+++ pkgsrc/math/muparser/buildlink3.mk  Sun Jan  7 13:04:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/08/15 17:38:49 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:22 rillig Exp $
 
 BUILDLINK_TREE+=       muparser
 
@@ -7,7 +7,7 @@ MUPARSER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.muparser+=       muparser>=130
 BUILDLINK_ABI_DEPENDS.muparser+=       muparser>=200
-BUILDLINK_PKGSRCDIR.muparser?= ../../math/muparser
+BUILDLINK_PKGSRCDIR.muparser?=         ../../math/muparser
 .endif # MUPARSER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -muparser

Index: pkgsrc/math/nlopt/buildlink3.mk
diff -u pkgsrc/math/nlopt/buildlink3.mk:1.1 pkgsrc/math/nlopt/buildlink3.mk:1.2
--- pkgsrc/math/nlopt/buildlink3.mk:1.1 Sat Nov 28 07:33:38 2015
+++ pkgsrc/math/nlopt/buildlink3.mk     Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/11/28 07:33:38 wen Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       nlopt
 
@@ -7,7 +7,7 @@ NLOPT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.nlopt+=  nlopt>=2.4.2
 BUILDLINK_ABI_DEPENDS.nlopt+=  nlopt>=2.4.2
-BUILDLINK_PKGSRCDIR.nlopt?=            ../../math/nlopt
+BUILDLINK_PKGSRCDIR.nlopt?=    ../../math/nlopt
 .endif # NLOPT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -nlopt

Index: pkgsrc/math/py-Numeric/buildlink3.mk
diff -u pkgsrc/math/py-Numeric/buildlink3.mk:1.15 pkgsrc/math/py-Numeric/buildlink3.mk:1.16
--- pkgsrc/math/py-Numeric/buildlink3.mk:1.15   Fri Mar 20 19:24:58 2009
+++ pkgsrc/math/py-Numeric/buildlink3.mk        Sun Jan  7 13:04:23 2018
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       pynumeric
 
 .if !defined(PY_NUMERIC_BUILDLINK3_MK)
 PY_NUMERIC_BUILDLINK3_MK:=
 
-.  include "../../lang/python/pyversion.mk"
+.include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pynumeric+=      ${PYPKGPREFIX}-Numeric-[0-9]*
 BUILDLINK_ABI_DEPENDS.pynumeric+=      ${PYPKGPREFIX}-Numeric>=23.7nb1
-BUILDLINK_PKGSRCDIR.pynumeric?=        ../../math/py-Numeric
+BUILDLINK_PKGSRCDIR.pynumeric?=                ../../math/py-Numeric
 .endif # PY_NUMERIC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -pynumeric

Index: pkgsrc/math/qalculate/buildlink3.mk
diff -u pkgsrc/math/qalculate/buildlink3.mk:1.17 pkgsrc/math/qalculate/buildlink3.mk:1.18
--- pkgsrc/math/qalculate/buildlink3.mk:1.17    Sat Sep 15 10:05:32 2012
+++ pkgsrc/math/qalculate/buildlink3.mk Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2012/09/15 10:05:32 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       qalculate
 
@@ -7,7 +7,7 @@ QALCULATE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qalculate+=      qalculate>=0.8.2
 BUILDLINK_ABI_DEPENDS.qalculate+=      qalculate>=0.9.7nb6
-BUILDLINK_PKGSRCDIR.qalculate?=        ../../math/qalculate
+BUILDLINK_PKGSRCDIR.qalculate?=                ../../math/qalculate
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../math/cln/buildlink3.mk"

Index: pkgsrc/math/scilab/buildlink3.mk
diff -u pkgsrc/math/scilab/buildlink3.mk:1.14 pkgsrc/math/scilab/buildlink3.mk:1.15
--- pkgsrc/math/scilab/buildlink3.mk:1.14       Mon May  7 01:53:46 2012
+++ pkgsrc/math/scilab/buildlink3.mk    Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2012/05/07 01:53:46 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:23 rillig Exp $
 #
 
 BUILDLINK_TREE+=       scilab
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.scilab?=  ../../math/
 
 BUILDLINK_FILES.scilab+=       lib/scilab-${SCIVERSION}/Version.incl
 
-SCI=   ${BUILDLINK_DIR}/lib/scilab-4.1
+SCI=           ${BUILDLINK_DIR}/lib/scilab-4.1
 CONFIGURE_ENV+=        SCI=${SCI:Q}
 MAKE_ENV+=     SCI=${SCI:Q}
 

Index: pkgsrc/misc/Addresses/buildlink3.mk
diff -u pkgsrc/misc/Addresses/buildlink3.mk:1.24 pkgsrc/misc/Addresses/buildlink3.mk:1.25
--- pkgsrc/misc/Addresses/buildlink3.mk:1.24    Thu Nov 30 16:45:05 2017
+++ pkgsrc/misc/Addresses/buildlink3.mk Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2017/11/30 16:45:05 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       Addresses
 
@@ -7,15 +7,15 @@ ADDRESSES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.Addresses+=      Addresses>=0.4.8
 BUILDLINK_ABI_DEPENDS.Addresses+=      Addresses>=0.4.8nb12
-BUILDLINK_PKGSRCDIR.Addresses?=        ../../misc/Addresses
+BUILDLINK_PKGSRCDIR.Addresses?=                ../../misc/Addresses
 
 .include "../../devel/gnustep-make/gnustep.mk"
 
 BUILDLINK_INCDIRS.Addresses+=  lib/GNUstep/Frameworks/Addresses.framework/Headers
 BUILDLINK_INCDIRS.Addresses+=  lib/GNUstep/Frameworks/AddresView.framework/Headers
-BUILDLINK_FILES.Addresses+=    include/AddressBook/*.h
-BUILDLINK_FILES.Addresses+=    include/Addresses/*.h
-BUILDLINK_FILES.Addresses+=    include/AddressView/*.h
+BUILDLINK_FILES.Addresses+=    include/AddressBook/*.h
+BUILDLINK_FILES.Addresses+=    include/Addresses/*.h
+BUILDLINK_FILES.Addresses+=    include/AddressView/*.h
 
 .include "../../x11/gnustep-back/buildlink3.mk"
 .endif # ADDRESSES_BUILDLINK3_MK

Index: pkgsrc/misc/bbdb/buildlink3.mk
diff -u pkgsrc/misc/bbdb/buildlink3.mk:1.3 pkgsrc/misc/bbdb/buildlink3.mk:1.4
--- pkgsrc/misc/bbdb/buildlink3.mk:1.3  Fri Mar 20 19:25:00 2009
+++ pkgsrc/misc/bbdb/buildlink3.mk      Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:00 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:23 rillig Exp $
 #
 
 .include "../../editors/emacs/modules.mk"
@@ -6,7 +6,7 @@
 
 BUILDLINK_TREE+=       bbdb
 
-.if !defined(BBDB_BUILDLINK3_MK)
+.  if !defined(BBDB_BUILDLINK3_MK)
 BBDB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.bbdb+=   ${EMACS_PKGNAME_PREFIX}bbdb>=2
@@ -14,12 +14,12 @@ BUILDLINK_PKGSRCDIR.bbdb?=  ../../misc/bb
 
 BUILDLINK_CONTENTS_FILTER.bbdb=        ${EGREP} '.*\.el$$|.*\.elc$$'
 
-.else
+.  else
 
 # XEmacs has bbdb in xemacs-packages
 EMACS_MODULES+=                base
 
-.endif
+.  endif
 .endif # BBDB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -bbdb

Index: pkgsrc/misc/go-genproto/buildlink3.mk
diff -u pkgsrc/misc/go-genproto/buildlink3.mk:1.1 pkgsrc/misc/go-genproto/buildlink3.mk:1.2
--- pkgsrc/misc/go-genproto/buildlink3.mk:1.1   Tue Sep 13 20:42:12 2016
+++ pkgsrc/misc/go-genproto/buildlink3.mk       Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/09/13 20:42:12 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       go-genproto
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-genproto
 GO_GENPROTO_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-genproto= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-genproto?=              build
+BUILDLINK_DEPMETHOD.go-genproto?=      build
 
 BUILDLINK_API_DEPENDS.go-genproto+=    go-genproto>=20160816
 BUILDLINK_PKGSRCDIR.go-genproto?=      ../../misc/go-genproto

Index: pkgsrc/misc/libkdeedu/buildlink3.mk
diff -u pkgsrc/misc/libkdeedu/buildlink3.mk:1.28 pkgsrc/misc/libkdeedu/buildlink3.mk:1.29
--- pkgsrc/misc/libkdeedu/buildlink3.mk:1.28    Mon Jan  1 21:18:09 2018
+++ pkgsrc/misc/libkdeedu/buildlink3.mk Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2018/01/01 21:18:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       libkdeedu
 
@@ -7,7 +7,7 @@ LIBKDEEDU_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libkdeedu+=      libkdeedu>=4.8.0
 BUILDLINK_ABI_DEPENDS.libkdeedu?=      libkdeedu>=4.14.3nb9
-BUILDLINK_PKGSRCDIR.libkdeedu?=        ../../misc/libkdeedu
+BUILDLINK_PKGSRCDIR.libkdeedu?=                ../../misc/libkdeedu
 
 .include "../../x11/kdelibs4/buildlink3.mk"
 .endif # LIBKDEEDU_BUILDLINK3_MK

Index: pkgsrc/multimedia/bsdav/buildlink3.mk
diff -u pkgsrc/multimedia/bsdav/buildlink3.mk:1.2 pkgsrc/multimedia/bsdav/buildlink3.mk:1.3
--- pkgsrc/multimedia/bsdav/buildlink3.mk:1.2   Fri Mar 20 19:25:02 2009
+++ pkgsrc/multimedia/bsdav/buildlink3.mk       Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       bsdav
 
@@ -8,11 +8,11 @@ BSDAV_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.bsdav+=  bsdav>=1.4
 BUILDLINK_PKGSRCDIR.bsdav?=    ../../multimedia/bsdav
 BUILDLINK_LDADD.bsdav=         -lbsdav
-BUILDLINK_FILES.bsdav=                 include/bsdav.h
-LIBBSDAV?= ${BUILDLINK_LDADD.bsdav}
+BUILDLINK_FILES.bsdav=         include/bsdav.h
+LIBBSDAV?=                     ${BUILDLINK_LDADD.bsdav}
 
 pkgbase := bsdav
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.bsdav:Mx11)
 .  include "../../x11/libXv/buildlink3.mk"

Index: pkgsrc/multimedia/farsight2/buildlink3.mk
diff -u pkgsrc/multimedia/farsight2/buildlink3.mk:1.25 pkgsrc/multimedia/farsight2/buildlink3.mk:1.26
--- pkgsrc/multimedia/farsight2/buildlink3.mk:1.25      Sat Feb 16 11:19:22 2013
+++ pkgsrc/multimedia/farsight2/buildlink3.mk   Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2013/02/16 11:19:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       farsight2
 
@@ -7,7 +7,7 @@ FARSIGHT2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.farsight2+=      farsight2>=0.0.14
 BUILDLINK_ABI_DEPENDS.farsight2+=      farsight2>=0.0.26nb15
-BUILDLINK_PKGSRCDIR.farsight2?=        ../../multimedia/farsight2
+BUILDLINK_PKGSRCDIR.farsight2?=                ../../multimedia/farsight2
 
 # unsure which are needed exactly
 #.include "../../devel/py-gobject/buildlink3.mk"

Index: pkgsrc/multimedia/ffmpeg010/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg010/buildlink3.mk:1.11 pkgsrc/multimedia/ffmpeg010/buildlink3.mk:1.12
--- pkgsrc/multimedia/ffmpeg010/buildlink3.mk:1.11      Mon Jan 16 23:45:10 2017
+++ pkgsrc/multimedia/ffmpeg010/buildlink3.mk   Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2017/01/16 23:45:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       ffmpeg010
 
@@ -7,14 +7,14 @@ FFMPEG010_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ffmpeg010+=      ffmpeg010>=20120609.0.10.4
 BUILDLINK_ABI_DEPENDS.ffmpeg010?=      ffmpeg010>=20150312.0.10.16nb5
-BUILDLINK_PKGSRCDIR.ffmpeg010?=        ../../multimedia/ffmpeg010
+BUILDLINK_PKGSRCDIR.ffmpeg010?=                ../../multimedia/ffmpeg010
 
 BUILDLINK_INCDIRS.ffmpeg010+=          include/ffmpeg010
 BUILDLINK_LIBDIRS.ffmpeg010+=          lib/ffmpeg010
-BUILDLINK_FNAME_TRANSFORM.ffmpeg010+=   -e 's|lib/ffmpeg010/pkgconfig/|lib/pkgconfig/|'
+BUILDLINK_FNAME_TRANSFORM.ffmpeg010+=  -e 's|lib/ffmpeg010/pkgconfig/|lib/pkgconfig/|'
 
 pkgbase := ffmpeg010
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .include "../../mk/bsd.fast.prefs.mk"
 

Index: pkgsrc/multimedia/ffmpeg1/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg1/buildlink3.mk:1.5 pkgsrc/multimedia/ffmpeg1/buildlink3.mk:1.6
--- pkgsrc/multimedia/ffmpeg1/buildlink3.mk:1.5 Mon Jan 16 23:45:10 2017
+++ pkgsrc/multimedia/ffmpeg1/buildlink3.mk     Sun Jan  7 13:04:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/01/16 23:45:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:23 rillig Exp $
 
 BUILDLINK_TREE+=       ffmpeg1
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ffmpeg1?=       ffmpeg1>
 BUILDLINK_PKGSRCDIR.ffmpeg1?=  ../../multimedia/ffmpeg1
 
 pkgbase := ffmpeg1
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .include "../../mk/bsd.fast.prefs.mk"
 

Index: pkgsrc/multimedia/ffmpegthumbnailer/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpegthumbnailer/buildlink3.mk:1.4 pkgsrc/multimedia/ffmpegthumbnailer/buildlink3.mk:1.5
--- pkgsrc/multimedia/ffmpegthumbnailer/buildlink3.mk:1.4       Mon Aug 11 23:09:45 2014
+++ pkgsrc/multimedia/ffmpegthumbnailer/buildlink3.mk   Sun Jan  7 13:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/08/11 23:09:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       ffmpegthumbnailer
 
@@ -7,7 +7,7 @@ FFMPEGTHUMBNAILER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ffmpegthumbnailer+=      ffmpegthumbnailer>=2.0.6nb1
 BUILDLINK_ABI_DEPENDS.ffmpegthumbnailer?=      ffmpegthumbnailer>=2.0.8nb1
-BUILDLINK_PKGSRCDIR.ffmpegthumbnailer?=        ../../multimedia/ffmpegthumbnailer
+BUILDLINK_PKGSRCDIR.ffmpegthumbnailer?=                ../../multimedia/ffmpegthumbnailer
 
 #.include "../../graphics/png/buildlink3.mk"
 #.include "../../multimedia/ffmpeg1/buildlink3.mk"

Index: pkgsrc/multimedia/gnome-media/buildlink3.mk
diff -u pkgsrc/multimedia/gnome-media/buildlink3.mk:1.33 pkgsrc/multimedia/gnome-media/buildlink3.mk:1.34
--- pkgsrc/multimedia/gnome-media/buildlink3.mk:1.33    Sun Feb 12 06:24:47 2017
+++ pkgsrc/multimedia/gnome-media/buildlink3.mk Sun Jan  7 13:04:24 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.33 2017/02/12 06:24:47 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       gnome-media
 
 .if !defined(GNOME_MEDIA_BUILDLINK3_MK)
 GNOME_MEDIA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnome-media+=            gnome-media>=2.12.0nb1
+BUILDLINK_API_DEPENDS.gnome-media+=    gnome-media>=2.12.0nb1
 BUILDLINK_ABI_DEPENDS.gnome-media+=    gnome-media>=2.28.5nb41
 BUILDLINK_PKGSRCDIR.gnome-media?=      ../../multimedia/gnome-media
 

Index: pkgsrc/multimedia/gst-plugins0.10-bad/buildlink3.mk
diff -u pkgsrc/multimedia/gst-plugins0.10-bad/buildlink3.mk:1.11 pkgsrc/multimedia/gst-plugins0.10-bad/buildlink3.mk:1.12
--- pkgsrc/multimedia/gst-plugins0.10-bad/buildlink3.mk:1.11    Sat Sep 15 10:05:47 2012
+++ pkgsrc/multimedia/gst-plugins0.10-bad/buildlink3.mk Sun Jan  7 13:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/09/15 10:05:47 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       gst-plugins0.10-bad
 
@@ -7,7 +7,7 @@ GST_PLUGINS0.10_BAD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gst-plugins0.10-bad+=    gst-plugins0.10-bad>=0.10.3
 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-bad+=    gst-plugins0.10-bad>=0.10.23nb3
-BUILDLINK_PKGSRCDIR.gst-plugins0.10-bad?= ../../multimedia/gst-plugins0.10-bad
+BUILDLINK_PKGSRCDIR.gst-plugins0.10-bad?=      ../../multimedia/gst-plugins0.10-bad
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"

Index: pkgsrc/multimedia/gst-plugins1-bad/buildlink3.mk
diff -u pkgsrc/multimedia/gst-plugins1-bad/buildlink3.mk:1.1 pkgsrc/multimedia/gst-plugins1-bad/buildlink3.mk:1.2
--- pkgsrc/multimedia/gst-plugins1-bad/buildlink3.mk:1.1        Thu Nov 29 08:26:09 2012
+++ pkgsrc/multimedia/gst-plugins1-bad/buildlink3.mk    Sun Jan  7 13:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/11/29 08:26:09 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       gst-plugins1-bad
 
@@ -7,7 +7,7 @@ GST_PLUGINS1_BAD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gst-plugins1-bad+=       gst-plugins1-bad>=1.0.3
 BUILDLINK_ABI_DEPENDS.gst-plugins1-bad+=       gst-plugins1-bad>=1.0.3
-BUILDLINK_PKGSRCDIR.gst-plugins1-bad?= ../../multimedia/gst-plugins1-bad
+BUILDLINK_PKGSRCDIR.gst-plugins1-bad?=         ../../multimedia/gst-plugins1-bad
 
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"

Index: pkgsrc/multimedia/gst-plugins1-good/buildlink3.mk
diff -u pkgsrc/multimedia/gst-plugins1-good/buildlink3.mk:1.1 pkgsrc/multimedia/gst-plugins1-good/buildlink3.mk:1.2
--- pkgsrc/multimedia/gst-plugins1-good/buildlink3.mk:1.1       Thu Nov 29 08:24:42 2012
+++ pkgsrc/multimedia/gst-plugins1-good/buildlink3.mk   Sun Jan  7 13:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/11/29 08:24:42 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       gst-plugins1-good
 
@@ -7,7 +7,7 @@ GST_PLUGINS1_GOOD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gst-plugins1-good+=      gst-plugins1-good>=1.0.3
 BUILDLINK_ABI_DEPENDS.gst-plugins1-good+=      gst-plugins1-good>=1.0.3
-BUILDLINK_PKGSRCDIR.gst-plugins1-good?=        ../../multimedia/gst-plugins1-good
+BUILDLINK_PKGSRCDIR.gst-plugins1-good?=                ../../multimedia/gst-plugins1-good
 
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"

Index: pkgsrc/multimedia/gst-plugins1-ugly/buildlink3.mk
diff -u pkgsrc/multimedia/gst-plugins1-ugly/buildlink3.mk:1.1 pkgsrc/multimedia/gst-plugins1-ugly/buildlink3.mk:1.2
--- pkgsrc/multimedia/gst-plugins1-ugly/buildlink3.mk:1.1       Thu Nov 29 08:27:25 2012
+++ pkgsrc/multimedia/gst-plugins1-ugly/buildlink3.mk   Sun Jan  7 13:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/11/29 08:27:25 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       gst-plugins1-ugly
 
@@ -7,7 +7,7 @@ GST_PLUGINS1_UGLY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gst-plugins1-ugly+=      gst-plugins1-ugly>=1.0.3
 BUILDLINK_ABI_DEPENDS.gst-plugins1-ugly+=      gst-plugins1-ugly>=1.0.3
-BUILDLINK_PKGSRCDIR.gst-plugins1-ugly?=        ../../multimedia/gst-plugins1-ugly
+BUILDLINK_PKGSRCDIR.gst-plugins1-ugly?=                ../../multimedia/gst-plugins1-ugly
 
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"

Index: pkgsrc/multimedia/gstreamer0.10/buildlink3.mk
diff -u pkgsrc/multimedia/gstreamer0.10/buildlink3.mk:1.19 pkgsrc/multimedia/gstreamer0.10/buildlink3.mk:1.20
--- pkgsrc/multimedia/gstreamer0.10/buildlink3.mk:1.19  Sat Sep 15 10:05:49 2012
+++ pkgsrc/multimedia/gstreamer0.10/buildlink3.mk       Sun Jan  7 13:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/09/15 10:05:49 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       gstreamer0.10
 
@@ -12,9 +12,9 @@ BUILDLINK_PKGSRCDIR.gstreamer0.10?=   ../.
 pkgbase := gstreamer0.10
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.gstreamer0.10:Mgstcheck)
+.  if !empty(PKG_BUILD_OPTIONS.gstreamer0.10:Mgstcheck)
 .include "../../devel/check/buildlink3.mk"
-.endif
+.  endif
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/multimedia/libdvdcss/buildlink3.mk
diff -u pkgsrc/multimedia/libdvdcss/buildlink3.mk:1.8 pkgsrc/multimedia/libdvdcss/buildlink3.mk:1.9
--- pkgsrc/multimedia/libdvdcss/buildlink3.mk:1.8       Sat Jan 31 21:24:11 2015
+++ pkgsrc/multimedia/libdvdcss/buildlink3.mk   Sun Jan  7 13:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2015/01/31 21:24:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       libdvdcss
 
@@ -7,7 +7,7 @@ LIBDVDCSS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libdvdcss+=      libdvdcss>=1.3.99
 BUILDLINK_ABI_DEPENDS.libdvdcss+=      libdvdcss>=1.3.99
-BUILDLINK_PKGSRCDIR.libdvdcss?=        ../../multimedia/libdvdcss
+BUILDLINK_PKGSRCDIR.libdvdcss?=                ../../multimedia/libdvdcss
 .endif # LIBDVDCSS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libdvdcss

Index: pkgsrc/multimedia/libdvdnav/buildlink3.mk
diff -u pkgsrc/multimedia/libdvdnav/buildlink3.mk:1.10 pkgsrc/multimedia/libdvdnav/buildlink3.mk:1.11
--- pkgsrc/multimedia/libdvdnav/buildlink3.mk:1.10      Sat Oct  4 12:49:05 2014
+++ pkgsrc/multimedia/libdvdnav/buildlink3.mk   Sun Jan  7 13:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2014/10/04 12:49:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       libdvdnav
 
@@ -7,7 +7,7 @@ LIBDVDNAV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libdvdnav+=      libdvdnav>=4.1.3
 BUILDLINK_ABI_DEPENDS.libdvdnav+=      libdvdnav>=5.0
-BUILDLINK_PKGSRCDIR.libdvdnav?=        ../../multimedia/libdvdnav
+BUILDLINK_PKGSRCDIR.libdvdnav?=                ../../multimedia/libdvdnav
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .endif # LIBDVDNAV_BUILDLINK3_MK

Index: pkgsrc/multimedia/libdvdplay/buildlink3.mk
diff -u pkgsrc/multimedia/libdvdplay/buildlink3.mk:1.8 pkgsrc/multimedia/libdvdplay/buildlink3.mk:1.9
--- pkgsrc/multimedia/libdvdplay/buildlink3.mk:1.8      Fri Mar 20 19:25:03 2009
+++ pkgsrc/multimedia/libdvdplay/buildlink3.mk  Sun Jan  7 13:04:24 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       libdvdplay
 
 .if !defined(LIBDVDPLAY_BUILDLINK3_MK)
 LIBDVDPLAY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libdvdplay+=             libdvdplay>=1.0.1
+BUILDLINK_API_DEPENDS.libdvdplay+=     libdvdplay>=1.0.1
 BUILDLINK_ABI_DEPENDS.libdvdplay+=     libdvdplay>=1.0.1nb3
 BUILDLINK_PKGSRCDIR.libdvdplay?=       ../../multimedia/libdvdplay
 

Index: pkgsrc/multimedia/libflash/buildlink3.mk
diff -u pkgsrc/multimedia/libflash/buildlink3.mk:1.12 pkgsrc/multimedia/libflash/buildlink3.mk:1.13
--- pkgsrc/multimedia/libflash/buildlink3.mk:1.12       Sat Jan 26 21:36:38 2013
+++ pkgsrc/multimedia/libflash/buildlink3.mk    Sun Jan  7 13:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2013/01/26 21:36:38 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:24 rillig Exp $
 
 BUILDLINK_TREE+=       libflash
 
@@ -7,7 +7,7 @@ LIBFLASH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libflash+=       libflash>=0.4.10nb4
 BUILDLINK_ABI_DEPENDS.libflash+=       libflash>=0.4.10nb9
-BUILDLINK_PKGSRCDIR.libflash?= ../../multimedia/libflash
+BUILDLINK_PKGSRCDIR.libflash?=         ../../multimedia/libflash
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/multimedia/libkcddb/buildlink3.mk
diff -u pkgsrc/multimedia/libkcddb/buildlink3.mk:1.1 pkgsrc/multimedia/libkcddb/buildlink3.mk:1.2
--- pkgsrc/multimedia/libkcddb/buildlink3.mk:1.1        Wed Apr  3 12:23:51 2013
+++ pkgsrc/multimedia/libkcddb/buildlink3.mk    Sun Jan  7 13:04:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/04/03 12:23:51 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:25 rillig Exp $
 
 BUILDLINK_TREE+=       libkcddb
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libkcddb
 LIBKCDDB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libkcddb+=       libkcddb>=4.10.2
-BUILDLINK_PKGSRCDIR.libkcddb?= ../../multimedia/libkcddb
+BUILDLINK_PKGSRCDIR.libkcddb?=         ../../multimedia/libkcddb
 
 .endif # LIBKCDDB_BUILDLINK3_MK
 

Index: pkgsrc/multimedia/libmp4v2/buildlink3.mk
diff -u pkgsrc/multimedia/libmp4v2/buildlink3.mk:1.2 pkgsrc/multimedia/libmp4v2/buildlink3.mk:1.3
--- pkgsrc/multimedia/libmp4v2/buildlink3.mk:1.2        Fri Mar 20 19:25:04 2009
+++ pkgsrc/multimedia/libmp4v2/buildlink3.mk    Sun Jan  7 13:04:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:25 rillig Exp $
 
 BUILDLINK_TREE+=       libmp4v2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libmp4v2
 LIBMP4V2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmp4v2+=       libmp4v2>=1.5.0.1
-BUILDLINK_PKGSRCDIR.libmp4v2?= ../../multimedia/libmp4v2
+BUILDLINK_PKGSRCDIR.libmp4v2?=         ../../multimedia/libmp4v2
 .endif # LIBMP4V2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libmp4v2

Index: pkgsrc/multimedia/libmpeg2/buildlink3.mk
diff -u pkgsrc/multimedia/libmpeg2/buildlink3.mk:1.11 pkgsrc/multimedia/libmpeg2/buildlink3.mk:1.12
--- pkgsrc/multimedia/libmpeg2/buildlink3.mk:1.11       Fri Mar 20 19:25:04 2009
+++ pkgsrc/multimedia/libmpeg2/buildlink3.mk    Sun Jan  7 13:04:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:25 rillig Exp $
 
 BUILDLINK_TREE+=       libmpeg2
 
@@ -7,7 +7,7 @@ LIBMPEG2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmpeg2+=       libmpeg2>=0.4.0
 BUILDLINK_ABI_DEPENDS.libmpeg2+=       libmpeg2>=0.4.0bnb5
-BUILDLINK_PKGSRCDIR.libmpeg2?= ../../multimedia/libmpeg2
+BUILDLINK_PKGSRCDIR.libmpeg2?=         ../../multimedia/libmpeg2
 .endif # LIBMPEG2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libmpeg2

Index: pkgsrc/multimedia/liboggz/buildlink3.mk
diff -u pkgsrc/multimedia/liboggz/buildlink3.mk:1.1 pkgsrc/multimedia/liboggz/buildlink3.mk:1.2
--- pkgsrc/multimedia/liboggz/buildlink3.mk:1.1 Thu May  9 00:40:12 2013
+++ pkgsrc/multimedia/liboggz/buildlink3.mk     Sun Jan  7 13:04:25 2018
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/05/09 00:40:12 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:25 rillig Exp $
 
-BUILDLINK_TREE+=      liboggz
+BUILDLINK_TREE+=       liboggz
 
 .if !defined(LIBOGGZ_BUILDLINK3_MK)
 LIBOGGZ_BUILDLINK3_MK:=

Index: pkgsrc/multimedia/libtheora/buildlink3.mk
diff -u pkgsrc/multimedia/libtheora/buildlink3.mk:1.8 pkgsrc/multimedia/libtheora/buildlink3.mk:1.9
--- pkgsrc/multimedia/libtheora/buildlink3.mk:1.8       Fri Mar 20 19:25:04 2009
+++ pkgsrc/multimedia/libtheora/buildlink3.mk   Sun Jan  7 13:04:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:25 rillig Exp $
 
 BUILDLINK_TREE+=       libtheora
 
@@ -7,7 +7,7 @@ LIBTHEORA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libtheora+=      libtheora>=1.0alpha3
 BUILDLINK_ABI_DEPENDS.libtheora+=      libtheora>=1.0alpha3nb1
-BUILDLINK_PKGSRCDIR.libtheora?=        ../../multimedia/libtheora
+BUILDLINK_PKGSRCDIR.libtheora?=                ../../multimedia/libtheora
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"

Index: pkgsrc/multimedia/libva/buildlink3.mk
diff -u pkgsrc/multimedia/libva/buildlink3.mk:1.2 pkgsrc/multimedia/libva/buildlink3.mk:1.3
--- pkgsrc/multimedia/libva/buildlink3.mk:1.2   Sun Apr 14 00:30:02 2013
+++ pkgsrc/multimedia/libva/buildlink3.mk       Sun Jan  7 13:04:25 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/04/14 00:30:02 cheusov Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:25 rillig Exp $
 
 .include "../../multimedia/libva/available.mk"
 .if ${VAAPI_AVAILABLE} == "yes"
 
 BUILDLINK_TREE+=       libva
 
-.if !defined(LIBVA_BUILDLINK3_MK)
+.  if !defined(LIBVA_BUILDLINK3_MK)
 LIBVA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libva+=  libva>=1.0.6
@@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.libva?=   ../../multim
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 
-.endif # LIBVA_BUILDLINK3_MK
+.  endif       # LIBVA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libva
 

Index: pkgsrc/multimedia/libvdpau/buildlink3.mk
diff -u pkgsrc/multimedia/libvdpau/buildlink3.mk:1.2 pkgsrc/multimedia/libvdpau/buildlink3.mk:1.3
--- pkgsrc/multimedia/libvdpau/buildlink3.mk:1.2        Wed Sep  1 20:54:09 2010
+++ pkgsrc/multimedia/libvdpau/buildlink3.mk    Sun Jan  7 13:04:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/09/01 20:54:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:25 rillig Exp $
 
 #
 # For linking use LDFLAGS.vdpau variable
@@ -14,7 +14,7 @@ BUILDLINK_TREE+=      libvdpau
 LIBVDPAU_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libvdpau+=       libvdpau>=0.3
-BUILDLINK_PKGSRCDIR.libvdpau?= ../../multimedia/libvdpau
+BUILDLINK_PKGSRCDIR.libvdpau?=         ../../multimedia/libvdpau
 
 .include "../../x11/libX11/buildlink3.mk"
 .  endif       # LIBVDPAU_BUILDLINK3_MK

Index: pkgsrc/multimedia/mjpegtools/buildlink3.mk
diff -u pkgsrc/multimedia/mjpegtools/buildlink3.mk:1.24 pkgsrc/multimedia/mjpegtools/buildlink3.mk:1.25
--- pkgsrc/multimedia/mjpegtools/buildlink3.mk:1.24     Sat Apr 25 14:23:40 2015
+++ pkgsrc/multimedia/mjpegtools/buildlink3.mk  Sun Jan  7 13:04:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2015/04/25 14:23:40 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:25 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        mjpegtools
 .if !defined(MJPEGTOOLS_BUILDLINK3_MK)
 MJPEGTOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mjpegtools+=             mjpegtools>=1.8.0
+BUILDLINK_API_DEPENDS.mjpegtools+=     mjpegtools>=1.8.0
 BUILDLINK_ABI_DEPENDS.mjpegtools+=     mjpegtools>=2.0.0nb4
 BUILDLINK_PKGSRCDIR.mjpegtools?=       ../../multimedia/mjpegtools
 

Index: pkgsrc/multimedia/xine-lib/buildlink3.mk
diff -u pkgsrc/multimedia/xine-lib/buildlink3.mk:1.34 pkgsrc/multimedia/xine-lib/buildlink3.mk:1.35
--- pkgsrc/multimedia/xine-lib/buildlink3.mk:1.34       Mon Jan 16 23:45:10 2017
+++ pkgsrc/multimedia/xine-lib/buildlink3.mk    Sun Jan  7 13:04:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2017/01/16 23:45:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2018/01/07 13:04:25 rillig Exp $
 
 BUILDLINK_TREE+=       xine-lib
 
@@ -7,7 +7,7 @@ XINE_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xine-lib+=       xine-lib>=1rc3c
 BUILDLINK_ABI_DEPENDS.xine-lib+=       xine-lib>=1.2.6nb9
-BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib
+BUILDLINK_PKGSRCDIR.xine-lib?=         ../../multimedia/xine-lib
 
 .include "../../multimedia/ffmpeg2/buildlink3.mk"
 .endif # XINE_LIB_BUILDLINK3_MK

Index: pkgsrc/multimedia/xvidcore/buildlink3.mk
diff -u pkgsrc/multimedia/xvidcore/buildlink3.mk:1.13 pkgsrc/multimedia/xvidcore/buildlink3.mk:1.14
--- pkgsrc/multimedia/xvidcore/buildlink3.mk:1.13       Mon May  7 01:53:51 2012
+++ pkgsrc/multimedia/xvidcore/buildlink3.mk    Sun Jan  7 13:04:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2012/05/07 01:53:51 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:25 rillig Exp $
 
 BUILDLINK_TREE+=       xvidcore
 
@@ -7,7 +7,7 @@ XVIDCORE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xvidcore+=       xvidcore>=1.0.0
 BUILDLINK_ABI_DEPENDS.xvidcore+=       xvidcore>=1.1.0nb1
-BUILDLINK_PKGSRCDIR.xvidcore?= ../../multimedia/xvidcore
+BUILDLINK_PKGSRCDIR.xvidcore?=         ../../multimedia/xvidcore
 .endif # XVIDCORE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -xvidcore

Index: pkgsrc/net/SDL2_net/buildlink3.mk
diff -u pkgsrc/net/SDL2_net/buildlink3.mk:1.1 pkgsrc/net/SDL2_net/buildlink3.mk:1.2
--- pkgsrc/net/SDL2_net/buildlink3.mk:1.1       Sun Nov  6 00:18:05 2016
+++ pkgsrc/net/SDL2_net/buildlink3.mk   Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/11/06 00:18:05 kamil Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       SDL2_net
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        SDL2_net
 SDL2_NET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL2_net+=       SDL2_net>=2.0.0nb2
-BUILDLINK_PKGSRCDIR.SDL2_net?= ../../net/SDL2_net
+BUILDLINK_PKGSRCDIR.SDL2_net?=         ../../net/SDL2_net
 
 .include "../../devel/SDL2/buildlink3.mk"
 .endif # SDL2_NET_BUILDLINK3_MK

Index: pkgsrc/net/aws-sdk-go/buildlink3.mk
diff -u pkgsrc/net/aws-sdk-go/buildlink3.mk:1.2 pkgsrc/net/aws-sdk-go/buildlink3.mk:1.3
--- pkgsrc/net/aws-sdk-go/buildlink3.mk:1.2     Sun Sep  4 19:29:33 2016
+++ pkgsrc/net/aws-sdk-go/buildlink3.mk Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/09/04 19:29:33 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       aws-sdk-go
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        aws-sdk-go
 AWS_SDK_GO_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.aws-sdk-go=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.aws-sdk-go?=               build
+BUILDLINK_DEPMETHOD.aws-sdk-go?=       build
 
 BUILDLINK_API_DEPENDS.aws-sdk-go+=     aws-sdk-go>=1.4.3
 BUILDLINK_PKGSRCDIR.aws-sdk-go?=       ../../net/aws-sdk-go

Index: pkgsrc/net/flickcurl/buildlink3.mk
diff -u pkgsrc/net/flickcurl/buildlink3.mk:1.2 pkgsrc/net/flickcurl/buildlink3.mk:1.3
--- pkgsrc/net/flickcurl/buildlink3.mk:1.2      Wed Mar 21 08:13:27 2012
+++ pkgsrc/net/flickcurl/buildlink3.mk  Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/03/21 08:13:27 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       flickcurl
 
@@ -7,7 +7,7 @@ FLICKCURL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.flickcurl+=      flickcurl>=1.21
 BUILDLINK_ABI_DEPENDS.flickcurl+=      flickcurl>=1.22nb1
-BUILDLINK_PKGSRCDIR.flickcurl?=        ../../net/flickcurl
+BUILDLINK_PKGSRCDIR.flickcurl?=                ../../net/flickcurl
 
 .endif # FLICKCURL_BUILDLINK3_MK
 

Index: pkgsrc/net/go-vultr/buildlink3.mk
diff -u pkgsrc/net/go-vultr/buildlink3.mk:1.1 pkgsrc/net/go-vultr/buildlink3.mk:1.2
--- pkgsrc/net/go-vultr/buildlink3.mk:1.1       Sat Jul 16 13:31:20 2016
+++ pkgsrc/net/go-vultr/buildlink3.mk   Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/07/16 13:31:20 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       go-vultr
 
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-vultr=     ${EG
 BUILDLINK_DEPMETHOD.go-vultr?=         build
 
 BUILDLINK_API_DEPENDS.go-vultr+=       go-vultr>=1.8
-BUILDLINK_PKGSRCDIR.go-vultr?= ../../net/go-vultr
+BUILDLINK_PKGSRCDIR.go-vultr?=         ../../net/go-vultr
 
 .include "../../devel/go-mow-cli/buildlink3.mk"
 .include "../../devel/go-ratelimit/buildlink3.mk"

Index: pkgsrc/net/gupnp-av/buildlink3.mk
diff -u pkgsrc/net/gupnp-av/buildlink3.mk:1.28 pkgsrc/net/gupnp-av/buildlink3.mk:1.29
--- pkgsrc/net/gupnp-av/buildlink3.mk:1.28      Thu Nov 30 16:45:06 2017
+++ pkgsrc/net/gupnp-av/buildlink3.mk   Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2017/11/30 16:45:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       gupnp-av
 
@@ -7,7 +7,7 @@ GUPNP_AV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gupnp-av+=       gupnp-av>=0.12.2
 BUILDLINK_ABI_DEPENDS.gupnp-av+=       gupnp-av>=0.12.7nb9
-BUILDLINK_PKGSRCDIR.gupnp-av?= ../../net/gupnp-av
+BUILDLINK_PKGSRCDIR.gupnp-av?=         ../../net/gupnp-av
 
 .include "../../net/gupnp/buildlink3.mk"
 .endif # GUPNP_AV_BUILDLINK3_MK

Index: pkgsrc/net/gupnp-igd/buildlink3.mk
diff -u pkgsrc/net/gupnp-igd/buildlink3.mk:1.28 pkgsrc/net/gupnp-igd/buildlink3.mk:1.29
--- pkgsrc/net/gupnp-igd/buildlink3.mk:1.28     Thu Nov 30 16:45:06 2017
+++ pkgsrc/net/gupnp-igd/buildlink3.mk  Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2017/11/30 16:45:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       gupnp-igd
 
@@ -7,7 +7,7 @@ GUPNP_IGD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gupnp-igd+=      gupnp-igd>=0.2.1
 BUILDLINK_ABI_DEPENDS.gupnp-igd+=      gupnp-igd>=0.2.4nb1
-BUILDLINK_PKGSRCDIR.gupnp-igd?=        ../../net/gupnp-igd
+BUILDLINK_PKGSRCDIR.gupnp-igd?=                ../../net/gupnp-igd
 
 .include "../../net/gupnp/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/net/isc-dhcp4/buildlink3.mk
diff -u pkgsrc/net/isc-dhcp4/buildlink3.mk:1.4 pkgsrc/net/isc-dhcp4/buildlink3.mk:1.5
--- pkgsrc/net/isc-dhcp4/buildlink3.mk:1.4      Sun Aug 13 14:21:03 2017
+++ pkgsrc/net/isc-dhcp4/buildlink3.mk  Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/08/13 14:21:03 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       isc-dhcp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        isc-dhcp
 ISC_DHCP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.isc-dhcp+=       isc-dhcp>=4.3.0
-BUILDLINK_PKGSRCDIR.isc-dhcp?= ../../net/isc-dhcp4
+BUILDLINK_PKGSRCDIR.isc-dhcp?=         ../../net/isc-dhcp4
 .endif # ISC_DHCP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -isc-dhcp

Index: pkgsrc/net/knewstuff/buildlink3.mk
diff -u pkgsrc/net/knewstuff/buildlink3.mk:1.12 pkgsrc/net/knewstuff/buildlink3.mk:1.13
--- pkgsrc/net/knewstuff/buildlink3.mk:1.12     Thu Nov 30 16:45:06 2017
+++ pkgsrc/net/knewstuff/buildlink3.mk  Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       knewstuff
 
@@ -7,7 +7,7 @@ KNEWSTUFF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.knewstuff+=      knewstuff>=5.21.0
 BUILDLINK_ABI_DEPENDS.knewstuff?=      knewstuff>=5.25.0nb11
-BUILDLINK_PKGSRCDIR.knewstuff?=        ../../net/knewstuff
+BUILDLINK_PKGSRCDIR.knewstuff?=                ../../net/knewstuff
 
 .include "../../devel/kio/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/net/libcares/buildlink3.mk
diff -u pkgsrc/net/libcares/buildlink3.mk:1.8 pkgsrc/net/libcares/buildlink3.mk:1.9
--- pkgsrc/net/libcares/buildlink3.mk:1.8       Sun Jul 25 13:09:42 2010
+++ pkgsrc/net/libcares/buildlink3.mk   Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/07/25 13:09:42 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       libcares
 
@@ -7,7 +7,7 @@ LIBCARES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcares+=       libcares>=1.3.0nb1
 BUILDLINK_ABI_DEPENDS.libcares+=       libcares>=1.6.0
-BUILDLINK_PKGSRCDIR.libcares?= ../../net/libcares
+BUILDLINK_PKGSRCDIR.libcares?=         ../../net/libcares
 .endif # LIBCARES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libcares

Index: pkgsrc/net/libfetch/buildlink3.mk
diff -u pkgsrc/net/libfetch/buildlink3.mk:1.13 pkgsrc/net/libfetch/buildlink3.mk:1.14
--- pkgsrc/net/libfetch/buildlink3.mk:1.13      Sat Mar  5 11:27:52 2016
+++ pkgsrc/net/libfetch/buildlink3.mk   Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2016/03/05 11:27:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       libfetch
 
@@ -9,7 +9,7 @@ BUILDLINK_DEPMETHOD.libfetch?=  build
 
 BUILDLINK_API_DEPENDS.libfetch+=       libfetch>=2.28
 BUILDLINK_ABI_DEPENDS.libfetch?=       libfetch>=2.36nb3
-BUILDLINK_PKGSRCDIR.libfetch?= ../../net/libfetch
+BUILDLINK_PKGSRCDIR.libfetch?=         ../../net/libfetch
 
 pkgbase := libfetch
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/net/libgdata/buildlink3.mk
diff -u pkgsrc/net/libgdata/buildlink3.mk:1.32 pkgsrc/net/libgdata/buildlink3.mk:1.33
--- pkgsrc/net/libgdata/buildlink3.mk:1.32      Mon Jan  1 21:18:10 2018
+++ pkgsrc/net/libgdata/buildlink3.mk   Sun Jan  7 13:04:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2018/01/01 21:18:10 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2018/01/07 13:04:26 rillig Exp $
 
 BUILDLINK_TREE+=       libgdata
 
@@ -7,7 +7,7 @@ LIBGDATA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgdata+=       libgdata>=0.6.4
 BUILDLINK_ABI_DEPENDS.libgdata+=       libgdata>=0.16.1nb13
-BUILDLINK_PKGSRCDIR.libgdata?= ../../net/libgdata
+BUILDLINK_PKGSRCDIR.libgdata?=         ../../net/libgdata
 
 
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/net/liblive/buildlink3.mk
diff -u pkgsrc/net/liblive/buildlink3.mk:1.8 pkgsrc/net/liblive/buildlink3.mk:1.9
--- pkgsrc/net/liblive/buildlink3.mk:1.8        Fri Mar 20 19:25:09 2009
+++ pkgsrc/net/liblive/buildlink3.mk    Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       liblive
 
@@ -8,10 +8,10 @@ LIBLIVE_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.liblive+=        liblive>=20080706
 BUILDLINK_ABI_DEPENDS.liblive+=        liblive>=20080706
 BUILDLINK_PKGSRCDIR.liblive?=  ../../net/liblive
-BUILDLINK_INCDIRS.liblive+=     include/BasicUsageEnvironment
-BUILDLINK_INCDIRS.liblive+=     include/UsageEnvironment
-BUILDLINK_INCDIRS.liblive+=     include/groupsock
-BUILDLINK_INCDIRS.liblive+=     include/liveMedia
+BUILDLINK_INCDIRS.liblive+=    include/BasicUsageEnvironment
+BUILDLINK_INCDIRS.liblive+=    include/UsageEnvironment
+BUILDLINK_INCDIRS.liblive+=    include/groupsock
+BUILDLINK_INCDIRS.liblive+=    include/liveMedia
 .endif # LIBLIVE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -liblive

Index: pkgsrc/net/libnipper/buildlink3.mk
diff -u pkgsrc/net/libnipper/buildlink3.mk:1.2 pkgsrc/net/libnipper/buildlink3.mk:1.3
--- pkgsrc/net/libnipper/buildlink3.mk:1.2      Fri Mar 20 19:25:10 2009
+++ pkgsrc/net/libnipper/buildlink3.mk  Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       libnipper
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libnipper
 LIBNIPPER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libnipper+=      libnipper>=0.12.1
-BUILDLINK_PKGSRCDIR.libnipper?=        ../../net/libnipper
+BUILDLINK_PKGSRCDIR.libnipper?=                ../../net/libnipper
 .endif # LIBNIPPER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libnipper

Index: pkgsrc/net/libradius/buildlink3.mk
diff -u pkgsrc/net/libradius/buildlink3.mk:1.11 pkgsrc/net/libradius/buildlink3.mk:1.12
--- pkgsrc/net/libradius/buildlink3.mk:1.11     Fri Mar 20 19:25:10 2009
+++ pkgsrc/net/libradius/buildlink3.mk  Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       libradius
 
@@ -6,14 +6,14 @@ BUILDLINK_TREE+=      libradius
 LIBRADIUS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libradius+=      libradius>=20040827
-BUILDLINK_PKGSRCDIR.libradius?=        ../../net/libradius
-BUILDLINK_DEPMETHOD.libradius?=        build
+BUILDLINK_PKGSRCDIR.libradius?=                ../../net/libradius
+BUILDLINK_DEPMETHOD.libradius?=                build
 
-.  include "../../mk/bsd.fast.prefs.mk"
-.  if ${OPSYS} == "FreeBSD"
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "FreeBSD"
 BUILDLINK_LDADD.libradius+=    -lmd
 BUILDLINK_LDFLAGS.libradius?=  ${BUILDLINK_LDADD.libradius}
-.  endif
+.endif
 .endif # LIBRADIUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libradius

Index: pkgsrc/net/librsync/buildlink3.mk
diff -u pkgsrc/net/librsync/buildlink3.mk:1.2 pkgsrc/net/librsync/buildlink3.mk:1.3
--- pkgsrc/net/librsync/buildlink3.mk:1.2       Thu Sep  1 16:18:08 2016
+++ pkgsrc/net/librsync/buildlink3.mk   Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/09/01 16:18:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       librsync
 
@@ -7,7 +7,7 @@ LIBRSYNC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.librsync+=       librsync>=1.0.1
 BUILDLINK_ABI_DEPENDS.librsync+=       librsync>=2.0
-BUILDLINK_PKGSRCDIR.librsync?= ../../net/librsync
+BUILDLINK_PKGSRCDIR.librsync?=         ../../net/librsync
 .endif # LIBRSYNC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -librsync

Index: pkgsrc/net/mono-nat/buildlink3.mk
diff -u pkgsrc/net/mono-nat/buildlink3.mk:1.18 pkgsrc/net/mono-nat/buildlink3.mk:1.19
--- pkgsrc/net/mono-nat/buildlink3.mk:1.18      Thu Nov 30 16:45:07 2017
+++ pkgsrc/net/mono-nat/buildlink3.mk   Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2017/11/30 16:45:07 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       mono-nat
 
@@ -7,7 +7,7 @@ MONO_NAT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mono-nat+=       mono-nat>=1.0.2
 BUILDLINK_ABI_DEPENDS.mono-nat+=       mono-nat>=1.0.2nb18
-BUILDLINK_PKGSRCDIR.mono-nat?= ../../net/mono-nat
+BUILDLINK_PKGSRCDIR.mono-nat?=         ../../net/mono-nat
 
 .include "../../lang/mono/buildlink3.mk"
 

Index: pkgsrc/net/net-snmp/buildlink3.mk
diff -u pkgsrc/net/net-snmp/buildlink3.mk:1.14 pkgsrc/net/net-snmp/buildlink3.mk:1.15
--- pkgsrc/net/net-snmp/buildlink3.mk:1.14      Sat Mar  5 11:27:52 2016
+++ pkgsrc/net/net-snmp/buildlink3.mk   Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2016/03/05 11:27:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       net-snmp
 
@@ -7,7 +7,7 @@ NET_SNMP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.net-snmp+=       net-snmp>=5.0.9nb3
 BUILDLINK_ABI_DEPENDS.net-snmp+=       net-snmp>=5.7.3nb3
-BUILDLINK_PKGSRCDIR.net-snmp?= ../../net/net-snmp
+BUILDLINK_PKGSRCDIR.net-snmp?=         ../../net/net-snmp
 
 pkgbase := net-snmp
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/net/netatalk22/buildlink3.mk
diff -u pkgsrc/net/netatalk22/buildlink3.mk:1.3 pkgsrc/net/netatalk22/buildlink3.mk:1.4
--- pkgsrc/net/netatalk22/buildlink3.mk:1.3     Mon Sep  8 16:02:35 2014
+++ pkgsrc/net/netatalk22/buildlink3.mk Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/09/08 16:02:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       netatalk
 
@@ -7,8 +7,8 @@ NETATALK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.netatalk+=       netatalk22>=2.0.3nb2
 BUILDLINK_ABI_DEPENDS.netatalk+=       netatalk22>=2.0.3nb3
-BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk22
-BUILDLINK_DEPMETHOD.netatalk?= build
+BUILDLINK_PKGSRCDIR.netatalk?=         ../../net/netatalk22
+BUILDLINK_DEPMETHOD.netatalk?=         build
 .endif # NETATALK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -netatalk

Index: pkgsrc/net/ocaml-ipaddr/buildlink3.mk
diff -u pkgsrc/net/ocaml-ipaddr/buildlink3.mk:1.10 pkgsrc/net/ocaml-ipaddr/buildlink3.mk:1.11
--- pkgsrc/net/ocaml-ipaddr/buildlink3.mk:1.10  Fri Sep  8 09:51:24 2017
+++ pkgsrc/net/ocaml-ipaddr/buildlink3.mk       Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2017/09/08 09:51:24 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-ipaddr
 
@@ -8,7 +8,7 @@ OCAML_IPADDR_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.ocaml-ipaddr+=   ocaml-ipaddr>=2.0.0
 BUILDLINK_ABI_DEPENDS.ocaml-ipaddr?=   ocaml-ipaddr>=2.8.0nb1
 BUILDLINK_PKGSRCDIR.ocaml-ipaddr?=     ../../net/ocaml-ipaddr
-BUILDLINK_FILES.ocaml-ipaddr+= lib/ocaml/site-lib/*
+BUILDLINK_FILES.ocaml-ipaddr+=         lib/ocaml/site-lib/*
 
 .include "../../lang/ocaml/buildlink3.mk"
 .endif # OCAML_IPADDR_BUILDLINK3_MK

Index: pkgsrc/net/ocamlnet/buildlink3.mk
diff -u pkgsrc/net/ocamlnet/buildlink3.mk:1.8 pkgsrc/net/ocamlnet/buildlink3.mk:1.9
--- pkgsrc/net/ocamlnet/buildlink3.mk:1.8       Wed Oct  4 13:08:20 2017
+++ pkgsrc/net/ocamlnet/buildlink3.mk   Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2017/10/04 13:08:20 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:27 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.4nb3
-BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
+BUILDLINK_PKGSRCDIR.ocamlnet?=         ../../net/ocamlnet
 
 .endif # OCAMLNET_BUILDLINK3_MK
 

Index: pkgsrc/net/openh323/buildlink3.mk
diff -u pkgsrc/net/openh323/buildlink3.mk:1.13 pkgsrc/net/openh323/buildlink3.mk:1.14
--- pkgsrc/net/openh323/buildlink3.mk:1.13      Sat Mar  5 11:27:52 2016
+++ pkgsrc/net/openh323/buildlink3.mk   Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2016/03/05 11:27:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       openh323
 
@@ -7,7 +7,7 @@ OPENH323_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openh323+=       openh323>=1.15.1
 BUILDLINK_ABI_DEPENDS.openh323+=       openh323>=1.15.2nb6
-BUILDLINK_PKGSRCDIR.openh323?= ../../net/openh323
+BUILDLINK_PKGSRCDIR.openh323?=         ../../net/openh323
 
 .include "../../devel/pwlib/buildlink3.mk"
 .endif # OPENH323_BUILDLINK3_MK

Index: pkgsrc/net/py-irclib/buildlink3.mk
diff -u pkgsrc/net/py-irclib/buildlink3.mk:1.1 pkgsrc/net/py-irclib/buildlink3.mk:1.2
--- pkgsrc/net/py-irclib/buildlink3.mk:1.1      Sat Nov  3 14:18:06 2012
+++ pkgsrc/net/py-irclib/buildlink3.mk  Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/11/03 14:18:06 imil Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:27 rillig Exp $
 
 BUILDLINK_TREE+=       py-irclib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        py-irclib
 PY_IRCLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-irclib+=      ${PYPKGPREFIX}-irclib>=3.4.2
-BUILDLINK_PKGSRCDIR.py-irclib?=        ../../net/py-irclib
+BUILDLINK_PKGSRCDIR.py-irclib?=                ../../net/py-irclib
 
 .endif # PY_IRCLIB_BUILDLINK3_MK
 

Index: pkgsrc/net/radiusclient-ng/buildlink3.mk
diff -u pkgsrc/net/radiusclient-ng/buildlink3.mk:1.2 pkgsrc/net/radiusclient-ng/buildlink3.mk:1.3
--- pkgsrc/net/radiusclient-ng/buildlink3.mk:1.2        Fri Mar 20 19:25:12 2009
+++ pkgsrc/net/radiusclient-ng/buildlink3.mk    Sun Jan  7 13:04:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:27 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -11,10 +11,10 @@ BUILDLINK_API_DEPENDS.radiusclient-ng+=     
 BUILDLINK_PKGSRCDIR.radiusclient-ng?=  ../../net/radiusclient-ng
 BUILDLINK_DEPMETHOD.radiusclient-ng?=  build
 
-.  if ${OPSYS} == "FreeBSD"
+.if ${OPSYS} == "FreeBSD"
 BUILDLINK_LDADD.radiusclient-ng+=      -lmd
 BUILDLINK_LDFLAGS.radiusclient-ng?=    ${BUILDLINK_LDADD.radiusclient-ng}
-.  endif
+.endif
 .endif # RADIUSCLIENT_NG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -radiusclient-ng

Index: pkgsrc/parallel/pvm3/buildlink3.mk
diff -u pkgsrc/parallel/pvm3/buildlink3.mk:1.10 pkgsrc/parallel/pvm3/buildlink3.mk:1.11
--- pkgsrc/parallel/pvm3/buildlink3.mk:1.10     Fri Mar 20 19:25:13 2009
+++ pkgsrc/parallel/pvm3/buildlink3.mk  Sun Jan  7 13:04:28 2018
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       pvm
 
 .if !defined(PVM_BUILDLINK3_MK)
 PVM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.pvm+=            pvm>=3.4.3
+BUILDLINK_API_DEPENDS.pvm+=    pvm>=3.4.3
 BUILDLINK_ABI_DEPENDS.pvm+=    pvm>=3.4.5nb1
 BUILDLINK_PKGSRCDIR.pvm?=      ../../parallel/pvm3
 
-.  include "${BUILDLINK_PKGSRCDIR.pvm}/arch.mk"
+.include "${BUILDLINK_PKGSRCDIR.pvm}/arch.mk"
 BUILDLINK_INCDIRS.pvm?=                pvm3/include
 BUILDLINK_LIBDIRS.pvm?=                pvm3/lib/${PVM_ARCH}
 .endif # PVM_BUILDLINK3_MK

Index: pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -u pkgsrc/pkgtools/x11-links/buildlink3.mk:1.70 pkgsrc/pkgtools/x11-links/buildlink3.mk:1.71
--- pkgsrc/pkgtools/x11-links/buildlink3.mk:1.70        Sat Sep  2 19:17:37 2017
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk     Sun Jan  7 13:04:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.70 2017/09/02 19:17:37 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.71 2018/01/07 13:04:28 rillig Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -13,8 +13,8 @@ BUILDLINK_TREE+=      x11-links
 X11_LINKS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=1.06
-BUILDLINK_PKGSRCDIR.x11-links?=        ../../pkgtools/x11-links
-BUILDLINK_DEPMETHOD.x11-links?=        build
+BUILDLINK_PKGSRCDIR.x11-links?=                ../../pkgtools/x11-links
+BUILDLINK_DEPMETHOD.x11-links?=                build
 
 # Force all of the helper programs, headers and libraries to be symlinked
 # into ${BUILDLINK_X11_DIR}.

Index: pkgsrc/print/ghostscript/buildlink3.mk
diff -u pkgsrc/print/ghostscript/buildlink3.mk:1.20 pkgsrc/print/ghostscript/buildlink3.mk:1.21
--- pkgsrc/print/ghostscript/buildlink3.mk:1.20 Thu Nov 23 17:19:43 2017
+++ pkgsrc/print/ghostscript/buildlink3.mk      Sun Jan  7 13:04:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2017/11/23 17:19:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       ghostscript
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ghostscript
 GHOSTSCRIPT_BUILDLINK3_MK:=    1
 
 BUILDLINK_API_DEPENDS.ghostscript+=    ghostscript>=8.63nb1
-BUILDLINK_ABI_DEPENDS.ghostscript+=    ghostscript>=9.05nb9
+BUILDLINK_ABI_DEPENDS.ghostscript+=    ghostscript>=9.05nb9
 BUILDLINK_PKGSRCDIR.ghostscript=       ../../print/ghostscript
 
 pkgbase := ghostscript

Index: pkgsrc/print/kpathsea/buildlink3.mk
diff -u pkgsrc/print/kpathsea/buildlink3.mk:1.4 pkgsrc/print/kpathsea/buildlink3.mk:1.5
--- pkgsrc/print/kpathsea/buildlink3.mk:1.4     Mon Sep 13 04:06:12 2010
+++ pkgsrc/print/kpathsea/buildlink3.mk Sun Jan  7 13:04:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/09/13 04:06:12 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       kpathsea
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=        kpathsea
 KPATHSEA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kpathsea+=       kpathsea>=6.0.0
-BUILDLINK_PKGSRCDIR.kpathsea?= ../../print/kpathsea
-BUILDLINK_FILES.kpathsea+=     bin/kpsewhich
+BUILDLINK_PKGSRCDIR.kpathsea?=         ../../print/kpathsea
+BUILDLINK_FILES.kpathsea+=             bin/kpsewhich
 .endif # KPATHSEA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -kpathsea

Index: pkgsrc/print/libpaper/buildlink3.mk
diff -u pkgsrc/print/libpaper/buildlink3.mk:1.2 pkgsrc/print/libpaper/buildlink3.mk:1.3
--- pkgsrc/print/libpaper/buildlink3.mk:1.2     Fri Mar 20 19:25:15 2009
+++ pkgsrc/print/libpaper/buildlink3.mk Sun Jan  7 13:04:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       libpaper
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libpaper
 LIBPAPER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpaper+=       libpaper>=1.1.22
-BUILDLINK_PKGSRCDIR.libpaper?= ../../print/libpaper
+BUILDLINK_PKGSRCDIR.libpaper?=         ../../print/libpaper
 .endif # LIBPAPER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libpaper

Index: pkgsrc/print/poppler-includes/buildlink3.mk
diff -u pkgsrc/print/poppler-includes/buildlink3.mk:1.28 pkgsrc/print/poppler-includes/buildlink3.mk:1.29
--- pkgsrc/print/poppler-includes/buildlink3.mk:1.28    Fri Dec  8 08:52:56 2017
+++ pkgsrc/print/poppler-includes/buildlink3.mk Sun Jan  7 13:04:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2017/12/08 08:52:56 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       poppler-includes
 
@@ -9,7 +9,7 @@ BUILDLINK_DEPMETHOD.poppler-includes?=  b
 
 BUILDLINK_API_DEPENDS.poppler-includes+=       poppler-includes>=0.22.2
 BUILDLINK_ABI_DEPENDS.poppler-includes?=       poppler-includes>=0.61.1nb1
-BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes
+BUILDLINK_PKGSRCDIR.poppler-includes?=         ../../print/poppler-includes
 .endif # POPPLER_INCLUDES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -poppler-includes

Index: pkgsrc/security/beecrypt/buildlink3.mk
diff -u pkgsrc/security/beecrypt/buildlink3.mk:1.7 pkgsrc/security/beecrypt/buildlink3.mk:1.8
--- pkgsrc/security/beecrypt/buildlink3.mk:1.7  Fri Mar 20 19:25:16 2009
+++ pkgsrc/security/beecrypt/buildlink3.mk      Sun Jan  7 13:04:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       beecrypt
 
@@ -7,7 +7,7 @@ BEECRYPT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.beecrypt+=       beecrypt>=3.0.0
 BUILDLINK_ABI_DEPENDS.beecrypt+=       beecrypt>=3.0.0nb1
-BUILDLINK_PKGSRCDIR.beecrypt?= ../../security/beecrypt
+BUILDLINK_PKGSRCDIR.beecrypt?=         ../../security/beecrypt
 .endif # BEECRYPT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -beecrypt

Index: pkgsrc/security/cvm/buildlink3.mk
diff -u pkgsrc/security/cvm/buildlink3.mk:1.10 pkgsrc/security/cvm/buildlink3.mk:1.11
--- pkgsrc/security/cvm/buildlink3.mk:1.10      Mon Mar 15 03:21:15 2010
+++ pkgsrc/security/cvm/buildlink3.mk   Sun Jan  7 13:04:28 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.10 2010/03/15 03:21:15 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       cvm
 
 .if !defined(CVM_BUILDLINK3_MK)
 CVM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.cvm+=            cvm>=0.90
+BUILDLINK_API_DEPENDS.cvm+=    cvm>=0.90
 BUILDLINK_PKGSRCDIR.cvm?=      ../../security/cvm
 .endif # CVM_BUILDLINK3_MK
 

Index: pkgsrc/security/go-crypto/buildlink3.mk
diff -u pkgsrc/security/go-crypto/buildlink3.mk:1.3 pkgsrc/security/go-crypto/buildlink3.mk:1.4
--- pkgsrc/security/go-crypto/buildlink3.mk:1.3 Mon Mar 20 22:53:45 2017
+++ pkgsrc/security/go-crypto/buildlink3.mk     Sun Jan  7 13:04:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/03/20 22:53:45 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       go-crypto
 
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-crypto=    ${E
 BUILDLINK_DEPMETHOD.go-crypto?=                build
 
 BUILDLINK_API_DEPENDS.go-crypto+=      go-crypto>=0.0.20170317
-BUILDLINK_PKGSRCDIR.go-crypto?=        ../../security/go-crypto
+BUILDLINK_PKGSRCDIR.go-crypto?=                ../../security/go-crypto
 
 .endif # GO_CRYPTO_BUILDLINK3_MK
 

Index: pkgsrc/security/go-oauth2/buildlink3.mk
diff -u pkgsrc/security/go-oauth2/buildlink3.mk:1.2 pkgsrc/security/go-oauth2/buildlink3.mk:1.3
--- pkgsrc/security/go-oauth2/buildlink3.mk:1.2 Tue Dec 29 21:47:48 2015
+++ pkgsrc/security/go-oauth2/buildlink3.mk     Sun Jan  7 13:04:28 2018
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       go-oauth2
 
 .if !defined(GO_OAUTH2_BUILDLINK3_MK)
 GO_OAUTH2_BUILDLINK3_MK:=
 
-BUILDLINK_CONTENTS_FILTER.go-oauth2= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-oauth2?=        build
+BUILDLINK_CONTENTS_FILTER.go-oauth2=   ${EGREP} gopkg/
+BUILDLINK_DEPMETHOD.go-oauth2?=                build
 BUILDLINK_API_DEPENDS.go-oauth2+=      go-oauth2>=20150310
-BUILDLINK_PKGSRCDIR.go-oauth2?=        ../../security/go-oauth2
+BUILDLINK_PKGSRCDIR.go-oauth2?=                ../../security/go-oauth2
 
 .include "../../textproc/go-text/buildlink3.mk"
 .include "../../net/gcloud-golang-metadata/buildlink3.mk"

Index: pkgsrc/security/gss/buildlink3.mk
diff -u pkgsrc/security/gss/buildlink3.mk:1.9 pkgsrc/security/gss/buildlink3.mk:1.10
--- pkgsrc/security/gss/buildlink3.mk:1.9       Fri Mar 20 19:25:17 2009
+++ pkgsrc/security/gss/buildlink3.mk   Sun Jan  7 13:04:28 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       gss
 
 .if !defined(GSS_BUILDLINK3_MK)
 GSS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gss+=            gss>=0.0.6nb1
+BUILDLINK_API_DEPENDS.gss+=    gss>=0.0.6nb1
 BUILDLINK_ABI_DEPENDS.gss+=    gss>=0.0.13nb1
 BUILDLINK_PKGSRCDIR.gss?=      ../../security/gss
 .endif # GSS_BUILDLINK3_MK

Index: pkgsrc/security/hs-digest/buildlink3.mk
diff -u pkgsrc/security/hs-digest/buildlink3.mk:1.2 pkgsrc/security/hs-digest/buildlink3.mk:1.3
--- pkgsrc/security/hs-digest/buildlink3.mk:1.2 Fri Aug 29 14:08:41 2014
+++ pkgsrc/security/hs-digest/buildlink3.mk     Sun Jan  7 13:04:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 14:08:41 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:28 rillig Exp $
 
 BUILDLINK_TREE+=       hs-digest
 
@@ -7,7 +7,7 @@ HS_DIGEST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-digest+=      hs-digest>=0.0.1
 BUILDLINK_ABI_DEPENDS.hs-digest+=      hs-digest>=0.0.1.2
-BUILDLINK_PKGSRCDIR.hs-digest?=        ../../security/hs-digest
+BUILDLINK_PKGSRCDIR.hs-digest?=                ../../security/hs-digest
 .endif # HS_DIGEST_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-digest

Index: pkgsrc/security/libcrack/buildlink3.mk
diff -u pkgsrc/security/libcrack/buildlink3.mk:1.11 pkgsrc/security/libcrack/buildlink3.mk:1.12
--- pkgsrc/security/libcrack/buildlink3.mk:1.11 Fri Mar 20 19:25:18 2009
+++ pkgsrc/security/libcrack/buildlink3.mk      Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       libcrack
 
@@ -7,7 +7,7 @@ LIBCRACK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcrack+=       libcrack>=2.7
 BUILDLINK_ABI_DEPENDS.libcrack+=       libcrack>=2.7nb1
-BUILDLINK_PKGSRCDIR.libcrack?= ../../security/libcrack
+BUILDLINK_PKGSRCDIR.libcrack?=         ../../security/libcrack
 .endif # LIBCRACK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libcrack

Index: pkgsrc/security/libglobalplatform/buildlink3.mk
diff -u pkgsrc/security/libglobalplatform/buildlink3.mk:1.2 pkgsrc/security/libglobalplatform/buildlink3.mk:1.3
--- pkgsrc/security/libglobalplatform/buildlink3.mk:1.2 Sat Mar  5 11:27:54 2016
+++ pkgsrc/security/libglobalplatform/buildlink3.mk     Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/03/05 11:27:54 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       libglobalplatform
 
@@ -7,7 +7,7 @@ LIBGLOBALPLATFORM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libglobalplatform+=      libglobalplatform>=6.0.0
 BUILDLINK_ABI_DEPENDS.libglobalplatform?=      libglobalplatform>=6.0.0nb1
-BUILDLINK_PKGSRCDIR.libglobalplatform?=        ../../security/libglobalplatform
+BUILDLINK_PKGSRCDIR.libglobalplatform?=                ../../security/libglobalplatform
 
 .include "../../security/pcsc-lite/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/security/libgnome-keyring/buildlink3.mk
diff -u pkgsrc/security/libgnome-keyring/buildlink3.mk:1.9 pkgsrc/security/libgnome-keyring/buildlink3.mk:1.10
--- pkgsrc/security/libgnome-keyring/buildlink3.mk:1.9  Wed Jan  1 11:52:02 2014
+++ pkgsrc/security/libgnome-keyring/buildlink3.mk      Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2014/01/01 11:52:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       libgnome-keyring
 
@@ -7,7 +7,7 @@ LIBGNOME_KEYRING_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgnome-keyring+=       libgnome-keyring>=2.32.0
 BUILDLINK_ABI_DEPENDS.libgnome-keyring+=       libgnome-keyring>=3.4.1nb2
-BUILDLINK_PKGSRCDIR.libgnome-keyring?= ../../security/libgnome-keyring
+BUILDLINK_PKGSRCDIR.libgnome-keyring?=         ../../security/libgnome-keyring
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"

Index: pkgsrc/security/libident/buildlink3.mk
diff -u pkgsrc/security/libident/buildlink3.mk:1.7 pkgsrc/security/libident/buildlink3.mk:1.8
--- pkgsrc/security/libident/buildlink3.mk:1.7  Fri Mar 20 19:25:19 2009
+++ pkgsrc/security/libident/buildlink3.mk      Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       libident
 
@@ -7,7 +7,7 @@ LIBIDENT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libident+=       libident>=0.22
 BUILDLINK_ABI_DEPENDS.libident+=       libident>=0.22nb1
-BUILDLINK_PKGSRCDIR.libident?= ../../security/libident
+BUILDLINK_PKGSRCDIR.libident?=         ../../security/libident
 .endif # LIBIDENT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libident

Index: pkgsrc/security/libmcrypt/buildlink3.mk
diff -u pkgsrc/security/libmcrypt/buildlink3.mk:1.7 pkgsrc/security/libmcrypt/buildlink3.mk:1.8
--- pkgsrc/security/libmcrypt/buildlink3.mk:1.7 Fri Mar 20 19:25:19 2009
+++ pkgsrc/security/libmcrypt/buildlink3.mk     Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       libmcrypt
 
@@ -7,7 +7,7 @@ LIBMCRYPT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmcrypt+=      libmcrypt>=2.5.6
 BUILDLINK_ABI_DEPENDS.libmcrypt+=      libmcrypt>=2.5.7nb1
-BUILDLINK_PKGSRCDIR.libmcrypt?=        ../../security/libmcrypt
+BUILDLINK_PKGSRCDIR.libmcrypt?=                ../../security/libmcrypt
 .endif # LIBMCRYPT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libmcrypt

Index: pkgsrc/security/liboauth/buildlink3.mk
diff -u pkgsrc/security/liboauth/buildlink3.mk:1.11 pkgsrc/security/liboauth/buildlink3.mk:1.12
--- pkgsrc/security/liboauth/buildlink3.mk:1.11 Mon Jan  1 21:18:10 2018
+++ pkgsrc/security/liboauth/buildlink3.mk      Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2018/01/01 21:18:10 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       liboauth
 
@@ -7,7 +7,7 @@ LIBOAUTH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.liboauth+=       liboauth>=0.8.9
 BUILDLINK_ABI_DEPENDS.liboauth?=       liboauth>=1.0.3nb6
-BUILDLINK_PKGSRCDIR.liboauth?= ../../security/liboauth
+BUILDLINK_PKGSRCDIR.liboauth?=         ../../security/liboauth
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"

Index: pkgsrc/security/libprelude-python/buildlink3.mk
diff -u pkgsrc/security/libprelude-python/buildlink3.mk:1.1.1.1 pkgsrc/security/libprelude-python/buildlink3.mk:1.2
--- pkgsrc/security/libprelude-python/buildlink3.mk:1.1.1.1     Sun Aug 23 19:05:56 2009
+++ pkgsrc/security/libprelude-python/buildlink3.mk     Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/08/23 19:05:56 hasso Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       libprelude-python
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libprelude-python
 LIBPRELUDE_PYTHON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libprelude-python+=      libprelude-python>=0.9.24
-BUILDLINK_PKGSRCDIR.libprelude-python?=        ../../security/libprelude-python
+BUILDLINK_PKGSRCDIR.libprelude-python?=                ../../security/libprelude-python
 .endif # LIBPRELUDE_PYTHON_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libprelude-python

Index: pkgsrc/security/libpreludedb-perl/buildlink3.mk
diff -u pkgsrc/security/libpreludedb-perl/buildlink3.mk:1.1.1.1 pkgsrc/security/libpreludedb-perl/buildlink3.mk:1.2
--- pkgsrc/security/libpreludedb-perl/buildlink3.mk:1.1.1.1     Fri Oct  2 09:59:40 2009
+++ pkgsrc/security/libpreludedb-perl/buildlink3.mk     Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/02 09:59:40 hasso Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       libpreludedb-perl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libpreludedb-perl
 LIBPRELUDEDB_PERL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpreludedb-perl+=      libpreludedb-perl>=0.9.15.3
-BUILDLINK_PKGSRCDIR.libpreludedb-perl?=        ../../security/libpreludedb-perl
+BUILDLINK_PKGSRCDIR.libpreludedb-perl?=                ../../security/libpreludedb-perl
 
 .endif # LIBPRELUDEDB_PERL_BUILDLINK3_MK
 

Index: pkgsrc/security/libressl/buildlink3.mk
diff -u pkgsrc/security/libressl/buildlink3.mk:1.2 pkgsrc/security/libressl/buildlink3.mk:1.3
--- pkgsrc/security/libressl/buildlink3.mk:1.2  Tue Jul 26 11:53:24 2016
+++ pkgsrc/security/libressl/buildlink3.mk      Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/07/26 11:53:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       libressl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libressl
 LIBRESSL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libressl+=       libressl>=2.2.6
-BUILDLINK_PKGSRCDIR.libressl?= ../../security/libressl
+BUILDLINK_PKGSRCDIR.libressl?=         ../../security/libressl
 
 BUILDLINK_PASSTHRU_DIRS+=      ${LOCALBASE}/libressl/include
 BUILDLINK_PASSTHRU_DIRS+=      ${LOCALBASE}/libressl/lib

Index: pkgsrc/security/libsecret/buildlink3.mk
diff -u pkgsrc/security/libsecret/buildlink3.mk:1.3 pkgsrc/security/libsecret/buildlink3.mk:1.4
--- pkgsrc/security/libsecret/buildlink3.mk:1.3 Wed Jan  1 11:52:03 2014
+++ pkgsrc/security/libsecret/buildlink3.mk     Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/01/01 11:52:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       libsecret
 
@@ -7,7 +7,7 @@ LIBSECRET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsecret+=      libsecret>=0.12
 BUILDLINK_ABI_DEPENDS.libsecret?=      libsecret>=0.15nb1
-BUILDLINK_PKGSRCDIR.libsecret?=        ../../security/libsecret
+BUILDLINK_PKGSRCDIR.libsecret?=                ../../security/libsecret
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"

Index: pkgsrc/security/nettle/buildlink3.mk
diff -u pkgsrc/security/nettle/buildlink3.mk:1.5 pkgsrc/security/nettle/buildlink3.mk:1.6
--- pkgsrc/security/nettle/buildlink3.mk:1.5    Mon Feb  1 13:27:36 2016
+++ pkgsrc/security/nettle/buildlink3.mk        Sun Jan  7 13:04:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2016/02/01 13:27:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:29 rillig Exp $
 
 BUILDLINK_TREE+=       nettle
 
@@ -7,7 +7,7 @@ NETTLE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.nettle+= nettle>=2.4
 BUILDLINK_ABI_DEPENDS.nettle?= nettle>=3.1.1
-BUILDLINK_PKGSRCDIR.nettle?=           ../../security/nettle
+BUILDLINK_PKGSRCDIR.nettle?=   ../../security/nettle
 
 .include "../../devel/gmp/buildlink3.mk"
 .endif # NETTLE_BUILDLINK3_MK

Index: pkgsrc/security/ocaml-ssl/buildlink3.mk
diff -u pkgsrc/security/ocaml-ssl/buildlink3.mk:1.20 pkgsrc/security/ocaml-ssl/buildlink3.mk:1.21
--- pkgsrc/security/ocaml-ssl/buildlink3.mk:1.20        Fri Sep  8 09:51:25 2017
+++ pkgsrc/security/ocaml-ssl/buildlink3.mk     Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2017/09/08 09:51:25 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-ssl
 
@@ -7,7 +7,7 @@ OCAML_SSL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ssl+=      ocaml-ssl>=0.4.0
 BUILDLINK_ABI_DEPENDS.ocaml-ssl+=      ocaml-ssl>=0.5.3nb2
-BUILDLINK_PKGSRCDIR.ocaml-ssl?=        ../../security/ocaml-ssl
+BUILDLINK_PKGSRCDIR.ocaml-ssl?=                ../../security/ocaml-ssl
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/security/openssl/buildlink3.mk
diff -u pkgsrc/security/openssl/buildlink3.mk:1.51 pkgsrc/security/openssl/buildlink3.mk:1.52
--- pkgsrc/security/openssl/buildlink3.mk:1.51  Sat Mar  5 11:27:55 2016
+++ pkgsrc/security/openssl/buildlink3.mk       Sun Jan  7 13:04:30 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.51 2016/03/05 11:27:55 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       openssl
 
 .if !defined(OPENSSL_BUILDLINK3_MK)
 OPENSSL_BUILDLINK3_MK:=
 
-.  include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_API_DEPENDS.openssl+=        openssl>=1.0.1c
 BUILDLINK_ABI_DEPENDS.openssl+=        openssl>=1.0.2gnb1

Index: pkgsrc/security/openvas-libraries/buildlink3.mk
diff -u pkgsrc/security/openvas-libraries/buildlink3.mk:1.2 pkgsrc/security/openvas-libraries/buildlink3.mk:1.3
--- pkgsrc/security/openvas-libraries/buildlink3.mk:1.2 Fri Mar 20 19:25:21 2009
+++ pkgsrc/security/openvas-libraries/buildlink3.mk     Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       openvas-libraries
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        openvas-libraries
 OPENVAS_LIBRARIES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openvas-libraries+=      openvas-libraries>=2.0.0
-BUILDLINK_PKGSRCDIR.openvas-libraries?=        ../../security/openvas-libraries
+BUILDLINK_PKGSRCDIR.openvas-libraries?=                ../../security/openvas-libraries
 .endif # OPENVAS_LIBRARIES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -openvas-libraries

Index: pkgsrc/security/pakchois/buildlink3.mk
diff -u pkgsrc/security/pakchois/buildlink3.mk:1.4 pkgsrc/security/pakchois/buildlink3.mk:1.5
--- pkgsrc/security/pakchois/buildlink3.mk:1.4  Mon May  7 01:53:57 2012
+++ pkgsrc/security/pakchois/buildlink3.mk      Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2012/05/07 01:53:57 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       pakchois
 
@@ -7,7 +7,7 @@ PAKCHOIS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pakchois+=       pakchois>=0.4
 BUILDLINK_ABI_DEPENDS.pakchois+=       pakchois>=0.4nb1
-BUILDLINK_PKGSRCDIR.pakchois?= ../../security/pakchois
+BUILDLINK_PKGSRCDIR.pakchois?=         ../../security/pakchois
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/security/pcsc-lite/buildlink3.mk
diff -u pkgsrc/security/pcsc-lite/buildlink3.mk:1.7 pkgsrc/security/pcsc-lite/buildlink3.mk:1.8
--- pkgsrc/security/pcsc-lite/buildlink3.mk:1.7 Mon Mar 17 17:44:23 2014
+++ pkgsrc/security/pcsc-lite/buildlink3.mk     Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2014/03/17 17:44:23 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       pcsc-lite
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        pcsc-lite
 PCSC_LITE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pcsc-lite+=      pcsc-lite>=1.6.5
-BUILDLINK_PKGSRCDIR.pcsc-lite?=        ../../security/pcsc-lite
+BUILDLINK_PKGSRCDIR.pcsc-lite?=                ../../security/pcsc-lite
 
 .endif # PCSC_LITE_BUILDLINK3_MK
 

Index: pkgsrc/security/pinentry/buildlink3.mk
diff -u pkgsrc/security/pinentry/buildlink3.mk:1.8 pkgsrc/security/pinentry/buildlink3.mk:1.9
--- pkgsrc/security/pinentry/buildlink3.mk:1.8  Fri Mar 20 19:25:21 2009
+++ pkgsrc/security/pinentry/buildlink3.mk      Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       pinentry
 
@@ -7,7 +7,7 @@ PINENTRY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pinentry+=       pinentry>=0.7.1
 BUILDLINK_ABI_DEPENDS.pinentry+=       pinentry>=0.7.1nb3
-BUILDLINK_PKGSRCDIR.pinentry?= ../../security/pinentry
+BUILDLINK_PKGSRCDIR.pinentry?=         ../../security/pinentry
 .endif # PINENTRY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -pinentry

Index: pkgsrc/security/policykit/buildlink3.mk
diff -u pkgsrc/security/policykit/buildlink3.mk:1.7 pkgsrc/security/policykit/buildlink3.mk:1.8
--- pkgsrc/security/policykit/buildlink3.mk:1.7 Sat Sep 15 10:06:17 2012
+++ pkgsrc/security/policykit/buildlink3.mk     Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2012/09/15 10:06:17 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       policykit
 
@@ -7,7 +7,7 @@ POLICYKIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.policykit+=      policykit>=0.9
 BUILDLINK_ABI_DEPENDS.policykit+=      policykit>=0.9nb12
-BUILDLINK_PKGSRCDIR.policykit?=        ../../security/policykit
+BUILDLINK_PKGSRCDIR.policykit?=                ../../security/policykit
 
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"

Index: pkgsrc/security/polkit-qt/buildlink3.mk
diff -u pkgsrc/security/polkit-qt/buildlink3.mk:1.25 pkgsrc/security/polkit-qt/buildlink3.mk:1.26
--- pkgsrc/security/polkit-qt/buildlink3.mk:1.25        Sat Mar  5 11:27:55 2016
+++ pkgsrc/security/polkit-qt/buildlink3.mk     Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2016/03/05 11:27:55 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       polkit-qt
 
@@ -7,7 +7,7 @@ POLKIT_QT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.polkit-qt+=      polkit-qt>=0.9.2
 BUILDLINK_ABI_DEPENDS.polkit-qt+=      polkit-qt>=0.9.4nb19
-BUILDLINK_PKGSRCDIR.polkit-qt?=        ../../security/polkit-qt
+BUILDLINK_PKGSRCDIR.polkit-qt?=                ../../security/polkit-qt
 
 .include "../../security/policykit/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"

Index: pkgsrc/security/qore-ssh2-module/buildlink3.mk
diff -u pkgsrc/security/qore-ssh2-module/buildlink3.mk:1.3 pkgsrc/security/qore-ssh2-module/buildlink3.mk:1.4
--- pkgsrc/security/qore-ssh2-module/buildlink3.mk:1.3  Wed Jul 20 14:54:57 2016
+++ pkgsrc/security/qore-ssh2-module/buildlink3.mk      Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/07/20 14:54:57 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       qore-ssh2-module
 
@@ -7,7 +7,7 @@ QORE_SSH2_MODULE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qore-ssh2-module+=       qore-ssh2-module>=0.9.9
 BUILDLINK_ABI_DEPENDS.qore-ssh2-module?=       qore-ssh2-module>=1.0
-BUILDLINK_PKGSRCDIR.qore-ssh2-module?= ../../security/qore-ssh2-module
+BUILDLINK_PKGSRCDIR.qore-ssh2-module?=         ../../security/qore-ssh2-module
 
 .include "../../lang/qore/buildlink3.mk"
 .endif # QORE_SSH2_MODULE_BUILDLINK3_MK

Index: pkgsrc/security/seahorse/buildlink3.mk
diff -u pkgsrc/security/seahorse/buildlink3.mk:1.38 pkgsrc/security/seahorse/buildlink3.mk:1.39
--- pkgsrc/security/seahorse/buildlink3.mk:1.38 Sun Feb 12 06:24:49 2017
+++ pkgsrc/security/seahorse/buildlink3.mk      Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2017/02/12 06:24:49 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       seahorse
 
@@ -7,7 +7,7 @@ SEAHORSE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.seahorse+=       seahorse>=2.24.1
 BUILDLINK_ABI_DEPENDS.seahorse+=       seahorse>=2.32.0nb42
-BUILDLINK_PKGSRCDIR.seahorse?= ../../security/seahorse
+BUILDLINK_PKGSRCDIR.seahorse?=         ../../security/seahorse
 
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/security/sleuthkit/buildlink3.mk
diff -u pkgsrc/security/sleuthkit/buildlink3.mk:1.1 pkgsrc/security/sleuthkit/buildlink3.mk:1.2
--- pkgsrc/security/sleuthkit/buildlink3.mk:1.1 Thu Jun 18 13:01:44 2015
+++ pkgsrc/security/sleuthkit/buildlink3.mk     Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/06/18 13:01:44 pettai Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       sleuthkit
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        sleuthkit
 SLEUTHKIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sleuthkit+=      sleuthkit>=4.1.3nb3
-BUILDLINK_PKGSRCDIR.sleuthkit?=        ../../security/sleuthkit
+BUILDLINK_PKGSRCDIR.sleuthkit?=                ../../security/sleuthkit
 
 .endif # SLEUTHKIT_BUILDLINK3_MK
 

Index: pkgsrc/security/ykclient/buildlink3.mk
diff -u pkgsrc/security/ykclient/buildlink3.mk:1.10 pkgsrc/security/ykclient/buildlink3.mk:1.11
--- pkgsrc/security/ykclient/buildlink3.mk:1.10 Mon Jan  1 21:18:11 2018
+++ pkgsrc/security/ykclient/buildlink3.mk      Sun Jan  7 13:04:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2018/01/01 21:18:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:30 rillig Exp $
 
 BUILDLINK_TREE+=       ykclient
 
@@ -7,7 +7,7 @@ YKCLIENT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ykclient+=       ykclient>=2.7
 BUILDLINK_ABI_DEPENDS.ykclient?=       ykclient>=2.13nb7
-BUILDLINK_PKGSRCDIR.ykclient?= ../../security/ykclient
+BUILDLINK_PKGSRCDIR.ykclient?=         ../../security/ykclient
 
 .include "../../www/curl/buildlink3.mk"
 .endif # YKCLIENT_BUILDLINK3_MK

Index: pkgsrc/sysutils/amanda-common/buildlink3.mk
diff -u pkgsrc/sysutils/amanda-common/buildlink3.mk:1.14 pkgsrc/sysutils/amanda-common/buildlink3.mk:1.15
--- pkgsrc/sysutils/amanda-common/buildlink3.mk:1.14    Mon Jul 30 07:21:11 2012
+++ pkgsrc/sysutils/amanda-common/buildlink3.mk Sun Jan  7 13:04:31 2018
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.14 2012/07/30 07:21:11 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:31 rillig Exp $
 
 BUILDLINK_TREE+=       amanda-common
 
 .if !defined(AMANDA_COMMON_BUILDLINK3_MK)
 AMANDA_COMMON_BUILDLINK3_MK:=
+
 .include "version.mk"
 
 BUILDLINK_API_DEPENDS.amanda-common+=  amanda-common>=${AMANDA_VERSION}
@@ -14,10 +15,10 @@ BUILDLINK_LIBDIRS.amanda-common=    lib/ama
 
 pkgbase := amanda-common
 .include "../../mk/pkg-build-options.mk"
-.  if !empty(PKG_BUILD_OPTIONS.amanda-common:Mamanda-krb5)
-CONFIGURE_ARGS+=       --with-krb5-security=${KRB5BASE:Q}
-.    include "../../mk/krb5.buildlink3.mk"
-.  endif
+.if !empty(PKG_BUILD_OPTIONS.amanda-common:Mamanda-krb5)
+CONFIGURE_ARGS+=       --with-krb5-security=${KRB5BASE}
+.  include "../../mk/krb5.buildlink3.mk"
+.endif
 .endif # AMANDA_COMMON_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -amanda-common

Index: pkgsrc/sysutils/augeas/buildlink3.mk
diff -u pkgsrc/sysutils/augeas/buildlink3.mk:1.1 pkgsrc/sysutils/augeas/buildlink3.mk:1.2
--- pkgsrc/sysutils/augeas/buildlink3.mk:1.1    Tue Dec 30 15:03:32 2014
+++ pkgsrc/sysutils/augeas/buildlink3.mk        Sun Jan  7 13:04:31 2018
@@ -1,4 +1,5 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/12/30 15:03:32 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:31 rillig Exp $
+
 BUILDLINK_TREE+=       augeas
 
 .if !defined(AUGEAS_BUILDLINK3_MK)

Index: pkgsrc/sysutils/dbus/buildlink3.mk
diff -u pkgsrc/sysutils/dbus/buildlink3.mk:1.16 pkgsrc/sysutils/dbus/buildlink3.mk:1.17
--- pkgsrc/sysutils/dbus/buildlink3.mk:1.16     Wed Jan 29 13:01:53 2014
+++ pkgsrc/sysutils/dbus/buildlink3.mk  Sun Jan  7 13:04:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2014/01/29 13:01:53 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:31 rillig Exp $
 
 BUILDLINK_TREE+=       dbus
 
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.dbus?=    ../../sysutil
 
 .if defined(USE_DBUS-ARCH-DEPS_H)
 .  if !empty(USE_DBUS-ARCH-DEPS_H:M[yY][eE][sS])
-BUILDLINK_INCDIRS.dbus+=       lib/dbus-1.0/include/dbus
+BUILDLINK_INCDIRS.dbus+=               lib/dbus-1.0/include/dbus
 BUILDLINK_FNAME_TRANSFORM.dbus+=       -e "s|lib/dbus-1.0/||"
 .  endif
 .endif

Index: pkgsrc/sysutils/dbus-glib/buildlink3.mk
diff -u pkgsrc/sysutils/dbus-glib/buildlink3.mk:1.16 pkgsrc/sysutils/dbus-glib/buildlink3.mk:1.17
--- pkgsrc/sysutils/dbus-glib/buildlink3.mk:1.16        Sat Sep 15 10:06:22 2012
+++ pkgsrc/sysutils/dbus-glib/buildlink3.mk     Sun Jan  7 13:04:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2012/09/15 10:06:22 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:31 rillig Exp $
 
 BUILDLINK_TREE+=       dbus-glib
 
@@ -7,7 +7,7 @@ DBUS_GLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.dbus-glib+=      dbus-glib>=0.61
 BUILDLINK_ABI_DEPENDS.dbus-glib+=      dbus-glib>=0.100nb1
-BUILDLINK_PKGSRCDIR.dbus-glib?=        ../../sysutils/dbus-glib
+BUILDLINK_PKGSRCDIR.dbus-glib?=                ../../sysutils/dbus-glib
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"

Index: pkgsrc/sysutils/deforaos-browser/buildlink3.mk
diff -u pkgsrc/sysutils/deforaos-browser/buildlink3.mk:1.15 pkgsrc/sysutils/deforaos-browser/buildlink3.mk:1.16
--- pkgsrc/sysutils/deforaos-browser/buildlink3.mk:1.15 Sun Feb 12 06:24:49 2017
+++ pkgsrc/sysutils/deforaos-browser/buildlink3.mk      Sun Jan  7 13:04:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2017/02/12 06:24:49 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:31 rillig Exp $
 
 BUILDLINK_TREE+=       deforaos-browser
 
@@ -7,7 +7,7 @@ DEFORAOS_BROWSER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.deforaos-browser+=       deforaos-browser>=0.5.0
 BUILDLINK_ABI_DEPENDS.deforaos-browser?=       deforaos-browser>=0.5.1nb3
-BUILDLINK_PKGSRCDIR.deforaos-browser?= ../../sysutils/deforaos-browser
+BUILDLINK_PKGSRCDIR.deforaos-browser?=         ../../sysutils/deforaos-browser
 
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .endif # DEFORAOS_BROWSER_BUILDLINK3_MK

Index: pkgsrc/sysutils/desktop-file-utils/buildlink3.mk
diff -u pkgsrc/sysutils/desktop-file-utils/buildlink3.mk:1.7 pkgsrc/sysutils/desktop-file-utils/buildlink3.mk:1.8
--- pkgsrc/sysutils/desktop-file-utils/buildlink3.mk:1.7        Fri Mar 20 19:25:23 2009
+++ pkgsrc/sysutils/desktop-file-utils/buildlink3.mk    Sun Jan  7 13:04:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:31 rillig Exp $
 
 BUILDLINK_TREE+=       desktop-file-utils
 
@@ -7,7 +7,7 @@ DESKTOP_FILE_UTILS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.desktop-file-utils+=     desktop-file-utils>=0.8
 BUILDLINK_ABI_DEPENDS.desktop-file-utils+=     desktop-file-utils>=0.10nb1
-BUILDLINK_PKGSRCDIR.desktop-file-utils?=../../sysutils/desktop-file-utils
+BUILDLINK_PKGSRCDIR.desktop-file-utils?=       ../../sysutils/desktop-file-utils
 
 BUILDLINK_TARGETS+=    desktop-file-utils-buildlink-fake
 

Index: pkgsrc/sysutils/eventlog/buildlink3.mk
diff -u pkgsrc/sysutils/eventlog/buildlink3.mk:1.1.1.1 pkgsrc/sysutils/eventlog/buildlink3.mk:1.2
--- pkgsrc/sysutils/eventlog/buildlink3.mk:1.1.1.1      Wed Sep 21 19:29:24 2011
+++ pkgsrc/sysutils/eventlog/buildlink3.mk      Sun Jan  7 13:04:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/09/21 19:29:24 bouyer Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:31 rillig Exp $
 
 BUILDLINK_TREE+=       eventlog
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        eventlog
 EVENTLOG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.eventlog+=       eventlog>=0.2.12
-BUILDLINK_PKGSRCDIR.eventlog?= ../../sysutils/eventlog
+BUILDLINK_PKGSRCDIR.eventlog?=         ../../sysutils/eventlog
 .endif # EVENTLOG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -eventlog

Index: pkgsrc/sysutils/fam/buildlink3.mk
diff -u pkgsrc/sysutils/fam/buildlink3.mk:1.9 pkgsrc/sysutils/fam/buildlink3.mk:1.10
--- pkgsrc/sysutils/fam/buildlink3.mk:1.9       Fri Mar 20 19:25:23 2009
+++ pkgsrc/sysutils/fam/buildlink3.mk   Sun Jan  7 13:04:31 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:31 rillig Exp $
 
 BUILDLINK_TREE+=       fam
 
 .if !defined(FAM_BUILDLINK3_MK)
 FAM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.fam+=            fam>=2.6.10
+BUILDLINK_API_DEPENDS.fam+=    fam>=2.6.10
 BUILDLINK_ABI_DEPENDS.fam+=    fam>=2.7.0nb7
 BUILDLINK_PKGSRCDIR.fam?=      ../../sysutils/fam
 .endif # FAM_BUILDLINK3_MK

Index: pkgsrc/sysutils/file/buildlink3.mk
diff -u pkgsrc/sysutils/file/buildlink3.mk:1.8 pkgsrc/sysutils/file/buildlink3.mk:1.9
--- pkgsrc/sysutils/file/buildlink3.mk:1.8      Fri Mar 20 19:25:24 2009
+++ pkgsrc/sysutils/file/buildlink3.mk  Sun Jan  7 13:04:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:31 rillig Exp $
 #
 
 BUILDLINK_TREE+=       file
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        file
 .if !defined(FILE_BUILDLINK3_MK)
 FILE_BUILDLINK3_MK:=
 
-.  include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_API_DEPENDS.file+=   file>=4.17
 BUILDLINK_ABI_DEPENDS.file+=   file>=4.17

Index: pkgsrc/sysutils/gnome-menus/buildlink3.mk
diff -u pkgsrc/sysutils/gnome-menus/buildlink3.mk:1.21 pkgsrc/sysutils/gnome-menus/buildlink3.mk:1.22
--- pkgsrc/sysutils/gnome-menus/buildlink3.mk:1.21      Sat Sep 15 10:06:24 2012
+++ pkgsrc/sysutils/gnome-menus/buildlink3.mk   Sun Jan  7 13:04:31 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.21 2012/09/15 10:06:24 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:31 rillig Exp $
 
 BUILDLINK_TREE+=       gnome-menus
 
 .if !defined(GNOME_MENUS_BUILDLINK3_MK)
 GNOME_MENUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnome-menus+=            gnome-menus>=2.13.5
+BUILDLINK_API_DEPENDS.gnome-menus+=    gnome-menus>=2.13.5
 BUILDLINK_ABI_DEPENDS.gnome-menus+=    gnome-menus>=2.30.5nb4
 BUILDLINK_PKGSRCDIR.gnome-menus?=      ../../sysutils/gnome-menus
 

Index: pkgsrc/sysutils/gsettings-desktop-schemas/buildlink3.mk
diff -u pkgsrc/sysutils/gsettings-desktop-schemas/buildlink3.mk:1.1 pkgsrc/sysutils/gsettings-desktop-schemas/buildlink3.mk:1.2
--- pkgsrc/sysutils/gsettings-desktop-schemas/buildlink3.mk:1.1 Thu Aug 23 13:38:03 2012
+++ pkgsrc/sysutils/gsettings-desktop-schemas/buildlink3.mk     Sun Jan  7 13:04:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/08/23 13:38:03 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:31 rillig Exp $
 
 # Just for the pkg_config .pc file
 BUILDLINK_TREE+=       gsettings-desktop-schemas
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        gsettings-desktop-schem
 GSETTINGS_DESKTOP_SCHEMAS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=      gsettings-desktop-schemas>=3.4.2
-BUILDLINK_PKGSRCDIR.gsettings-desktop-schemas?=        ../../sysutils/gsettings-desktop-schemas
+BUILDLINK_PKGSRCDIR.gsettings-desktop-schemas?=                ../../sysutils/gsettings-desktop-schemas
 
 .endif # GSETTINGS_DESKTOP_SCHEMAS_BUILDLINK3_MK
 

Index: pkgsrc/sysutils/hal-info/buildlink3.mk
diff -u pkgsrc/sysutils/hal-info/buildlink3.mk:1.2 pkgsrc/sysutils/hal-info/buildlink3.mk:1.3
--- pkgsrc/sysutils/hal-info/buildlink3.mk:1.2  Fri Mar 20 19:25:24 2009
+++ pkgsrc/sysutils/hal-info/buildlink3.mk      Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       hal-info
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        hal-info
 HAL_INFO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hal-info+=       hal-info>=20081022
-BUILDLINK_PKGSRCDIR.hal-info?= ../../sysutils/hal-info
+BUILDLINK_PKGSRCDIR.hal-info?=         ../../sysutils/hal-info
 .endif # HAL_INFO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hal-info

Index: pkgsrc/sysutils/libbaloo4/buildlink3.mk
diff -u pkgsrc/sysutils/libbaloo4/buildlink3.mk:1.1 pkgsrc/sysutils/libbaloo4/buildlink3.mk:1.2
--- pkgsrc/sysutils/libbaloo4/buildlink3.mk:1.1 Thu Apr 28 07:01:13 2016
+++ pkgsrc/sysutils/libbaloo4/buildlink3.mk     Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/04/28 07:01:13 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       libbaloo4
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libbaloo4
 LIBBALOO4_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libbaloo4+=      libbaloo4>=4.14.3
-BUILDLINK_PKGSRCDIR.libbaloo4?=        ../../sysutils/libbaloo4
+BUILDLINK_PKGSRCDIR.libbaloo4?=                ../../sysutils/libbaloo4
 
 .include "../../sysutils/kfilemetadata/buildlink3.mk"
 .endif # LIBBALOO4_BUILDLINK3_MK

Index: pkgsrc/sysutils/libdevkit-gobject/buildlink3.mk
diff -u pkgsrc/sysutils/libdevkit-gobject/buildlink3.mk:1.6 pkgsrc/sysutils/libdevkit-gobject/buildlink3.mk:1.7
--- pkgsrc/sysutils/libdevkit-gobject/buildlink3.mk:1.6 Sat Sep 15 10:06:29 2012
+++ pkgsrc/sysutils/libdevkit-gobject/buildlink3.mk     Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2012/09/15 10:06:29 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       libdevkit-gobject
 
@@ -7,7 +7,7 @@ LIBDEVKIT_GOBJECT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libdevkit-gobject+=      libdevkit-gobject>=003
 BUILDLINK_ABI_DEPENDS.libdevkit-gobject+=      libdevkit-gobject>=003nb6
-BUILDLINK_PKGSRCDIR.libdevkit-gobject?=        ../../sysutils/libdevkit-gobject
+BUILDLINK_PKGSRCDIR.libdevkit-gobject?=                ../../sysutils/libdevkit-gobject
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"

Index: pkgsrc/sysutils/libgamin/buildlink3.mk
diff -u pkgsrc/sysutils/libgamin/buildlink3.mk:1.2 pkgsrc/sysutils/libgamin/buildlink3.mk:1.3
--- pkgsrc/sysutils/libgamin/buildlink3.mk:1.2  Fri Mar 20 19:25:24 2009
+++ pkgsrc/sysutils/libgamin/buildlink3.mk      Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       libgamin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libgamin
 LIBGAMIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgamin+=       libgamin>=0.1.10
-BUILDLINK_PKGSRCDIR.libgamin?= ../../sysutils/libgamin
+BUILDLINK_PKGSRCDIR.libgamin?=         ../../sysutils/libgamin
 .endif # LIBGAMIN_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libgamin

Index: pkgsrc/sysutils/libisofs/buildlink3.mk
diff -u pkgsrc/sysutils/libisofs/buildlink3.mk:1.1 pkgsrc/sysutils/libisofs/buildlink3.mk:1.2
--- pkgsrc/sysutils/libisofs/buildlink3.mk:1.1  Tue Apr 29 20:03:06 2014
+++ pkgsrc/sysutils/libisofs/buildlink3.mk      Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/04/29 20:03:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       libisofs
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libisofs
 LIBISOFS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libisofs+=       libisofs>=1.1.6
-BUILDLINK_PKGSRCDIR.libisofs?= ../../sysutils/libisofs
+BUILDLINK_PKGSRCDIR.libisofs?=         ../../sysutils/libisofs
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif # LIBISOFS_BUILDLINK3_MK

Index: pkgsrc/sysutils/libnotify/buildlink3.mk
diff -u pkgsrc/sysutils/libnotify/buildlink3.mk:1.27 pkgsrc/sysutils/libnotify/buildlink3.mk:1.28
--- pkgsrc/sysutils/libnotify/buildlink3.mk:1.27        Wed Aug  3 10:22:19 2016
+++ pkgsrc/sysutils/libnotify/buildlink3.mk     Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2016/08/03 10:22:19 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       libnotify
 
@@ -7,7 +7,7 @@ LIBNOTIFY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libnotify+=      libnotify>=0.7.0
 BUILDLINK_ABI_DEPENDS.libnotify?=      libnotify>=0.7.6nb3
-BUILDLINK_PKGSRCDIR.libnotify?=        ../../sysutils/libnotify
+BUILDLINK_PKGSRCDIR.libnotify?=                ../../sysutils/libnotify
 
 pkgbase := libnotify
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/sysutils/libpciaccess/buildlink3.mk
diff -u pkgsrc/sysutils/libpciaccess/buildlink3.mk:1.4 pkgsrc/sysutils/libpciaccess/buildlink3.mk:1.5
--- pkgsrc/sysutils/libpciaccess/buildlink3.mk:1.4      Tue Apr 29 06:18:42 2014
+++ pkgsrc/sysutils/libpciaccess/buildlink3.mk  Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/04/29 06:18:42 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:32 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,14 +10,14 @@
 
 BUILDLINK_TREE+=       libpciaccess
 
-.if !defined(LIBPCIACCESS_BUILDLINK3_MK)
+.  if !defined(LIBPCIACCESS_BUILDLINK3_MK)
 LIBPCIACCESS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpciaccess+=   libpciaccess>=0.10.4
 BUILDLINK_PKGSRCDIR.libpciaccess?=     ../../sysutils/libpciaccess
 
 .include "../../devel/zlib/buildlink3.mk"
-.endif # LIBPCIACCESS_BUILDLINK3_MK
+.  endif # LIBPCIACCESS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libpciaccess
 

Index: pkgsrc/sysutils/nautilus/buildlink3.mk
diff -u pkgsrc/sysutils/nautilus/buildlink3.mk:1.63 pkgsrc/sysutils/nautilus/buildlink3.mk:1.64
--- pkgsrc/sysutils/nautilus/buildlink3.mk:1.63 Sun Feb 12 06:24:50 2017
+++ pkgsrc/sysutils/nautilus/buildlink3.mk      Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.63 2017/02/12 06:24:50 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.64 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       nautilus
 
@@ -7,7 +7,7 @@ NAUTILUS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.nautilus+=       nautilus>=2.12.1nb1
 BUILDLINK_ABI_DEPENDS.nautilus+=       nautilus>=2.32.2.1nb25
-BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus
+BUILDLINK_PKGSRCDIR.nautilus?=         ../../sysutils/nautilus
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/sysutils/pciutils/buildlink3.mk
diff -u pkgsrc/sysutils/pciutils/buildlink3.mk:1.8 pkgsrc/sysutils/pciutils/buildlink3.mk:1.9
--- pkgsrc/sysutils/pciutils/buildlink3.mk:1.8  Fri Mar 20 19:25:26 2009
+++ pkgsrc/sysutils/pciutils/buildlink3.mk      Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       pciutils
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=        pciutils
 PCIUTILS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pciutils+=       pciutils>=3.0.2
-BUILDLINK_PKGSRCDIR.pciutils?= ../../sysutils/pciutils
-BUILDLINK_DEPMETHOD.pciutils?= build
+BUILDLINK_PKGSRCDIR.pciutils?=         ../../sysutils/pciutils
+BUILDLINK_DEPMETHOD.pciutils?=         build
 .endif # PCIUTILS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -pciutils

Index: pkgsrc/sysutils/py-notify-python/buildlink3.mk
diff -u pkgsrc/sysutils/py-notify-python/buildlink3.mk:1.11 pkgsrc/sysutils/py-notify-python/buildlink3.mk:1.12
--- pkgsrc/sysutils/py-notify-python/buildlink3.mk:1.11 Sun Feb 12 06:24:50 2017
+++ pkgsrc/sysutils/py-notify-python/buildlink3.mk      Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2017/02/12 06:24:50 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       py-notify-python
 
@@ -9,7 +9,7 @@ PY_NOTIFY_PYTHON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-notify-python+=       ${PYPKGPREFIX}-notify-python>=0.1.1
 BUILDLINK_ABI_DEPENDS.py-notify-python+=       ${PYPKGPREFIX}-notify-python>=0.1.1nb29
-BUILDLINK_PKGSRCDIR.py-notify-python?= ../../sysutils/py-notify-python
+BUILDLINK_PKGSRCDIR.py-notify-python?=         ../../sysutils/py-notify-python
 
 .include "../../x11/py-gtk2/buildlink3.mk"
 .endif # PY_NOTIFY_PYTHON_BUILDLINK3_MK

Index: pkgsrc/sysutils/vcdimager-devel/buildlink3.mk
diff -u pkgsrc/sysutils/vcdimager-devel/buildlink3.mk:1.12 pkgsrc/sysutils/vcdimager-devel/buildlink3.mk:1.13
--- pkgsrc/sysutils/vcdimager-devel/buildlink3.mk:1.12  Sun Sep 23 05:36:24 2012
+++ pkgsrc/sysutils/vcdimager-devel/buildlink3.mk       Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2012/09/23 05:36:24 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       vcdimager
 
@@ -7,7 +7,7 @@ VCDIMAGER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.vcdimager+=      vcdimager>=0.7.20
 BUILDLINK_ABI_DEPENDS.vcdimager+=      vcdimager>=0.7.24nb2
-BUILDLINK_PKGSRCDIR.vcdimager?=        ../../sysutils/vcdimager-devel
+BUILDLINK_PKGSRCDIR.vcdimager?=                ../../sysutils/vcdimager-devel
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"

Index: pkgsrc/textproc/aiksaurus/buildlink3.mk
diff -u pkgsrc/textproc/aiksaurus/buildlink3.mk:1.8 pkgsrc/textproc/aiksaurus/buildlink3.mk:1.9
--- pkgsrc/textproc/aiksaurus/buildlink3.mk:1.8 Fri Mar 20 19:25:28 2009
+++ pkgsrc/textproc/aiksaurus/buildlink3.mk     Sun Jan  7 13:04:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:32 rillig Exp $
 
 BUILDLINK_TREE+=       aiksaurus
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        aiksaurus
 AIKSAURUS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.aiksaurus+=      aiksaurus>=1.2.1
-BUILDLINK_PKGSRCDIR.aiksaurus?=        ../../textproc/aiksaurus
+BUILDLINK_PKGSRCDIR.aiksaurus?=                ../../textproc/aiksaurus
 .endif # AIKSAURUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -aiksaurus

Index: pkgsrc/textproc/cityhash/buildlink3.mk
diff -u pkgsrc/textproc/cityhash/buildlink3.mk:1.1 pkgsrc/textproc/cityhash/buildlink3.mk:1.2
--- pkgsrc/textproc/cityhash/buildlink3.mk:1.1  Tue Jul  2 11:22:21 2013
+++ pkgsrc/textproc/cityhash/buildlink3.mk      Sun Jan  7 13:04:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/07/02 11:22:21 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       cityhash
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        cityhash
 CITYHASH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cityhash+=       cityhash>=1.1.0
-BUILDLINK_PKGSRCDIR.cityhash?= ../../textproc/cityhash
+BUILDLINK_PKGSRCDIR.cityhash?=         ../../textproc/cityhash
 .endif # CITYHASH_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -cityhash

Index: pkgsrc/textproc/gnome-spell/buildlink3.mk
diff -u pkgsrc/textproc/gnome-spell/buildlink3.mk:1.55 pkgsrc/textproc/gnome-spell/buildlink3.mk:1.56
--- pkgsrc/textproc/gnome-spell/buildlink3.mk:1.55      Thu Nov 23 17:19:44 2017
+++ pkgsrc/textproc/gnome-spell/buildlink3.mk   Sun Jan  7 13:04:33 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.55 2017/11/23 17:19:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.56 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       gnome-spell
 
 .if !defined(GNOME_SPELL_BUILDLINK3_MK)
 GNOME_SPELL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnome-spell+=            gnome-spell>=1.0.5
+BUILDLINK_API_DEPENDS.gnome-spell+=    gnome-spell>=1.0.5
 BUILDLINK_ABI_DEPENDS.gnome-spell+=    gnome-spell>=1.0.8nb37
 BUILDLINK_PKGSRCDIR.gnome-spell?=      ../../textproc/gnome-spell
 

Index: pkgsrc/textproc/go-prose/buildlink3.mk
diff -u pkgsrc/textproc/go-prose/buildlink3.mk:1.2 pkgsrc/textproc/go-prose/buildlink3.mk:1.3
--- pkgsrc/textproc/go-prose/buildlink3.mk:1.2  Fri Aug 25 16:49:15 2017
+++ pkgsrc/textproc/go-prose/buildlink3.mk      Sun Jan  7 13:04:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       go-prose
 
@@ -8,7 +8,7 @@ GO_PROSE_BUILDLINK3_MK:=
 BUILDLINK_CONTENTS_FILTER.go-prose=    ${EGREP} gopkg/
 BUILDLINK_DEPMETHOD.go-prose?=         build
 
-BUILDLINK_API_DEPENDS.go-prose+=               go-prose>=0.0
+BUILDLINK_API_DEPENDS.go-prose+=       go-prose>=0.0
 BUILDLINK_PKGSRCDIR.go-prose?=         ../../textproc/go-prose
 
 .endif  # GO_PROSE_BUILDLINK3_MK

Index: pkgsrc/textproc/go-runewidth/buildlink3.mk
diff -u pkgsrc/textproc/go-runewidth/buildlink3.mk:1.1 pkgsrc/textproc/go-runewidth/buildlink3.mk:1.2
--- pkgsrc/textproc/go-runewidth/buildlink3.mk:1.1      Sat Aug 13 20:21:08 2016
+++ pkgsrc/textproc/go-runewidth/buildlink3.mk  Sun Jan  7 13:04:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/08/13 20:21:08 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       go-runewidth
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-runewidth
 GO_RUNEWIDTH_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-runewidth=        ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-runewidth?=             build
+BUILDLINK_DEPMETHOD.go-runewidth?=     build
 
 BUILDLINK_API_DEPENDS.go-runewidth+=   go-runewidth>=0.0.1
 BUILDLINK_PKGSRCDIR.go-runewidth?=     ../../textproc/go-runewidth

Index: pkgsrc/textproc/go-sentences/buildlink3.mk
diff -u pkgsrc/textproc/go-sentences/buildlink3.mk:1.2 pkgsrc/textproc/go-sentences/buildlink3.mk:1.3
--- pkgsrc/textproc/go-sentences/buildlink3.mk:1.2      Fri Aug 25 16:49:15 2017
+++ pkgsrc/textproc/go-sentences/buildlink3.mk  Sun Jan  7 13:04:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       go-sentences
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-sentences
 GO_SENTENCES_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-sentences=        ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-sentences?=             build
+BUILDLINK_DEPMETHOD.go-sentences?=     build
 
 BUILDLINK_API_DEPENDS.go-sentences+=           go-sentences>=1.0.6
 BUILDLINK_PKGSRCDIR.go-sentences?=             ../../textproc/go-sentences

Index: pkgsrc/textproc/gtkspell/buildlink3.mk
diff -u pkgsrc/textproc/gtkspell/buildlink3.mk:1.38 pkgsrc/textproc/gtkspell/buildlink3.mk:1.39
--- pkgsrc/textproc/gtkspell/buildlink3.mk:1.38 Sun Feb 12 06:24:50 2017
+++ pkgsrc/textproc/gtkspell/buildlink3.mk      Sun Jan  7 13:04:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2017/02/12 06:24:50 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       gtkspell
 
@@ -7,7 +7,7 @@ GTKSPELL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtkspell+=       gtkspell>=2.0.13
 BUILDLINK_ABI_DEPENDS.gtkspell+=       gtkspell>=2.0.16nb24
-BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell
+BUILDLINK_PKGSRCDIR.gtkspell?=         ../../textproc/gtkspell
 
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/textproc/hre/buildlink3.mk
diff -u pkgsrc/textproc/hre/buildlink3.mk:1.7 pkgsrc/textproc/hre/buildlink3.mk:1.8
--- pkgsrc/textproc/hre/buildlink3.mk:1.7       Fri Mar 20 19:25:29 2009
+++ pkgsrc/textproc/hre/buildlink3.mk   Sun Jan  7 13:04:33 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       hre
 
 .if !defined(HRE_BUILDLINK3_MK)
 HRE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hre+=            hre>=0.9.7
+BUILDLINK_API_DEPENDS.hre+=    hre>=0.9.7
 BUILDLINK_ABI_DEPENDS.hre+=    hre>=0.9.8anb1
 BUILDLINK_PKGSRCDIR.hre?=      ../../textproc/hre
 .endif # HRE_BUILDLINK3_MK

Index: pkgsrc/textproc/hs-parsec/buildlink3.mk
diff -u pkgsrc/textproc/hs-parsec/buildlink3.mk:1.11 pkgsrc/textproc/hs-parsec/buildlink3.mk:1.12
--- pkgsrc/textproc/hs-parsec/buildlink3.mk:1.11        Sun Jan 10 11:49:11 2016
+++ pkgsrc/textproc/hs-parsec/buildlink3.mk     Sun Jan  7 13:04:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2016/01/10 11:49:11 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       hs-parsec
 
@@ -7,7 +7,7 @@ HS_PARSEC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-parsec+=      hs-parsec>=3.1.9
 BUILDLINK_ABI_DEPENDS.hs-parsec+=      hs-parsec>=3.1.9nb2
-BUILDLINK_PKGSRCDIR.hs-parsec?=        ../../textproc/hs-parsec
+BUILDLINK_PKGSRCDIR.hs-parsec?=                ../../textproc/hs-parsec
 
 .include "../../devel/hs-mtl/buildlink3.mk"
 .include "../../devel/hs-text/buildlink3.mk"

Index: pkgsrc/textproc/iso-codes/buildlink3.mk
diff -u pkgsrc/textproc/iso-codes/buildlink3.mk:1.9 pkgsrc/textproc/iso-codes/buildlink3.mk:1.10
--- pkgsrc/textproc/iso-codes/buildlink3.mk:1.9 Fri Mar 20 19:25:29 2009
+++ pkgsrc/textproc/iso-codes/buildlink3.mk     Sun Jan  7 13:04:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       iso-codes
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        iso-codes
 ISO_CODES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.iso-codes+=      iso-codes>=0.50
-BUILDLINK_PKGSRCDIR.iso-codes?=        ../../textproc/iso-codes
+BUILDLINK_PKGSRCDIR.iso-codes?=                ../../textproc/iso-codes
 .endif # ISO_CODES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -iso-codes

Index: pkgsrc/textproc/jansson/buildlink3.mk
diff -u pkgsrc/textproc/jansson/buildlink3.mk:1.3 pkgsrc/textproc/jansson/buildlink3.mk:1.4
--- pkgsrc/textproc/jansson/buildlink3.mk:1.3   Fri Jan 16 11:50:28 2015
+++ pkgsrc/textproc/jansson/buildlink3.mk       Sun Jan  7 13:04:33 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/01/16 11:50:28 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:33 rillig Exp $
 
 BUILDLINK_TREE+=       jansson
 
 .if !defined(JANSSON_BUILDLINK3_MK)
 JANSSON_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.jansson+=jansson>=2.0
+BUILDLINK_API_DEPENDS.jansson+=        jansson>=2.0
 BUILDLINK_ABI_DEPENDS.jansson?=        jansson>=2.4nb1
 BUILDLINK_PKGSRCDIR.jansson?=  ../../textproc/jansson
 

Index: pkgsrc/textproc/json-glib/buildlink3.mk
diff -u pkgsrc/textproc/json-glib/buildlink3.mk:1.11 pkgsrc/textproc/json-glib/buildlink3.mk:1.12
--- pkgsrc/textproc/json-glib/buildlink3.mk:1.11        Thu Jan  2 12:19:00 2014
+++ pkgsrc/textproc/json-glib/buildlink3.mk     Sun Jan  7 13:04:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2014/01/02 12:19:00 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:33 rillig Exp $
 #
 
 BUILDLINK_TREE+=       json-glib
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        json-glib
 JSON_GLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.json-glib+=      json-glib>=0.6.2
-BUILDLINK_ABI_DEPENDS.json-glib+=              json-glib>=0.14.2nb3
+BUILDLINK_ABI_DEPENDS.json-glib+=      json-glib>=0.14.2nb3
 BUILDLINK_PKGSRCDIR.json-glib?=                ../../textproc/json-glib
 
 pkgbase := json-glib

Index: pkgsrc/textproc/kakasi/buildlink3.mk
diff -u pkgsrc/textproc/kakasi/buildlink3.mk:1.9 pkgsrc/textproc/kakasi/buildlink3.mk:1.10
--- pkgsrc/textproc/kakasi/buildlink3.mk:1.9    Fri Jun  6 12:09:47 2014
+++ pkgsrc/textproc/kakasi/buildlink3.mk        Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2014/06/06 12:09:47 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       kakasi
 
@@ -12,9 +12,9 @@ BUILDLINK_PKGSRCDIR.kakasi?=  ../../textp
 pkgbase := kakasi
 .include "../../mk/pkg-build-options.mk"
 
-.  if !empty(PKG_BUILD_OPTIONS.kakasi:Mutf8)
+.if !empty(PKG_BUILD_OPTIONS.kakasi:Mutf8)
 .include "../../converters/libiconv/buildlink3.mk"
-.  endif
+.endif
 
 .endif # KAKASI_BUILDLINK3_MK
 

Index: pkgsrc/textproc/libcroco/buildlink3.mk
diff -u pkgsrc/textproc/libcroco/buildlink3.mk:1.29 pkgsrc/textproc/libcroco/buildlink3.mk:1.30
--- pkgsrc/textproc/libcroco/buildlink3.mk:1.29 Mon Nov 23 12:54:53 2015
+++ pkgsrc/textproc/libcroco/buildlink3.mk      Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2015/11/23 12:54:53 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       libcroco
 
@@ -7,7 +7,7 @@ LIBCROCO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcroco+=       libcroco>=0.6.0
 BUILDLINK_ABI_DEPENDS.libcroco+=       libcroco>=0.6.5nb2
-BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco
+BUILDLINK_PKGSRCDIR.libcroco?=         ../../textproc/libcroco
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/textproc/libexttextcat/buildlink3.mk
diff -u pkgsrc/textproc/libexttextcat/buildlink3.mk:1.1.1.1 pkgsrc/textproc/libexttextcat/buildlink3.mk:1.2
--- pkgsrc/textproc/libexttextcat/buildlink3.mk:1.1.1.1 Fri Mar 16 17:30:16 2012
+++ pkgsrc/textproc/libexttextcat/buildlink3.mk Sun Jan  7 13:04:34 2018
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/03/16 17:30:16 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       libexttextcat
 
 .if !defined(LIBEXTTEXTCAT_BUILDLINK3_MK)
 LIBEXTTEXTCAT_BUILDLINK3_MK:=
+
 BUILDLINK_API_DEPENDS.libexttextcat+=  libexttextcat>=3.2
 BUILDLINK_PKGSRCDIR.libexttextcat?=    ../../textproc/libexttextcat
 .endif

Index: pkgsrc/textproc/libodfgen/buildlink3.mk
diff -u pkgsrc/textproc/libodfgen/buildlink3.mk:1.10 pkgsrc/textproc/libodfgen/buildlink3.mk:1.11
--- pkgsrc/textproc/libodfgen/buildlink3.mk:1.10        Mon Jan  1 21:18:11 2018
+++ pkgsrc/textproc/libodfgen/buildlink3.mk     Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2018/01/01 21:18:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       libodfgen
 
@@ -7,7 +7,7 @@ LIBODFGEN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libodfgen+=      libodfgen>=0.0.3
 BUILDLINK_ABI_DEPENDS.libodfgen?=      libodfgen>=0.1.6nb5
-BUILDLINK_PKGSRCDIR.libodfgen?=        ../../textproc/libodfgen
+BUILDLINK_PKGSRCDIR.libodfgen?=                ../../textproc/libodfgen
 
 .include "../../converters/librevenge/buildlink3.mk"
 .include "../../converters/libwpd/buildlink3.mk"

Index: pkgsrc/textproc/libpinyin/buildlink3.mk
diff -u pkgsrc/textproc/libpinyin/buildlink3.mk:1.1 pkgsrc/textproc/libpinyin/buildlink3.mk:1.2
--- pkgsrc/textproc/libpinyin/buildlink3.mk:1.1 Sun Jun  1 13:25:55 2014
+++ pkgsrc/textproc/libpinyin/buildlink3.mk     Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/06/01 13:25:55 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:34 rillig Exp $
 #
 
 BUILDLINK_TREE+=       libpinyin
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        libpinyin
 LIBPINYIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpinyin+=      libpinyin>=1.0.0
-BUILDLINK_PKGSRCDIR.libpinyin?=        ../../textproc/libpinyin
+BUILDLINK_PKGSRCDIR.libpinyin?=                ../../textproc/libpinyin
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"

Index: pkgsrc/textproc/libplist/buildlink3.mk
diff -u pkgsrc/textproc/libplist/buildlink3.mk:1.7 pkgsrc/textproc/libplist/buildlink3.mk:1.8
--- pkgsrc/textproc/libplist/buildlink3.mk:1.7  Mon Mar  7 18:36:05 2016
+++ pkgsrc/textproc/libplist/buildlink3.mk      Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2016/03/07 18:36:05 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       libplist
 
@@ -7,7 +7,7 @@ LIBPLIST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libplist+=       libplist>=1.8
 BUILDLINK_ABI_DEPENDS.libplist+=       libplist>=1.12
-BUILDLINK_PKGSRCDIR.libplist?= ../../textproc/libplist
+BUILDLINK_PKGSRCDIR.libplist?=         ../../textproc/libplist
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # LIBPLIST_BUILDLINK3_MK

Index: pkgsrc/textproc/libunicode/buildlink3.mk
diff -u pkgsrc/textproc/libunicode/buildlink3.mk:1.8 pkgsrc/textproc/libunicode/buildlink3.mk:1.9
--- pkgsrc/textproc/libunicode/buildlink3.mk:1.8        Fri Mar 20 19:25:30 2009
+++ pkgsrc/textproc/libunicode/buildlink3.mk    Sun Jan  7 13:04:34 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       libunicode
 
 .if !defined(LIBUNICODE_BUILDLINK3_MK)
 LIBUNICODE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libunicode+=             libunicode>=0.4
+BUILDLINK_API_DEPENDS.libunicode+=     libunicode>=0.4
 BUILDLINK_ABI_DEPENDS.libunicode+=     libunicode>=0.4nb1
 BUILDLINK_PKGSRCDIR.libunicode?=       ../../textproc/libunicode
 .endif # LIBUNICODE_BUILDLINK3_MK

Index: pkgsrc/textproc/libxml++/buildlink3.mk
diff -u pkgsrc/textproc/libxml++/buildlink3.mk:1.10 pkgsrc/textproc/libxml++/buildlink3.mk:1.11
--- pkgsrc/textproc/libxml++/buildlink3.mk:1.10 Thu Mar 10 21:00:45 2016
+++ pkgsrc/textproc/libxml++/buildlink3.mk      Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2016/03/10 21:00:45 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       libxmlpp
 
@@ -7,7 +7,7 @@ LIBXMLPP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libxmlpp+=       libxml++>=2.10.0
 BUILDLINK_ABI_DEPENDS.libxmlpp+=       libxml++>=2.40.1
-BUILDLINK_PKGSRCDIR.libxmlpp?= ../../textproc/libxml++
+BUILDLINK_PKGSRCDIR.libxmlpp?=         ../../textproc/libxml++
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/glibmm/buildlink3.mk"

Index: pkgsrc/textproc/libxml++1/buildlink3.mk
diff -u pkgsrc/textproc/libxml++1/buildlink3.mk:1.3 pkgsrc/textproc/libxml++1/buildlink3.mk:1.4
--- pkgsrc/textproc/libxml++1/buildlink3.mk:1.3 Thu Jun 14 07:43:21 2012
+++ pkgsrc/textproc/libxml++1/buildlink3.mk     Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/06/14 07:43:21 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       libxmlpp1
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libxmlpp1
 LIBXMLPP1_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libxmlpp1+=      libxml++1>=1.0.5
-BUILDLINK_ABI_DEPENDS.libxmlpp1?=              libxml++1>=1.0.5nb1
+BUILDLINK_ABI_DEPENDS.libxmlpp1?=      libxml++1>=1.0.5nb1
 BUILDLINK_PKGSRCDIR.libxmlpp1?=                ../../textproc/libxml++1
 
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/textproc/lucene++/buildlink3.mk
diff -u pkgsrc/textproc/lucene++/buildlink3.mk:1.1 pkgsrc/textproc/lucene++/buildlink3.mk:1.2
--- pkgsrc/textproc/lucene++/buildlink3.mk:1.1  Sat Oct 17 03:02:47 2015
+++ pkgsrc/textproc/lucene++/buildlink3.mk      Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/10/17 03:02:47 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       lucene++
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        lucene++
 LUCENE++_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.lucene+++=       lucene++>=3.0.7
-BUILDLINK_PKGSRCDIR.lucene++?= ../../textproc/lucene++
+BUILDLINK_PKGSRCDIR.lucene++?=         ../../textproc/lucene++
 
 .endif # LUCENE++_BUILDLINK3_MK
 

Index: pkgsrc/textproc/ocaml-csv/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.4 pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.5
--- pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.4 Tue Oct 10 09:47:25 2017
+++ pkgsrc/textproc/ocaml-csv/buildlink3.mk     Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/10/10 09:47:25 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-csv
 
@@ -7,7 +7,7 @@ OCAML_CSV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-csv+=      ocaml-csv>=2.0
 BUILDLINK_ABI_DEPENDS.ocaml-csv+=      ocaml-csv>=2.0
-BUILDLINK_PKGSRCDIR.ocaml-csv?=        ../../textproc/ocaml-csv
+BUILDLINK_PKGSRCDIR.ocaml-csv?=                ../../textproc/ocaml-csv
 
 .endif # OCAML_CSV_BUILDLINK3_MK
 

Index: pkgsrc/textproc/ocaml-easy-format/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-easy-format/buildlink3.mk:1.1 pkgsrc/textproc/ocaml-easy-format/buildlink3.mk:1.2
--- pkgsrc/textproc/ocaml-easy-format/buildlink3.mk:1.1 Tue Jul 11 11:20:12 2017
+++ pkgsrc/textproc/ocaml-easy-format/buildlink3.mk     Sun Jan  7 13:04:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/07/11 11:20:12 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:34 rillig Exp $
 
 BUILDLINK_TREE+=       ocaml-easy-format
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-easy-format
 OCAML_EASY_FORMAT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-easy-format+=      ocaml-easy-format>=1.2.0
-BUILDLINK_PKGSRCDIR.ocaml-easy-format?=        ../../textproc/ocaml-easy-format
+BUILDLINK_PKGSRCDIR.ocaml-easy-format?=                ../../textproc/ocaml-easy-format
 .endif # OCAML_EASY_FORMAT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -ocaml-easy-format

Index: pkgsrc/textproc/ocaml-tyxml/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-tyxml/buildlink3.mk:1.5 pkgsrc/textproc/ocaml-tyxml/buildlink3.mk:1.6
--- pkgsrc/textproc/ocaml-tyxml/buildlink3.mk:1.5       Tue Jul 11 11:12:22 2017
+++ pkgsrc/textproc/ocaml-tyxml/buildlink3.mk   Sun Jan  7 13:04:35 2018
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/07/11 11:12:22 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:35 rillig Exp $
 
-BUILDLINK_TREE+=        ocaml-tyxml
+BUILDLINK_TREE+=       ocaml-tyxml
 
 .if !defined(OCAML_TYXML_BUILDLINK3_MK)
 OCAML_TYXML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.0.1
-BUILDLINK_ABI_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.1.0
-BUILDLINK_PKGSRCDIR.ocaml-tyxml?=       ../../textproc/ocaml-tyxml
+BUILDLINK_API_DEPENDS.ocaml-tyxml+=    ocaml-tyxml>=4.0.1
+BUILDLINK_ABI_DEPENDS.ocaml-tyxml+=    ocaml-tyxml>=4.1.0
+BUILDLINK_PKGSRCDIR.ocaml-tyxml?=      ../../textproc/ocaml-tyxml
 
 .endif  # OCAML_TYXML_BUILDLINK3_MK
 

Index: pkgsrc/textproc/oniguruma/buildlink3.mk
diff -u pkgsrc/textproc/oniguruma/buildlink3.mk:1.3 pkgsrc/textproc/oniguruma/buildlink3.mk:1.4
--- pkgsrc/textproc/oniguruma/buildlink3.mk:1.3 Fri Mar 20 19:25:31 2009
+++ pkgsrc/textproc/oniguruma/buildlink3.mk     Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:35 rillig Exp $
 
 BUILDLINK_TREE+=       oniguruma
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        oniguruma
 ONIGURUMA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.oniguruma+=      oniguruma>=5.9.1
-BUILDLINK_PKGSRCDIR.oniguruma?=        ../../textproc/oniguruma
+BUILDLINK_PKGSRCDIR.oniguruma?=                ../../textproc/oniguruma
 .endif # ONIGURUMA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -oniguruma

Index: pkgsrc/textproc/opensp/buildlink3.mk
diff -u pkgsrc/textproc/opensp/buildlink3.mk:1.13 pkgsrc/textproc/opensp/buildlink3.mk:1.14
--- pkgsrc/textproc/opensp/buildlink3.mk:1.13   Fri Apr 22 13:41:59 2011
+++ pkgsrc/textproc/opensp/buildlink3.mk        Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2011/04/22 13:41:59 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:35 rillig Exp $
 
 BUILDLINK_TREE+=       opensp
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.opensp+=  opensp>=1
 BUILDLINK_ABI_DEPENDS.opensp+= opensp>=1.5.2nb1
 BUILDLINK_PKGSRCDIR.opensp?=   ../../textproc/opensp
 
-PTHREAD_OPTS+=          require
+PTHREAD_OPTS+= require
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/textproc/p5-Encode/buildlink3.mk
diff -u pkgsrc/textproc/p5-Encode/buildlink3.mk:1.1 pkgsrc/textproc/p5-Encode/buildlink3.mk:1.2
--- pkgsrc/textproc/p5-Encode/buildlink3.mk:1.1 Tue Aug  1 13:06:00 2017
+++ pkgsrc/textproc/p5-Encode/buildlink3.mk     Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/01 13:06:00 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:35 rillig Exp $
 
 BUILDLINK_TREE+=       p5-Encode
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        p5-Encode
 P5_ENCODE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-Encode+=      p5-Encode>=2.89nb1
-BUILDLINK_PKGSRCDIR.p5-Encode?=        ../../textproc/p5-Encode
+BUILDLINK_PKGSRCDIR.p5-Encode?=                ../../textproc/p5-Encode
 .endif # P5_ENCODE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -p5-Encode

Index: pkgsrc/textproc/qore-json-module/buildlink3.mk
diff -u pkgsrc/textproc/qore-json-module/buildlink3.mk:1.4 pkgsrc/textproc/qore-json-module/buildlink3.mk:1.5
--- pkgsrc/textproc/qore-json-module/buildlink3.mk:1.4  Thu Oct 12 18:38:47 2017
+++ pkgsrc/textproc/qore-json-module/buildlink3.mk      Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/10/12 18:38:47 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:35 rillig Exp $
 
 BUILDLINK_TREE+=       qore-json-module
 
@@ -7,7 +7,7 @@ QORE_JSON_MODULE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qore-json-module+=       qore-json-module>=1.4
 BUILDLINK_ABI_DEPENDS.qore-json-module?=       qore-json-module>=1.5nb1
-BUILDLINK_PKGSRCDIR.qore-json-module?= ../../textproc/qore-json-module
+BUILDLINK_PKGSRCDIR.qore-json-module?=         ../../textproc/qore-json-module
 
 .include "../../lang/qore/buildlink3.mk"
 .endif # QORE_JSON_MODULE_BUILDLINK3_MK

Index: pkgsrc/textproc/qore-yaml-module/buildlink3.mk
diff -u pkgsrc/textproc/qore-yaml-module/buildlink3.mk:1.3 pkgsrc/textproc/qore-yaml-module/buildlink3.mk:1.4
--- pkgsrc/textproc/qore-yaml-module/buildlink3.mk:1.3  Fri Jul 22 12:39:22 2016
+++ pkgsrc/textproc/qore-yaml-module/buildlink3.mk      Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/07/22 12:39:22 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:35 rillig Exp $
 #
 
 BUILDLINK_TREE+=       qore-yaml-module
@@ -8,7 +8,7 @@ QORE_YAML_MODULE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qore-yaml-module+=       qore-yaml-module>=0.4
 BUILDLINK_ABI_DEPENDS.qore-yaml-module?=       qore-yaml-module>=0.5
-BUILDLINK_PKGSRCDIR.qore-yaml-module?= ../../textproc/qore-yaml-module
+BUILDLINK_PKGSRCDIR.qore-yaml-module?=         ../../textproc/qore-yaml-module
 
 
 .include "../../lang/qore/buildlink3.mk"

Index: pkgsrc/textproc/sablotron/buildlink3.mk
diff -u pkgsrc/textproc/sablotron/buildlink3.mk:1.9 pkgsrc/textproc/sablotron/buildlink3.mk:1.10
--- pkgsrc/textproc/sablotron/buildlink3.mk:1.9 Fri Mar 20 19:25:33 2009
+++ pkgsrc/textproc/sablotron/buildlink3.mk     Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:35 rillig Exp $
 
 BUILDLINK_TREE+=       sablotron
 
@@ -7,7 +7,7 @@ SABLOTRON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sablotron+=      sablotron>=1.0
 BUILDLINK_ABI_DEPENDS.sablotron+=      sablotron>=1.0.2nb2
-BUILDLINK_PKGSRCDIR.sablotron?=        ../../textproc/sablotron
+BUILDLINK_PKGSRCDIR.sablotron?=                ../../textproc/sablotron
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"

Index: pkgsrc/textproc/shared-desktop-ontologies/buildlink3.mk
diff -u pkgsrc/textproc/shared-desktop-ontologies/buildlink3.mk:1.1.1.1 pkgsrc/textproc/shared-desktop-ontologies/buildlink3.mk:1.2
--- pkgsrc/textproc/shared-desktop-ontologies/buildlink3.mk:1.1.1.1     Fri Apr  9 23:36:21 2010
+++ pkgsrc/textproc/shared-desktop-ontologies/buildlink3.mk     Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/04/09 23:36:21 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:35 rillig Exp $
 
 BUILDLINK_TREE+=       shared-desktop-ontologies
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        shared-desktop-ontologi
 SHARED_DESKTOP_ONTOLOGIES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.shared-desktop-ontologies+=      shared-desktop-ontologies>=0.3
-BUILDLINK_PKGSRCDIR.shared-desktop-ontologies?=        ../../textproc/shared-desktop-ontologies
+BUILDLINK_PKGSRCDIR.shared-desktop-ontologies?=                ../../textproc/shared-desktop-ontologies
 .endif # SHARED_DESKTOP_ONTOLOGIES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -shared-desktop-ontologies

Index: pkgsrc/textproc/source-highlight/buildlink3.mk
diff -u pkgsrc/textproc/source-highlight/buildlink3.mk:1.7 pkgsrc/textproc/source-highlight/buildlink3.mk:1.8
--- pkgsrc/textproc/source-highlight/buildlink3.mk:1.7  Mon Jan  1 21:18:12 2018
+++ pkgsrc/textproc/source-highlight/buildlink3.mk      Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2018/01/01 21:18:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:35 rillig Exp $
 
 BUILDLINK_TREE+=       source-highlight
 
@@ -7,7 +7,7 @@ SOURCE_HIGHLIGHT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.source-highlight+=       source-highlight>=3.1.7nb2
 BUILDLINK_ABI_DEPENDS.source-highlight?=       source-highlight>=3.1.8nb5
-BUILDLINK_PKGSRCDIR.source-highlight?= ../../textproc/source-highlight
+BUILDLINK_PKGSRCDIR.source-highlight?=         ../../textproc/source-highlight
 
 .include "../../devel/boost-libs/buildlink3.mk"
 .endif # SOURCE_HIGHLIGHT_BUILDLINK3_MK

Index: pkgsrc/textproc/uriparser/buildlink3.mk
diff -u pkgsrc/textproc/uriparser/buildlink3.mk:1.2 pkgsrc/textproc/uriparser/buildlink3.mk:1.3
--- pkgsrc/textproc/uriparser/buildlink3.mk:1.2 Fri Mar 20 19:25:33 2009
+++ pkgsrc/textproc/uriparser/buildlink3.mk     Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:35 rillig Exp $
 
 BUILDLINK_TREE+=       uriparser
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        uriparser
 URIPARSER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.uriparser+=      uriparser>=0.6.0
-BUILDLINK_PKGSRCDIR.uriparser?=        ../../textproc/uriparser
+BUILDLINK_PKGSRCDIR.uriparser?=                ../../textproc/uriparser
 .endif # URIPARSER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -uriparser

Index: pkgsrc/textproc/xmlada/buildlink3.mk
diff -u pkgsrc/textproc/xmlada/buildlink3.mk:1.2 pkgsrc/textproc/xmlada/buildlink3.mk:1.3
--- pkgsrc/textproc/xmlada/buildlink3.mk:1.2    Sun Jul  8 20:03:08 2012
+++ pkgsrc/textproc/xmlada/buildlink3.mk        Sun Jan  7 13:04:35 2018
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/07/08 20:03:08 marino Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:35 rillig Exp $
 
-BUILDLINK_TREE+= xmlada
+BUILDLINK_TREE+=       xmlada
 
 .if !defined(XMLADA_BUILDLINK3_MK)
 XMLADA_BUILDLINK3_MK:=
@@ -10,4 +10,4 @@ BUILDLINK_PKGSRCDIR.xmlada?=  ../../textp
 
 .endif # XMLADA_BUILDLINK3_MK
 
-BUILDLINK_TREE+= -xmlada
+BUILDLINK_TREE+=       -xmlada

Index: pkgsrc/textproc/xmlcatmgr/buildlink3.mk
diff -u pkgsrc/textproc/xmlcatmgr/buildlink3.mk:1.12 pkgsrc/textproc/xmlcatmgr/buildlink3.mk:1.13
--- pkgsrc/textproc/xmlcatmgr/buildlink3.mk:1.12        Wed Nov 25 12:53:42 2015
+++ pkgsrc/textproc/xmlcatmgr/buildlink3.mk     Sun Jan  7 13:04:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2015/11/25 12:53:42 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:35 rillig Exp $
 #
 # This Makefile fragment is included by packages that use xmlcatmgr.
 #
@@ -17,7 +17,7 @@ BUILDLINK_TREE+=      xmlcatmgr
 .if !defined(XMLCATMGR_BUILDLINK3_MK)
 XMLCATMGR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xmlcatmgr+=              xmlcatmgr>=2.0beta1
+BUILDLINK_API_DEPENDS.xmlcatmgr+=      xmlcatmgr>=2.0beta1
 BUILDLINK_PKGSRCDIR.xmlcatmgr?=                ../../textproc/xmlcatmgr
 
 # Location of the xmlcatmgr binary program.

Index: pkgsrc/textproc/xmlrpc-c/buildlink3.mk
diff -u pkgsrc/textproc/xmlrpc-c/buildlink3.mk:1.18 pkgsrc/textproc/xmlrpc-c/buildlink3.mk:1.19
--- pkgsrc/textproc/xmlrpc-c/buildlink3.mk:1.18 Mon Jan  1 21:18:12 2018
+++ pkgsrc/textproc/xmlrpc-c/buildlink3.mk      Sun Jan  7 13:04:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2018/01/01 21:18:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:36 rillig Exp $
 
 BUILDLINK_TREE+=       xmlrpc-c
 
@@ -7,7 +7,7 @@ XMLRPC_C_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xmlrpc-c+=       xmlrpc-c-ss>=1.16.34
 BUILDLINK_ABI_DEPENDS.xmlrpc-c+=       xmlrpc-c-ss>=1.25.26nb7
-BUILDLINK_PKGSRCDIR.xmlrpc-c?= ../../textproc/xmlrpc-c
+BUILDLINK_PKGSRCDIR.xmlrpc-c?=         ../../textproc/xmlrpc-c
 
 .include "../../www/libwww/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"

Index: pkgsrc/textproc/yaml-cpp/buildlink3.mk
diff -u pkgsrc/textproc/yaml-cpp/buildlink3.mk:1.1 pkgsrc/textproc/yaml-cpp/buildlink3.mk:1.2
--- pkgsrc/textproc/yaml-cpp/buildlink3.mk:1.1  Mon Nov 24 11:27:52 2014
+++ pkgsrc/textproc/yaml-cpp/buildlink3.mk      Sun Jan  7 13:04:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/11/24 11:27:52 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:36 rillig Exp $
 #
 
 BUILDLINK_TREE+=       yaml-cpp
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        yaml-cpp
 YAML_CPP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.yaml-cpp+=       yaml-cpp>=0.5.0
-BUILDLINK_PKGSRCDIR.yaml-cpp?= ../../textproc/yaml-cpp
+BUILDLINK_PKGSRCDIR.yaml-cpp?=         ../../textproc/yaml-cpp
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .endif # YAML_CPP_BUILDLINK3_MK

Index: pkgsrc/textproc/yelp-xsl/buildlink3.mk
diff -u pkgsrc/textproc/yelp-xsl/buildlink3.mk:1.1.1.1 pkgsrc/textproc/yelp-xsl/buildlink3.mk:1.2
--- pkgsrc/textproc/yelp-xsl/buildlink3.mk:1.1.1.1      Fri Feb 10 17:57:38 2012
+++ pkgsrc/textproc/yelp-xsl/buildlink3.mk      Sun Jan  7 13:04:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/02/10 17:57:38 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:36 rillig Exp $
 
 BUILDLINK_TREE+=       yelp-xsl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        yelp-xsl
 YELP_XSL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.yelp-xsl+=       yelp-xsl>=3.3.1
-BUILDLINK_PKGSRCDIR.yelp-xsl?= ../../textproc/yelp-xsl
+BUILDLINK_PKGSRCDIR.yelp-xsl?=         ../../textproc/yelp-xsl
 .endif # YELP_XSL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -yelp-xsl

Index: pkgsrc/time/hs-timezone-olson/buildlink3.mk
diff -u pkgsrc/time/hs-timezone-olson/buildlink3.mk:1.2 pkgsrc/time/hs-timezone-olson/buildlink3.mk:1.3
--- pkgsrc/time/hs-timezone-olson/buildlink3.mk:1.2     Sun Nov 15 08:22:15 2015
+++ pkgsrc/time/hs-timezone-olson/buildlink3.mk Sun Jan  7 13:04:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/11/15 08:22:15 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:36 rillig Exp $
 
 BUILDLINK_TREE+=       hs-timezone-olson
 
@@ -7,7 +7,7 @@ HS_TIMEZONE_OLSON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-timezone-olson+=      hs-timezone-olson>=0.1.7
 BUILDLINK_ABI_DEPENDS.hs-timezone-olson+=      hs-timezone-olson>=0.1.7
-BUILDLINK_PKGSRCDIR.hs-timezone-olson?=        ../../time/hs-timezone-olson
+BUILDLINK_PKGSRCDIR.hs-timezone-olson?=                ../../time/hs-timezone-olson
 
 .include "../../devel/hs-extensible-exceptions/buildlink3.mk"
 .include "../../time/hs-timezone-series/buildlink3.mk"

Index: pkgsrc/wm/afterstep/buildlink3.mk
diff -u pkgsrc/wm/afterstep/buildlink3.mk:1.4 pkgsrc/wm/afterstep/buildlink3.mk:1.5
--- pkgsrc/wm/afterstep/buildlink3.mk:1.4       Sun Feb 12 06:24:51 2017
+++ pkgsrc/wm/afterstep/buildlink3.mk   Sun Jan  7 13:04:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/02/12 06:24:51 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:36 rillig Exp $
 
 BUILDLINK_TREE+=       afterstep
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        afterstep
 AFTERSTEP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.afterstep+=      afterstep>=2.2.11
-BUILDLINK_ABI_DEPENDS.afterstep?=              afterstep>=2.2.11nb17
+BUILDLINK_ABI_DEPENDS.afterstep?=      afterstep>=2.2.11nb17
 BUILDLINK_PKGSRCDIR.afterstep?=                ../../wm/afterstep
 BUILDLINK_DEPMETHOD.afterstep?=                build
 

Index: pkgsrc/wm/i3/buildlink3.mk
diff -u pkgsrc/wm/i3/buildlink3.mk:1.2 pkgsrc/wm/i3/buildlink3.mk:1.3
--- pkgsrc/wm/i3/buildlink3.mk:1.2      Wed Aug  9 10:27:44 2017
+++ pkgsrc/wm/i3/buildlink3.mk  Sun Jan  7 13:04:36 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/09 10:27:44 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:36 rillig Exp $
 
 BUILDLINK_TREE+=       i3
 
 .if !defined(I3_BUILDLINK3_MK)
 I3_BUILDLINK3_MK:=
 
-BUILDLINK_DEPMETHOD.i3?=               build
+BUILDLINK_DEPMETHOD.i3?=       build
 BUILDLINK_API_DEPENDS.i3+=     i3>=4.10.1
 BUILDLINK_PKGSRCDIR.i3?=       ../../wm/i3
 

Index: pkgsrc/wm/metacity/buildlink3.mk
diff -u pkgsrc/wm/metacity/buildlink3.mk:1.45 pkgsrc/wm/metacity/buildlink3.mk:1.46
--- pkgsrc/wm/metacity/buildlink3.mk:1.45       Sun Feb 12 06:24:51 2017
+++ pkgsrc/wm/metacity/buildlink3.mk    Sun Jan  7 13:04:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2017/02/12 06:24:51 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2018/01/07 13:04:36 rillig Exp $
 
 BUILDLINK_TREE+=       metacity
 
@@ -7,7 +7,7 @@ METACITY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.metacity+=       metacity>=2.8.5
 BUILDLINK_ABI_DEPENDS.metacity+=       metacity>=2.34.13nb4
-BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity
+BUILDLINK_PKGSRCDIR.metacity?=         ../../wm/metacity
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"

Index: pkgsrc/www/apache24/buildlink3.mk
diff -u pkgsrc/www/apache24/buildlink3.mk:1.8 pkgsrc/www/apache24/buildlink3.mk:1.9
--- pkgsrc/www/apache24/buildlink3.mk:1.8       Sat Mar  5 11:27:57 2016
+++ pkgsrc/www/apache24/buildlink3.mk   Sun Jan  7 13:04:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2016/03/05 11:27:57 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:36 rillig Exp $
 
 BUILDLINK_TREE+=       apache
 
@@ -19,10 +19,10 @@ ${BUILDLINK_DIR}/bin/apxs: buildlink-dir
 
 buildlink-apache-cookie: ${BUILDLINK_DIR}/bin/apxs
 
-USE_TOOLS+=    perl                    # for "apxs"
-CONFIGURE_ENV+=        APR_LIBTOOL=${LIBTOOL:Q}        # make apxs use the libtool we specify
-MAKE_ENV+=     APR_LIBTOOL=${LIBTOOL:Q}
-APXS?=         ${BUILDLINK_PREFIX.apache}/bin/apxs
+USE_TOOLS+=            perl                    # for "apxs"
+CONFIGURE_ENV+=                APR_LIBTOOL=${LIBTOOL:Q}        # make apxs use the libtool we specify
+MAKE_ENV+=             APR_LIBTOOL=${LIBTOOL:Q}
+APXS?=                 ${BUILDLINK_PREFIX.apache}/bin/apxs
 .if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=       --with-apxs2=${APXS:Q}
 .endif

Index: pkgsrc/www/emacs-w3m/buildlink3.mk
diff -u pkgsrc/www/emacs-w3m/buildlink3.mk:1.2 pkgsrc/www/emacs-w3m/buildlink3.mk:1.3
--- pkgsrc/www/emacs-w3m/buildlink3.mk:1.2      Fri Mar 20 19:25:36 2009
+++ pkgsrc/www/emacs-w3m/buildlink3.mk  Sun Jan  7 13:04:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:36 rillig Exp $
 #
 
 BUILDLINK_TREE+=       emacs-w3m
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        emacs-w3m
 EMACS_W3M_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.emacs-w3m+=      ${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.4
-BUILDLINK_PKGSRCDIR.emacs-w3m?=        ../../www/emacs-w3m
+BUILDLINK_PKGSRCDIR.emacs-w3m?=                ../../www/emacs-w3m
 
 BUILDLINK_CONTENTS_FILTER.emacs-w3m=   ${EGREP} '.*\.el$$|.*\.elc$$'
 .endif # EMACS_W3M_BUILDLINK3_MK

Index: pkgsrc/www/epiphany/buildlink3.mk
diff -u pkgsrc/www/epiphany/buildlink3.mk:1.81 pkgsrc/www/epiphany/buildlink3.mk:1.82
--- pkgsrc/www/epiphany/buildlink3.mk:1.81      Thu Nov 30 16:45:09 2017
+++ pkgsrc/www/epiphany/buildlink3.mk   Sun Jan  7 13:04:36 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.81 2017/11/30 16:45:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.82 2018/01/07 13:04:36 rillig Exp $
 
 BUILDLINK_TREE+=       epiphany
 
 .if !defined(EPIPHANY_BUILDLINK3_MK)
 EPIPHANY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.epiphany+=               epiphany>=2.28
-BUILDLINK_ABI_DEPENDS.epiphany+=               epiphany>=2.30.6nb56
+BUILDLINK_API_DEPENDS.epiphany+=       epiphany>=2.28
+BUILDLINK_ABI_DEPENDS.epiphany+=       epiphany>=2.30.6nb56
 BUILDLINK_PKGSRCDIR.epiphany?=         ../../www/epiphany
 
 .include "../../mk/bsd.fast.prefs.mk"

Index: pkgsrc/www/go-toml-burntsushi/buildlink3.mk
diff -u pkgsrc/www/go-toml-burntsushi/buildlink3.mk:1.2 pkgsrc/www/go-toml-burntsushi/buildlink3.mk:1.3
--- pkgsrc/www/go-toml-burntsushi/buildlink3.mk:1.2     Fri Aug 25 16:49:15 2017
+++ pkgsrc/www/go-toml-burntsushi/buildlink3.mk Sun Jan  7 13:04:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:36 rillig Exp $
 
 BUILDLINK_TREE+=       go-toml-burntsushi
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        go-toml-burntsushi
 GO_TOML_BURNTSUSHI_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-toml-burntsushi=  ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-toml-burntsushi?=               build
+BUILDLINK_DEPMETHOD.go-toml-burntsushi?=       build
 
 BUILDLINK_API_DEPENDS.go-toml-burntsushi+=             go-toml-burntsushi>=0.2.0
 BUILDLINK_PKGSRCDIR.go-toml-burntsushi?=               ../../www/go-toml-burntsushi

Index: pkgsrc/www/go-toml-pelletier/buildlink3.mk
diff -u pkgsrc/www/go-toml-pelletier/buildlink3.mk:1.2 pkgsrc/www/go-toml-pelletier/buildlink3.mk:1.3
--- pkgsrc/www/go-toml-pelletier/buildlink3.mk:1.2      Fri Aug 25 16:49:15 2017
+++ pkgsrc/www/go-toml-pelletier/buildlink3.mk  Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       go-toml-pelletier
 
@@ -8,7 +8,7 @@ GO_TOML_PELLETIER_BUILDLINK3_MK:=
 BUILDLINK_CONTENTS_FILTER.go-toml-pelletier=   ${EGREP} gopkg/
 BUILDLINK_DEPMETHOD.go-toml-pelletier?=                build
 
-BUILDLINK_API_DEPENDS.go-toml-pelletier+=              go-toml-pelletier>=1.0.0
+BUILDLINK_API_DEPENDS.go-toml-pelletier+=      go-toml-pelletier>=1.0.0
 BUILDLINK_PKGSRCDIR.go-toml-pelletier?=                ../../www/go-toml-pelletier
 
 .include "../../devel/go-buffruneio/buildlink3.mk"

Index: pkgsrc/www/kdewebkit/buildlink3.mk
diff -u pkgsrc/www/kdewebkit/buildlink3.mk:1.12 pkgsrc/www/kdewebkit/buildlink3.mk:1.13
--- pkgsrc/www/kdewebkit/buildlink3.mk:1.12     Thu Nov 30 16:45:09 2017
+++ pkgsrc/www/kdewebkit/buildlink3.mk  Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       kdewebkit
 
@@ -7,7 +7,7 @@ KDEWEBKIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdewebkit+=      kdewebkit>=5.21.0
 BUILDLINK_ABI_DEPENDS.kdewebkit?=      kdewebkit>=5.25.0nb11
-BUILDLINK_PKGSRCDIR.kdewebkit?=        ../../www/kdewebkit
+BUILDLINK_PKGSRCDIR.kdewebkit?=                ../../www/kdewebkit
 
 .include "../../devel/kparts/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/www/kjsembed/buildlink3.mk
diff -u pkgsrc/www/kjsembed/buildlink3.mk:1.10 pkgsrc/www/kjsembed/buildlink3.mk:1.11
--- pkgsrc/www/kjsembed/buildlink3.mk:1.10      Thu Nov 30 16:45:09 2017
+++ pkgsrc/www/kjsembed/buildlink3.mk   Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2017/11/30 16:45:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       kjsembed
 
@@ -7,7 +7,7 @@ KJSEMBED_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kjsembed+=       kjsembed>=5.21.0
 BUILDLINK_ABI_DEPENDS.kjsembed?=       kjsembed>=5.25.0nb10
-BUILDLINK_PKGSRCDIR.kjsembed?= ../../www/kjsembed
+BUILDLINK_PKGSRCDIR.kjsembed?=         ../../www/kjsembed
 
 .include "../../devel/ki18n/buildlink3.mk"
 .include "../../www/kjs/buildlink3.mk"

Index: pkgsrc/www/libghttp/buildlink3.mk
diff -u pkgsrc/www/libghttp/buildlink3.mk:1.8 pkgsrc/www/libghttp/buildlink3.mk:1.9
--- pkgsrc/www/libghttp/buildlink3.mk:1.8       Fri Mar 20 19:25:37 2009
+++ pkgsrc/www/libghttp/buildlink3.mk   Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       libghttp
 
@@ -7,7 +7,7 @@ LIBGHTTP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libghttp+=       libghttp>=1.0.9
 BUILDLINK_ABI_DEPENDS.libghttp+=       libghttp>=1.0.9nb1
-BUILDLINK_PKGSRCDIR.libghttp?= ../../www/libghttp
+BUILDLINK_PKGSRCDIR.libghttp?=         ../../www/libghttp
 .endif # LIBGHTTP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libghttp

Index: pkgsrc/www/libgtkhtml/buildlink3.mk
diff -u pkgsrc/www/libgtkhtml/buildlink3.mk:1.47 pkgsrc/www/libgtkhtml/buildlink3.mk:1.48
--- pkgsrc/www/libgtkhtml/buildlink3.mk:1.47    Sun Feb 12 06:24:52 2017
+++ pkgsrc/www/libgtkhtml/buildlink3.mk Sun Jan  7 13:04:37 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.47 2017/02/12 06:24:52 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.48 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       libgtkhtml
 
 .if !defined(LIBGTKHTML_BUILDLINK3_MK)
 LIBGTKHTML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libgtkhtml+=             libgtkhtml>=2.6.0
+BUILDLINK_API_DEPENDS.libgtkhtml+=     libgtkhtml>=2.6.0
 BUILDLINK_ABI_DEPENDS.libgtkhtml+=     libgtkhtml>=2.6.3nb36
 BUILDLINK_PKGSRCDIR.libgtkhtml?=       ../../www/libgtkhtml
 

Index: pkgsrc/www/mono-xsp/buildlink3.mk
diff -u pkgsrc/www/mono-xsp/buildlink3.mk:1.20 pkgsrc/www/mono-xsp/buildlink3.mk:1.21
--- pkgsrc/www/mono-xsp/buildlink3.mk:1.20      Thu Nov 30 16:45:10 2017
+++ pkgsrc/www/mono-xsp/buildlink3.mk   Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2017/11/30 16:45:10 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       mono-xsp
 
@@ -7,7 +7,7 @@ MONO_XSP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mono-xsp+=       mono-xsp>=2.0
 BUILDLINK_ABI_DEPENDS.mono-xsp+=       mono-xsp>=3.8nb6
-BUILDLINK_PKGSRCDIR.mono-xsp?= ../../www/mono-xsp
+BUILDLINK_PKGSRCDIR.mono-xsp?=         ../../www/mono-xsp
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"

Index: pkgsrc/www/py-gdata/buildlink3.mk
diff -u pkgsrc/www/py-gdata/buildlink3.mk:1.3 pkgsrc/www/py-gdata/buildlink3.mk:1.4
--- pkgsrc/www/py-gdata/buildlink3.mk:1.3       Fri Mar 20 19:25:37 2009
+++ pkgsrc/www/py-gdata/buildlink3.mk   Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       py-gdata
 
@@ -8,7 +8,7 @@ PY_GDATA_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-gdata+=       ${PYPKGPREFIX}-gdata>=1.2.1
-BUILDLINK_PKGSRCDIR.py-gdata?= ../../www/py-gdata
+BUILDLINK_PKGSRCDIR.py-gdata?=         ../../www/py-gdata
 .endif # PY_GDATA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -py-gdata

Index: pkgsrc/www/uhttpmock/buildlink3.mk
diff -u pkgsrc/www/uhttpmock/buildlink3.mk:1.7 pkgsrc/www/uhttpmock/buildlink3.mk:1.8
--- pkgsrc/www/uhttpmock/buildlink3.mk:1.7      Thu Nov 30 16:45:10 2017
+++ pkgsrc/www/uhttpmock/buildlink3.mk  Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:10 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       uhttpmock
 
@@ -7,7 +7,7 @@ UHTTPMOCK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.uhttpmock+=      uhttpmock>=0.4.0
 BUILDLINK_ABI_DEPENDS.uhttpmock?=      uhttpmock>=0.4.0nb11
-BUILDLINK_PKGSRCDIR.uhttpmock?=        ../../www/uhttpmock
+BUILDLINK_PKGSRCDIR.uhttpmock?=                ../../www/uhttpmock
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"

Index: pkgsrc/x11/blt/buildlink3.mk
diff -u pkgsrc/x11/blt/buildlink3.mk:1.17 pkgsrc/x11/blt/buildlink3.mk:1.18
--- pkgsrc/x11/blt/buildlink3.mk:1.17   Sat Jan 11 14:42:01 2014
+++ pkgsrc/x11/blt/buildlink3.mk        Sun Jan  7 13:04:37 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.17 2014/01/11 14:42:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       blt
 
 .if !defined(BLT_BUILDLINK3_MK)
 BLT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.blt+=            blt>=2.4z
+BUILDLINK_API_DEPENDS.blt+=    blt>=2.4z
 BUILDLINK_ABI_DEPENDS.blt+=    blt>=2.4znb7
 BUILDLINK_PKGSRCDIR.blt?=      ../../x11/blt
 

Index: pkgsrc/x11/deforaos-keyboard/buildlink3.mk
diff -u pkgsrc/x11/deforaos-keyboard/buildlink3.mk:1.13 pkgsrc/x11/deforaos-keyboard/buildlink3.mk:1.14
--- pkgsrc/x11/deforaos-keyboard/buildlink3.mk:1.13     Sun Feb 12 06:24:52 2017
+++ pkgsrc/x11/deforaos-keyboard/buildlink3.mk  Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2017/02/12 06:24:52 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:37 rillig Exp $
 #
 
 BUILDLINK_TREE+=       deforaos-keyboard
@@ -8,7 +8,7 @@ DEFORAOS_KEYBOARD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.deforaos-keyboard+=      deforaos-keyboard>=0.3.0
 BUILDLINK_ABI_DEPENDS.deforaos-keyboard?=      deforaos-keyboard>=0.3.0nb3
-BUILDLINK_PKGSRCDIR.deforaos-keyboard?=        ../../x11/deforaos-keyboard
+BUILDLINK_PKGSRCDIR.deforaos-keyboard?=                ../../x11/deforaos-keyboard
 
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .endif # DEFORAOS_KEYBOARD_BUILDLINK3_MK

Index: pkgsrc/x11/dri3proto/buildlink3.mk
diff -u pkgsrc/x11/dri3proto/buildlink3.mk:1.1 pkgsrc/x11/dri3proto/buildlink3.mk:1.2
--- pkgsrc/x11/dri3proto/buildlink3.mk:1.1      Mon Mar  9 21:33:28 2015
+++ pkgsrc/x11/dri3proto/buildlink3.mk  Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/03/09 21:33:28 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:37 rillig Exp $
 
 BUILDLINK_TREE+=       dri3proto
 
@@ -8,7 +8,7 @@ DRI3PROTO_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.dri3proto?=        build
 
 BUILDLINK_API_DEPENDS.dri3proto+=      dri3proto>=1.0
-BUILDLINK_PKGSRCDIR.dri3proto?=        ../../x11/dri3proto
+BUILDLINK_PKGSRCDIR.dri3proto?=                ../../x11/dri3proto
 .endif # DRI3PROTO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -dri3proto

Index: pkgsrc/x11/eekboard/buildlink3.mk
diff -u pkgsrc/x11/eekboard/buildlink3.mk:1.30 pkgsrc/x11/eekboard/buildlink3.mk:1.31
--- pkgsrc/x11/eekboard/buildlink3.mk:1.30      Thu Nov 23 17:19:45 2017
+++ pkgsrc/x11/eekboard/buildlink3.mk   Sun Jan  7 13:04:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2017/11/23 17:19:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2018/01/07 13:04:37 rillig Exp $
 #
 
 BUILDLINK_TREE+=       eekboard
@@ -8,7 +8,7 @@ EEKBOARD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.eekboard+=       eekboard>=1.0.6
 BUILDLINK_ABI_DEPENDS.eekboard?=       eekboard>=1.0.8nb14
-BUILDLINK_PKGSRCDIR.eekboard?= ../../x11/eekboard
+BUILDLINK_PKGSRCDIR.eekboard?=         ../../x11/eekboard
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"

Index: pkgsrc/x11/fixesproto/buildlink3.mk
diff -u pkgsrc/x11/fixesproto/buildlink3.mk:1.10 pkgsrc/x11/fixesproto/buildlink3.mk:1.11
--- pkgsrc/x11/fixesproto/buildlink3.mk:1.10    Thu Jun 18 21:48:52 2015
+++ pkgsrc/x11/fixesproto/buildlink3.mk Sun Jan  7 13:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2015/06/18 21:48:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:38 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -13,7 +13,7 @@ BUILDLINK_DEPMETHOD.fixesproto?=      build
 
 BUILDLINK_TREE+=       fixesproto
 
-.if !defined(FIXESPROTO_BUILDLINK3_MK)
+.  if !defined(FIXESPROTO_BUILDLINK3_MK)
 FIXESPROTO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.fixesproto+=     fixesproto>=4.0.0
@@ -31,7 +31,7 @@ BUILDLINK_API_DEPENDS.xextproto+=     xextpr
 
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
-.endif # FIXESPROTO_BUILDLINK3_MK
+.  endif # FIXESPROTO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -fixesproto
 

Index: pkgsrc/x11/gnome-mag/buildlink3.mk
diff -u pkgsrc/x11/gnome-mag/buildlink3.mk:1.43 pkgsrc/x11/gnome-mag/buildlink3.mk:1.44
--- pkgsrc/x11/gnome-mag/buildlink3.mk:1.43     Sun Feb 12 06:24:53 2017
+++ pkgsrc/x11/gnome-mag/buildlink3.mk  Sun Jan  7 13:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.43 2017/02/12 06:24:53 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2018/01/07 13:04:38 rillig Exp $
 
 BUILDLINK_TREE+=       gnome-mag
 
@@ -7,7 +7,7 @@ GNOME_MAG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-mag+=      gnome-mag>=0.12.0
 BUILDLINK_ABI_DEPENDS.gnome-mag+=      gnome-mag>=0.16.3nb24
-BUILDLINK_PKGSRCDIR.gnome-mag?=        ../../x11/gnome-mag
+BUILDLINK_PKGSRCDIR.gnome-mag?=                ../../x11/gnome-mag
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"

Index: pkgsrc/x11/gnome-panel/buildlink3.mk
diff -u pkgsrc/x11/gnome-panel/buildlink3.mk:1.82 pkgsrc/x11/gnome-panel/buildlink3.mk:1.83
--- pkgsrc/x11/gnome-panel/buildlink3.mk:1.82   Thu Nov 30 16:45:10 2017
+++ pkgsrc/x11/gnome-panel/buildlink3.mk        Sun Jan  7 13:04:38 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.82 2017/11/30 16:45:10 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.83 2018/01/07 13:04:38 rillig Exp $
 
 BUILDLINK_TREE+=       gnome-panel
 
 .if !defined(GNOME_PANEL_BUILDLINK3_MK)
 GNOME_PANEL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnome-panel+=            gnome-panel>=2.12.1nb3
+BUILDLINK_API_DEPENDS.gnome-panel+=    gnome-panel>=2.12.1nb3
 BUILDLINK_ABI_DEPENDS.gnome-panel+=    gnome-panel>=2.32.1nb57
 BUILDLINK_PKGSRCDIR.gnome-panel?=      ../../x11/gnome-panel
 

Index: pkgsrc/x11/gtk/buildlink3.mk
diff -u pkgsrc/x11/gtk/buildlink3.mk:1.19 pkgsrc/x11/gtk/buildlink3.mk:1.20
--- pkgsrc/x11/gtk/buildlink3.mk:1.19   Fri Apr 22 13:42:06 2011
+++ pkgsrc/x11/gtk/buildlink3.mk        Sun Jan  7 13:04:38 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.19 2011/04/22 13:42:06 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:38 rillig Exp $
 
 BUILDLINK_TREE+=       gtk
 
 .if !defined(GTK_BUILDLINK3_MK)
 GTK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gtk+=            gtk+>=1.2.10
+BUILDLINK_API_DEPENDS.gtk+=    gtk+>=1.2.10
 BUILDLINK_ABI_DEPENDS.gtk+=    gtk+>=1.2.10nb10
 BUILDLINK_PKGSRCDIR.gtk?=      ../../x11/gtk
 

Index: pkgsrc/x11/gtk+extra/buildlink3.mk
diff -u pkgsrc/x11/gtk+extra/buildlink3.mk:1.10 pkgsrc/x11/gtk+extra/buildlink3.mk:1.11
--- pkgsrc/x11/gtk+extra/buildlink3.mk:1.10     Mon May  7 01:54:08 2012
+++ pkgsrc/x11/gtk+extra/buildlink3.mk  Sun Jan  7 13:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:54:08 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:38 rillig Exp $
 
 BUILDLINK_TREE+=       gtk+extra
 
@@ -7,7 +7,7 @@ GTK_EXTRA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk+extra+=      gtk+extra>=0.99.17nb2
 BUILDLINK_ABI_DEPENDS.gtk+extra+=      gtk+extra>=0.99.17nb6
-BUILDLINK_PKGSRCDIR.gtk+extra?=        ../../x11/gtk+extra
+BUILDLINK_PKGSRCDIR.gtk+extra?=                ../../x11/gtk+extra
 
 .include "../../x11/gtk/buildlink3.mk"
 .endif # GTK_EXTRA_BUILDLINK3_MK

Index: pkgsrc/x11/gtk3/buildlink3.mk
diff -u pkgsrc/x11/gtk3/buildlink3.mk:1.31 pkgsrc/x11/gtk3/buildlink3.mk:1.32
--- pkgsrc/x11/gtk3/buildlink3.mk:1.31  Thu Nov 23 17:19:45 2017
+++ pkgsrc/x11/gtk3/buildlink3.mk       Sun Jan  7 13:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2017/11/23 17:19:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2018/01/07 13:04:38 rillig Exp $
 
 BUILDLINK_TREE+=       gtk3
 
@@ -26,7 +26,7 @@ pkgbase := gtk3
 .include "../../graphics/libepoxy/buildlink3.mk"
 .if !empty(PKG_BUILD_OPTIONS.gtk3:Mx11)
 .  if !empty(PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge)
-.  include "../../devel/at-spi2-atk/buildlink3.mk"
+.    include "../../devel/at-spi2-atk/buildlink3.mk"
 .  endif
 .include "../../x11/libXcursor/buildlink3.mk"
 BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.2nb2

Index: pkgsrc/x11/gtkglarea/buildlink3.mk
diff -u pkgsrc/x11/gtkglarea/buildlink3.mk:1.11 pkgsrc/x11/gtkglarea/buildlink3.mk:1.12
--- pkgsrc/x11/gtkglarea/buildlink3.mk:1.11     Sat Apr 25 14:25:06 2015
+++ pkgsrc/x11/gtkglarea/buildlink3.mk  Sun Jan  7 13:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2015/04/25 14:25:06 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:38 rillig Exp $
 
 BUILDLINK_TREE+=       gtkglarea
 
@@ -7,7 +7,7 @@ GTKGLAREA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtkglarea+=      gtkglarea>=1.2.2nb3
 BUILDLINK_ABI_DEPENDS.gtkglarea+=      gtkglarea>=1.2.3nb4
-BUILDLINK_PKGSRCDIR.gtkglarea?=        ../../x11/gtkglarea
+BUILDLINK_PKGSRCDIR.gtkglarea?=                ../../x11/gtkglarea
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"

Index: pkgsrc/x11/keybinder/buildlink3.mk
diff -u pkgsrc/x11/keybinder/buildlink3.mk:1.4 pkgsrc/x11/keybinder/buildlink3.mk:1.5
--- pkgsrc/x11/keybinder/buildlink3.mk:1.4      Sun Feb 12 06:24:55 2017
+++ pkgsrc/x11/keybinder/buildlink3.mk  Sun Jan  7 13:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/02/12 06:24:55 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:38 rillig Exp $
 
 BUILDLINK_TREE+=       keybinder
 
@@ -7,7 +7,7 @@ KEYBINDER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.keybinder+=      keybinder>=0.3.0
 BUILDLINK_ABI_DEPENDS.keybinder?=      keybinder>=0.3.0nb3
-BUILDLINK_PKGSRCDIR.keybinder?=        ../../x11/keybinder
+BUILDLINK_PKGSRCDIR.keybinder?=                ../../x11/keybinder
 
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/x11/libICE/buildlink3.mk
diff -u pkgsrc/x11/libICE/buildlink3.mk:1.6 pkgsrc/x11/libICE/buildlink3.mk:1.7
--- pkgsrc/x11/libICE/buildlink3.mk:1.6 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libICE/buildlink3.mk     Sun Jan  7 13:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:38 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,12 +10,12 @@
 
 BUILDLINK_TREE+=       libICE
 
-.if !defined(LIBICE_BUILDLINK3_MK)
+.  if !defined(LIBICE_BUILDLINK3_MK)
 LIBICE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libICE+= libICE>=0.99.1
 BUILDLINK_PKGSRCDIR.libICE?=   ../../x11/libICE
-.endif # LIBICE_BUILDLINK3_MK
+.  endif # LIBICE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libICE
 

Index: pkgsrc/x11/libSM/buildlink3.mk
diff -u pkgsrc/x11/libSM/buildlink3.mk:1.5 pkgsrc/x11/libSM/buildlink3.mk:1.6
--- pkgsrc/x11/libSM/buildlink3.mk:1.5  Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libSM/buildlink3.mk      Sun Jan  7 13:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:38 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,14 +10,14 @@
 
 BUILDLINK_TREE+=       libSM
 
-.if !defined(LIBSM_BUILDLINK3_MK)
+.  if !defined(LIBSM_BUILDLINK3_MK)
 LIBSM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libSM+=  libSM>=0.99.2
 BUILDLINK_PKGSRCDIR.libSM?=    ../../x11/libSM
 
 .include "../../x11/libICE/buildlink3.mk"
-.endif # LIBSM_BUILDLINK3_MK
+.  endif # LIBSM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libSM
 

Index: pkgsrc/x11/libX11/buildlink3.mk
diff -u pkgsrc/x11/libX11/buildlink3.mk:1.11 pkgsrc/x11/libX11/buildlink3.mk:1.12
--- pkgsrc/x11/libX11/buildlink3.mk:1.11        Wed Jul 30 20:34:50 2014
+++ pkgsrc/x11/libX11/buildlink3.mk     Sun Jan  7 13:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2014/07/30 20:34:50 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:38 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,7 +10,7 @@
 
 BUILDLINK_TREE+=       libX11
 
-.if !defined(LIBX11_BUILDLINK3_MK)
+.  if !defined(LIBX11_BUILDLINK3_MK)
 LIBX11_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libX11+= libX11>=1.1
@@ -20,22 +20,22 @@ BUILDLINK_PKGSRCDIR.libX11?=        ../../x11/l
 X11_LDFLAGS+=  ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
 X11_LDFLAGS+=  -L${BUILDLINK_PREFIX.libX11}/lib
 
-.if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD"
+.  if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD"
 .include "../../mk/pthread.buildlink3.mk"
-.endif
+.  endif
 
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
 
-.if ${X11_TYPE} == "modular" || \
+.  if ${X11_TYPE} == "modular" || \
     exists(${X11BASE}/lib/pkgconfig/xcb.pc) || \
     exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc)
 .include "../../x11/libxcb/buildlink3.mk"
-.endif
+.  endif
 
 .include "../../x11/xproto/buildlink3.mk"
-.endif # LIBX11_BUILDLINK3_MK
+.  endif # LIBX11_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libX11
 

Index: pkgsrc/x11/libXTrap/buildlink3.mk
diff -u pkgsrc/x11/libXTrap/buildlink3.mk:1.2 pkgsrc/x11/libXTrap/buildlink3.mk:1.3
--- pkgsrc/x11/libXTrap/buildlink3.mk:1.2       Fri Mar 20 19:25:44 2009
+++ pkgsrc/x11/libXTrap/buildlink3.mk   Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $
 
 BUILDLINK_TREE+=       libXTrap
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libXTrap
 LIBXTRAP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXTrap+=       libXTrap>=1.0.0
-BUILDLINK_PKGSRCDIR.libXTrap?= ../../x11/libXTrap
+BUILDLINK_PKGSRCDIR.libXTrap?=         ../../x11/libXTrap
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"

Index: pkgsrc/x11/libXaw/buildlink3.mk
diff -u pkgsrc/x11/libXaw/buildlink3.mk:1.6 pkgsrc/x11/libXaw/buildlink3.mk:1.7
--- pkgsrc/x11/libXaw/buildlink3.mk:1.6 Tue Oct 23 10:24:18 2012
+++ pkgsrc/x11/libXaw/buildlink3.mk     Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2012/10/23 10:24:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,7 +8,7 @@
 
 BUILDLINK_TREE+=       libXaw
 
-.if !defined(LIBXAW_BUILDLINK3_MK)
+.  if !defined(LIBXAW_BUILDLINK3_MK)
 LIBXAW_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXaw+= libXaw>=1.0.5
@@ -23,7 +23,7 @@ BUILDLINK_TRANSFORM+=         l:Xaw:Xaw7
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
-.endif # LIBXAW_BUILDLINK3_MK
+.  endif # LIBXAW_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXaw
 

Index: pkgsrc/x11/libXaw3d/buildlink3.mk
diff -u pkgsrc/x11/libXaw3d/buildlink3.mk:1.2 pkgsrc/x11/libXaw3d/buildlink3.mk:1.3
--- pkgsrc/x11/libXaw3d/buildlink3.mk:1.2       Sat Jan 23 03:04:00 2016
+++ pkgsrc/x11/libXaw3d/buildlink3.mk   Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/01/23 03:04:00 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $
 
 BUILDLINK_TREE+=       libXaw3d
 
@@ -6,16 +6,16 @@ BUILDLINK_TREE+=      libXaw3d
 LIBXAW3D_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXaw3d+=       libXaw3d>=1.6.2
-BUILDLINK_PKGSRCDIR.libXaw3d?= ../../x11/libXaw3d
+BUILDLINK_PKGSRCDIR.libXaw3d?=         ../../x11/libXaw3d
 
 BUILDLINK_TRANSFORM+=  l:Xaw:Xaw3d
- 
+
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "modular"
 .PHONY: buildlink-libXaw3d-inc-hack
 buildlink-libXaw3d-cookie: buildlink-libXaw3d-inc-hack
- 
+
 buildlink-libXaw3d-inc-hack: buildlink-directories
        [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \
                ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \

Index: pkgsrc/x11/libXcursor/buildlink3.mk
diff -u pkgsrc/x11/libXcursor/buildlink3.mk:1.3 pkgsrc/x11/libXcursor/buildlink3.mk:1.4
--- pkgsrc/x11/libXcursor/buildlink3.mk:1.3     Fri Mar 20 19:25:44 2009
+++ pkgsrc/x11/libXcursor/buildlink3.mk Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:39 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,7 +8,7 @@
 
 BUILDLINK_TREE+=       libXcursor
 
-.if !defined(LIBXCURSOR_BUILDLINK3_MK)
+.  if !defined(LIBXCURSOR_BUILDLINK3_MK)
 LIBXCURSOR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXcursor+=     libXcursor>=1.1.1
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXcursor?=      ../../x
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
-.endif # LIBXCURSOR_BUILDLINK3_MK
+.  endif # LIBXCURSOR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXcursor
 

Index: pkgsrc/x11/libXdmcp/buildlink3.mk
diff -u pkgsrc/x11/libXdmcp/buildlink3.mk:1.2 pkgsrc/x11/libXdmcp/buildlink3.mk:1.3
--- pkgsrc/x11/libXdmcp/buildlink3.mk:1.2       Fri Mar 20 19:25:44 2009
+++ pkgsrc/x11/libXdmcp/buildlink3.mk   Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $
 
 BUILDLINK_TREE+=       libXdmcp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libXdmcp
 LIBXDMCP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXdmcp+=       libXdmcp>=0.99
-BUILDLINK_PKGSRCDIR.libXdmcp?= ../../x11/libXdmcp
+BUILDLINK_PKGSRCDIR.libXdmcp?=         ../../x11/libXdmcp
 .endif # LIBXDMCP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXdmcp

Index: pkgsrc/x11/libXevie/buildlink3.mk
diff -u pkgsrc/x11/libXevie/buildlink3.mk:1.2 pkgsrc/x11/libXevie/buildlink3.mk:1.3
--- pkgsrc/x11/libXevie/buildlink3.mk:1.2       Fri Mar 20 19:25:44 2009
+++ pkgsrc/x11/libXevie/buildlink3.mk   Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $
 
 BUILDLINK_TREE+=       libXevie
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libXevie
 LIBXEVIE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXevie+=       libXevie>=1.0.2
-BUILDLINK_PKGSRCDIR.libXevie?= ../../x11/libXevie
+BUILDLINK_PKGSRCDIR.libXevie?=         ../../x11/libXevie
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"

Index: pkgsrc/x11/libXext/buildlink3.mk
diff -u pkgsrc/x11/libXext/buildlink3.mk:1.10 pkgsrc/x11/libXext/buildlink3.mk:1.11
--- pkgsrc/x11/libXext/buildlink3.mk:1.10       Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXext/buildlink3.mk    Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:39 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,7 +10,7 @@
 
 BUILDLINK_TREE+=       libXext
 
-.if !defined(LIBXEXT_BUILDLINK3_MK)
+.  if !defined(LIBXEXT_BUILDLINK3_MK)
 LIBXEXT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXext+=        libXext>=0.99.0
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXext?= ../../x11/
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
-.endif # LIBXEXT_BUILDLINK3_MK
+.  endif # LIBXEXT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXext
 

Index: pkgsrc/x11/libXfixes/buildlink3.mk
diff -u pkgsrc/x11/libXfixes/buildlink3.mk:1.4 pkgsrc/x11/libXfixes/buildlink3.mk:1.5
--- pkgsrc/x11/libXfixes/buildlink3.mk:1.4      Thu Apr 24 12:18:09 2014
+++ pkgsrc/x11/libXfixes/buildlink3.mk  Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/04/24 12:18:09 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:39 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,15 +10,15 @@
 
 BUILDLINK_TREE+=       libXfixes
 
-.if !defined(LIBXFIXES_BUILDLINK3_MK)
+.  if !defined(LIBXFIXES_BUILDLINK3_MK)
 LIBXFIXES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXfixes+=      libXfixes>=4.0.1
-BUILDLINK_PKGSRCDIR.libXfixes?=        ../../x11/libXfixes
+BUILDLINK_PKGSRCDIR.libXfixes?=                ../../x11/libXfixes
 
 .include "../../x11/fixesproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.endif # LIBXFIXES_BUILDLINK3_MK
+.  endif # LIBXFIXES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXfixes
 

Index: pkgsrc/x11/libXfont/buildlink3.mk
diff -u pkgsrc/x11/libXfont/buildlink3.mk:1.6 pkgsrc/x11/libXfont/buildlink3.mk:1.7
--- pkgsrc/x11/libXfont/buildlink3.mk:1.6       Tue Jun  4 22:17:27 2013
+++ pkgsrc/x11/libXfont/buildlink3.mk   Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/06/04 22:17:27 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $
 
 BUILDLINK_TREE+=       libXfont
 
@@ -7,7 +7,7 @@ LIBXFONT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXfont+=       libXfont>=1.2.0
 BUILDLINK_ABI_DEPENDS.libXfont+=       libXfont>=1.4.5nb2
-BUILDLINK_PKGSRCDIR.libXfont?= ../../x11/libXfont
+BUILDLINK_PKGSRCDIR.libXfont?=         ../../x11/libXfont
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"

Index: pkgsrc/x11/libXfont2/buildlink3.mk
diff -u pkgsrc/x11/libXfont2/buildlink3.mk:1.1 pkgsrc/x11/libXfont2/buildlink3.mk:1.2
--- pkgsrc/x11/libXfont2/buildlink3.mk:1.1      Fri Dec 11 14:04:23 2015
+++ pkgsrc/x11/libXfont2/buildlink3.mk  Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/12/11 14:04:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:39 rillig Exp $
 
 BUILDLINK_TREE+=       libXfont2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libXfont2
 LIBXFONT2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXfont2+=      libXfont2>=2.0
-BUILDLINK_PKGSRCDIR.libXfont2?=        ../../x11/libXfont2
+BUILDLINK_PKGSRCDIR.libXfont2?=                ../../x11/libXfont2
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"

Index: pkgsrc/x11/libXft/buildlink3.mk
diff -u pkgsrc/x11/libXft/buildlink3.mk:1.13 pkgsrc/x11/libXft/buildlink3.mk:1.14
--- pkgsrc/x11/libXft/buildlink3.mk:1.13        Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXft/buildlink3.mk     Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:39 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,7 +10,7 @@
 
 BUILDLINK_TREE+=       libXft
 
-.if !defined(LIBXFT_BUILDLINK3_MK)
+.  if !defined(LIBXFT_BUILDLINK3_MK)
 LIBXFT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXft+= libXft>=2.1.10
@@ -22,7 +22,7 @@ BUILDLINK_PKGSRCDIR.libXft?=  ../../x11/l
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
-.endif # LIBXFT_BUILDLINK3_MK
+.  endif # LIBXFT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXft
 

Index: pkgsrc/x11/libXi/buildlink3.mk
diff -u pkgsrc/x11/libXi/buildlink3.mk:1.8 pkgsrc/x11/libXi/buildlink3.mk:1.9
--- pkgsrc/x11/libXi/buildlink3.mk:1.8  Wed Apr 23 12:22:48 2014
+++ pkgsrc/x11/libXi/buildlink3.mk      Sun Jan  7 13:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2014/04/23 12:22:48 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:39 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -9,7 +9,7 @@
 
 BUILDLINK_TREE+=       libXi
 
-.if !defined(LIBXI_BUILDLINK3_MK)
+.  if !defined(LIBXI_BUILDLINK3_MK)
 LIBXI_BUILDLINK3_MK:=
 
 .  if !defined(USE_BUILTIN.libXi)
@@ -33,7 +33,7 @@ BUILDLINK_API_DEPENDS.xproto+=                xproto>=
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
-.endif # LIBXI_BUILDLINK3_MK
+.  endif # LIBXI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXi
 

Index: pkgsrc/x11/libXinerama/buildlink3.mk
diff -u pkgsrc/x11/libXinerama/buildlink3.mk:1.8 pkgsrc/x11/libXinerama/buildlink3.mk:1.9
--- pkgsrc/x11/libXinerama/buildlink3.mk:1.8    Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXinerama/buildlink3.mk        Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:40 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,7 +10,7 @@
 
 BUILDLINK_TREE+=       libXinerama
 
-.if !defined(LIBXINERAMA_BUILDLINK3_MK)
+.  if !defined(LIBXINERAMA_BUILDLINK3_MK)
 LIBXINERAMA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXinerama+=    libXinerama>=1.0.1
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXinerama?=     ../../
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xineramaproto/buildlink3.mk"
-.endif # LIBXINERAMA_BUILDLINK3_MK
+.  endif # LIBXINERAMA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXinerama
 

Index: pkgsrc/x11/libXmu/buildlink3.mk
diff -u pkgsrc/x11/libXmu/buildlink3.mk:1.5 pkgsrc/x11/libXmu/buildlink3.mk:1.6
--- pkgsrc/x11/libXmu/buildlink3.mk:1.5 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXmu/buildlink3.mk     Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,7 +10,7 @@
 
 BUILDLINK_TREE+=       libXmu
 
-.if !defined(LIBXMU_BUILDLINK3_MK)
+.  if !defined(LIBXMU_BUILDLINK3_MK)
 LIBXMU_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXmu+= libXmu>=1.0.0
@@ -20,7 +20,7 @@ BUILDLINK_PKGSRCDIR.libXmu?=  ../../x11/l
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
-.endif # LIBXMU_BUILDLINK3_MK
+.  endif # LIBXMU_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXmu
 

Index: pkgsrc/x11/libXprintAppUtil/buildlink3.mk
diff -u pkgsrc/x11/libXprintAppUtil/buildlink3.mk:1.1 pkgsrc/x11/libXprintAppUtil/buildlink3.mk:1.2
--- pkgsrc/x11/libXprintAppUtil/buildlink3.mk:1.1       Thu Jul  2 12:38:32 2015
+++ pkgsrc/x11/libXprintAppUtil/buildlink3.mk   Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/07/02 12:38:32 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:40 rillig Exp $
 
 BUILDLINK_TREE+=       libXprintAppUtil
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libXprintAppUtil
 LIBXPRINTAPPUTIL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXprintAppUtil+=       libXprintAppUtil>=1.0.1
-BUILDLINK_PKGSRCDIR.libXprintAppUtil?= ../../x11/libXprintAppUtil
+BUILDLINK_PKGSRCDIR.libXprintAppUtil?=         ../../x11/libXprintAppUtil
 
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXprintUtil/buildlink3.mk"

Index: pkgsrc/x11/libXrandr/buildlink3.mk
diff -u pkgsrc/x11/libXrandr/buildlink3.mk:1.7 pkgsrc/x11/libXrandr/buildlink3.mk:1.8
--- pkgsrc/x11/libXrandr/buildlink3.mk:1.7      Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXrandr/buildlink3.mk  Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:40 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,17 +10,17 @@
 
 BUILDLINK_TREE+=       libXrandr
 
-.if !defined(LIBXRANDR_BUILDLINK3_MK)
+.  if !defined(LIBXRANDR_BUILDLINK3_MK)
 LIBXRANDR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXrandr+=      libXrandr>=1.1.2
-BUILDLINK_PKGSRCDIR.libXrandr?=        ../../x11/libXrandr
+BUILDLINK_PKGSRCDIR.libXrandr?=                ../../x11/libXrandr
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
-.endif # LIBXRANDR_BUILDLINK3_MK
+.  endif # LIBXRANDR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXrandr
 

Index: pkgsrc/x11/libXrender/buildlink3.mk
diff -u pkgsrc/x11/libXrender/buildlink3.mk:1.5 pkgsrc/x11/libXrender/buildlink3.mk:1.6
--- pkgsrc/x11/libXrender/buildlink3.mk:1.5     Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXrender/buildlink3.mk Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,7 +10,7 @@
 
 BUILDLINK_TREE+=       libXrender
 
-.if !defined(LIBXRENDER_BUILDLINK3_MK)
+.  if !defined(LIBXRENDER_BUILDLINK3_MK)
 LIBXRENDER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXrender+=     libXrender>=0.9.2
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXrender?=      ../../x
 
 .include "../../x11/renderproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.endif # LIBXRENDER_BUILDLINK3_MK
+.  endif # LIBXRENDER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXrender
 

Index: pkgsrc/x11/libXt/buildlink3.mk
diff -u pkgsrc/x11/libXt/buildlink3.mk:1.6 pkgsrc/x11/libXt/buildlink3.mk:1.7
--- pkgsrc/x11/libXt/buildlink3.mk:1.6  Mon Mar 10 11:05:53 2014
+++ pkgsrc/x11/libXt/buildlink3.mk      Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2014/03/10 11:05:53 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:40 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,7 +10,7 @@
 
 BUILDLINK_TREE+=       libXt
 
-.if !defined(LIBXT_BUILDLINK3_MK)
+.  if !defined(LIBXT_BUILDLINK3_MK)
 LIBXT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXt+=  libXt>=1.0.0
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXt?=   ../../x11/li
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
-.endif # LIBXT_BUILDLINK3_MK
+.  endif # LIBXT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXt
 

Index: pkgsrc/x11/libXxf86dga/buildlink3.mk
diff -u pkgsrc/x11/libXxf86dga/buildlink3.mk:1.2 pkgsrc/x11/libXxf86dga/buildlink3.mk:1.3
--- pkgsrc/x11/libXxf86dga/buildlink3.mk:1.2    Fri Mar 20 19:25:46 2009
+++ pkgsrc/x11/libXxf86dga/buildlink3.mk        Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:40 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,7 +8,7 @@
 
 BUILDLINK_TREE+=       libXxf86dga
 
-.if !defined(LIBXXF86DGA_BUILDLINK3_MK)
+.  if !defined(LIBXXF86DGA_BUILDLINK3_MK)
 LIBXXF86DGA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXxf86dga+=    libXxf86dga>=1.0.1
@@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXxf86dga?=     ../../
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"
-.endif # LIBXXF86DGA_BUILDLINK3_MK
+.  endif # LIBXXF86DGA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXxf86dga
 

Index: pkgsrc/x11/libXxf86misc/buildlink3.mk
diff -u pkgsrc/x11/libXxf86misc/buildlink3.mk:1.3 pkgsrc/x11/libXxf86misc/buildlink3.mk:1.4
--- pkgsrc/x11/libXxf86misc/buildlink3.mk:1.3   Fri Mar 20 19:25:46 2009
+++ pkgsrc/x11/libXxf86misc/buildlink3.mk       Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:40 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,7 +8,7 @@
 
 BUILDLINK_TREE+=       libXxf86misc
 
-.if !defined(LIBXXF86MISC_BUILDLINK3_MK)
+.  if !defined(LIBXXF86MISC_BUILDLINK3_MK)
 LIBXXF86MISC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXxf86misc+=   libXxf86misc>=1.0.0
@@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXxf86misc?=    ../..
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xf86miscproto/buildlink3.mk"
-.endif # LIBXXF86MISC_BUILDLINK3_MK
+.  endif # LIBXXF86MISC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXxf86misc
 

Index: pkgsrc/x11/libXxf86vm/buildlink3.mk
diff -u pkgsrc/x11/libXxf86vm/buildlink3.mk:1.4 pkgsrc/x11/libXxf86vm/buildlink3.mk:1.5
--- pkgsrc/x11/libXxf86vm/buildlink3.mk:1.4     Thu Feb 25 17:10:49 2010
+++ pkgsrc/x11/libXxf86vm/buildlink3.mk Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/02/25 17:10:49 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:40 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,7 +8,7 @@
 
 BUILDLINK_TREE+=       libXxf86vm
 
-.if !defined(LIBXXF86VM_BUILDLINK3_MK)
+.  if !defined(LIBXXF86VM_BUILDLINK3_MK)
 LIBXXF86VM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libXxf86vm+=     libXxf86vm>=1.1.0
@@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXxf86vm?=      ../../x
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.endif # LIBXXF86VM_BUILDLINK3_MK
+.  endif # LIBXXF86VM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libXxf86vm
 

Index: pkgsrc/x11/libunique/buildlink3.mk
diff -u pkgsrc/x11/libunique/buildlink3.mk:1.27 pkgsrc/x11/libunique/buildlink3.mk:1.28
--- pkgsrc/x11/libunique/buildlink3.mk:1.27     Sun Feb 12 06:24:56 2017
+++ pkgsrc/x11/libunique/buildlink3.mk  Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2017/02/12 06:24:56 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:40 rillig Exp $
 
 BUILDLINK_TREE+=       libunique
 
@@ -7,7 +7,7 @@ LIBUNIQUE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libunique+=      libunique>=1.0.4
 BUILDLINK_ABI_DEPENDS.libunique+=      libunique>=1.1.6nb24
-BUILDLINK_PKGSRCDIR.libunique?=        ../../x11/libunique
+BUILDLINK_PKGSRCDIR.libunique?=                ../../x11/libunique
 
 pkgbase := libunique
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/x11/libxkbfile/buildlink3.mk
diff -u pkgsrc/x11/libxkbfile/buildlink3.mk:1.5 pkgsrc/x11/libxkbfile/buildlink3.mk:1.6
--- pkgsrc/x11/libxkbfile/buildlink3.mk:1.5     Fri Mar 20 19:25:47 2009
+++ pkgsrc/x11/libxkbfile/buildlink3.mk Sun Jan  7 13:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,7 +8,7 @@
 
 BUILDLINK_TREE+=       libxkbfile
 
-.if !defined(LIBXKBFILE_BUILDLINK3_MK)
+.  if !defined(LIBXKBFILE_BUILDLINK3_MK)
 LIBXKBFILE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libxkbfile+=     libxkbfile>=0.99.1
@@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.libxkbfile?=      ../../x
 
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.endif # LIBXKBFILE_BUILDLINK3_MK
+.  endif # LIBXKBFILE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libxkbfile
 

Index: pkgsrc/x11/libxkbui/buildlink3.mk
diff -u pkgsrc/x11/libxkbui/buildlink3.mk:1.4 pkgsrc/x11/libxkbui/buildlink3.mk:1.5
--- pkgsrc/x11/libxkbui/buildlink3.mk:1.4       Fri Mar 20 19:25:47 2009
+++ pkgsrc/x11/libxkbui/buildlink3.mk   Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:41 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,15 +8,15 @@
 
 BUILDLINK_TREE+=       libxkbui
 
-.if !defined(LIBXKBUI_BUILDLINK3_MK)
+.  if !defined(LIBXKBUI_BUILDLINK3_MK)
 LIBXKBUI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libxkbui+=       libxkbui>=1.0.2
-BUILDLINK_PKGSRCDIR.libxkbui?= ../../x11/libxkbui
+BUILDLINK_PKGSRCDIR.libxkbui?=         ../../x11/libxkbui
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
-.endif # LIBXKBUI_BUILDLINK3_MK
+.  endif # LIBXKBUI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libxkbui
 

Index: pkgsrc/x11/p5-Wx/buildlink3.mk
diff -u pkgsrc/x11/p5-Wx/buildlink3.mk:1.33 pkgsrc/x11/p5-Wx/buildlink3.mk:1.34
--- pkgsrc/x11/p5-Wx/buildlink3.mk:1.33 Sun Sep 17 14:42:16 2017
+++ pkgsrc/x11/p5-Wx/buildlink3.mk      Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2017/09/17 14:42:16 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       p5-Wx
 
@@ -14,8 +14,8 @@ BUILDLINK_LIBDIRS.p5-Wx?=     ${PERL5_SUB_IN
 # We want all of the arch-dependent Wx files.
 BUILDLINK_CONTENTS_FILTER.p5-Wx?=      ${GREP} ${PERL5_SUB_INSTALLVENDORARCH}
 
-BUILD_DEPENDS+= p5-Alien-wxWidgets>=0.69:../../x11/p5-Alien-wxWidgets
-BUILD_DEPENDS+= p5-ExtUtils-XSpp>=0.05:../../devel/p5-ExtUtils-XSpp
+BUILD_DEPENDS+=        p5-Alien-wxWidgets>=0.69:../../x11/p5-Alien-wxWidgets
+BUILD_DEPENDS+=        p5-ExtUtils-XSpp>=0.05:../../devel/p5-ExtUtils-XSpp
 
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"

Index: pkgsrc/x11/plasma-framework/buildlink3.mk
diff -u pkgsrc/x11/plasma-framework/buildlink3.mk:1.12 pkgsrc/x11/plasma-framework/buildlink3.mk:1.13
--- pkgsrc/x11/plasma-framework/buildlink3.mk:1.12      Thu Nov 30 16:45:12 2017
+++ pkgsrc/x11/plasma-framework/buildlink3.mk   Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       plasma-framework
 
@@ -7,7 +7,7 @@ PLASMA_FRAMEWORK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.plasma-framework+=       plasma-framework>=5.21.0
 BUILDLINK_ABI_DEPENDS.plasma-framework?=       plasma-framework>=5.25.0nb12
-BUILDLINK_PKGSRCDIR.plasma-framework?= ../../x11/plasma-framework
+BUILDLINK_PKGSRCDIR.plasma-framework?=         ../../x11/plasma-framework
 
 .include "../../devel/kdeclarative/buildlink3.mk"
 .include "../../x11/kactivities5/buildlink3.mk"

Index: pkgsrc/x11/py-gnome2/buildlink3.mk
diff -u pkgsrc/x11/py-gnome2/buildlink3.mk:1.59 pkgsrc/x11/py-gnome2/buildlink3.mk:1.60
--- pkgsrc/x11/py-gnome2/buildlink3.mk:1.59     Thu Nov 23 17:19:46 2017
+++ pkgsrc/x11/py-gnome2/buildlink3.mk  Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.59 2017/11/23 17:19:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.60 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       pygnome2
 
@@ -9,7 +9,7 @@ PYGNOME2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pygnome2+=       ${PYPKGPREFIX}-gnome2>=2.10.0
 BUILDLINK_ABI_DEPENDS.pygnome2+=       ${PYPKGPREFIX}-gnome2>=2.28.1nb34
-BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2
+BUILDLINK_PKGSRCDIR.pygnome2?=         ../../x11/py-gnome2
 
 .include "../../net/py-ORBit/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"

Index: pkgsrc/x11/py-gnome2-desktop/buildlink3.mk
diff -u pkgsrc/x11/py-gnome2-desktop/buildlink3.mk:1.38 pkgsrc/x11/py-gnome2-desktop/buildlink3.mk:1.39
--- pkgsrc/x11/py-gnome2-desktop/buildlink3.mk:1.38     Thu Nov 23 17:19:46 2017
+++ pkgsrc/x11/py-gnome2-desktop/buildlink3.mk  Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2017/11/23 17:19:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       py-gnome2-desktop
 
@@ -7,10 +7,10 @@ PY_GNOME2_DESKTOP_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_API_DEPENDS.py-gnome2-desktop+=${PYPKGPREFIX}-gnome2-desktop>=2.16.0
-BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=${PYPKGPREFIX}-gnome2-desktop>=2.32.0nb36
+BUILDLINK_API_DEPENDS.py-gnome2-desktop+=      ${PYPKGPREFIX}-gnome2-desktop>=2.16.0
+BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=      ${PYPKGPREFIX}-gnome2-desktop>=2.32.0nb36
 BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=      ${PYPKGPREFIX}-gnome2-desktop>=2.32.0nb51
-BUILDLINK_PKGSRCDIR.py-gnome2-desktop?=        ../../x11/py-gnome2-desktop
+BUILDLINK_PKGSRCDIR.py-gnome2-desktop?=                ../../x11/py-gnome2-desktop
 
 .include "../../x11/py-gnome2/buildlink3.mk"
 .endif # PY_GNOME2_DESKTOP_BUILDLINK3_MK

Index: pkgsrc/x11/py-gtksourceview/buildlink3.mk
diff -u pkgsrc/x11/py-gtksourceview/buildlink3.mk:1.6 pkgsrc/x11/py-gtksourceview/buildlink3.mk:1.7
--- pkgsrc/x11/py-gtksourceview/buildlink3.mk:1.6       Sat Sep 15 10:07:12 2012
+++ pkgsrc/x11/py-gtksourceview/buildlink3.mk   Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2012/09/15 10:07:12 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       py_gtksourceview
 
@@ -9,7 +9,7 @@ PY_GTKSOURCEVIEW_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py_gtksourceview+=       ${PYPKGPREFIX}-gtksourceview>=2.8.0nb1
 BUILDLINK_ABI_DEPENDS.py_gtksourceview+=       ${PYPKGPREFIX}-gtksourceview>=2.10.1nb9
-BUILDLINK_PKGSRCDIR.py_gtksourceview?= ../../x11/py-gtksourceview
+BUILDLINK_PKGSRCDIR.py_gtksourceview?=         ../../x11/py-gtksourceview
 
 #.include "../../devel/py-gobject-shared/buildlink3.mk"
 #.include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/x11/py-qt4-qscintilla/buildlink3.mk
diff -u pkgsrc/x11/py-qt4-qscintilla/buildlink3.mk:1.26 pkgsrc/x11/py-qt4-qscintilla/buildlink3.mk:1.27
--- pkgsrc/x11/py-qt4-qscintilla/buildlink3.mk:1.26     Sat Mar  5 11:27:59 2016
+++ pkgsrc/x11/py-qt4-qscintilla/buildlink3.mk  Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2016/03/05 11:27:59 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       py-qt4-qscintilla
 
@@ -7,7 +7,7 @@ PY_QT4_QSCINTILLA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-qt4-qscintilla+=      ${PYPKGPREFIX}-qt4-qscintilla>=2.4.3
 BUILDLINK_ABI_DEPENDS.py-qt4-qscintilla+=      ${PYPKGPREFIX}-qt4-qscintilla>=2.9.1nb1
-BUILDLINK_PKGSRCDIR.py-qt4-qscintilla?=        ../../x11/py-qt4-qscintilla
+BUILDLINK_PKGSRCDIR.py-qt4-qscintilla?=                ../../x11/py-qt4-qscintilla
 
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/py-qt4/buildlink3.mk"

Index: pkgsrc/x11/py-wxWidgets/buildlink3.mk
diff -u pkgsrc/x11/py-wxWidgets/buildlink3.mk:1.46 pkgsrc/x11/py-wxWidgets/buildlink3.mk:1.47
--- pkgsrc/x11/py-wxWidgets/buildlink3.mk:1.46  Sun Feb 12 06:24:57 2017
+++ pkgsrc/x11/py-wxWidgets/buildlink3.mk       Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.46 2017/02/12 06:24:57 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.47 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       ${PYPKGPREFIX}-wxWidgets
 
@@ -7,10 +7,10 @@ PY_WXWIDGETS_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=${PYPKGPREFIX}-wxWidgets>=2.6.1.0
-BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets+=${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb26
+BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=       ${PYPKGPREFIX}-wxWidgets>=2.6.1.0
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets+=       ${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb26
 BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=       ${PYPKGPREFIX}-wxWidgets>=2.8.12.0nb6
-BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?= ../../x11/py-wxWidgets
+BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?=         ../../x11/py-wxWidgets
 
 .include "../../x11/wxGTK28/buildlink3.mk"
 .endif # PY_WXWIDGETS_BUILDLINK3_MK

Index: pkgsrc/x11/qt4-libs/buildlink3.mk
diff -u pkgsrc/x11/qt4-libs/buildlink3.mk:1.45 pkgsrc/x11/qt4-libs/buildlink3.mk:1.46
--- pkgsrc/x11/qt4-libs/buildlink3.mk:1.45      Sat Mar  5 11:27:59 2016
+++ pkgsrc/x11/qt4-libs/buildlink3.mk   Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2016/03/05 11:27:59 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       qt4-libs
 
@@ -7,7 +7,7 @@ QT4_LIBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt4-libs+=       qt4-libs>=4.6.1nb2
 BUILDLINK_ABI_DEPENDS.qt4-libs+=       qt4-libs>=4.8.7nb1
-BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
+BUILDLINK_PKGSRCDIR.qt4-libs?=         ../../x11/qt4-libs
 
 BUILDLINK_INCDIRS.qt4-libs+=   qt4/include
 BUILDLINK_LIBDIRS.qt4-libs+=   qt4/lib
@@ -31,7 +31,7 @@ PTHREAD_OPTS+=        require
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .  if ${X11_TYPE} == "modular"
-.  include "../../x11/libXinerama/buildlink3.mk"
+.    include "../../x11/libXinerama/buildlink3.mk"
 .  endif
 .endif
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/x11/qt4-qdbus/buildlink3.mk
diff -u pkgsrc/x11/qt4-qdbus/buildlink3.mk:1.27 pkgsrc/x11/qt4-qdbus/buildlink3.mk:1.28
--- pkgsrc/x11/qt4-qdbus/buildlink3.mk:1.27     Sat Mar  5 11:27:59 2016
+++ pkgsrc/x11/qt4-qdbus/buildlink3.mk  Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2016/03/05 11:27:59 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       qt4-qdbus
 
@@ -7,7 +7,7 @@ QT4_QDBUS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt4-qdbus+=      qt4-qdbus>=4.3.2
 BUILDLINK_ABI_DEPENDS.qt4-qdbus+=      qt4-qdbus>=4.8.7nb1
-BUILDLINK_PKGSRCDIR.qt4-qdbus?=        ../../x11/qt4-qdbus
+BUILDLINK_PKGSRCDIR.qt4-qdbus?=                ../../x11/qt4-qdbus
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"

Index: pkgsrc/x11/qt4-tools/buildlink3.mk
diff -u pkgsrc/x11/qt4-tools/buildlink3.mk:1.35 pkgsrc/x11/qt4-tools/buildlink3.mk:1.36
--- pkgsrc/x11/qt4-tools/buildlink3.mk:1.35     Sat Mar  5 11:28:00 2016
+++ pkgsrc/x11/qt4-tools/buildlink3.mk  Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2016/03/05 11:28:00 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       qt4-tools
 
@@ -7,8 +7,8 @@ QT4_TOOLS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt4-tools+=      qt4-tools>=4.1.0
 BUILDLINK_ABI_DEPENDS.qt4-tools+=      qt4-tools>=4.8.7nb1
-BUILDLINK_PKGSRCDIR.qt4-tools?=        ../../x11/qt4-tools
-BUILDLINK_DEPMETHOD.qt4-tools?=        build
+BUILDLINK_PKGSRCDIR.qt4-tools?=                ../../x11/qt4-tools
+BUILDLINK_DEPMETHOD.qt4-tools?=                build
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 

Index: pkgsrc/x11/qt5-mysql/buildlink3.mk
diff -u pkgsrc/x11/qt5-mysql/buildlink3.mk:1.17 pkgsrc/x11/qt5-mysql/buildlink3.mk:1.18
--- pkgsrc/x11/qt5-mysql/buildlink3.mk:1.17     Thu Nov 30 16:45:12 2017
+++ pkgsrc/x11/qt5-mysql/buildlink3.mk  Sun Jan  7 13:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:41 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-mysql
 
@@ -7,7 +7,7 @@ QT5_MYSQL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-mysql+=      qt5-mysql>=5.5.1
 BUILDLINK_ABI_DEPENDS.qt5-mysql+=      qt5-mysql>=5.5.1nb9
-BUILDLINK_PKGSRCDIR.qt5-mysql?=        ../../x11/qt5-mysql
+BUILDLINK_PKGSRCDIR.qt5-mysql?=                ../../x11/qt5-mysql
 
 BUILDLINK_LIBDIRS.qt5-mysql+=          qt5/plugins
 

Index: pkgsrc/x11/qt5-odbc/buildlink3.mk
diff -u pkgsrc/x11/qt5-odbc/buildlink3.mk:1.17 pkgsrc/x11/qt5-odbc/buildlink3.mk:1.18
--- pkgsrc/x11/qt5-odbc/buildlink3.mk:1.17      Thu Nov 30 16:45:12 2017
+++ pkgsrc/x11/qt5-odbc/buildlink3.mk   Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-odbc
 
@@ -7,7 +7,7 @@ QT5_ODBC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-odbc+=       qt5-odbc>=5.5.1
 BUILDLINK_ABI_DEPENDS.qt5-odbc+=       qt5-odbc>=5.5.1nb9
-BUILDLINK_PKGSRCDIR.qt5-odbc?= ../../x11/qt5-odbc
+BUILDLINK_PKGSRCDIR.qt5-odbc?=         ../../x11/qt5-odbc
 
 BUILDLINK_LIBDIRS.qt5-odbc+=           qt5/plugins
 

Index: pkgsrc/x11/qt5-psql/buildlink3.mk
diff -u pkgsrc/x11/qt5-psql/buildlink3.mk:1.17 pkgsrc/x11/qt5-psql/buildlink3.mk:1.18
--- pkgsrc/x11/qt5-psql/buildlink3.mk:1.17      Thu Nov 30 16:45:12 2017
+++ pkgsrc/x11/qt5-psql/buildlink3.mk   Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-psql
 
@@ -7,7 +7,7 @@ QT5_PSQL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-psql+=       qt5-psql>=5.5.1
 BUILDLINK_ABI_DEPENDS.qt5-psql+=       qt5-psql>=5.5.1nb10
-BUILDLINK_PKGSRCDIR.qt5-psql?= ../../x11/qt5-psql
+BUILDLINK_PKGSRCDIR.qt5-psql?=         ../../x11/qt5-psql
 
 BUILDLINK_LIBDIRS.qt5-psql+=           qt5/plugins
 

Index: pkgsrc/x11/qt5-qtbase/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtbase/buildlink3.mk:1.21 pkgsrc/x11/qt5-qtbase/buildlink3.mk:1.22
--- pkgsrc/x11/qt5-qtbase/buildlink3.mk:1.21    Thu Nov 30 16:45:12 2017
+++ pkgsrc/x11/qt5-qtbase/buildlink3.mk Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-qtbase
 
@@ -13,11 +13,11 @@ BUILDLINK_INCDIRS.qt5-qtbase+=      qt5/inclu
 BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib
 BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins
 
-QTDIR=         ${BUILDLINK_PREFIX.qt5-qtbase}/qt5
+QTDIR=                 ${BUILDLINK_PREFIX.qt5-qtbase}/qt5
 CMAKE_PREFIX_PATH+=    ${QTDIR}
 
 CONFIGURE_ENV+=        QTDIR=${QTDIR}
-MAKE_ENV+=     QTDIR=${QTDIR}
+MAKE_ENV+=     QTDIR=${QTDIR}
 
 PTHREAD_OPTS+= require
 

Index: pkgsrc/x11/qt5-qtdeclarative/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtdeclarative/buildlink3.mk:1.18 pkgsrc/x11/qt5-qtdeclarative/buildlink3.mk:1.19
--- pkgsrc/x11/qt5-qtdeclarative/buildlink3.mk:1.18     Thu Nov 30 16:45:12 2017
+++ pkgsrc/x11/qt5-qtdeclarative/buildlink3.mk  Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-qtdeclarative
 
@@ -7,7 +7,7 @@ QT5_QTDECLARATIVE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-qtdeclarative+=      qt5-qtdeclarative>=5.5.1
 BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+=      qt5-qtdeclarative>=5.5.1nb9
-BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?=        ../../x11/qt5-qtdeclarative
+BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?=                ../../x11/qt5-qtdeclarative
 
 BUILDLINK_INCDIRS.qt5-qtdeclarative+=  qt5/include
 BUILDLINK_LIBDIRS.qt5-qtdeclarative+=  qt5/lib

Index: pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk:1.24 pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk:1.25
--- pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk:1.24      Thu Nov 30 16:45:12 2017
+++ pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk   Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-qtmultimedia
 
@@ -7,7 +7,7 @@ QT5_QTMULTIMEDIA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-qtmultimedia+=       qt5-qtmultimedia>=5.5.1
 BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+=       qt5-qtmultimedia>=5.5.1nb13
-BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia
+BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?=         ../../x11/qt5-qtmultimedia
 
 BUILDLINK_INCDIRS.qt5-qtmultimedia+=   qt5/include
 BUILDLINK_LIBDIRS.qt5-qtmultimedia+=   qt5/lib

Index: pkgsrc/x11/qt5-qtserialport/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtserialport/buildlink3.mk:1.17 pkgsrc/x11/qt5-qtserialport/buildlink3.mk:1.18
--- pkgsrc/x11/qt5-qtserialport/buildlink3.mk:1.17      Thu Nov 30 16:45:13 2017
+++ pkgsrc/x11/qt5-qtserialport/buildlink3.mk   Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-qtserialport
 
@@ -7,7 +7,7 @@ QT5_QTSERIALPORT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-qtserialport+=       qt5-qtserialport>=5.5.1
 BUILDLINK_ABI_DEPENDS.qt5-qtserialport+=       qt5-qtserialport>=5.5.1nb9
-BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport
+BUILDLINK_PKGSRCDIR.qt5-qtserialport?=         ../../x11/qt5-qtserialport
 
 BUILDLINK_INCDIRS.qt5-qtserialport+=   qt5/include
 BUILDLINK_LIBDIRS.qt5-qtserialport+=   qt5/lib

Index: pkgsrc/x11/qt5-qtsvg/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtsvg/buildlink3.mk:1.17 pkgsrc/x11/qt5-qtsvg/buildlink3.mk:1.18
--- pkgsrc/x11/qt5-qtsvg/buildlink3.mk:1.17     Thu Nov 30 16:45:13 2017
+++ pkgsrc/x11/qt5-qtsvg/buildlink3.mk  Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-qtsvg
 
@@ -7,7 +7,7 @@ QT5_QTSVG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-qtsvg+=      qt5-qtsvg>=5.5.1
 BUILDLINK_ABI_DEPENDS.qt5-qtsvg+=      qt5-qtsvg>=5.5.1nb9
-BUILDLINK_PKGSRCDIR.qt5-qtsvg?=        ../../x11/qt5-qtsvg
+BUILDLINK_PKGSRCDIR.qt5-qtsvg?=                ../../x11/qt5-qtsvg
 
 BUILDLINK_INCDIRS.qt5-qtsvg+=  qt5/include
 BUILDLINK_LIBDIRS.qt5-qtsvg+=  qt5/lib

Index: pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk:1.12 pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk:1.13
--- pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk:1.12      Thu Nov 30 16:45:13 2017
+++ pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk   Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-qtwebchannel
 
@@ -7,7 +7,7 @@ QT5_QTWEBCHANNEL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-qtwebchannel+=       qt5-qtwebchannel>=5.5.1
 BUILDLINK_ABI_DEPENDS.qt5-qtwebchannel+=       qt5-qtwebchannel>=5.5.1nb10
-BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel
+BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?=         ../../x11/qt5-qtwebchannel
 
 BUILDLINK_INCDIRS.qt5-qtwebchannel+=   qt5/include
 BUILDLINK_LIBDIRS.qt5-qtwebchannel+=   qt5/lib

Index: pkgsrc/x11/qt5-qtxmlpatterns/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtxmlpatterns/buildlink3.mk:1.17 pkgsrc/x11/qt5-qtxmlpatterns/buildlink3.mk:1.18
--- pkgsrc/x11/qt5-qtxmlpatterns/buildlink3.mk:1.17     Thu Nov 30 16:45:14 2017
+++ pkgsrc/x11/qt5-qtxmlpatterns/buildlink3.mk  Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qt5-qtxmlpatterns
 
@@ -7,7 +7,7 @@ QT5_QTXMLPATTERNS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-qtxmlpatterns+=      qt5-qtxmlpatterns>=5.5.1
 BUILDLINK_ABI_DEPENDS.qt5-qtxmlpatterns+=      qt5-qtxmlpatterns>=5.5.1nb9
-BUILDLINK_PKGSRCDIR.qt5-qtxmlpatterns?=        ../../x11/qt5-qtxmlpatterns
+BUILDLINK_PKGSRCDIR.qt5-qtxmlpatterns?=                ../../x11/qt5-qtxmlpatterns
 
 BUILDLINK_INCDIRS.qt5-qtxmlpatterns+=  qt5/include
 BUILDLINK_LIBDIRS.qt5-qtxmlpatterns+=  qt5/lib

Index: pkgsrc/x11/qwtplot3d-qt4/buildlink3.mk
diff -u pkgsrc/x11/qwtplot3d-qt4/buildlink3.mk:1.24 pkgsrc/x11/qwtplot3d-qt4/buildlink3.mk:1.25
--- pkgsrc/x11/qwtplot3d-qt4/buildlink3.mk:1.24 Sat Mar  5 11:28:02 2016
+++ pkgsrc/x11/qwtplot3d-qt4/buildlink3.mk      Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2016/03/05 11:28:02 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:42 rillig Exp $
 
 BUILDLINK_TREE+=       qwtplot3d
 
@@ -7,7 +7,7 @@ QWTPLOT3D_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qwtplot3d+=      qwtplot3d>=0.2.7
 BUILDLINK_ABI_DEPENDS.qwtplot3d+=      qwtplot3d>=0.2.7nb23
-BUILDLINK_PKGSRCDIR.qwtplot3d?=        ../../x11/qwtplot3d-qt4
+BUILDLINK_PKGSRCDIR.qwtplot3d?=                ../../x11/qwtplot3d-qt4
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .endif # QWTPLOT3D_BUILDLINK3_MK

Index: pkgsrc/x11/renderproto/buildlink3.mk
diff -u pkgsrc/x11/renderproto/buildlink3.mk:1.15 pkgsrc/x11/renderproto/buildlink3.mk:1.16
--- pkgsrc/x11/renderproto/buildlink3.mk:1.15   Wed Apr 20 10:00:01 2011
+++ pkgsrc/x11/renderproto/buildlink3.mk        Sun Jan  7 13:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2011/04/20 10:00:01 hauke Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:42 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,12 +8,12 @@ BUILDLINK_TREE+=      renderproto
 RENDERPROTO_BUILDLINK3_MK:=
 
 .if ${X11_TYPE} == "native"
-. include "../../mk/x11.buildlink3.mk"
-. if ${BUILTIN_X11_TYPE.native} == "XFree86" || \
+.  include "../../mk/x11.buildlink3.mk"
+.  if ${BUILTIN_X11_TYPE.native} == "XFree86" || \
      ${BUILTIN_X11_TYPE.native} == "xorg" && \
      empty(BUILTIN_X11_VERSION.xorg)
 RENDERPROTO_RENDERPROTO9=1
-. endif
+.  endif
 .endif
 
 .if defined(RENDERPROTO_RENDERPROTO9)

Index: pkgsrc/x11/rep-gtk2/buildlink3.mk
diff -u pkgsrc/x11/rep-gtk2/buildlink3.mk:1.3 pkgsrc/x11/rep-gtk2/buildlink3.mk:1.4
--- pkgsrc/x11/rep-gtk2/buildlink3.mk:1.3       Fri Jan  3 05:03:51 2014
+++ pkgsrc/x11/rep-gtk2/buildlink3.mk   Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/01/03 05:03:51 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       rep-gtk2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        rep-gtk2
 REP_GTK2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.rep-gtk2+=       rep-gtk2>=0.90.8.1
-BUILDLINK_PKGSRCDIR.rep-gtk2?= ../../x11/rep-gtk2
+BUILDLINK_PKGSRCDIR.rep-gtk2?=         ../../x11/rep-gtk2
 
 .endif # REP_GTK2_BUILDLINK3_MK
 

Index: pkgsrc/x11/ruby-gnome2-gtk3/buildlink3.mk
diff -u pkgsrc/x11/ruby-gnome2-gtk3/buildlink3.mk:1.17 pkgsrc/x11/ruby-gnome2-gtk3/buildlink3.mk:1.18
--- pkgsrc/x11/ruby-gnome2-gtk3/buildlink3.mk:1.17      Thu Nov 23 17:19:46 2017
+++ pkgsrc/x11/ruby-gnome2-gtk3/buildlink3.mk   Sun Jan  7 13:04:43 2018
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.17 2017/11/23 17:19:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       ruby-gnome2-gtk3
 
 .if !defined(RUBY_GNOME2_GTK3_BUILDLINK3_MK)
 RUBY_GNOME2_GTK3_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ruby-gnome2-gtk3+=${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3+=${RUBY_PKGPREFIX}-gnome2-gtk3>=3.1.1nb2
+BUILDLINK_API_DEPENDS.ruby-gnome2-gtk3+=       ${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2.0
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3+=       ${RUBY_PKGPREFIX}-gnome2-gtk3>=3.1.1nb2
 BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3?=       ruby23-gnome2-gtk3>=3.1.9nb1
-BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk3?= ../../x11/ruby-gnome2-gtk3
+BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk3?=         ../../x11/ruby-gnome2-gtk3
 
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/x11/tk/buildlink3.mk
diff -u pkgsrc/x11/tk/buildlink3.mk:1.35 pkgsrc/x11/tk/buildlink3.mk:1.36
--- pkgsrc/x11/tk/buildlink3.mk:1.35    Wed Nov 25 12:54:23 2015
+++ pkgsrc/x11/tk/buildlink3.mk Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2015/11/25 12:54:23 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       tk
 
@@ -27,7 +27,7 @@ pkgbase := tk
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.tk:Mxft2)
-. include "../../x11/libXft/buildlink3.mk"
+.  include "../../x11/libXft/buildlink3.mk"
 .endif
 
 .include "../../mk/bsd.fast.prefs.mk"

Index: pkgsrc/x11/tk85/buildlink3.mk
diff -u pkgsrc/x11/tk85/buildlink3.mk:1.3 pkgsrc/x11/tk85/buildlink3.mk:1.4
--- pkgsrc/x11/tk85/buildlink3.mk:1.3   Wed Nov 25 12:54:23 2015
+++ pkgsrc/x11/tk85/buildlink3.mk       Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/11/25 12:54:23 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       tk
 
@@ -27,7 +27,7 @@ pkgbase := tk
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.tk:Mxft2)
-. include "../../x11/libXft/buildlink3.mk"
+.  include "../../x11/libXft/buildlink3.mk"
 .endif
 
 .include "../../mk/bsd.fast.prefs.mk"

Index: pkgsrc/x11/trapproto/buildlink3.mk
diff -u pkgsrc/x11/trapproto/buildlink3.mk:1.4 pkgsrc/x11/trapproto/buildlink3.mk:1.5
--- pkgsrc/x11/trapproto/buildlink3.mk:1.4      Sat Apr  6 13:46:35 2013
+++ pkgsrc/x11/trapproto/buildlink3.mk  Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2013/04/06 13:46:35 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       trapproto
 
@@ -8,7 +8,7 @@ TRAPPROTO_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.trapproto?=        build
 
 BUILDLINK_API_DEPENDS.trapproto+=      trapproto>=3.4.3
-BUILDLINK_PKGSRCDIR.trapproto?=        ../../x11/trapproto
+BUILDLINK_PKGSRCDIR.trapproto?=                ../../x11/trapproto
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"

Index: pkgsrc/x11/wxGTK30/buildlink3.mk
diff -u pkgsrc/x11/wxGTK30/buildlink3.mk:1.9 pkgsrc/x11/wxGTK30/buildlink3.mk:1.10
--- pkgsrc/x11/wxGTK30/buildlink3.mk:1.9        Sun Feb 12 06:25:00 2017
+++ pkgsrc/x11/wxGTK30/buildlink3.mk    Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2017/02/12 06:25:00 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       wxGTK30
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.wxGTK30+=       wxGTK30>
 BUILDLINK_PKGSRCDIR.wxGTK30?=  ../../x11/wxGTK30
 
 BUILDLINK_INCDIRS.wxGTK30+=    include/wx-3.0
-PREPEND_PATH+=                 ${PREFIX}/libexec/wx-3.0
+PREPEND_PATH+=                 ${PREFIX}/libexec/wx-3.0
 CONFIGURE_ARGS+=               --with-wx-version=3.0
 CONFIGURE_ARGS+=               --with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config
 

Index: pkgsrc/x11/xbitmaps/buildlink3.mk
diff -u pkgsrc/x11/xbitmaps/buildlink3.mk:1.5 pkgsrc/x11/xbitmaps/buildlink3.mk:1.6
--- pkgsrc/x11/xbitmaps/buildlink3.mk:1.5       Sat Apr  6 13:46:35 2013
+++ pkgsrc/x11/xbitmaps/buildlink3.mk   Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2013/04/06 13:46:35 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       xbitmaps
 
@@ -8,7 +8,7 @@ XBITMAPS_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.xbitmaps?= build
 
 BUILDLINK_API_DEPENDS.xbitmaps+=       xbitmaps>=1.0
-BUILDLINK_PKGSRCDIR.xbitmaps?= ../../x11/xbitmaps
+BUILDLINK_PKGSRCDIR.xbitmaps?=         ../../x11/xbitmaps
 .endif # XBITMAPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -xbitmaps

Index: pkgsrc/x11/xcb-proto/buildlink3.mk
diff -u pkgsrc/x11/xcb-proto/buildlink3.mk:1.2 pkgsrc/x11/xcb-proto/buildlink3.mk:1.3
--- pkgsrc/x11/xcb-proto/buildlink3.mk:1.2      Mon May  7 02:45:47 2012
+++ pkgsrc/x11/xcb-proto/buildlink3.mk  Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/05/07 02:45:47 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       xcb-proto
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=        xcb-proto
 XCB_PROTO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xcb-proto+=      xcb-proto>=1.4
-BUILDLINK_PKGSRCDIR.xcb-proto?=        ../../x11/xcb-proto
-BUILDLINK_DEPMETHOD.xcb-proto?=        build
+BUILDLINK_PKGSRCDIR.xcb-proto?=                ../../x11/xcb-proto
+BUILDLINK_DEPMETHOD.xcb-proto?=                build
 .endif # XCB_PROTO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -xcb-proto

Index: pkgsrc/x11/xcb-util-keysyms/buildlink3.mk
diff -u pkgsrc/x11/xcb-util-keysyms/buildlink3.mk:1.1 pkgsrc/x11/xcb-util-keysyms/buildlink3.mk:1.2
--- pkgsrc/x11/xcb-util-keysyms/buildlink3.mk:1.1       Tue Jul 24 18:02:07 2012
+++ pkgsrc/x11/xcb-util-keysyms/buildlink3.mk   Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/07/24 18:02:07 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       xcb-util-keysyms
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        xcb-util-keysyms
 XCB_UTIL_KEYSYMS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xcb-util-keysyms+=       xcb-util-keysyms>=0.3.9
-BUILDLINK_PKGSRCDIR.xcb-util-keysyms?= ../../x11/xcb-util-keysyms
+BUILDLINK_PKGSRCDIR.xcb-util-keysyms?=         ../../x11/xcb-util-keysyms
 
 .include "../../x11/libxcb/buildlink3.mk"
 .endif # XCB_UTIL_KEYSYMS_BUILDLINK3_MK

Index: pkgsrc/x11/xextproto/buildlink3.mk
diff -u pkgsrc/x11/xextproto/buildlink3.mk:1.11 pkgsrc/x11/xextproto/buildlink3.mk:1.12
--- pkgsrc/x11/xextproto/buildlink3.mk:1.11     Sat Apr 10 21:09:21 2010
+++ pkgsrc/x11/xextproto/buildlink3.mk  Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2010/04/10 21:09:21 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:43 rillig Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -10,7 +10,7 @@ BUILDLINK_TREE+=      xextproto
 XEXTPROTO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xextproto+=      xextproto>=7.0
-BUILDLINK_PKGSRCDIR.xextproto?=        ../../x11/xextproto
+BUILDLINK_PKGSRCDIR.xextproto?=                ../../x11/xextproto
 
 .include "../../x11/inputproto/buildlink3.mk"
 .endif # XEXTPROTO_BUILDLINK3_MK

Index: pkgsrc/x11/xf86bigfontproto/buildlink3.mk
diff -u pkgsrc/x11/xf86bigfontproto/buildlink3.mk:1.3 pkgsrc/x11/xf86bigfontproto/buildlink3.mk:1.4
--- pkgsrc/x11/xf86bigfontproto/buildlink3.mk:1.3       Sat Apr  6 13:46:36 2013
+++ pkgsrc/x11/xf86bigfontproto/buildlink3.mk   Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:36 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       xf86bigfontproto
 
@@ -8,7 +8,7 @@ XF86BIGFONTPROTO_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.xf86bigfontproto?= build
 
 BUILDLINK_API_DEPENDS.xf86bigfontproto+=       xf86bigfontproto>=1.1
-BUILDLINK_PKGSRCDIR.xf86bigfontproto?= ../../x11/xf86bigfontproto
+BUILDLINK_PKGSRCDIR.xf86bigfontproto?=         ../../x11/xf86bigfontproto
 .endif # XF86BIGFONTPROTO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -xf86bigfontproto

Index: pkgsrc/x11/xf86vidmodeproto/buildlink3.mk
diff -u pkgsrc/x11/xf86vidmodeproto/buildlink3.mk:1.4 pkgsrc/x11/xf86vidmodeproto/buildlink3.mk:1.5
--- pkgsrc/x11/xf86vidmodeproto/buildlink3.mk:1.4       Sat Apr  6 13:46:36 2013
+++ pkgsrc/x11/xf86vidmodeproto/buildlink3.mk   Sun Jan  7 13:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2013/04/06 13:46:36 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:43 rillig Exp $
 
 BUILDLINK_TREE+=       xf86vidmodeproto
 
@@ -8,7 +8,7 @@ XF86VIDMODEPROTO_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.xf86vidmodeproto?= build
 
 BUILDLINK_API_DEPENDS.xf86vidmodeproto+=       xf86vidmodeproto>=2.3
-BUILDLINK_PKGSRCDIR.xf86vidmodeproto?= ../../x11/xf86vidmodeproto
+BUILDLINK_PKGSRCDIR.xf86vidmodeproto?=         ../../x11/xf86vidmodeproto
 
 .include "../../x11/xproto/buildlink3.mk"
 .endif # XF86VIDMODEPROTO_BUILDLINK3_MK

Index: pkgsrc/x11/xproxymanagementprotocol/buildlink3.mk
diff -u pkgsrc/x11/xproxymanagementprotocol/buildlink3.mk:1.3 pkgsrc/x11/xproxymanagementprotocol/buildlink3.mk:1.4
--- pkgsrc/x11/xproxymanagementprotocol/buildlink3.mk:1.3       Sat Apr  6 13:46:36 2013
+++ pkgsrc/x11/xproxymanagementprotocol/buildlink3.mk   Sun Jan  7 13:04:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:36 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:44 rillig Exp $
 
 BUILDLINK_TREE+=       xproxymanagementprotocol
 
@@ -8,7 +8,7 @@ XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.xproxymanagementprotocol?= build
 
 BUILDLINK_API_DEPENDS.xproxymanagementprotocol+=       xproxymanagementprotocol>=1.0.2
-BUILDLINK_PKGSRCDIR.xproxymanagementprotocol?= ../../x11/xproxymanagementprotocol
+BUILDLINK_PKGSRCDIR.xproxymanagementprotocol?=         ../../x11/xproxymanagementprotocol
 .endif # XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -xproxymanagementprotocol

Index: pkgsrc/x11/xview-lib/buildlink3.mk
diff -u pkgsrc/x11/xview-lib/buildlink3.mk:1.11 pkgsrc/x11/xview-lib/buildlink3.mk:1.12
--- pkgsrc/x11/xview-lib/buildlink3.mk:1.11     Mon May  7 01:54:16 2012
+++ pkgsrc/x11/xview-lib/buildlink3.mk  Sun Jan  7 13:04:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 01:54:16 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:44 rillig Exp $
 
 BUILDLINK_TREE+=       xview-lib
 
@@ -7,7 +7,7 @@ XVIEW_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xview-lib+=      xview-lib>=3.2.1
 BUILDLINK_ABI_DEPENDS.xview-lib+=      xview-lib>=3.2.1nb8
-BUILDLINK_PKGSRCDIR.xview-lib?=        ../../x11/xview-lib
+BUILDLINK_PKGSRCDIR.xview-lib?=                ../../x11/xview-lib
 
 .include "../../x11/libX11/buildlink3.mk"
 .endif # XVIEW_LIB_BUILDLINK3_MK



Home | Main Index | Thread Index | Old Index