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:   agc
Date:           Thu Jan 19 18:52:30 UTC 2017

Modified Files:
        pkgsrc/audio/abcmidi: Makefile
        pkgsrc/audio/aumix: Makefile.common
        pkgsrc/audio/gmp3info: Makefile
        pkgsrc/audio/gmpc: Makefile
        pkgsrc/audio/gmpc-alarm: Makefile
        pkgsrc/audio/gmpc-jamendo: Makefile
        pkgsrc/audio/gmpc-libnotify: Makefile
        pkgsrc/audio/gmpc-magnatune: Makefile
        pkgsrc/audio/gmpc-wikipedia: Makefile
        pkgsrc/audio/libmpd: Makefile
        pkgsrc/audio/libofa: Makefile
        pkgsrc/audio/libtunepimp: Makefile
        pkgsrc/audio/muse: Makefile
        pkgsrc/audio/sound-juicer: Makefile
        pkgsrc/benchmarks/benchfft: Makefile
        pkgsrc/biology/clustalw: Makefile
        pkgsrc/biology/hmmer: Makefile
        pkgsrc/cad/gnucap: Makefile
        pkgsrc/chat/centerim: Makefile
        pkgsrc/chat/ekg: Makefile
        pkgsrc/chat/epic4: Makefile
        pkgsrc/chat/epic4-doc: Makefile
        pkgsrc/chat/i2cbd: Makefile
        pkgsrc/chat/irchat-pj: Makefile
        pkgsrc/chat/ircservices: Makefile
        pkgsrc/chat/silc-client: Makefile
        pkgsrc/chat/silc-server: Makefile
        pkgsrc/comms/asterisk: Makefile
        pkgsrc/comms/asterisk13: Makefile
        pkgsrc/comms/asterisk14: Makefile
        pkgsrc/comms/asterisk18: Makefile
        pkgsrc/comms/xisp: Makefile
        pkgsrc/converters/jcode-perl: Makefile
        pkgsrc/converters/latex2rtf: Makefile
        pkgsrc/converters/py-jpCodecs: Makefile
        pkgsrc/converters/py-zhCodecs: Makefile
        pkgsrc/databases/cstore: Makefile
        pkgsrc/databases/db4: Makefile
        pkgsrc/databases/db5: Makefile
        pkgsrc/databases/geneweb: Makefile
        pkgsrc/databases/openldap: Makefile.common
        pkgsrc/databases/openldap-doc: Makefile
        pkgsrc/databases/sqlite: Makefile
        pkgsrc/databases/sqlite3: Makefile.version
        pkgsrc/devel/automake: Makefile
        pkgsrc/devel/bin86: Makefile
        pkgsrc/devel/cdecl: Makefile
        pkgsrc/devel/chrpath: Makefile
        pkgsrc/devel/doxygen: Makefile
        pkgsrc/devel/elf: Makefile
        pkgsrc/devel/ffcall: Makefile
        pkgsrc/devel/gmp: Makefile
        pkgsrc/devel/libdatrie: Makefile
        pkgsrc/devel/libfreefare: Makefile
        pkgsrc/devel/libidn: Makefile
        pkgsrc/devel/libslang: Makefile
        pkgsrc/devel/libslang2: Makefile
        pkgsrc/devel/libstatgrab: Makefile
        pkgsrc/devel/libthai: Makefile
        pkgsrc/devel/lmdbg: Makefile
        pkgsrc/devel/lua-alt-getopt: Makefile
        pkgsrc/devel/mk-configure: Makefile
        pkgsrc/devel/ncurses: Makefile.common
        pkgsrc/devel/p5-Cache: Makefile
        pkgsrc/devel/p5-Cache-Cache: Makefile
        pkgsrc/devel/p5-Glib-Object-Introspection: Makefile
        pkgsrc/devel/pcc-libs: Makefile
        pkgsrc/devel/pcre: Makefile
        pkgsrc/devel/pcre2: Makefile
        pkgsrc/devel/rdp: Makefile
        pkgsrc/devel/silc-toolkit: Makefile
        pkgsrc/devel/xulrunner17: dist.mk
        pkgsrc/devel/zlib: Makefile
        pkgsrc/editors/ce: Makefile.common
        pkgsrc/editors/emacs20: Makefile
        pkgsrc/editors/jed: Makefile.common
        pkgsrc/editors/lyx: Makefile
        pkgsrc/editors/nedit: Makefile
        pkgsrc/editors/pico: Makefile
        pkgsrc/editors/ve: Makefile
        pkgsrc/emulators/cygwin_esound: Makefile
        pkgsrc/emulators/snes9x: Makefile
        pkgsrc/emulators/wine: Makefile
        pkgsrc/emulators/wine-devel: Makefile
        pkgsrc/fonts/cyr-rfx-share: Makefile.common
        pkgsrc/fonts/freefonts: Makefile
        pkgsrc/fonts/ghostscript-fonts: Makefile
        pkgsrc/fonts/ipaexfont: Makefile
        pkgsrc/fonts/ja-elisau: Makefile
        pkgsrc/fonts/jisx0212fonts: Makefile
        pkgsrc/fonts/ko-hanyang: Makefile
        pkgsrc/fonts/mplayer-fonts: Makefile
        pkgsrc/fonts/ttf-tlwg: Makefile
        pkgsrc/games/civctp-demo: Makefile
        pkgsrc/games/doom1: Makefile
        pkgsrc/games/eus-demo: Makefile
        pkgsrc/games/finalbattle: Makefile
        pkgsrc/games/flightgear: Makefile
        pkgsrc/games/flightgear-data: Makefile
        pkgsrc/games/fltk-sudoku: Makefile
        pkgsrc/games/frotz: Makefile
        pkgsrc/games/heretic2-demo: Makefile
        pkgsrc/games/quake: Makefile
        pkgsrc/games/quakedata: Makefile
        pkgsrc/games/rollemup: Makefile
        pkgsrc/games/simgear: Makefile
        pkgsrc/games/sjeng: Makefile
        pkgsrc/games/thew: Makefile
        pkgsrc/games/xarchon: Makefile
        pkgsrc/games/xjump: Makefile
        pkgsrc/games/xpuyopuyo: Makefile
        pkgsrc/geography/epsg: Makefile
        pkgsrc/geography/proj-doc: Makefile
        pkgsrc/graphics/GMT: Makefile
        pkgsrc/graphics/GraphicsMagick: Makefile.common
        pkgsrc/graphics/ImageMagick: Makefile.common
        pkgsrc/graphics/ImageMagick6: Makefile.common
        pkgsrc/graphics/Ngraph: Makefile
        pkgsrc/graphics/claraocr: Makefile
        pkgsrc/graphics/dvipng: Makefile
        pkgsrc/graphics/freetype2: Makefile
        pkgsrc/graphics/gimp: Makefile
        pkgsrc/graphics/gle: Makefile
        pkgsrc/graphics/libggi: Makefile
        pkgsrc/graphics/libggigcp: Makefile
        pkgsrc/graphics/libggimisc: Makefile
        pkgsrc/graphics/libggiwmh: Makefile
        pkgsrc/graphics/libgii: Makefile
        pkgsrc/graphics/libgiigic: Makefile
        pkgsrc/graphics/mng: Makefile
        pkgsrc/graphics/p5-Image-ExifTool: Makefile
        pkgsrc/graphics/png: Makefile
        pkgsrc/graphics/potrace: Makefile
        pkgsrc/graphics/povray: Makefile
        pkgsrc/graphics/radiance: Makefile
        pkgsrc/graphics/viewfax: Makefile
        pkgsrc/inputmethod/gtk-im-libthai: Makefile
        pkgsrc/inputmethod/ibus-libthai: Makefile
        pkgsrc/inputmethod/ja-freewnn-lib: Makefile.common
        pkgsrc/inputmethod/scim-thai: Makefile
        pkgsrc/inputmethod/skk: Makefile
        pkgsrc/inputmethod/tegaki-wagomu: Makefile
        pkgsrc/lang/chicken: Makefile
        pkgsrc/lang/gcc-aux: Makefile
        pkgsrc/lang/gcc5-aux: Makefile
        pkgsrc/lang/gprolog: Makefile
        pkgsrc/lang/gwydion-dylan: Makefile
        pkgsrc/lang/lua51: Makefile
        pkgsrc/lang/lua52: Makefile
        pkgsrc/lang/lua53: Makefile
        pkgsrc/lang/maude: Makefile
        pkgsrc/lang/mercury: Makefile
        pkgsrc/lang/pcc: Makefile
        pkgsrc/lang/racket: Makefile
        pkgsrc/lang/racket-textual: Makefile
        pkgsrc/lang/rexx-imc: Makefile
        pkgsrc/lang/runawk: Makefile
        pkgsrc/lang/snobol: Makefile
        pkgsrc/lang/spl: Makefile
        pkgsrc/lang/squeak-vm: Makefile
        pkgsrc/lang/swi-prolog-lite: Makefile.common
        pkgsrc/lang/vscm: Makefile
        pkgsrc/lang/yap: Makefile
        pkgsrc/mail/amavis-perl: Makefile
        pkgsrc/mail/amavisd-new: Makefile
        pkgsrc/mail/cyrus-imapd: Makefile
        pkgsrc/mail/cyrus-imapd23: Makefile
        pkgsrc/mail/cyrus-imapd24: Makefile
        pkgsrc/mail/dovecot2-antispam-plugin: Makefile
        pkgsrc/mail/exim: Makefile
        pkgsrc/mail/exim-html: Makefile
        pkgsrc/mail/exim3: Makefile
        pkgsrc/mail/hypermail: Makefile
        pkgsrc/mail/imp: Makefile
        pkgsrc/mail/ingo: Makefile
        pkgsrc/mail/mailgraph: Makefile
        pkgsrc/mail/majordomo: Makefile
        pkgsrc/mail/metamail: Makefile
        pkgsrc/mail/mimp: Makefile
        pkgsrc/mail/p5-Mail-Milter: Makefile
        pkgsrc/mail/pine: Makefile
        pkgsrc/mail/popa3d: Makefile
        pkgsrc/mail/qpopper: Makefile.common
        pkgsrc/mail/sendmail: Makefile.common
        pkgsrc/mail/sympa: Makefile
        pkgsrc/mail/turba: Makefile
        pkgsrc/mail/vm: Makefile
        pkgsrc/math/cln: Makefile
        pkgsrc/math/fftw: Makefile
        pkgsrc/math/fftw2: Makefile
        pkgsrc/math/fftwf: Makefile
        pkgsrc/math/gap: Makefile
        pkgsrc/math/grace: Makefile
        pkgsrc/math/mpcomplex: Makefile
        pkgsrc/math/py-Scientific-doc: Makefile
        pkgsrc/math/py-mpmath: Makefile
        pkgsrc/math/xlispstat: Makefile
        pkgsrc/mbone/mdp: Makefile
        pkgsrc/misc/astrolog: Makefile
        pkgsrc/misc/elscreen: Makefile
        pkgsrc/misc/epm: Makefile
        pkgsrc/misc/iselect: Makefile
        pkgsrc/misc/logsurfer: Makefile
        pkgsrc/misc/pty-redir: Makefile
        pkgsrc/misc/vfu: Makefile
        pkgsrc/misc/zorro: Makefile
        pkgsrc/multimedia/gopchop: Makefile
        pkgsrc/multimedia/handbrake: Makefile
        pkgsrc/multimedia/realplayer-codecs: Makefile
        pkgsrc/multimedia/vlc: Makefile
        pkgsrc/multimedia/vlc20: Makefile
        pkgsrc/multimedia/win32-codecs: Makefile
        pkgsrc/multimedia/x265: Makefile
        pkgsrc/multimedia/xanim: Makefile
        pkgsrc/net/cftp: Makefile
        pkgsrc/net/csup: Makefile
        pkgsrc/net/delegate: Makefile
        pkgsrc/net/dtcpclient: Makefile
        pkgsrc/net/ftpproxy: Makefile
        pkgsrc/net/ipv6calc: Makefile
        pkgsrc/net/isc-dhcp4: Makefile.common
        pkgsrc/net/lambdamoo-core: Makefile
        pkgsrc/net/lambdamoo-doc: Makefile
        pkgsrc/net/lftp: Makefile
        pkgsrc/net/mrtg: Makefile
        pkgsrc/net/nslint: Makefile
        pkgsrc/net/ocsinventory-agent: Makefile
        pkgsrc/net/p5-Net-DNS: Makefile
        pkgsrc/net/parpd: Makefile
        pkgsrc/net/proftpd: Makefile.common
        pkgsrc/net/pure-ftpd: Makefile
        pkgsrc/net/rsync: Makefile
        pkgsrc/net/snort: Makefile
        pkgsrc/net/teamspeak-server: Makefile
        pkgsrc/net/tinyfugue: Makefile
        pkgsrc/net/traceroute-nanog: Makefile
        pkgsrc/net/wu-ftpd: Makefile
        pkgsrc/news/inn: Makefile
        pkgsrc/news/tin: Makefile
        pkgsrc/parallel/paexec: Makefile
        pkgsrc/parallel/slurm: Makefile
        pkgsrc/pkgtools/distbb: Makefile
        pkgsrc/pkgtools/nih: Makefile
        pkgsrc/pkgtools/pkg_online-server: Makefile.common
        pkgsrc/pkgtools/pkg_summary-utils: Makefile
        pkgsrc/print/LPRng-core: Makefile
        pkgsrc/print/a2ps: Makefile
        pkgsrc/print/cnprint: Makefile
        pkgsrc/print/cups15: Makefile
        pkgsrc/print/foomatic-ppds: Makefile
        pkgsrc/print/mpage: Makefile
        pkgsrc/print/p5-PostScript-MailLabels: Makefile
        pkgsrc/print/xpdf: Makefile
        pkgsrc/print/xpdf-arabic: Makefile
        pkgsrc/print/xpdf-chinese-simplified: Makefile
        pkgsrc/print/xpdf-chinese-traditional: Makefile
        pkgsrc/print/xpdf-cyrillic: Makefile
        pkgsrc/print/xpdf-greek: Makefile
        pkgsrc/print/xpdf-hebrew: Makefile
        pkgsrc/print/xpdf-japanese: Makefile
        pkgsrc/print/xpdf-korean: Makefile
        pkgsrc/print/xpdf-latin2: Makefile
        pkgsrc/print/xpdf-thai: Makefile
        pkgsrc/print/xpdf-turkish: Makefile
        pkgsrc/security/cyrus-sasl: Makefile.common
        pkgsrc/security/fsh: Makefile
        pkgsrc/security/gnupg: Makefile
        pkgsrc/security/gss: Makefile
        pkgsrc/security/libgcrypt: Makefile
        pkgsrc/security/libgpg-error: Makefile
        pkgsrc/security/lsh: Makefile
        pkgsrc/security/nettle: Makefile
        pkgsrc/security/pam-ldap: Makefile
        pkgsrc/security/pgp2: Makefile
        pkgsrc/security/pgp5: Makefile
        pkgsrc/security/pinepgp: Makefile
        pkgsrc/security/pks: Makefile
        pkgsrc/security/prelude-manager: Makefile
        pkgsrc/security/pwsafe: Makefile
        pkgsrc/security/py-prewikka: Makefile
        pkgsrc/security/sudo: Makefile
        pkgsrc/shells/bash: Makefile
        pkgsrc/shells/bash2: Makefile
        pkgsrc/shells/bash2-doc: Makefile
        pkgsrc/shells/mksh: Makefile
        pkgsrc/shells/pdksh: Makefile
        pkgsrc/shells/scsh: Makefile
        pkgsrc/shells/tcsh: Makefile
        pkgsrc/sysutils/asapm: Makefile
        pkgsrc/sysutils/cfengine2: Makefile
        pkgsrc/sysutils/dc-tools: Makefile
        pkgsrc/sysutils/dtpstree: Makefile
        pkgsrc/sysutils/fam: Makefile
        pkgsrc/sysutils/ipw-firmware: Makefile
        pkgsrc/sysutils/iwi-firmware: Makefile
        pkgsrc/sysutils/iwi-firmware3: Makefile
        pkgsrc/sysutils/iwn-firmware: Makefile
        pkgsrc/sysutils/lilo: Makefile
        pkgsrc/sysutils/lsof: Makefile
        pkgsrc/sysutils/mc46: Makefile
        pkgsrc/sysutils/mktemp: Makefile
        pkgsrc/sysutils/pciutils: Makefile
        pkgsrc/sysutils/py-notify-python: Makefile
        pkgsrc/sysutils/rtty: Makefile
        pkgsrc/sysutils/whowatch: Makefile
        pkgsrc/sysutils/wpi-firmware2: Makefile
        pkgsrc/textproc/WordNet: Makefile
        pkgsrc/textproc/dict-mueller7: Makefile
        pkgsrc/textproc/dict-server: Makefile.common
        pkgsrc/textproc/dictem: Makefile
        pkgsrc/textproc/eb: Makefile
        pkgsrc/textproc/html2text: Makefile
        pkgsrc/textproc/html2wml: Makefile
        pkgsrc/textproc/hyperestraier: Makefile.common
        pkgsrc/textproc/intltool: Makefile
        pkgsrc/textproc/libxml2: Makefile.common
        pkgsrc/textproc/libxslt: Makefile.common
        pkgsrc/textproc/markdown2social: Makefile
        pkgsrc/textproc/rtfm: Makefile
        pkgsrc/textproc/swath: Makefile
        pkgsrc/textproc/urlview: Makefile
        pkgsrc/time/kronolith: Makefile
        pkgsrc/time/rclock: Makefile
        pkgsrc/wm/fvwm: Makefile
        pkgsrc/www/amaya: Makefile
        pkgsrc/www/analog: Makefile
        pkgsrc/www/apache22: Makefile
        pkgsrc/www/apache24: Makefile
        pkgsrc/www/bluefish: Makefile
        pkgsrc/www/elinks: Makefile
        pkgsrc/www/horde: Makefile
        pkgsrc/www/htdig: Makefile
        pkgsrc/www/lynx: Makefile
        pkgsrc/www/nspluginwrapper: Makefile
        pkgsrc/www/p5-HTML-Template: Makefile
        pkgsrc/www/p5-HTML-Template-Expr: Makefile
        pkgsrc/www/py-mechanize: Makefile
        pkgsrc/www/py-webcolors: Makefile
        pkgsrc/www/ruby-borges: Makefile
        pkgsrc/www/squid3: Makefile
        pkgsrc/www/squidGuard: Makefile
        pkgsrc/www/webalizer: Makefile
        pkgsrc/x11/fltk: Makefile
        pkgsrc/x11/fltk2: Makefile
        pkgsrc/x11/matchbox-common: Makefile
        pkgsrc/x11/qt3-libs: Makefile.common
        pkgsrc/x11/rxvt: Makefile
        pkgsrc/x11/rxvt-unicode: Makefile
        pkgsrc/x11/xkeycaps: Makefile
        pkgsrc/x11/xless: Makefile
        pkgsrc/x11/xlockmore: Makefile.common
        pkgsrc/x11/xmindpath: Makefile
        pkgsrc/x11/xscript: Makefile

Log Message:
Convert all occurrences (353 by my count) of

        MASTER_SITES=   site1 \
                        site2

style continuation lines to be simple repeated

        MASTER_SITES+= site1
        MASTER_SITES+= site2

lines. As previewed on tech-pkg. With thanks to rillig for fixing pkglint
accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/audio/abcmidi/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/aumix/Makefile.common
cvs rdiff -u -r1.54 -r1.55 pkgsrc/audio/gmp3info/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/audio/gmpc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/gmpc-alarm/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/gmpc-jamendo/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/gmpc-libnotify/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/audio/gmpc-magnatune/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/audio/gmpc-wikipedia/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/audio/libmpd/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/audio/libofa/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/audio/libtunepimp/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/audio/muse/Makefile
cvs rdiff -u -r1.87 -r1.88 pkgsrc/audio/sound-juicer/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/benchmarks/benchfft/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/biology/clustalw/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/biology/hmmer/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/cad/gnucap/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/chat/centerim/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/chat/ekg/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/chat/epic4/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/chat/epic4-doc/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/chat/i2cbd/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/chat/irchat-pj/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/chat/ircservices/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/chat/silc-client/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/chat/silc-server/Makefile
cvs rdiff -u -r1.149 -r1.150 pkgsrc/comms/asterisk/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/comms/asterisk13/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/comms/asterisk14/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/comms/asterisk18/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/comms/xisp/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/converters/jcode-perl/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/converters/latex2rtf/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/converters/py-jpCodecs/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/converters/py-zhCodecs/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/cstore/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/databases/db4/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/db5/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/databases/geneweb/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/openldap/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/openldap-doc/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/sqlite/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/sqlite3/Makefile.version
cvs rdiff -u -r1.103 -r1.104 pkgsrc/devel/automake/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/bin86/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/cdecl/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/chrpath/Makefile
cvs rdiff -u -r1.128 -r1.129 pkgsrc/devel/doxygen/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/elf/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/ffcall/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/devel/gmp/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/libdatrie/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libfreefare/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/libidn/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/devel/libslang/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/libslang2/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/libstatgrab/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/libthai/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/lmdbg/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/lua-alt-getopt/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/mk-configure/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/ncurses/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/p5-Cache/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/p5-Cache-Cache/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/p5-Glib-Object-Introspection/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/pcc-libs/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/devel/pcre/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/pcre2/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/rdp/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/silc-toolkit/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/xulrunner17/dist.mk
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/zlib/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/editors/ce/Makefile.common
cvs rdiff -u -r1.56 -r1.57 pkgsrc/editors/emacs20/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/jed/Makefile.common
cvs rdiff -u -r1.59 -r1.60 pkgsrc/editors/lyx/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/editors/nedit/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/editors/pico/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/editors/ve/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/cygwin_esound/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/emulators/snes9x/Makefile
cvs rdiff -u -r1.194 -r1.195 pkgsrc/emulators/wine/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/emulators/wine-devel/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/fonts/cyr-rfx-share/Makefile.common
cvs rdiff -u -r1.15 -r1.16 pkgsrc/fonts/freefonts/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/fonts/ghostscript-fonts/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/fonts/ipaexfont/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/fonts/ja-elisau/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/fonts/jisx0212fonts/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/fonts/ko-hanyang/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/fonts/mplayer-fonts/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/ttf-tlwg/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/games/civctp-demo/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/doom1/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/games/eus-demo/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/games/finalbattle/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/games/flightgear/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/flightgear-data/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/fltk-sudoku/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/games/frotz/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/games/heretic2-demo/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/games/quake/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/games/quakedata/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/games/rollemup/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/games/simgear/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/games/sjeng/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/thew/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/games/xarchon/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/xjump/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/games/xpuyopuyo/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/geography/epsg/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/geography/proj-doc/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/GMT/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/GraphicsMagick/Makefile.common
cvs rdiff -u -r1.140 -r1.141 pkgsrc/graphics/ImageMagick/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/ImageMagick6/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/Ngraph/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/claraocr/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/dvipng/Makefile
cvs rdiff -u -r1.109 -r1.110 pkgsrc/graphics/freetype2/Makefile
cvs rdiff -u -r1.261 -r1.262 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/gle/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/graphics/libggi/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/libggigcp/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/libggimisc/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/libggiwmh/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/libgii/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/libgiigic/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/graphics/mng/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/p5-Image-ExifTool/Makefile
cvs rdiff -u -r1.188 -r1.189 pkgsrc/graphics/png/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/potrace/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/povray/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/radiance/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/viewfax/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/inputmethod/gtk-im-libthai/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/inputmethod/ibus-libthai/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/inputmethod/ja-freewnn-lib/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/inputmethod/scim-thai/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/inputmethod/skk/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/inputmethod/tegaki-wagomu/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/lang/chicken/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/gcc-aux/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc5-aux/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/gprolog/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/gwydion-dylan/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/lua51/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/lua52/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/lua53/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/maude/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/lang/mercury/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/pcc/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/lang/racket/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/racket-textual/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/rexx-imc/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/runawk/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/snobol/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/spl/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/squeak-vm/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/swi-prolog-lite/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/vscm/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/yap/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/amavis-perl/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/amavisd-new/Makefile
cvs rdiff -u -r1.106 -r1.107 pkgsrc/mail/cyrus-imapd/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/mail/cyrus-imapd23/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mail/cyrus-imapd24/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/dovecot2-antispam-plugin/Makefile
cvs rdiff -u -r1.151 -r1.152 pkgsrc/mail/exim/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mail/exim-html/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/mail/exim3/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/hypermail/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/mail/imp/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/ingo/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/mailgraph/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/mail/majordomo/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/mail/metamail/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/mimp/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mail/p5-Mail-Milter/Makefile
cvs rdiff -u -r1.134 -r1.135 pkgsrc/mail/pine/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/mail/popa3d/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/qpopper/Makefile.common
cvs rdiff -u -r1.64 -r1.65 pkgsrc/mail/sendmail/Makefile.common
cvs rdiff -u -r1.63 -r1.64 pkgsrc/mail/sympa/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/mail/turba/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/mail/vm/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/math/cln/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/math/fftw/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/math/fftw2/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/math/fftwf/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/math/gap/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/math/grace/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/mpcomplex/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/py-Scientific-doc/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/math/py-mpmath/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/math/xlispstat/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mbone/mdp/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/misc/astrolog/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/misc/elscreen/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/epm/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/misc/iselect/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/misc/logsurfer/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/pty-redir/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/misc/vfu/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/misc/zorro/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/multimedia/gopchop/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/multimedia/handbrake/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/multimedia/realplayer-codecs/Makefile
cvs rdiff -u -r1.196 -r1.197 pkgsrc/multimedia/vlc/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/vlc20/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/multimedia/win32-codecs/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/x265/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/multimedia/xanim/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/cftp/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/csup/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/delegate/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/dtcpclient/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/ftpproxy/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/ipv6calc/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/isc-dhcp4/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/lambdamoo-core/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/lambdamoo-doc/Makefile
cvs rdiff -u -r1.118 -r1.119 pkgsrc/net/lftp/Makefile
cvs rdiff -u -r1.120 -r1.121 pkgsrc/net/mrtg/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/nslint/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/ocsinventory-agent/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/net/p5-Net-DNS/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/parpd/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/proftpd/Makefile.common
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/pure-ftpd/Makefile
cvs rdiff -u -r1.103 -r1.104 pkgsrc/net/rsync/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/snort/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/teamspeak-server/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/tinyfugue/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/traceroute-nanog/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/wu-ftpd/Makefile
cvs rdiff -u -r1.123 -r1.124 pkgsrc/news/inn/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/news/tin/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/parallel/paexec/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/parallel/slurm/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/pkgtools/distbb/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/pkgtools/nih/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/pkgtools/pkg_online-server/Makefile.common
cvs rdiff -u -r1.36 -r1.37 pkgsrc/pkgtools/pkg_summary-utils/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/print/LPRng-core/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/print/a2ps/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/print/cnprint/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/cups15/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/foomatic-ppds/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/print/mpage/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/print/p5-PostScript-MailLabels/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/print/xpdf/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/xpdf-arabic/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/print/xpdf-chinese-simplified/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/xpdf-chinese-traditional/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/xpdf-cyrillic/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/xpdf-greek/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/xpdf-hebrew/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/print/xpdf-japanese/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/xpdf-korean/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/xpdf-latin2/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/xpdf-thai/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/xpdf-turkish/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/cyrus-sasl/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/fsh/Makefile
cvs rdiff -u -r1.136 -r1.137 pkgsrc/security/gnupg/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/gss/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/security/libgcrypt/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/security/libgpg-error/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/lsh/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/nettle/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/pam-ldap/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/security/pgp2/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/pgp5/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/pinepgp/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/security/pks/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/prelude-manager/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/pwsafe/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/py-prewikka/Makefile
cvs rdiff -u -r1.152 -r1.153 pkgsrc/security/sudo/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/shells/bash/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/shells/bash2/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/shells/bash2-doc/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/shells/mksh/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/shells/pdksh/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/shells/scsh/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/shells/tcsh/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/sysutils/asapm/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/sysutils/cfengine2/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/dc-tools/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/dtpstree/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/fam/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/ipw-firmware/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/iwi-firmware/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/iwi-firmware3/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/iwn-firmware/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/lilo/Makefile
cvs rdiff -u -r1.122 -r1.123 pkgsrc/sysutils/lsof/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/mc46/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/mktemp/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/pciutils/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/py-notify-python/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/rtty/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/whowatch/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/wpi-firmware2/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/WordNet/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/dict-mueller7/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/dict-server/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/dictem/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/textproc/eb/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/html2text/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/textproc/html2wml/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/hyperestraier/Makefile.common
cvs rdiff -u -r1.65 -r1.66 pkgsrc/textproc/intltool/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/libxml2/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/libxslt/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/markdown2social/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/rtfm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/swath/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/urlview/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/time/kronolith/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/time/rclock/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/wm/fvwm/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/www/amaya/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/www/analog/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/www/apache22/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/www/apache24/Makefile
cvs rdiff -u -r1.127 -r1.128 pkgsrc/www/bluefish/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/www/elinks/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/www/horde/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/htdig/Makefile
cvs rdiff -u -r1.125 -r1.126 pkgsrc/www/lynx/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/www/nspluginwrapper/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/p5-HTML-Template/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/p5-HTML-Template-Expr/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/py-mechanize/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/py-webcolors/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/ruby-borges/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/www/squid3/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/squidGuard/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/www/webalizer/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/x11/fltk/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/fltk2/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/matchbox-common/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/x11/qt3-libs/Makefile.common
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/rxvt/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/rxvt-unicode/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xkeycaps/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xless/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/x11/xlockmore/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xmindpath/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/xscript/Makefile

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

Modified files:

Index: pkgsrc/audio/abcmidi/Makefile
diff -u pkgsrc/audio/abcmidi/Makefile:1.17 pkgsrc/audio/abcmidi/Makefile:1.18
--- pkgsrc/audio/abcmidi/Makefile:1.17  Fri Jan 23 00:02:48 2015
+++ pkgsrc/audio/abcmidi/Makefile       Thu Jan 19 18:52:01 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2015/01/23 00:02:48 mef Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:01 agc Exp $
 #
 
 DISTNAME=      abcMIDI-${ABCMIDIVER}
 PKGNAME=       abcmidi-${ABCMIDIVER:S/-//g}
 CATEGORIES=    audio
-MASTER_SITES=  http://ifdo.ca/~seymour/runabc/ \
-               http://ifdo.pugmarks.com/~seymour/backup/
+MASTER_SITES=  http://ifdo.ca/~seymour/runabc/
+MASTER_SITES+= http://ifdo.pugmarks.com/~seymour/backup/
 EXTRACT_SUFX=  .zip
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/audio/aumix/Makefile.common
diff -u pkgsrc/audio/aumix/Makefile.common:1.10 pkgsrc/audio/aumix/Makefile.common:1.11
--- pkgsrc/audio/aumix/Makefile.common:1.10     Mon Oct 14 13:02:39 2013
+++ pkgsrc/audio/aumix/Makefile.common  Thu Jan 19 18:52:02 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.10 2013/10/14 13:02:39 roy Exp $
+# $NetBSD: Makefile.common,v 1.11 2017/01/19 18:52:02 agc Exp $
 # used by audio/aumix/Makefile
 # used by audio/aumix-gtk/Makefile
 
 DISTNAME=      aumix-2.9.1
 PKGREVISION=   1
 CATEGORIES=    audio
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=aumix/} \
-               http://jpj.net/~trevor/aumix/ \
-               ${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=aumix/}
+MASTER_SITES+= http://jpj.net/~trevor/aumix/
+MASTER_SITES+= ${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    trevor%jpj.net@localhost

Index: pkgsrc/audio/gmp3info/Makefile
diff -u pkgsrc/audio/gmp3info/Makefile:1.54 pkgsrc/audio/gmp3info/Makefile:1.55
--- pkgsrc/audio/gmp3info/Makefile:1.54 Wed Aug  3 10:22:28 2016
+++ pkgsrc/audio/gmp3info/Makefile      Thu Jan 19 18:52:02 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.54 2016/08/03 10:22:28 adam Exp $
+# $NetBSD: Makefile,v 1.55 2017/01/19 18:52:02 agc Exp $
 
 DISTNAME=      mp3info-0.8.5a
 PKGNAME=       g${DISTNAME}
 PKGREVISION=   24
 CATEGORIES=    audio
-MASTER_SITES=  ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/ \
-               ${MASTER_SITE_SUNSITE:=apps/sound/mp3-utils/mp3info/}
+MASTER_SITES=  ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/
+MASTER_SITES+= ${MASTER_SITE_SUNSITE:=apps/sound/mp3-utils/mp3info/}
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/audio/gmpc/Makefile
diff -u pkgsrc/audio/gmpc/Makefile:1.79 pkgsrc/audio/gmpc/Makefile:1.80
--- pkgsrc/audio/gmpc/Makefile:1.79     Sun Dec  4 05:17:17 2016
+++ pkgsrc/audio/gmpc/Makefile  Thu Jan 19 18:52:02 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.79 2016/12/04 05:17:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.80 2017/01/19 18:52:02 agc Exp $
 #
 
 DISTNAME=              gmpc-11.8.16
 PKGREVISION=           13
 CATEGORIES=            audio
-MASTER_SITES=          http://download.sarine.nl/Programs/gmpc/11.8/ \
-                       ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=          http://download.sarine.nl/Programs/gmpc/11.8/
+MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client

Index: pkgsrc/audio/gmpc-alarm/Makefile
diff -u pkgsrc/audio/gmpc-alarm/Makefile:1.6 pkgsrc/audio/gmpc-alarm/Makefile:1.7
--- pkgsrc/audio/gmpc-alarm/Makefile:1.6        Wed Aug  3 10:22:28 2016
+++ pkgsrc/audio/gmpc-alarm/Makefile    Thu Jan 19 18:52:02 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2016/08/03 10:22:28 adam Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/19 18:52:02 agc Exp $
 
 DISTNAME=      gmpc-alarm-11.8.16
 PKGREVISION=   4
 CATEGORIES=    audio
-MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/ \
-               ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALARM

Index: pkgsrc/audio/gmpc-jamendo/Makefile
diff -u pkgsrc/audio/gmpc-jamendo/Makefile:1.13 pkgsrc/audio/gmpc-jamendo/Makefile:1.14
--- pkgsrc/audio/gmpc-jamendo/Makefile:1.13     Sun Dec  4 05:17:18 2016
+++ pkgsrc/audio/gmpc-jamendo/Makefile  Thu Jan 19 18:52:02 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2016/12/04 05:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2017/01/19 18:52:02 agc Exp $
 
 DISTNAME=      gmpc-jamendo-11.8.16
 PKGREVISION=   11
 CATEGORIES=    audio
-MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/ \
-               ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gmpc.wikia.com/wiki/GMPC_PLUGIN_JAMENDO

Index: pkgsrc/audio/gmpc-libnotify/Makefile
diff -u pkgsrc/audio/gmpc-libnotify/Makefile:1.6 pkgsrc/audio/gmpc-libnotify/Makefile:1.7
--- pkgsrc/audio/gmpc-libnotify/Makefile:1.6    Wed Aug  3 10:22:29 2016
+++ pkgsrc/audio/gmpc-libnotify/Makefile        Thu Jan 19 18:52:02 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2016/08/03 10:22:29 adam Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/19 18:52:02 agc Exp $
 
 DISTNAME=      gmpc-libnotify-11.8.16
 PKGREVISION=   4
 CATEGORIES=    audio
-MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/ \
-               ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LIBNOTIFY

Index: pkgsrc/audio/gmpc-magnatune/Makefile
diff -u pkgsrc/audio/gmpc-magnatune/Makefile:1.37 pkgsrc/audio/gmpc-magnatune/Makefile:1.38
--- pkgsrc/audio/gmpc-magnatune/Makefile:1.37   Sun Dec  4 05:17:18 2016
+++ pkgsrc/audio/gmpc-magnatune/Makefile        Thu Jan 19 18:52:02 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2016/12/04 05:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2017/01/19 18:52:02 agc Exp $
 
 DISTNAME=      gmpc-magnatune-11.8.16
 PKGREVISION=   11
 CATEGORIES=    audio
-MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/ \
-               ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MAGNATUNE

Index: pkgsrc/audio/gmpc-wikipedia/Makefile
diff -u pkgsrc/audio/gmpc-wikipedia/Makefile:1.19 pkgsrc/audio/gmpc-wikipedia/Makefile:1.20
--- pkgsrc/audio/gmpc-wikipedia/Makefile:1.19   Sun Dec  4 05:17:18 2016
+++ pkgsrc/audio/gmpc-wikipedia/Makefile        Thu Jan 19 18:52:02 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2016/12/04 05:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:02 agc Exp $
 
 DISTNAME=      gmpc-wikipedia-11.8.16
 PKGREVISION=   16
 CATEGORIES=    audio
-MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/ \
-               ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=  http://download.sarine.nl/Programs/gmpc/11.8/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gmpc.wikia.com/wiki/GMPC_PLUGIN_WIKIPEDIA

Index: pkgsrc/audio/libmpd/Makefile
diff -u pkgsrc/audio/libmpd/Makefile:1.17 pkgsrc/audio/libmpd/Makefile:1.18
--- pkgsrc/audio/libmpd/Makefile:1.17   Tue Oct  1 16:07:02 2013
+++ pkgsrc/audio/libmpd/Makefile        Thu Jan 19 18:52:02 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2013/10/01 16:07:02 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:02 agc Exp $
 #
 
 DISTNAME=              libmpd-11.8.17
 CATEGORIES=            audio
-MASTER_SITES=          http://download.sarine.nl/Programs/gmpc/11.8/ \
-                       ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=          http://download.sarine.nl/Programs/gmpc/11.8/
+MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://gmpc.wikia.com/?title=Libmpd

Index: pkgsrc/audio/libofa/Makefile
diff -u pkgsrc/audio/libofa/Makefile:1.16 pkgsrc/audio/libofa/Makefile:1.17
--- pkgsrc/audio/libofa/Makefile:1.16   Sun Jan  1 16:06:03 2017
+++ pkgsrc/audio/libofa/Makefile        Thu Jan 19 18:52:02 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2017/01/01 16:06:03 adam Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/19 18:52:02 agc Exp $
 #
 
 DISTNAME=              libofa-0.9.3
 PKGREVISION=           10
 CATEGORIES=            audio
-MASTER_SITES=          http://distfiles.aydogan.net/audio/ \
-                                       http://musicip-libofa.googlecode.com/files/
+MASTER_SITES=          http://distfiles.aydogan.net/audio/
+MASTER_SITES+=         http://musicip-libofa.googlecode.com/files/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://code.google.com/p/musicip-libofa/

Index: pkgsrc/audio/libtunepimp/Makefile
diff -u pkgsrc/audio/libtunepimp/Makefile:1.32 pkgsrc/audio/libtunepimp/Makefile:1.33
--- pkgsrc/audio/libtunepimp/Makefile:1.32      Sun Jan  1 16:05:55 2017
+++ pkgsrc/audio/libtunepimp/Makefile   Thu Jan 19 18:52:02 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2017/01/01 16:05:55 adam Exp $
+# $NetBSD: Makefile,v 1.33 2017/01/19 18:52:02 agc Exp $
 
 DISTNAME=              libtunepimp-0.5.3
 PKGREVISION=           18
 CATEGORIES=            audio
-MASTER_SITES=          ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
-                       http://ftp.musicbrainz.org/pub/musicbrainz/
+MASTER_SITES=          ftp://ftp.musicbrainz.org/pub/musicbrainz/
+MASTER_SITES+=         http://ftp.musicbrainz.org/pub/musicbrainz/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://musicbrainz.org/doc/libtunepimp

Index: pkgsrc/audio/muse/Makefile
diff -u pkgsrc/audio/muse/Makefile:1.54 pkgsrc/audio/muse/Makefile:1.55
--- pkgsrc/audio/muse/Makefile:1.54     Wed Aug  3 10:22:30 2016
+++ pkgsrc/audio/muse/Makefile  Thu Jan 19 18:52:02 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.54 2016/08/03 10:22:30 adam Exp $
+# $NetBSD: Makefile,v 1.55 2017/01/19 18:52:02 agc Exp $
 #
 
 DISTNAME=      MuSE-0.9
 PKGNAME=       ${DISTNAME:S/MuSE/muse/}
 PKGREVISION=   32
 CATEGORIES=    audio
-MASTER_SITES=  ftp://ftp.dyne.org/muse/releases/ \
-               http://www.ljudmila.org/~jaromil/mirror/muse/releases/
+MASTER_SITES=  ftp://ftp.dyne.org/muse/releases/
+MASTER_SITES+= http://www.ljudmila.org/~jaromil/mirror/muse/releases/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://muse.dyne.org/

Index: pkgsrc/audio/sound-juicer/Makefile
diff -u pkgsrc/audio/sound-juicer/Makefile:1.87 pkgsrc/audio/sound-juicer/Makefile:1.88
--- pkgsrc/audio/sound-juicer/Makefile:1.87     Sun Dec  4 05:17:18 2016
+++ pkgsrc/audio/sound-juicer/Makefile  Thu Jan 19 18:52:02 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.87 2016/12/04 05:17:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.88 2017/01/19 18:52:02 agc Exp $
 #
 
 DISTNAME=              sound-juicer-2.32.0
 PKGREVISION=           6
 CATEGORIES=            audio
-MASTER_SITES=          http://www.burtonini.com/computing/ \
-                       ${MASTER_SITE_GNOME:=sources/sound-juicer/2.32/}
+MASTER_SITES=          http://www.burtonini.com/computing/
+MASTER_SITES+=         ${MASTER_SITE_GNOME:=sources/sound-juicer/2.32/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.burtonini.com/computing/

Index: pkgsrc/benchmarks/benchfft/Makefile
diff -u pkgsrc/benchmarks/benchfft/Makefile:1.39 pkgsrc/benchmarks/benchfft/Makefile:1.40
--- pkgsrc/benchmarks/benchfft/Makefile:1.39    Sun Sep 25 23:14:52 2016
+++ pkgsrc/benchmarks/benchfft/Makefile Thu Jan 19 18:52:03 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2016/09/25 23:14:52 kamil Exp $
+# $NetBSD: Makefile,v 1.40 2017/01/19 18:52:03 agc Exp $
 
 DISTNAME=              benchfft-2.0
 PKGREVISION=           5
 CATEGORIES=            benchmarks math
-MASTER_SITES=          ftp://ftp.fftw.org/pub/fftw/ \
-                       ftp://ftp.fftw.org/pub/fftw/old/benchfft/
+MASTER_SITES=          ftp://ftp.fftw.org/pub/fftw/
+MASTER_SITES+=         ftp://ftp.fftw.org/pub/fftw/old/benchfft/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} fftw-2.0.1${EXTRACT_SUFX}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/biology/clustalw/Makefile
diff -u pkgsrc/biology/clustalw/Makefile:1.14 pkgsrc/biology/clustalw/Makefile:1.15
--- pkgsrc/biology/clustalw/Makefile:1.14       Thu Oct  9 14:06:00 2014
+++ pkgsrc/biology/clustalw/Makefile    Thu Jan 19 18:52:03 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2014/10/09 14:06:00 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:03 agc Exp $
 
 DISTNAME=      clustalw-2.1
 CATEGORIES=    biology
-MASTER_SITES=  ftp://ftp.ebi.ac.uk/pub/software/clustalw2/2.1/ \
-               http://www.clustal.org/download/current/
+MASTER_SITES=  ftp://ftp.ebi.ac.uk/pub/software/clustalw2/2.1/
+MASTER_SITES+= http://www.clustal.org/download/current/
 
 MAINTAINER=    babafou%babafou.eu.org@localhost
 HOMEPAGE=      http://bips.u-strasbg.fr/fr/Documentation/ClustalW/

Index: pkgsrc/biology/hmmer/Makefile
diff -u pkgsrc/biology/hmmer/Makefile:1.15 pkgsrc/biology/hmmer/Makefile:1.16
--- pkgsrc/biology/hmmer/Makefile:1.15  Thu Oct  9 14:06:00 2014
+++ pkgsrc/biology/hmmer/Makefile       Thu Jan 19 18:52:03 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2014/10/09 14:06:00 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2017/01/19 18:52:03 agc Exp $
 #
 
 DISTNAME=              hmmer-3.0
 CATEGORIES=            biology
-MASTER_SITES=          ${MASTER_SITE_GENTOO:=distfiles/} \
-                       http://selab.janelia.org/software/hmmer3/3.0/ \
-                       ftp://selab.janelia.org/pub/software/hmmer3/3.0/
+MASTER_SITES=          ${MASTER_SITE_GENTOO:=distfiles/}
+MASTER_SITES+=         http://selab.janelia.org/software/hmmer3/3.0/
+MASTER_SITES+=         ftp://selab.janelia.org/pub/software/hmmer3/3.0/
 
 MAINTAINER=            hdp%cs.nmsu.edu@localhost
 HOMEPAGE=              http://hmmer.janelia.org/

Index: pkgsrc/cad/gnucap/Makefile
diff -u pkgsrc/cad/gnucap/Makefile:1.29 pkgsrc/cad/gnucap/Makefile:1.30
--- pkgsrc/cad/gnucap/Makefile:1.29     Sun May  3 19:43:21 2015
+++ pkgsrc/cad/gnucap/Makefile  Thu Jan 19 18:52:03 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2015/05/03 19:43:21 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/19 18:52:03 agc Exp $
 #
 
 DISTNAME=      gnucap-2006-07-08
 PKGNAME=       gnucap-20060708
 PKGREVISION=   3
 CATEGORIES=    cad
-MASTER_SITES=  http://www.gnucap.org/devel/ \
-               http://www.geda.seul.org/dist/
+MASTER_SITES=  http://www.gnucap.org/devel/
+MASTER_SITES+= http://www.geda.seul.org/dist/
 
 MAINTAINER=    dmcmahill%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnucap.org/

Index: pkgsrc/chat/centerim/Makefile
diff -u pkgsrc/chat/centerim/Makefile:1.35 pkgsrc/chat/centerim/Makefile:1.36
--- pkgsrc/chat/centerim/Makefile:1.35  Sun Jan  1 16:06:04 2017
+++ pkgsrc/chat/centerim/Makefile       Thu Jan 19 18:52:03 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2017/01/01 16:06:04 adam Exp $
+# $NetBSD: Makefile,v 1.36 2017/01/19 18:52:03 agc Exp $
 #
 
 DISTNAME=      centerim-4.22.10
 PKGREVISION=   7
 CATEGORIES=    chat
-MASTER_SITES=  http://www.centerim.org/download/releases/ \
-               http://transacid.de/centerim/releases/
+MASTER_SITES=  http://www.centerim.org/download/releases/
+MASTER_SITES+= http://transacid.de/centerim/releases/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.centerim.org/

Index: pkgsrc/chat/ekg/Makefile
diff -u pkgsrc/chat/ekg/Makefile:1.55 pkgsrc/chat/ekg/Makefile:1.56
--- pkgsrc/chat/ekg/Makefile:1.55       Sat Mar  5 11:27:41 2016
+++ pkgsrc/chat/ekg/Makefile    Thu Jan 19 18:52:03 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.55 2016/03/05 11:27:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.56 2017/01/19 18:52:03 agc Exp $
 
 DISTNAME=      ekg-1.7
 PKGREVISION=   11
 CATEGORIES=    chat
-MASTER_SITES=  http://ekg.chmurka.net/ \
-               http://ekg.chmurka.net/archive/
+MASTER_SITES=  http://ekg.chmurka.net/
+MASTER_SITES+= http://ekg.chmurka.net/archive/
 
 MAINTAINER=    adam%NetBSD.org@localhost
 HOMEPAGE=      http://ekg.chmurka.net/

Index: pkgsrc/chat/epic4/Makefile
diff -u pkgsrc/chat/epic4/Makefile:1.43 pkgsrc/chat/epic4/Makefile:1.44
--- pkgsrc/chat/epic4/Makefile:1.43     Wed Jun  8 19:22:16 2016
+++ pkgsrc/chat/epic4/Makefile  Thu Jan 19 18:52:03 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2016/06/08 19:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/01/19 18:52:03 agc Exp $
 #
 
 DISTNAME=      epic4-2.10.2
 PKGREVISION=   3
 CATEGORIES=    chat
-MASTER_SITES=  ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ \
-               ftp://totem.fix.no/pub/mirrors/epic/EPIC4-PRODUCTION/
+MASTER_SITES=  ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/
+MASTER_SITES+= ftp://totem.fix.no/pub/mirrors/epic/EPIC4-PRODUCTION/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/chat/epic4-doc/Makefile
diff -u pkgsrc/chat/epic4-doc/Makefile:1.12 pkgsrc/chat/epic4-doc/Makefile:1.13
--- pkgsrc/chat/epic4-doc/Makefile:1.12 Fri Jan 22 09:07:39 2016
+++ pkgsrc/chat/epic4-doc/Makefile      Thu Jan 19 18:52:03 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2016/01/22 09:07:39 zafer Exp $
+# $NetBSD: Makefile,v 1.13 2017/01/19 18:52:03 agc Exp $
 #
 
 DISTNAME=      epic4-help-20050315
 PKGNAME=       epic4-doc-1.0.20050315
 CATEGORIES=    chat
-MASTER_SITES=  ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ \
-               ftp://ftp.freenet.de/pub/ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/ \
-               http://ftp.freenet.de/pub/ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/ \
-               ftp://totem.fix.no/pub/mirrors/epic/EPIC4-PRODUCTION/
+MASTER_SITES=  ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/
+MASTER_SITES+= ftp://ftp.freenet.de/pub/ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/
+MASTER_SITES+= http://ftp.freenet.de/pub/ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/
+MASTER_SITES+= ftp://totem.fix.no/pub/mirrors/epic/EPIC4-PRODUCTION/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.epicsol.org/

Index: pkgsrc/chat/i2cbd/Makefile
diff -u pkgsrc/chat/i2cbd/Makefile:1.32 pkgsrc/chat/i2cbd/Makefile:1.33
--- pkgsrc/chat/i2cbd/Makefile:1.32     Wed Oct  3 00:02:37 2012
+++ pkgsrc/chat/i2cbd/Makefile  Thu Jan 19 18:52:03 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2012/10/03 00:02:37 asau Exp $
+# $NetBSD: Makefile,v 1.33 2017/01/19 18:52:03 agc Exp $
 #
 
 DISTNAME=      i2cbd-2.0_BETA5
 PKGREVISION=   3
 CATEGORIES=    chat
-MASTER_SITES=  ${MASTER_SITE_LOCAL} \
-               http://www.draga.com/~jwise/i2cb/
+MASTER_SITES=  ${MASTER_SITE_LOCAL}
+MASTER_SITES+= http://www.draga.com/~jwise/i2cb/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.draga.com/~jwise/i2cb/

Index: pkgsrc/chat/irchat-pj/Makefile
diff -u pkgsrc/chat/irchat-pj/Makefile:1.19 pkgsrc/chat/irchat-pj/Makefile:1.20
--- pkgsrc/chat/irchat-pj/Makefile:1.19 Sun Feb 17 19:17:56 2013
+++ pkgsrc/chat/irchat-pj/Makefile      Thu Jan 19 18:52:03 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2013/02/17 19:17:56 dholland Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:03 agc Exp $
 
 DISTNAME=      irchat-pj-2.4.24.22
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   4
 CATEGORIES=    chat
-MASTER_SITES=  http://his.luky.org/ftp/mirrors/irchat-pj/ \
-               http://gouketsu.net/irchat-pj/src/
+MASTER_SITES=  http://his.luky.org/ftp/mirrors/irchat-pj/
+MASTER_SITES+= http://gouketsu.net/irchat-pj/src/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost

Index: pkgsrc/chat/ircservices/Makefile
diff -u pkgsrc/chat/ircservices/Makefile:1.47 pkgsrc/chat/ircservices/Makefile:1.48
--- pkgsrc/chat/ircservices/Makefile:1.47       Sat Jul  9 06:37:53 2016
+++ pkgsrc/chat/ircservices/Makefile    Thu Jan 19 18:52:03 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.47 2016/07/09 06:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2017/01/19 18:52:03 agc Exp $
 #
 
 DISTNAME=      ircservices-5.0.64
 PKGREVISION=   5
 CATEGORIES=    chat
-MASTER_SITES=  http://www.ircservices.za.net/download/old/ \
-               ftp://ftp.esper.net/ircservices/old/
+MASTER_SITES=  http://www.ircservices.za.net/download/old/
+MASTER_SITES+= ftp://ftp.esper.net/ircservices/old/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.ircservices.za.net/

Index: pkgsrc/chat/silc-client/Makefile
diff -u pkgsrc/chat/silc-client/Makefile:1.67 pkgsrc/chat/silc-client/Makefile:1.68
--- pkgsrc/chat/silc-client/Makefile:1.67       Wed Jun  8 19:22:19 2016
+++ pkgsrc/chat/silc-client/Makefile    Thu Jan 19 18:52:03 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.67 2016/06/08 19:22:19 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2017/01/19 18:52:03 agc Exp $
 
 DISTNAME=              ${SILC_CLIENT_DISTNAME}
 PKGREVISION=           8
 CATEGORIES=            chat security
-MASTER_SITES=          http://www.silcnet.org/download/client/sources/ \
-                       ftp://ftp.silcnet.org/silc/client/sources/
+MASTER_SITES=          http://www.silcnet.org/download/client/sources/
+MASTER_SITES+=         ftp://ftp.silcnet.org/silc/client/sources/
 EXTRACT_SUFX=          ${SILC_CLIENT_EXTRACT_SUFX}
 
 MAINTAINER=            salo%NetBSD.org@localhost

Index: pkgsrc/chat/silc-server/Makefile
diff -u pkgsrc/chat/silc-server/Makefile:1.67 pkgsrc/chat/silc-server/Makefile:1.68
--- pkgsrc/chat/silc-server/Makefile:1.67       Tue May 17 10:32:06 2016
+++ pkgsrc/chat/silc-server/Makefile    Thu Jan 19 18:52:04 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.67 2016/05/17 10:32:06 fhajny Exp $
+# $NetBSD: Makefile,v 1.68 2017/01/19 18:52:04 agc Exp $
 
 DISTNAME=      silc-server-1.1.18
 PKGREVISION=   2
 CATEGORIES=    chat security
-MASTER_SITES=  http://www.silcnet.org/download/server/sources/ \
-               ftp://ftp.silcnet.org/silc/server/sources/
+MASTER_SITES=  http://www.silcnet.org/download/server/sources/
+MASTER_SITES+= ftp://ftp.silcnet.org/silc/server/sources/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    salo%NetBSD.org@localhost

Index: pkgsrc/comms/asterisk/Makefile
diff -u pkgsrc/comms/asterisk/Makefile:1.149 pkgsrc/comms/asterisk/Makefile:1.150
--- pkgsrc/comms/asterisk/Makefile:1.149        Sun Jan  1 16:06:05 2017
+++ pkgsrc/comms/asterisk/Makefile      Thu Jan 19 18:52:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2017/01/01 16:06:05 adam Exp $
+# $NetBSD: Makefile,v 1.150 2017/01/19 18:52:04 agc Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look win ${WRKSRC}/sounds/Makefile
@@ -7,9 +7,9 @@
 DISTNAME=      asterisk-11.25.1
 PKGREVISION=   1
 CATEGORIES=    comms net audio
-MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/ \
-               http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
-               http://downloads.asterisk.org/pub/telephony/sounds/releases/
+MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/
+MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
+MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 DISTFILES=     ${DEFAULT_DISTFILES}
 

Index: pkgsrc/comms/asterisk13/Makefile
diff -u pkgsrc/comms/asterisk13/Makefile:1.20 pkgsrc/comms/asterisk13/Makefile:1.21
--- pkgsrc/comms/asterisk13/Makefile:1.20       Sun Jan  1 16:06:06 2017
+++ pkgsrc/comms/asterisk13/Makefile    Thu Jan 19 18:52:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/01/01 16:06:06 adam Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:04 agc Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -7,9 +7,9 @@
 DISTNAME=      asterisk-13.13.0
 PKGREVISION=   2
 CATEGORIES=    comms net audio
-MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/ \
-               http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
-               http://downloads.asterisk.org/pub/telephony/sounds/releases/
+MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/
+MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
+MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 DISTFILES=     ${DEFAULT_DISTFILES}
 

Index: pkgsrc/comms/asterisk14/Makefile
diff -u pkgsrc/comms/asterisk14/Makefile:1.7 pkgsrc/comms/asterisk14/Makefile:1.8
--- pkgsrc/comms/asterisk14/Makefile:1.7        Sun Jan  1 16:06:06 2017
+++ pkgsrc/comms/asterisk14/Makefile    Thu Jan 19 18:52:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/01/01 16:06:06 adam Exp $
+# $NetBSD: Makefile,v 1.8 2017/01/19 18:52:04 agc Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -7,9 +7,9 @@
 DISTNAME=      asterisk-14.2.0
 PKGREVISION=   2
 CATEGORIES=    comms net audio
-MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/ \
-               http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
-               http://downloads.asterisk.org/pub/telephony/sounds/releases/
+MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/
+MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
+MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 DISTFILES=     ${DEFAULT_DISTFILES}
 

Index: pkgsrc/comms/asterisk18/Makefile
diff -u pkgsrc/comms/asterisk18/Makefile:1.111 pkgsrc/comms/asterisk18/Makefile:1.112
--- pkgsrc/comms/asterisk18/Makefile:1.111      Sun Jan  1 16:06:06 2017
+++ pkgsrc/comms/asterisk18/Makefile    Thu Jan 19 18:52:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2017/01/01 16:06:06 adam Exp $
+# $NetBSD: Makefile,v 1.112 2017/01/19 18:52:04 agc Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
@@ -9,9 +9,9 @@ DISTFILES=      ${DEFAULT_DISTFILES}
 EXTRACT_ONLY=  ${DISTNAME}.tar.gz
 PKGREVISION=   13
 CATEGORIES=    comms net audio
-MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/ \
-               http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
-               http://downloads.asterisk.org/pub/telephony/sounds/releases/
+MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/
+MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
+MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/sounds/releases/
 
 OWNER=         jnemeth%NetBSD.org@localhost
 HOMEPAGE=      http://www.asterisk.org/

Index: pkgsrc/comms/xisp/Makefile
diff -u pkgsrc/comms/xisp/Makefile:1.36 pkgsrc/comms/xisp/Makefile:1.37
--- pkgsrc/comms/xisp/Makefile:1.36     Sun Mar 15 15:08:30 2015
+++ pkgsrc/comms/xisp/Makefile  Thu Jan 19 18:52:04 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.36 2015/03/15 15:08:30 tnn Exp $
+# $NetBSD: Makefile,v 1.37 2017/01/19 18:52:04 agc Exp $
 #
 
 DISTNAME=              xisp-2.7p4
 PKGREVISION=           3
 CATEGORIES=            comms x11
-MASTER_SITES=          http://xisp.hellug.gr/release/ \
-                       ${MASTER_SITE_SUNSITE:=system/network/serial/}
+MASTER_SITES=          http://xisp.hellug.gr/release/
+MASTER_SITES+=         ${MASTER_SITE_SUNSITE:=system/network/serial/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://xisp.hellug.gr/

Index: pkgsrc/converters/jcode-perl/Makefile
diff -u pkgsrc/converters/jcode-perl/Makefile:1.14 pkgsrc/converters/jcode-perl/Makefile:1.15
--- pkgsrc/converters/jcode-perl/Makefile:1.14  Sat Jul  9 06:37:56 2016
+++ pkgsrc/converters/jcode-perl/Makefile       Thu Jan 19 18:52:04 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 06:37:56 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:04 agc Exp $
 
 DISTNAME=      jcode.pl-2.13
 PKGNAME=       ${DISTNAME:S/jcode.pl/jcode-perl/}
 PKGREVISION=   9
 CATEGORIES=    japanese converters perl5
-MASTER_SITES=  ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
-               ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
+MASTER_SITES=  ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/
+MASTER_SITES+= ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
 EXTRACT_SUFX=  # empty
 
 MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost

Index: pkgsrc/converters/latex2rtf/Makefile
diff -u pkgsrc/converters/latex2rtf/Makefile:1.29 pkgsrc/converters/latex2rtf/Makefile:1.30
--- pkgsrc/converters/latex2rtf/Makefile:1.29   Sat Mar 19 17:21:48 2016
+++ pkgsrc/converters/latex2rtf/Makefile        Thu Jan 19 18:52:04 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2016/03/19 17:21:48 nros Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/19 18:52:04 agc Exp $
 
 DISTNAME=      latex2rtf-2.3.10
 PKGREVISION=   1
 CATEGORIES=    print converters textproc
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=latex2rtf/}  \
-               ${MASTER_SITE_TEX_CTAN:=support/latex2rtf/}
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=latex2rtf/}
+MASTER_SITES+= ${MASTER_SITE_TEX_CTAN:=support/latex2rtf/}
 
 MAINTAINER=    brook%nmsu.edu@localhost
 HOMEPAGE=      http://latex2rtf.sourceforge.net/

Index: pkgsrc/converters/py-jpCodecs/Makefile
diff -u pkgsrc/converters/py-jpCodecs/Makefile:1.21 pkgsrc/converters/py-jpCodecs/Makefile:1.22
--- pkgsrc/converters/py-jpCodecs/Makefile:1.21 Sun Jan  1 14:43:26 2017
+++ pkgsrc/converters/py-jpCodecs/Makefile      Thu Jan 19 18:52:04 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2017/01/01 14:43:26 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:04 agc Exp $
 
 DISTNAME=      JapaneseCodecs-1.4.11
 PKGNAME=       ${PYPKGPREFIX}-jpCodecs-1.4.11
 PKGREVISION=   2
 CATEGORIES=    converters python
-MASTER_SITES=  http://www.python.jp/Zope/download/JapaneseCodecs/ \
-               http://www.asahi-net.or.jp/~rd6t-kjym/python/JapaneseCodecs/dist/
+MASTER_SITES=  http://www.python.jp/Zope/download/JapaneseCodecs/
+MASTER_SITES+= http://www.asahi-net.or.jp/~rd6t-kjym/python/JapaneseCodecs/dist/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.asahi-net.or.jp/~rd6t-kjym/python/

Index: pkgsrc/converters/py-zhCodecs/Makefile
diff -u pkgsrc/converters/py-zhCodecs/Makefile:1.21 pkgsrc/converters/py-zhCodecs/Makefile:1.22
--- pkgsrc/converters/py-zhCodecs/Makefile:1.21 Sun Jan  1 14:43:26 2017
+++ pkgsrc/converters/py-zhCodecs/Makefile      Thu Jan 19 18:52:04 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2017/01/01 14:43:26 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:04 agc Exp $
 
 DISTNAME=      ChineseCodecs1.2.0
 PKGNAME=       ${PYPKGPREFIX}-zhCodecs-1.2.0
 PKGREVISION=   1
 CATEGORIES=    converters devel python
-MASTER_SITES=  ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/ \
-               ftp://ftp2.python.or.kr/pub/FreeBSD/ports/distfiles/
+MASTER_SITES=  ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/
+MASTER_SITES+= ftp://ftp2.python.or.kr/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://sourceforge.net/projects/python-codecs/

Index: pkgsrc/databases/cstore/Makefile
diff -u pkgsrc/databases/cstore/Makefile:1.13 pkgsrc/databases/cstore/Makefile:1.14
--- pkgsrc/databases/cstore/Makefile:1.13       Sat Jul  9 06:37:59 2016
+++ pkgsrc/databases/cstore/Makefile    Thu Jan 19 18:52:04 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2016/07/09 06:37:59 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2017/01/19 18:52:04 agc Exp $
 
 DISTNAME=      cstore0.2
 PKGNAME=       cstore-0.2
 PKGREVISION=   9
 CATEGORIES=    databases
-MASTER_SITES=  http://db.lcs.mit.edu/projects/cstore/ \
-               http://db.csail.mit.edu/data/
+MASTER_SITES=  http://db.lcs.mit.edu/projects/cstore/
+MASTER_SITES+= http://db.csail.mit.edu/data/
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} data4.tar.gz D6.data.ros.gz
 
 MAINTAINER=    agc%NetBSD.org@localhost

Index: pkgsrc/databases/db4/Makefile
diff -u pkgsrc/databases/db4/Makefile:1.68 pkgsrc/databases/db4/Makefile:1.69
--- pkgsrc/databases/db4/Makefile:1.68  Thu Oct  9 14:06:05 2014
+++ pkgsrc/databases/db4/Makefile       Thu Jan 19 18:52:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2014/10/09 14:06:05 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2017/01/19 18:52:04 agc Exp $
 #
 # NOTE:
 # When updating this package, a change in the minor (4.n -> 4.(n+1))
@@ -9,8 +9,8 @@
 DISTNAME=      db-4.8.30
 PKGNAME=       ${DISTNAME:S/db/db4/}
 CATEGORIES=    databases
-MASTER_SITES=  http://download.oracle.com/berkeley-db/ \
-               http://download-uk.oracle.com/berkeley-db/
+MASTER_SITES=  http://download.oracle.com/berkeley-db/
+MASTER_SITES+= http://download-uk.oracle.com/berkeley-db/
 
 #PATCHFILES=   patch.4.8.30.1
 #PATCH_SITES=  http://www.oracle.com/technology/products/berkeley-db/db/update/4.8.30/

Index: pkgsrc/databases/db5/Makefile
diff -u pkgsrc/databases/db5/Makefile:1.17 pkgsrc/databases/db5/Makefile:1.18
--- pkgsrc/databases/db5/Makefile:1.17  Thu Aug 25 06:18:57 2016
+++ pkgsrc/databases/db5/Makefile       Thu Jan 19 18:52:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/08/25 06:18:57 richard Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:05 agc Exp $
 #
 # NOTE:
 # When updating this package, a change in the minor (5.n -> 5.(n+1))
@@ -10,8 +10,8 @@ DISTNAME=     db-5.3.28
 PKGNAME=       ${DISTNAME:S/db/db5/}
 PKGREVISION=   1
 CATEGORIES=    databases
-MASTER_SITES=  http://download.oracle.com/berkeley-db/ \
-               http://download-uk.oracle.com/berkeley-db/
+MASTER_SITES=  http://download.oracle.com/berkeley-db/
+MASTER_SITES+= http://download-uk.oracle.com/berkeley-db/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.oracle.com/database/berkeley-db/db/index.html

Index: pkgsrc/databases/geneweb/Makefile
diff -u pkgsrc/databases/geneweb/Makefile:1.46 pkgsrc/databases/geneweb/Makefile:1.47
--- pkgsrc/databases/geneweb/Makefile:1.46      Fri Dec 30 11:16:57 2016
+++ pkgsrc/databases/geneweb/Makefile   Thu Jan 19 18:52:05 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.46 2016/12/30 11:16:57 jaapb Exp $
+# $NetBSD: Makefile,v 1.47 2017/01/19 18:52:05 agc Exp $
 #
 
 DISTNAME=      geneweb-5.01
 PKGREVISION=   11
 CATEGORIES=    databases
 EXTRACT_SUFX=  .tgz
-MASTER_SITES=  ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/ \
-               http://www.sartorelli.gen.nz/GeneWeb/Src/
+MASTER_SITES=  ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/
+MASTER_SITES+= http://www.sartorelli.gen.nz/GeneWeb/Src/
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      http://www.geneweb.org/

Index: pkgsrc/databases/openldap/Makefile.common
diff -u pkgsrc/databases/openldap/Makefile.common:1.38 pkgsrc/databases/openldap/Makefile.common:1.39
--- pkgsrc/databases/openldap/Makefile.common:1.38      Fri Jun 17 13:56:53 2016
+++ pkgsrc/databases/openldap/Makefile.common   Thu Jan 19 18:52:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2016/06/17 13:56:53 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.39 2017/01/19 18:52:05 agc Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-cloak/Makefile
@@ -10,15 +10,15 @@
 
 DISTNAME=      openldap-${OPENLDAP_VERSION}
 CATEGORIES=    databases
-MASTER_SITES=  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
-               http://www.openldap.org/software/download/OpenLDAP/openldap-release/ \
-               ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
-               ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \
-               ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \
-               ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \
-               ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
-               ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \
-               ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
+MASTER_SITES=  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+MASTER_SITES+= http://www.openldap.org/software/download/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/
+MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
+MASTER_SITES+= ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    adam%NetBSD.org@localhost

Index: pkgsrc/databases/openldap-doc/Makefile
diff -u pkgsrc/databases/openldap-doc/Makefile:1.26 pkgsrc/databases/openldap-doc/Makefile:1.27
--- pkgsrc/databases/openldap-doc/Makefile:1.26 Mon Oct 22 09:41:07 2012
+++ pkgsrc/databases/openldap-doc/Makefile      Thu Jan 19 18:52:05 2017
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.26 2012/10/22 09:41:07 ghen Exp $
+# $NetBSD: Makefile,v 1.27 2017/01/19 18:52:05 agc Exp $
 
 .include "../../databases/openldap/Makefile.version"
 
 DISTNAME=      openldap-${OPENLDAP_VERSION}
 PKGNAME=       ${DISTNAME:S/-/-doc-/}
 CATEGORIES=    databases
-MASTER_SITES=  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
-               http://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
-               ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
-               ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \
-               ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \
-               ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \
-               ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
-               ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \
-               ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
+MASTER_SITES=  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+MASTER_SITES+= http://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/
+MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
+MASTER_SITES+= ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/
+MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    adam%NetBSD.org@localhost

Index: pkgsrc/databases/sqlite/Makefile
diff -u pkgsrc/databases/sqlite/Makefile:1.45 pkgsrc/databases/sqlite/Makefile:1.46
--- pkgsrc/databases/sqlite/Makefile:1.45       Mon Jul 15 02:02:20 2013
+++ pkgsrc/databases/sqlite/Makefile    Thu Jan 19 18:52:05 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.45 2013/07/15 02:02:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2017/01/19 18:52:05 agc Exp $
 
 DISTNAME=              sqlite-2.8.17
 PKGREVISION=           1
 CATEGORIES=            databases
-MASTER_SITES=          http://www.hwaci.com/sw/sqlite/ \
-                       http://www.sqlite.org/
+MASTER_SITES=          http://www.hwaci.com/sw/sqlite/
+MASTER_SITES+=         http://www.sqlite.org/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.hwaci.com/sw/sqlite/

Index: pkgsrc/databases/sqlite3/Makefile.version
diff -u pkgsrc/databases/sqlite3/Makefile.version:1.28 pkgsrc/databases/sqlite3/Makefile.version:1.29
--- pkgsrc/databases/sqlite3/Makefile.version:1.28      Sat Jan  7 10:23:00 2017
+++ pkgsrc/databases/sqlite3/Makefile.version   Thu Jan 19 18:52:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.28 2017/01/07 10:23:00 adam Exp $
+# $NetBSD: Makefile.version,v 1.29 2017/01/19 18:52:05 agc Exp $
 #
 # used by databases/sqlite3/Makefile
 # used by databases/sqlite3-docs/Makefile
@@ -8,5 +8,5 @@
 SQLITE3_DISTVERSION=   3160200
 SQLITE3_VERSION=       3.16.2
 
-MASTER_SITES=  http://www.hwaci.com/sw/sqlite/2017/ \
-               http://www.sqlite.org/2017/
+MASTER_SITES=  http://www.hwaci.com/sw/sqlite/2017/
+MASTER_SITES+= http://www.sqlite.org/2017/

Index: pkgsrc/devel/automake/Makefile
diff -u pkgsrc/devel/automake/Makefile:1.103 pkgsrc/devel/automake/Makefile:1.104
--- pkgsrc/devel/automake/Makefile:1.103        Sat Jul  9 06:38:05 2016
+++ pkgsrc/devel/automake/Makefile      Thu Jan 19 18:52:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2016/07/09 06:38:05 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2017/01/19 18:52:05 agc Exp $
 #
 # for major version updates, don't forget adding new links in
 # mk/tools/automake.mk
@@ -6,8 +6,8 @@
 DISTNAME=      automake-1.15
 PKGREVISION=   4
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_GNU:=automake/} \
-               ftp://sources.redhat.com/pub/automake/
+MASTER_SITES=  ${MASTER_SITE_GNU:=automake/}
+MASTER_SITES+= ftp://sources.redhat.com/pub/automake/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    wiz%NetBSD.org@localhost

Index: pkgsrc/devel/bin86/Makefile
diff -u pkgsrc/devel/bin86/Makefile:1.4 pkgsrc/devel/bin86/Makefile:1.5
--- pkgsrc/devel/bin86/Makefile:1.4     Wed Oct 31 11:16:40 2012
+++ pkgsrc/devel/bin86/Makefile Thu Jan 19 18:52:05 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:16:40 asau Exp $
+# $NetBSD: Makefile,v 1.5 2017/01/19 18:52:05 agc Exp $
 
 DISTNAME=              bin86-0.16.17
 PKGREVISION=           1
 CATEGORIES=            devel
-MASTER_SITES=          http://homepage.ntlworld.com/robert.debath/dev86/ \
-                       http://www.debath.co.uk/dev86/
+MASTER_SITES=          http://homepage.ntlworld.com/robert.debath/dev86/
+MASTER_SITES+=         http://www.debath.co.uk/dev86/
 
 MAINTAINER=            reed%reedmedia.net@localhost
 HOMEPAGE=              http://www.debath.co.uk/

Index: pkgsrc/devel/cdecl/Makefile
diff -u pkgsrc/devel/cdecl/Makefile:1.29 pkgsrc/devel/cdecl/Makefile:1.30
--- pkgsrc/devel/cdecl/Makefile:1.29    Mon Jul 15 02:02:20 2013
+++ pkgsrc/devel/cdecl/Makefile Thu Jan 19 18:52:05 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2013/07/15 02:02:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/19 18:52:05 agc Exp $
 #
 
 DISTNAME=      cdecl-2.5
 PKGREVISION=   2
 CATEGORIES=    devel
-MASTER_SITES=  ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/ \
-               ftp://ftp-linux.cc.gatech.edu/pub/linux/devel/lang/c/
+MASTER_SITES=  ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/
+MASTER_SITES+= ftp://ftp-linux.cc.gatech.edu/pub/linux/devel/lang/c/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Utility to explain and compose C and C++ declarations

Index: pkgsrc/devel/chrpath/Makefile
diff -u pkgsrc/devel/chrpath/Makefile:1.2 pkgsrc/devel/chrpath/Makefile:1.3
--- pkgsrc/devel/chrpath/Makefile:1.2   Wed Oct 31 11:16:46 2012
+++ pkgsrc/devel/chrpath/Makefile       Thu Jan 19 18:52:05 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/10/31 11:16:46 asau Exp $
+# $NetBSD: Makefile,v 1.3 2017/01/19 18:52:05 agc Exp $
 #
 
 DISTNAME=      chrpath-0.13
 CATEGORIES=    devel
-MASTER_SITES=  ftp://ftp.hungry.com/pub/hungry/chrpath/ \
-               ${MASTER_SITE_GENTOO:=distfiles/}
+MASTER_SITES=  ftp://ftp.hungry.com/pub/hungry/chrpath/
+MASTER_SITES+= ${MASTER_SITE_GENTOO:=distfiles/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://freshmeat.net/projects/chrpath/

Index: pkgsrc/devel/doxygen/Makefile
diff -u pkgsrc/devel/doxygen/Makefile:1.128 pkgsrc/devel/doxygen/Makefile:1.129
--- pkgsrc/devel/doxygen/Makefile:1.128 Sun Jan  1 14:43:30 2017
+++ pkgsrc/devel/doxygen/Makefile       Thu Jan 19 18:52:05 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.128 2017/01/01 14:43:30 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2017/01/19 18:52:05 agc Exp $
 
 DISTNAME=      doxygen-1.8.12.src
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    devel
-MASTER_SITES=  ftp://ftp.stack.nl/pub/users/dimitri/ \
-               http://ftp.stack.nl/pub/users/dimitri/
+MASTER_SITES=  ftp://ftp.stack.nl/pub/users/dimitri/
+MASTER_SITES+= http://ftp.stack.nl/pub/users/dimitri/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.doxygen.org/

Index: pkgsrc/devel/elf/Makefile
diff -u pkgsrc/devel/elf/Makefile:1.19 pkgsrc/devel/elf/Makefile:1.20
--- pkgsrc/devel/elf/Makefile:1.19      Wed Oct 16 12:32:17 2013
+++ pkgsrc/devel/elf/Makefile   Thu Jan 19 18:52:05 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2013/10/16 12:32:17 roy Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:05 agc Exp $
 #
 
 DISTNAME=      elf-0.5.3
 PKGREVISION=   4
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_BACKUP} \
-               http://www.kerneled.com/projects/elf/
+MASTER_SITES=  ${MASTER_SITE_BACKUP}
+MASTER_SITES+= http://www.kerneled.com/projects/elf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.kerneled.com/projects/elf/

Index: pkgsrc/devel/ffcall/Makefile
diff -u pkgsrc/devel/ffcall/Makefile:1.31 pkgsrc/devel/ffcall/Makefile:1.32
--- pkgsrc/devel/ffcall/Makefile:1.31   Fri Aug 26 17:25:08 2016
+++ pkgsrc/devel/ffcall/Makefile        Thu Jan 19 18:52:05 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2016/08/26 17:25:08 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2017/01/19 18:52:05 agc Exp $
 
 DISTNAME=      ffcall-1.10
 PKGREVISION=   4
 CATEGORIES=    devel
-MASTER_SITES=  http://www.haible.de/bruno/gnu/ \
-               ${MASTER_SITE_GNUSTEP:=libs/}
+MASTER_SITES=  http://www.haible.de/bruno/gnu/
+MASTER_SITES+= ${MASTER_SITE_GNUSTEP:=libs/}
 
 MAINTAINER=    adam%NetBSD.org@localhost
 HOMEPAGE=      http://www.haible.de/bruno/packages-ffcall.html

Index: pkgsrc/devel/gmp/Makefile
diff -u pkgsrc/devel/gmp/Makefile:1.80 pkgsrc/devel/gmp/Makefile:1.81
--- pkgsrc/devel/gmp/Makefile:1.80      Mon Dec 19 08:50:45 2016
+++ pkgsrc/devel/gmp/Makefile   Thu Jan 19 18:52:06 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.80 2016/12/19 08:50:45 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2017/01/19 18:52:06 agc Exp $
 
 DISTNAME=      gmp-6.1.2
 CATEGORIES=    devel math
-MASTER_SITES=  https://gmplib.org/download/gmp/ \
-               ${MASTER_SITE_GNU:=gmp/}
+MASTER_SITES=  https://gmplib.org/download/gmp/
+MASTER_SITES+= ${MASTER_SITE_GNU:=gmp/}
 # Use .tar.bz2 distfile so that no extra dependency on archivers/xz
 # is needed when building lang/gcc* with option gcc-inplace-math.
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/devel/libdatrie/Makefile
diff -u pkgsrc/devel/libdatrie/Makefile:1.14 pkgsrc/devel/libdatrie/Makefile:1.15
--- pkgsrc/devel/libdatrie/Makefile:1.14        Sun Mar 15 17:09:00 2015
+++ pkgsrc/devel/libdatrie/Makefile     Thu Jan 19 18:52:06 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2015/03/15 17:09:00 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:06 agc Exp $
 #
 
 DISTNAME=      libdatrie-0.2.8
 CATEGORIES=    devel
-MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/ \
-               ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
+MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/
+MASTER_SITES+= ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/libfreefare/Makefile
diff -u pkgsrc/devel/libfreefare/Makefile:1.1 pkgsrc/devel/libfreefare/Makefile:1.2
--- pkgsrc/devel/libfreefare/Makefile:1.1       Fri Dec 16 08:13:01 2016
+++ pkgsrc/devel/libfreefare/Makefile   Thu Jan 19 18:52:06 2017
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2016/12/16 08:13:01 manu Exp $
+# $NetBSD: Makefile,v 1.2 2017/01/19 18:52:06 agc Exp $
 
 DISTNAME=      libfreefare-0.4.0
 CATEGORIES=    devel
-MASTER_SITES=  \
-  ${MASTER_SITE_GITHUB:=nfc-tools/libfreefare/releases/download/${DISTNAME}/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=nfc-tools/libfreefare/releases/download/${DISTNAME}/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/libidn/Makefile
diff -u pkgsrc/devel/libidn/Makefile:1.97 pkgsrc/devel/libidn/Makefile:1.98
--- pkgsrc/devel/libidn/Makefile:1.97   Thu Jul 21 11:51:28 2016
+++ pkgsrc/devel/libidn/Makefile        Thu Jan 19 18:52:06 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.97 2016/07/21 11:51:28 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2017/01/19 18:52:06 agc Exp $
 
 DISTNAME=      libidn-1.33
 CATEGORIES=    devel
-MASTER_SITES=  ftp://alpha.gnu.org/pub/gnu/libidn/ \
-               ${MASTER_SITE_GNU:=libidn/}
+MASTER_SITES=  ftp://alpha.gnu.org/pub/gnu/libidn/
+MASTER_SITES+= ${MASTER_SITE_GNU:=libidn/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/libidn/

Index: pkgsrc/devel/libslang/Makefile
diff -u pkgsrc/devel/libslang/Makefile:1.71 pkgsrc/devel/libslang/Makefile:1.72
--- pkgsrc/devel/libslang/Makefile:1.71 Thu Oct  9 14:06:10 2014
+++ pkgsrc/devel/libslang/Makefile      Thu Jan 19 18:52:06 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.71 2014/10/09 14:06:10 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2017/01/19 18:52:06 agc Exp $
 #
 
 DISTNAME=      slang-1.4.9
 PKGNAME=       lib${DISTNAME}
 PKGREVISION=   7
 CATEGORIES=    devel
-MASTER_SITES=  ftp://space.mit.edu/pub/davis/slang/v1.4/ \
-               ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/
+MASTER_SITES=  ftp://space.mit.edu/pub/davis/slang/v1.4/
+MASTER_SITES+= ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/libslang2/Makefile
diff -u pkgsrc/devel/libslang2/Makefile:1.18 pkgsrc/devel/libslang2/Makefile:1.19
--- pkgsrc/devel/libslang2/Makefile:1.18        Thu Oct  9 14:06:10 2014
+++ pkgsrc/devel/libslang2/Makefile     Thu Jan 19 18:52:06 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.18 2014/10/09 14:06:10 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:06 agc Exp $
 #
 
 DISTNAME=      slang-2.2.4
 PKGNAME=       lib${DISTNAME:slang%=slang2%}
 PKGREVISION=   2
 CATEGORIES=    devel
-MASTER_SITES=  ftp://space.mit.edu/pub/davis/slang/v2.2/ \
-               ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/
+MASTER_SITES=  ftp://space.mit.edu/pub/davis/slang/v2.2/
+MASTER_SITES+= ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/libstatgrab/Makefile
diff -u pkgsrc/devel/libstatgrab/Makefile:1.31 pkgsrc/devel/libstatgrab/Makefile:1.32
--- pkgsrc/devel/libstatgrab/Makefile:1.31      Sat Jul  9 06:38:09 2016
+++ pkgsrc/devel/libstatgrab/Makefile   Thu Jan 19 18:52:06 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.31 2016/07/09 06:38:09 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2017/01/19 18:52:06 agc Exp $
 
 DISTNAME=      libstatgrab-0.91
 PKGREVISION=   1
 CATEGORIES=    devel
-MASTER_SITES=  ftp://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/ \
-               ftp://ftp.i-scream.org/pub/i-scream/libstatgrab/ \
-               http://ftp.i-scream.org/pub/i-scream/libstatgrab/ \
-               http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/ \
-               http://dl.ambiweb.de/mirrors/ftp.i-scream.org/libstatgrab/
+MASTER_SITES=  ftp://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/
+MASTER_SITES+= ftp://ftp.i-scream.org/pub/i-scream/libstatgrab/
+MASTER_SITES+= http://ftp.i-scream.org/pub/i-scream/libstatgrab/
+MASTER_SITES+= http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/
+MASTER_SITES+= http://dl.ambiweb.de/mirrors/ftp.i-scream.org/libstatgrab/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.i-scream.org/libstatgrab/

Index: pkgsrc/devel/libthai/Makefile
diff -u pkgsrc/devel/libthai/Makefile:1.16 pkgsrc/devel/libthai/Makefile:1.17
--- pkgsrc/devel/libthai/Makefile:1.16  Sun Mar 15 19:51:07 2015
+++ pkgsrc/devel/libthai/Makefile       Thu Jan 19 18:52:06 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2015/03/15 19:51:07 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/19 18:52:06 agc Exp $
 
 DISTNAME=      libthai-0.1.21
 CATEGORIES=    devel
-MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/ \
-               ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
+MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/
+MASTER_SITES+= ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/lmdbg/Makefile
diff -u pkgsrc/devel/lmdbg/Makefile:1.15 pkgsrc/devel/lmdbg/Makefile:1.16
--- pkgsrc/devel/lmdbg/Makefile:1.15    Sun Jan  4 02:47:06 2015
+++ pkgsrc/devel/lmdbg/Makefile Thu Jan 19 18:52:07 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2015/01/04 02:47:06 dholland Exp $
+# $NetBSD: Makefile,v 1.16 2017/01/19 18:52:07 agc Exp $
 #
 
 DISTNAME=      lmdbg-1.2.1
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lmdbg/} \
-               http://mova.org/~cheusov/pub/lmdbg/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lmdbg/}
+MASTER_SITES+= http://mova.org/~cheusov/pub/lmdbg/
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      http://sourceforge.net/projects/lmdbg/

Index: pkgsrc/devel/lua-alt-getopt/Makefile
diff -u pkgsrc/devel/lua-alt-getopt/Makefile:1.9 pkgsrc/devel/lua-alt-getopt/Makefile:1.10
--- pkgsrc/devel/lua-alt-getopt/Makefile:1.9    Sat Jan 10 20:52:25 2015
+++ pkgsrc/devel/lua-alt-getopt/Makefile        Thu Jan 19 18:52:07 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2015/01/10 20:52:25 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/01/19 18:52:07 agc Exp $
 
 DISTNAME=      lua-alt-getopt-0.7.0
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME:S/lua-//}
 PKGREVISION=   3
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lua-alt-getopt/} \
-               http://mova.org/~cheusov/pub/lua_alt_getopt/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lua-alt-getopt/}
+MASTER_SITES+= http://mova.org/~cheusov/pub/lua_alt_getopt/
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      https://sourceforge.net/projects/lua-alt-getopt/

Index: pkgsrc/devel/mk-configure/Makefile
diff -u pkgsrc/devel/mk-configure/Makefile:1.20 pkgsrc/devel/mk-configure/Makefile:1.21
--- pkgsrc/devel/mk-configure/Makefile:1.20     Sun Jun 12 15:30:17 2016
+++ pkgsrc/devel/mk-configure/Makefile  Thu Jan 19 18:52:07 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2016/06/12 15:30:17 cheusov Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:07 agc Exp $
 #
 
 DISTNAME=      mk-configure-0.29.1
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mk-configure/} \
-               http://mova.org/~cheusov/pub/mk-configure/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mk-configure/}
+MASTER_SITES+= http://mova.org/~cheusov/pub/mk-configure/
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      http://sourceforge.net/projects/mk-configure

Index: pkgsrc/devel/ncurses/Makefile.common
diff -u pkgsrc/devel/ncurses/Makefile.common:1.33 pkgsrc/devel/ncurses/Makefile.common:1.34
--- pkgsrc/devel/ncurses/Makefile.common:1.33   Thu Mar 24 13:28:49 2016
+++ pkgsrc/devel/ncurses/Makefile.common        Thu Jan 19 18:52:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2016/03/24 13:28:49 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.34 2017/01/19 18:52:07 agc Exp $
 #
 # used by devel/ncurses/Makefile
 # used by devel/ncursesw/Makefile
@@ -6,9 +6,9 @@
 DISTNAME=      ncurses-${NC_VERS}
 NC_VERS=       6.0
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_GNU:=ncurses/} \
-               ftp://dickey.his.com/ncurses/ \
-               ftp://dickey.his.com/ncurses/${NC_VERS}/
+MASTER_SITES=  ${MASTER_SITE_GNU:=ncurses/}
+MASTER_SITES+= ftp://dickey.his.com/ncurses/
+MASTER_SITES+= ftp://dickey.his.com/ncurses/${NC_VERS}/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://invisible-island.net/ncurses/ncurses.html

Index: pkgsrc/devel/p5-Cache/Makefile
diff -u pkgsrc/devel/p5-Cache/Makefile:1.16 pkgsrc/devel/p5-Cache/Makefile:1.17
--- pkgsrc/devel/p5-Cache/Makefile:1.16 Wed Jun  8 19:22:37 2016
+++ pkgsrc/devel/p5-Cache/Makefile      Thu Jan 19 18:52:07 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2016/06/08 19:22:37 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/19 18:52:07 agc Exp $
 
 DISTNAME=      Cache-2.11
 PKGNAME=       p5-${DISTNAME}
 PKGREVISION=   2
 CATEGORIES=    devel perl5
-MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Cache/} \
-               ${MASTER_SITE_SOURCEFORGE:=perl-cache/}
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Cache/}
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=perl-cache/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://perl-cache.sourceforge.net/

Index: pkgsrc/devel/p5-Cache-Cache/Makefile
diff -u pkgsrc/devel/p5-Cache-Cache/Makefile:1.26 pkgsrc/devel/p5-Cache-Cache/Makefile:1.27
--- pkgsrc/devel/p5-Cache-Cache/Makefile:1.26   Wed Jun  8 19:22:37 2016
+++ pkgsrc/devel/p5-Cache-Cache/Makefile        Thu Jan 19 18:52:07 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2016/06/08 19:22:37 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2017/01/19 18:52:07 agc Exp $
 
 DISTNAME=      Cache-Cache-1.08
 PKGNAME=       p5-${DISTNAME}
 PKGREVISION=   2
 CATEGORIES=    devel perl5
-MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Cache/} \
-               ${MASTER_SITE_SOURCEFORGE:=perl-cache/}
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Cache/}
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=perl-cache/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://perl-cache.sourceforge.net/

Index: pkgsrc/devel/p5-Glib-Object-Introspection/Makefile
diff -u pkgsrc/devel/p5-Glib-Object-Introspection/Makefile:1.11 pkgsrc/devel/p5-Glib-Object-Introspection/Makefile:1.12
--- pkgsrc/devel/p5-Glib-Object-Introspection/Makefile:1.11     Thu Dec 15 21:54:25 2016
+++ pkgsrc/devel/p5-Glib-Object-Introspection/Makefile  Thu Jan 19 18:52:07 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2016/12/15 21:54:25 mef Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/19 18:52:07 agc Exp $
 
 DISTNAME=      Glib-Object-Introspection-0.041
 PKGNAME=       p5-${DISTNAME}
 CATEGORIES=    devel perl5
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gtk2-perl/} \
-               ${MASTER_SITE_PERL_CPAN:=Glib/}
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
+MASTER_SITES+= ${MASTER_SITE_PERL_CPAN:=Glib/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gtk2-perl.sourceforge.net/

Index: pkgsrc/devel/pcc-libs/Makefile
diff -u pkgsrc/devel/pcc-libs/Makefile:1.3 pkgsrc/devel/pcc-libs/Makefile:1.4
--- pkgsrc/devel/pcc-libs/Makefile:1.3  Sun Jan 15 15:04:29 2017
+++ pkgsrc/devel/pcc-libs/Makefile      Thu Jan 19 18:52:07 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2017/01/15 15:04:29 mef Exp $
+# $NetBSD: Makefile,v 1.4 2017/01/19 18:52:07 agc Exp $
 
 DISTNAME=      pcc-libs-1.1.0
 CATEGORIES=    devel
-MASTER_SITES=  ftp://pcc.ludd.ltu.se/pub/pcc-releases/ \
-               http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
+MASTER_SITES=  ftp://pcc.ludd.ltu.se/pub/pcc-releases/
+MASTER_SITES+= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
 EXTRACT_SUFX=  .tgz
 
 HOMEPAGE=      http://pcc.ludd.ltu.se/

Index: pkgsrc/devel/pcre/Makefile
diff -u pkgsrc/devel/pcre/Makefile:1.81 pkgsrc/devel/pcre/Makefile:1.82
--- pkgsrc/devel/pcre/Makefile:1.81     Mon Jan 16 09:21:15 2017
+++ pkgsrc/devel/pcre/Makefile  Thu Jan 19 18:52:07 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2017/01/16 09:21:15 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2017/01/19 18:52:07 agc Exp $
 
 DISTNAME=      pcre-8.40
 CATEGORIES=    devel
-MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
-               ${MASTER_SITE_SOURCEFORGE:=pcre/}
+MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pcre/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/pcre2/Makefile
diff -u pkgsrc/devel/pcre2/Makefile:1.6 pkgsrc/devel/pcre2/Makefile:1.7
--- pkgsrc/devel/pcre2/Makefile:1.6     Sat Oct  1 10:21:03 2016
+++ pkgsrc/devel/pcre2/Makefile Thu Jan 19 18:52:07 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2016/10/01 10:21:03 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/19 18:52:07 agc Exp $
 
 DISTNAME=      pcre2-10.22
 PKGREVISION=   1
 CATEGORIES=    devel
-MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
-               ${MASTER_SITE_SOURCEFORGE:=pcre/}
+MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pcre/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/rdp/Makefile
diff -u pkgsrc/devel/rdp/Makefile:1.27 pkgsrc/devel/rdp/Makefile:1.28
--- pkgsrc/devel/rdp/Makefile:1.27      Wed Oct 31 11:19:38 2012
+++ pkgsrc/devel/rdp/Makefile   Thu Jan 19 18:52:07 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2012/10/31 11:19:38 asau Exp $
+# $NetBSD: Makefile,v 1.28 2017/01/19 18:52:07 agc Exp $
 
 DISTNAME=              rdp1_5
 PKGNAME=               rdp-1.5
 PKGREVISION=           1
 CATEGORIES=            devel
-MASTER_SITES=          ftp://ftp.cs.rhul.ac.uk/pub/rdp/        \
-                       ftp://ftp.cs.rhul.ac.uk/pub/rdp/old_versions/
+MASTER_SITES=          ftp://ftp.cs.rhul.ac.uk/pub/rdp/
+MASTER_SITES+=         ftp://ftp.cs.rhul.ac.uk/pub/rdp/old_versions/
 EXTRACT_SUFX=          .zip
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/silc-toolkit/Makefile
diff -u pkgsrc/devel/silc-toolkit/Makefile:1.18 pkgsrc/devel/silc-toolkit/Makefile:1.19
--- pkgsrc/devel/silc-toolkit/Makefile:1.18     Wed Oct 31 11:19:46 2012
+++ pkgsrc/devel/silc-toolkit/Makefile  Thu Jan 19 18:52:07 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2012/10/31 11:19:46 asau Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:07 agc Exp $
 
 DISTNAME=      silc-toolkit-1.1.10
 CATEGORIES=    devel chat security
-MASTER_SITES=  http://www.silcnet.org/download/toolkit/sources/ \
-               ftp://ftp.silcnet.org/silc/toolkit/sources/
+MASTER_SITES=  http://www.silcnet.org/download/toolkit/sources/
+MASTER_SITES+= ftp://ftp.silcnet.org/silc/toolkit/sources/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    salo%NetBSD.org@localhost

Index: pkgsrc/devel/xulrunner17/dist.mk
diff -u pkgsrc/devel/xulrunner17/dist.mk:1.11 pkgsrc/devel/xulrunner17/dist.mk:1.12
--- pkgsrc/devel/xulrunner17/dist.mk:1.11       Mon Dec 16 03:10:12 2013
+++ pkgsrc/devel/xulrunner17/dist.mk    Thu Jan 19 18:52:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.11 2013/12/16 03:10:12 ryoon Exp $
+# $NetBSD: dist.mk,v 1.12 2017/01/19 18:52:07 agc Exp $
 #
 # used by devel/xulrunner17/Makefile
 # used by www/firefox17/Makefile
@@ -7,8 +7,8 @@ DISTNAME=       firefox-${FIREFOX_VER}.source
 FIREFOX_VER=   ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=    17.0.11
 MOZ_BRANCH_MINOR=      esr
-MASTER_SITES=  ${MASTER_SITE_MOZILLA_ESR:=firefox/releases/${FIREFOX_VER}/source/} \
-               ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
+MASTER_SITES=  ${MASTER_SITE_MOZILLA_ESR:=firefox/releases/${FIREFOX_VER}/source/}
+MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.bz2
 
 DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner17/distinfo

Index: pkgsrc/devel/zlib/Makefile
diff -u pkgsrc/devel/zlib/Makefile:1.53 pkgsrc/devel/zlib/Makefile:1.54
--- pkgsrc/devel/zlib/Makefile:1.53     Sun Aug 30 10:54:11 2015
+++ pkgsrc/devel/zlib/Makefile  Thu Jan 19 18:52:08 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.53 2015/08/30 10:54:11 richard Exp $
+# $NetBSD: Makefile,v 1.54 2017/01/19 18:52:08 agc Exp $
 
 DISTNAME=      zlib-1.2.8
 PKGREVISION=   3
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libpng/} \
-               http://zlib.net/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libpng/}
+MASTER_SITES+= http://zlib.net/
 DISTFILES=     # empty
 
 MAINTAINER=    joerg%NetBSD.org@localhost

Index: pkgsrc/editors/ce/Makefile.common
diff -u pkgsrc/editors/ce/Makefile.common:1.16 pkgsrc/editors/ce/Makefile.common:1.17
--- pkgsrc/editors/ce/Makefile.common:1.16      Sun Oct  5 16:41:06 2014
+++ pkgsrc/editors/ce/Makefile.common   Thu Jan 19 18:52:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2014/10/05 16:41:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.17 2017/01/19 18:52:08 agc Exp $
 #
 # used by editors/ce-x11/Makefile
 # used by editors/ce-doc/Makefile
@@ -6,8 +6,8 @@
 DISTNAME=              ce-${VERSION}
 VERSION=               4.6
 CATEGORIES=            editors
-MASTER_SITES=          ftp://ftp.cwru.edu/pub/chet/ \
-                       http://tiswww.case.edu/php/chet/dist/
+MASTER_SITES=          ftp://ftp.cwru.edu/pub/chet/
+MASTER_SITES+=         http://tiswww.case.edu/php/chet/dist/
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://tiswww.case.edu/php/chet/

Index: pkgsrc/editors/emacs20/Makefile
diff -u pkgsrc/editors/emacs20/Makefile:1.56 pkgsrc/editors/emacs20/Makefile:1.57
--- pkgsrc/editors/emacs20/Makefile:1.56        Sat Nov 26 06:38:06 2016
+++ pkgsrc/editors/emacs20/Makefile     Thu Jan 19 18:52:08 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.56 2016/11/26 06:38:06 dholland Exp $
+# $NetBSD: Makefile,v 1.57 2017/01/19 18:52:08 agc Exp $
 
 DISTNAME=      emacs-20.7
 PKGNAME=       ${DISTNAME:S/emacs/emacs20/}
 PKGREVISION=   22
 CATEGORIES=    editors
-MASTER_SITES=  http://ftp.gnu.org/pub/old-gnu/emacs/   \
-               ftp://ftp.gnu.org/pub/old-gnu/emacs
+MASTER_SITES=  http://ftp.gnu.org/pub/old-gnu/emacs/
+MASTER_SITES+= ftp://ftp.gnu.org/pub/old-gnu/emacs
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=    ${DISTNAME}-mule-4.1b-elc${EXTRACT_SUFX}
 SITES.${DISTNAME}-mule-4.1b-elc.tar.gz=        ${MASTER_SITE_LOCAL}

Index: pkgsrc/editors/jed/Makefile.common
diff -u pkgsrc/editors/jed/Makefile.common:1.13 pkgsrc/editors/jed/Makefile.common:1.14
--- pkgsrc/editors/jed/Makefile.common:1.13     Sun Oct  5 16:41:06 2014
+++ pkgsrc/editors/jed/Makefile.common  Thu Jan 19 18:52:08 2017
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.13 2014/10/05 16:41:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2017/01/19 18:52:08 agc Exp $
 #
 # used by editors/jed/Makefile
 # used by editors/xjed/Makefile
 
 DISTNAME=              jed-0.99-16
 CATEGORIES=            editors
-MASTER_SITES=  ftp://space.mit.edu/pub/davis/jed/v0.99/ \
-                       ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v0.99/ \
-                       ftp://ftp.ntua.gr/pub/lang/slang/jed/v0.99/ \
-                       ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/
+MASTER_SITES=          ftp://space.mit.edu/pub/davis/jed/v0.99/
+MASTER_SITES+=         ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v0.99/
+MASTER_SITES+=         ftp://ftp.ntua.gr/pub/lang/slang/jed/v0.99/
+MASTER_SITES+=         ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            joerg%gmx.net@localhost

Index: pkgsrc/editors/lyx/Makefile
diff -u pkgsrc/editors/lyx/Makefile:1.59 pkgsrc/editors/lyx/Makefile:1.60
--- pkgsrc/editors/lyx/Makefile:1.59    Sun Jan  1 16:06:11 2017
+++ pkgsrc/editors/lyx/Makefile Thu Jan 19 18:52:08 2017
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.59 2017/01/01 16:06:11 adam Exp $
+# $NetBSD: Makefile,v 1.60 2017/01/19 18:52:08 agc Exp $
 
 DISTNAME=              lyx-2.2.2
 PKGREVISION=           1
 CATEGORIES=            editors
-MASTER_SITES=          ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/ \
-                       http://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.2.x/ \
-                       ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.2.x/ \
-                       ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.2.x/ \
-                       ftp://ftp.lip6.fr/pub/lyx/stable/2.2.x/ \
-                       ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.2.x/
+MASTER_SITES=          ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/
+MASTER_SITES+=         http://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.2.x/
+MASTER_SITES+=         ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.2.x/
+MASTER_SITES+=         ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.2.x/
+MASTER_SITES+=         ftp://ftp.lip6.fr/pub/lyx/stable/2.2.x/
+MASTER_SITES+=         ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.2.x/
 EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            reed%reedmedia.net@localhost

Index: pkgsrc/editors/nedit/Makefile
diff -u pkgsrc/editors/nedit/Makefile:1.57 pkgsrc/editors/nedit/Makefile:1.58
--- pkgsrc/editors/nedit/Makefile:1.57  Mon Apr 14 16:41:56 2014
+++ pkgsrc/editors/nedit/Makefile       Thu Jan 19 18:52:08 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.57 2014/04/14 16:41:56 gdt Exp $
+# $NetBSD: Makefile,v 1.58 2017/01/19 18:52:08 agc Exp $
 
 DISTNAME=      nedit-${VERS}-src
 PKGNAME=       nedit-${VERS}
 PKGREVISION=   9
 CATEGORIES=    editors
 # @pkglint: MASTER_SITE_NEDIT is defined below
-MASTER_SITES=  ${MASTER_SITE_NEDIT:=v${VERS:S/./_/g}/} \
-               ${MASTER_SITE_SOURCEFORGE:=nedit/}
+MASTER_SITES=  ${MASTER_SITE_NEDIT:=v${VERS:S/./_/g}/}
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=nedit/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/editors/pico/Makefile
diff -u pkgsrc/editors/pico/Makefile:1.78 pkgsrc/editors/pico/Makefile:1.79
--- pkgsrc/editors/pico/Makefile:1.78   Wed Oct  3 11:43:42 2012
+++ pkgsrc/editors/pico/Makefile        Thu Jan 19 18:52:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2012/10/03 11:43:42 asau Exp $
+# $NetBSD: Makefile,v 1.79 2017/01/19 18:52:08 agc Exp $
 #
 # NOTE:
 # When updating, it is necessary to change the shlib version, located in
@@ -10,8 +10,8 @@ DISTNAME=     pine4.64
 PKGNAME=       pico-4.10
 PKGREVISION=   2
 CATEGORIES=    editors
-MASTER_SITES=  ftp://ftp.cac.washington.edu/pine/ \
-               ftp://ftp.fu-berlin.de/unix/mail/pine/
+MASTER_SITES=  ftp://ftp.cac.washington.edu/pine/
+MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/mail/pine/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/editors/ve/Makefile
diff -u pkgsrc/editors/ve/Makefile:1.7 pkgsrc/editors/ve/Makefile:1.8
--- pkgsrc/editors/ve/Makefile:1.7      Thu Feb 25 12:22:40 2016
+++ pkgsrc/editors/ve/Makefile  Thu Jan 19 18:52:08 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2016/02/25 12:22:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2017/01/19 18:52:08 agc Exp $
 
 DISTNAME=      ve-1.0
 CATEGORIES=    editors
-MASTER_SITES=  ftp://freebsd.ntu.edu.tw/FreeBSD/woju/source/ \
-               ftp://freebsd.csie.nctu.edu.tw/pub/taiwan/NTU/woju/source/
+MASTER_SITES=  ftp://freebsd.ntu.edu.tw/FreeBSD/woju/source/
+MASTER_SITES+= ftp://freebsd.csie.nctu.edu.tw/pub/taiwan/NTU/woju/source/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    rxg%NetBSD.org@localhost

Index: pkgsrc/emulators/cygwin_esound/Makefile
diff -u pkgsrc/emulators/cygwin_esound/Makefile:1.9 pkgsrc/emulators/cygwin_esound/Makefile:1.10
--- pkgsrc/emulators/cygwin_esound/Makefile:1.9 Wed Oct  3 12:55:11 2012
+++ pkgsrc/emulators/cygwin_esound/Makefile     Thu Jan 19 18:52:08 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2012/10/03 12:55:11 asau Exp $
+# $NetBSD: Makefile,v 1.10 2017/01/19 18:52:08 agc Exp $
 #
 
 DISTNAME=              esound-0.2.35-1
 PKGNAME=               ${DISTNAME:S/-/!/:S/-/./g:S/!/-/:S/^/cygwin_/}
 PKGREVISION=           1
 CATEGORIES=            emulators
-MASTER_SITES=          ${MASTER_SITE_CYGWIN:=release/esound/} \
-                       ${MASTER_SITE_CYGWIN:=release/esound/libesound0/} \
-                       ${MASTER_SITE_CYGWIN:=release/audiofile/libaudiofile0/}
+MASTER_SITES=          ${MASTER_SITE_CYGWIN:=release/esound/}
+MASTER_SITES+=         ${MASTER_SITE_CYGWIN:=release/esound/libesound0/}
+MASTER_SITES+=         ${MASTER_SITE_CYGWIN:=release/audiofile/libaudiofile0/}
 EXTRACT_SUFX=          .tar.bz2
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} \
                        libesound0-0.2.35-1.tar.bz2 \

Index: pkgsrc/emulators/snes9x/Makefile
diff -u pkgsrc/emulators/snes9x/Makefile:1.53 pkgsrc/emulators/snes9x/Makefile:1.54
--- pkgsrc/emulators/snes9x/Makefile:1.53       Tue Mar 31 15:27:06 2015
+++ pkgsrc/emulators/snes9x/Makefile    Thu Jan 19 18:52:08 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.53 2015/03/31 15:27:06 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2017/01/19 18:52:08 agc Exp $
 
 SNESVER=               1.43
 DISTNAME=              snes9x-${SNESVER}-src
 PKGNAME=               snes9x-${SNESVER}
 CATEGORIES=            emulators
-MASTER_SITES=          http://www.lysator.liu.se/snes9x/${SNESVER}/ \
-                       http://files.ipherswipsite.com/snes9x/
+MASTER_SITES=          http://www.lysator.liu.se/snes9x/${SNESVER}/
+MASTER_SITES+=         http://files.ipherswipsite.com/snes9x/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.snes9x.com/

Index: pkgsrc/emulators/wine/Makefile
diff -u pkgsrc/emulators/wine/Makefile:1.194 pkgsrc/emulators/wine/Makefile:1.195
--- pkgsrc/emulators/wine/Makefile:1.194        Mon Sep 19 13:04:21 2016
+++ pkgsrc/emulators/wine/Makefile      Thu Jan 19 18:52:08 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.194 2016/09/19 13:04:21 wiz Exp $
+# $NetBSD: Makefile,v 1.195 2017/01/19 18:52:08 agc Exp $
 
 DISTNAME=      wine-1.6.2
 PKGREVISION=   12
 CATEGORIES=    emulators
-MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/ \
-               ${MASTER_SITE_SOURCEFORGE:=wine/}
+MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=wine/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    adam%NetBSD.org@localhost

Index: pkgsrc/emulators/wine-devel/Makefile
diff -u pkgsrc/emulators/wine-devel/Makefile:1.63 pkgsrc/emulators/wine-devel/Makefile:1.64
--- pkgsrc/emulators/wine-devel/Makefile:1.63   Tue Nov  1 20:04:55 2016
+++ pkgsrc/emulators/wine-devel/Makefile        Thu Jan 19 18:52:08 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.63 2016/11/01 20:04:55 maya Exp $
+# $NetBSD: Makefile,v 1.64 2017/01/19 18:52:08 agc Exp $
 
 DISTNAME=      wine-1.9.18
 PKGREVISION=   4
 CATEGORIES=    emulators
-MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/ \
-               ${MASTER_SITE_SOURCEFORGE:=wine/}
+MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=wine/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    adam%NetBSD.org@localhost

Index: pkgsrc/fonts/cyr-rfx-share/Makefile.common
diff -u pkgsrc/fonts/cyr-rfx-share/Makefile.common:1.17 pkgsrc/fonts/cyr-rfx-share/Makefile.common:1.18
--- pkgsrc/fonts/cyr-rfx-share/Makefile.common:1.17     Sat Jul  4 16:18:31 2015
+++ pkgsrc/fonts/cyr-rfx-share/Makefile.common  Thu Jan 19 18:52:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2015/07/04 16:18:31 joerg Exp $
+# $NetBSD: Makefile.common,v 1.18 2017/01/19 18:52:09 agc Exp $
 
 # used by fonts/cyr-rfx-bulgarian-mik/Makefile
 # used by fonts/cyr-rfx-ibm-cp866/Makefile
@@ -15,9 +15,8 @@
 
 DISTNAME=      cyr-rfx-${CYR_RFX_ENCODING}-1.1
 CATEGORIES=    fonts x11
-MASTER_SITES=  \
-       ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/pub/BINP/X11/fonts/cyr-rfx/ \
-       http://www.inp.nsk.su/~bolkhov/files/fonts/cyr-rfx/
+MASTER_SITES=  ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/pub/BINP/X11/fonts/cyr-rfx/
+MASTER_SITES+= http://www.inp.nsk.su/~bolkhov/files/fonts/cyr-rfx/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    shattered%NetBSD.org@localhost

Index: pkgsrc/fonts/freefonts/Makefile
diff -u pkgsrc/fonts/freefonts/Makefile:1.15 pkgsrc/fonts/freefonts/Makefile:1.16
--- pkgsrc/fonts/freefonts/Makefile:1.15        Sat Jul  4 16:18:31 2015
+++ pkgsrc/fonts/freefonts/Makefile     Thu Jan 19 18:52:09 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:31 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2017/01/19 18:52:09 agc Exp $
 
 DISTNAME=      freefonts-0.10
 PKGREVISION=   3
 CATEGORIES=    fonts
-MASTER_SITES=  ${MASTER_SITE_SUNSITE:=X11/fonts/} \
-               http://download.gimp.org/pub/gimp/fonts/
+MASTER_SITES=  ${MASTER_SITE_SUNSITE:=X11/fonts/}
+MASTER_SITES+= http://download.gimp.org/pub/gimp/fonts/
 
 MAINTAINER=    reed%reedmedia.net@localhost
 COMMENT=       Collection of 79 freely available fonts

Index: pkgsrc/fonts/ghostscript-fonts/Makefile
diff -u pkgsrc/fonts/ghostscript-fonts/Makefile:1.21 pkgsrc/fonts/ghostscript-fonts/Makefile:1.22
--- pkgsrc/fonts/ghostscript-fonts/Makefile:1.21        Thu Oct  9 14:06:33 2014
+++ pkgsrc/fonts/ghostscript-fonts/Makefile     Thu Jan 19 18:52:09 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2014/10/09 14:06:33 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:09 agc Exp $
 
 DISTNAME=              ghostscript-fonts-8.11
 PKGREVISION=           3
 CATEGORIES=            fonts
-MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
-                       ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/
+MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
+MASTER_SITES+=         ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/
 DISTFILES=             ${GS_FONTS_OTHER}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/fonts/ipaexfont/Makefile
diff -u pkgsrc/fonts/ipaexfont/Makefile:1.10 pkgsrc/fonts/ipaexfont/Makefile:1.11
--- pkgsrc/fonts/ipaexfont/Makefile:1.10        Sat Jul  4 16:18:31 2015
+++ pkgsrc/fonts/ipaexfont/Makefile     Thu Jan 19 18:52:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/07/04 16:18:31 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2017/01/19 18:52:09 agc Exp $
 #
 
 IPAEXVER=      00201
@@ -6,8 +6,8 @@ DISTNAME=       IPAexfont${IPAEXVER}
 PKGNAME=       ${DISTNAME:S/IPAexfont/ipaexfont-/}
 PKGREVISION=   1
 CATEGORIES=    fonts japanese
-MASTER_SITES=  ${MASTER_SITE_OSDN:=ipafonts/57330/} \
-               http://dl.ipafont.ipa.go.jp/IPAexfont/
+MASTER_SITES=  ${MASTER_SITE_OSDN:=ipafonts/57330/}
+MASTER_SITES+= http://dl.ipafont.ipa.go.jp/IPAexfont/
 EXTRACT_SUFX=  .zip
 
 MAINTAINER=    ryoon%NetBSD.org@localhost

Index: pkgsrc/fonts/ja-elisau/Makefile
diff -u pkgsrc/fonts/ja-elisau/Makefile:1.20 pkgsrc/fonts/ja-elisau/Makefile:1.21
--- pkgsrc/fonts/ja-elisau/Makefile:1.20        Sat Jul  4 16:18:31 2015
+++ pkgsrc/fonts/ja-elisau/Makefile     Thu Jan 19 18:52:09 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:31 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:09 agc Exp $
 
 DISTNAME=              elisau10
 PKGNAME=               ja-elisau-1.0
 PKGREVISION=           2
 CATEGORIES=            fonts x11 japanese
-MASTER_SITES=          http://www.wheel.gr.jp/~dai/software/ \
-                       ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
+MASTER_SITES=          http://www.wheel.gr.jp/~dai/software/
+MASTER_SITES+=         ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
 EXTRACT_SUFX=          .tgz
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} clR5x8.bdf
 

Index: pkgsrc/fonts/jisx0212fonts/Makefile
diff -u pkgsrc/fonts/jisx0212fonts/Makefile:1.22 pkgsrc/fonts/jisx0212fonts/Makefile:1.23
--- pkgsrc/fonts/jisx0212fonts/Makefile:1.22    Sat Jul  4 16:18:32 2015
+++ pkgsrc/fonts/jisx0212fonts/Makefile Thu Jan 19 18:52:09 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:32 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:09 agc Exp $
 
 DISTNAME=      jisx0212fonts-0.0
 PKGREVISION=   3
 CATEGORIES=    fonts x11 japanese
-MASTER_SITES=  ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/ \
-               http://www.freebsd.org/~itojun/distfiles/
+MASTER_SITES=  ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
+MASTER_SITES+= http://www.freebsd.org/~itojun/distfiles/
 DISTFILES=     jisksp14.bdf.gz jisksp16-1990.bdf.Z min-1-24.bdf.gz \
                jisksp40.bdf.Z
 

Index: pkgsrc/fonts/ko-hanyang/Makefile
diff -u pkgsrc/fonts/ko-hanyang/Makefile:1.14 pkgsrc/fonts/ko-hanyang/Makefile:1.15
--- pkgsrc/fonts/ko-hanyang/Makefile:1.14       Sat Jul  4 16:18:32 2015
+++ pkgsrc/fonts/ko-hanyang/Makefile    Thu Jan 19 18:52:09 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:32 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:09 agc Exp $
 #
 
 DISTNAME=      hanyang-font-pcf
 PKGNAME=       ko-hanyang-20010718
 PKGREVISION=   2
 CATEGORIES=    fonts x11 korean
-MASTER_SITES+= ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \
-               ftp://ftp.kreonet.re.kr/pub/hangul/cair-archive/fonts/
+MASTER_SITES+= ftp://ftp.kaist.ac.kr/pub/hangul/fonts/
+MASTER_SITES+= ftp://ftp.kreonet.re.kr/pub/hangul/cair-archive/fonts/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       X11 fonts for KSC 5601 standard

Index: pkgsrc/fonts/mplayer-fonts/Makefile
diff -u pkgsrc/fonts/mplayer-fonts/Makefile:1.9 pkgsrc/fonts/mplayer-fonts/Makefile:1.10
--- pkgsrc/fonts/mplayer-fonts/Makefile:1.9     Fri Jan 22 08:08:49 2016
+++ pkgsrc/fonts/mplayer-fonts/Makefile Thu Jan 19 18:52:09 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2016/01/22 08:08:49 zafer Exp $
+# $NetBSD: Makefile,v 1.10 2017/01/19 18:52:09 agc Exp $
 
 DISTNAME=      mplayer-fonts-20030714
 PKGREVISION=   1
 CATEGORIES=    fonts
-MASTER_SITES=  ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/ \
-               http://www1.mplayerhq.hu/MPlayer/releases/fonts/ \
-               http://www2.mplayerhq.hu/MPlayer/releases/fonts/
+MASTER_SITES=  ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/
+MASTER_SITES+= http://www1.mplayerhq.hu/MPlayer/releases/fonts/
+MASTER_SITES+= http://www2.mplayerhq.hu/MPlayer/releases/fonts/
 DISTFILES=     font-arial-iso-8859-1.tar.bz2 \
                font-arial-iso-8859-2.tar.bz2 \
                font-arial-iso-8859-7.tar.bz2 \

Index: pkgsrc/fonts/ttf-tlwg/Makefile
diff -u pkgsrc/fonts/ttf-tlwg/Makefile:1.4 pkgsrc/fonts/ttf-tlwg/Makefile:1.5
--- pkgsrc/fonts/ttf-tlwg/Makefile:1.4  Mon Aug 17 18:33:08 2015
+++ pkgsrc/fonts/ttf-tlwg/Makefile      Thu Jan 19 18:52:09 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/08/17 18:33:08 leot Exp $
+# $NetBSD: Makefile,v 1.5 2017/01/19 18:52:09 agc Exp $
 
 DISTNAME=      ttf-tlwg-0.6.1
 CATEGORIES=    fonts
-MASTER_SITES=  ftp://linux.thai.net/pub/thailinux/software/thai-ttf/ \
-               http://linux.thai.net/pub/thailinux/software/thai-ttf/
+MASTER_SITES=  ftp://linux.thai.net/pub/thailinux/software/thai-ttf/
+MASTER_SITES+= http://linux.thai.net/pub/thailinux/software/thai-ttf/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/civctp-demo/Makefile
diff -u pkgsrc/games/civctp-demo/Makefile:1.20 pkgsrc/games/civctp-demo/Makefile:1.21
--- pkgsrc/games/civctp-demo/Makefile:1.20      Sat Oct  6 11:54:33 2012
+++ pkgsrc/games/civctp-demo/Makefile   Thu Jan 19 18:52:09 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2012/10/06 11:54:33 asau Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:09 agc Exp $
 
 DISTNAME=      civctp-demo-10251999
 PKGNAME=       civctp-demo-19991025
 PKGREVISION=   1
 CATEGORIES=    games x11
-MASTER_SITES=  ftp://ftp.linuxgames.com/loki/demos/civctp/ \
-               ftp://download.linuxlords.com/pub/demos/civctp/ \
-               ftp://ftp.linux.tucows.com/pub/Loki/demos/civctp/
+MASTER_SITES=  ftp://ftp.linuxgames.com/loki/demos/civctp/
+MASTER_SITES+= ftp://download.linuxlords.com/pub/demos/civctp/
+MASTER_SITES+= ftp://ftp.linux.tucows.com/pub/Loki/demos/civctp/
 
 MAINTAINER=    abs%NetBSD.org@localhost
 HOMEPAGE=      http://www.lokigames.com/products/civctp/

Index: pkgsrc/games/doom1/Makefile
diff -u pkgsrc/games/doom1/Makefile:1.2 pkgsrc/games/doom1/Makefile:1.3
--- pkgsrc/games/doom1/Makefile:1.2     Sat Oct  6 11:54:35 2012
+++ pkgsrc/games/doom1/Makefile Thu Jan 19 18:52:09 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/10/06 11:54:35 asau Exp $
+# $NetBSD: Makefile,v 1.3 2017/01/19 18:52:09 agc Exp $
 
 DISTNAME=      doom-1.8.wad
 PKGNAME=       doom1-1.8
 CATEGORIES=    games
-MASTER_SITES=  ftp://ftp.idsoftware.com/idstuff/doom/ \
-               http://www.gamers.org/pub/games/idgames/idstuff/doom/
+MASTER_SITES=  ftp://ftp.idsoftware.com/idstuff/doom/
+MASTER_SITES+= http://www.gamers.org/pub/games/idgames/idstuff/doom/
 EXTRACT_SUFX=  .gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/eus-demo/Makefile
diff -u pkgsrc/games/eus-demo/Makefile:1.19 pkgsrc/games/eus-demo/Makefile:1.20
--- pkgsrc/games/eus-demo/Makefile:1.19 Sat Oct  6 11:54:36 2012
+++ pkgsrc/games/eus-demo/Makefile      Thu Jan 19 18:52:09 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.19 2012/10/06 11:54:36 asau Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:09 agc Exp $
 
 DISTNAME=      eus-demo
 PKGNAME=       eus-demo-1.0
 PKGREVISION=   1
 CATEGORIES=    games x11
-MASTER_SITES=  ftp://ftp.linuxgames.com/loki/demos/eus/ \
-               ftp://download.linuxlords.com/pub/demos/eus/ \
-               ftp://ftp.linux.tucows.com/pub/Loki/demos/eus/
+MASTER_SITES=  ftp://ftp.linuxgames.com/loki/demos/eus/
+MASTER_SITES+= ftp://download.linuxlords.com/pub/demos/eus/
+MASTER_SITES+= ftp://ftp.linux.tucows.com/pub/Loki/demos/eus/
 
 MAINTAINER=    abs%NetBSD.org@localhost
 HOMEPAGE=      http://www.lokigames.com/products/eus/

Index: pkgsrc/games/finalbattle/Makefile
diff -u pkgsrc/games/finalbattle/Makefile:1.17 pkgsrc/games/finalbattle/Makefile:1.18
--- pkgsrc/games/finalbattle/Makefile:1.17      Sun Dec 11 01:10:26 2016
+++ pkgsrc/games/finalbattle/Makefile   Thu Jan 19 18:52:10 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.17 2016/12/11 01:10:26 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:10 agc Exp $
 #
 
 DISTNAME=      finalbattle.0.0
 PKGNAME=       finalbattle-0.0
 PKGREVISION=   2
 CATEGORIES=    games x11
-MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=games/} \
-               ftp://ftp.billsgames.com/unix/x/finalbattle/
+MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=games/}
+MASTER_SITES+= ftp://ftp.billsgames.com/unix/x/finalbattle/
 
 PATCH_SITES=   http://www.NetBSD.org/~dholland/patchkits/finalbattle/
 PATCHFILES=    finalbattle-jumbo-patch-20161210.gz

Index: pkgsrc/games/flightgear/Makefile
diff -u pkgsrc/games/flightgear/Makefile:1.61 pkgsrc/games/flightgear/Makefile:1.62
--- pkgsrc/games/flightgear/Makefile:1.61       Mon Jan 16 23:45:12 2017
+++ pkgsrc/games/flightgear/Makefile    Thu Jan 19 18:52:10 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.61 2017/01/16 23:45:12 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=      flightgear-2.8.0
 PKGREVISION=   32
 CATEGORIES=    games
-MASTER_SITES=  ftp://ftp.flightgear.org/pub/fgfs/Source/ \
-               http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \
-               ftp://ftp.kingmont.com/flightsims/flightgear/Source/
+MASTER_SITES=  ftp://ftp.flightgear.org/pub/fgfs/Source/
+MASTER_SITES+= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/
+MASTER_SITES+= ftp://ftp.kingmont.com/flightsims/flightgear/Source/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/flightgear-data/Makefile
diff -u pkgsrc/games/flightgear-data/Makefile:1.5 pkgsrc/games/flightgear-data/Makefile:1.6
--- pkgsrc/games/flightgear-data/Makefile:1.5   Tue Apr 21 17:02:51 2015
+++ pkgsrc/games/flightgear-data/Makefile       Thu Jan 19 18:52:10 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/04/21 17:02:51 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=      FlightGear-data-2.8.0
 PKGNAME=       ${DISTNAME:tl}
 CATEGORIES=    games
-MASTER_SITES=  http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/ \
-               ftp://ftp.de.flightgear.org/pub/fgfs/Shared/ \
-               ftp://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Shared/
+MASTER_SITES=  http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/
+MASTER_SITES+= ftp://ftp.de.flightgear.org/pub/fgfs/Shared/
+MASTER_SITES+= ftp://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Shared/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/fltk-sudoku/Makefile
diff -u pkgsrc/games/fltk-sudoku/Makefile:1.14 pkgsrc/games/fltk-sudoku/Makefile:1.15
--- pkgsrc/games/fltk-sudoku/Makefile:1.14      Sat Apr 25 14:22:54 2015
+++ pkgsrc/games/fltk-sudoku/Makefile   Thu Jan 19 18:52:10 2017
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.14 2015/04/25 14:22:54 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=      fltk-1.1.7-source
 PKGNAME=       fltk-sudoku-1.1.7
 PKGREVISION=   8
 VERS=          ${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=    x11
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fltk/} \
-               ftp://ftp2.easysw.com/pub/fltk/${VERS}/ \
-               ftp://ftp3.easysw.com/pub/fltk/${VERS}/ \
-               http://ftp.easysw.com/pub/fltk/${VERS}/ \
-               http://mirror.nu6.org/ftp.easysw.com/pub/fltk/${VERS}/ \
-               ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \
-               ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fltk/}
+MASTER_SITES+= ftp://ftp2.easysw.com/pub/fltk/${VERS}/
+MASTER_SITES+= ftp://ftp3.easysw.com/pub/fltk/${VERS}/
+MASTER_SITES+= http://ftp.easysw.com/pub/fltk/${VERS}/
+MASTER_SITES+= http://mirror.nu6.org/ftp.easysw.com/pub/fltk/${VERS}/
+MASTER_SITES+= ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/
+MASTER_SITES+= ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/frotz/Makefile
diff -u pkgsrc/games/frotz/Makefile:1.31 pkgsrc/games/frotz/Makefile:1.32
--- pkgsrc/games/frotz/Makefile:1.31    Tue Jan  3 21:30:38 2017
+++ pkgsrc/games/frotz/Makefile Thu Jan 19 18:52:10 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2017/01/03 21:30:38 roy Exp $
+# $NetBSD: Makefile,v 1.32 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=      frotz-2.43
 PKGREVISION=   5
 CATEGORIES=    games
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=frotz/} \
-               ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/frotz/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=frotz/}
+MASTER_SITES+= ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/frotz/
 
 MAINTAINER=    seebs%plethora.net@localhost
 HOMEPAGE=      http://frotz.sourceforge.net/

Index: pkgsrc/games/heretic2-demo/Makefile
diff -u pkgsrc/games/heretic2-demo/Makefile:1.24 pkgsrc/games/heretic2-demo/Makefile:1.25
--- pkgsrc/games/heretic2-demo/Makefile:1.24    Fri Jul 25 15:39:00 2014
+++ pkgsrc/games/heretic2-demo/Makefile Thu Jan 19 18:52:10 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2014/07/25 15:39:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/19 18:52:10 agc Exp $
 #
 
 DISTNAME=      heretic2-demo-x86
 PKGNAME=       heretic2-demo-2.0
 PKGREVISION=   1
 CATEGORIES=    games x11
-MASTER_SITES=  ftp://ftp.linuxgames.com/loki/demos/heretic2/ \
-               ftp://download.linuxlords.com/pub/demos/heretic2/ \
-               ftp://ftp.linux.tucows.com/pub/Loki/demos/heretic2/
+MASTER_SITES=  ftp://ftp.linuxgames.com/loki/demos/heretic2/
+MASTER_SITES+= ftp://download.linuxlords.com/pub/demos/heretic2/
+MASTER_SITES+= ftp://ftp.linux.tucows.com/pub/Loki/demos/heretic2/
 EXTRACT_SUFX=  .run
 
 MAINTAINER=    abs%NetBSD.org@localhost

Index: pkgsrc/games/quake/Makefile
diff -u pkgsrc/games/quake/Makefile:1.49 pkgsrc/games/quake/Makefile:1.50
--- pkgsrc/games/quake/Makefile:1.49    Sat Apr 25 14:23:02 2015
+++ pkgsrc/games/quake/Makefile Thu Jan 19 18:52:10 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.49 2015/04/25 14:23:02 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=      q1source
 PKGNAME=       quake-2.30
 PKGREVISION=   6
 CATEGORIES=    games x11
-MASTER_SITES=  ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/source/ \
-               ftp://ftp.idsoftware.com/idstuff/source/
+MASTER_SITES=  ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/source/
+MASTER_SITES+= ftp://ftp.idsoftware.com/idstuff/source/
 EXTRACT_SUFX=  .zip
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/quakedata/Makefile
diff -u pkgsrc/games/quakedata/Makefile:1.25 pkgsrc/games/quakedata/Makefile:1.26
--- pkgsrc/games/quakedata/Makefile:1.25        Sat Oct  6 11:54:52 2012
+++ pkgsrc/games/quakedata/Makefile     Thu Jan 19 18:52:10 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2012/10/06 11:54:52 asau Exp $
+# $NetBSD: Makefile,v 1.26 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=      quake106
 PKGNAME=       quakedata-1.0
 PKGREVISION=   1
 CATEGORIES=    games
-MASTER_SITES=  ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/quake/ \
-               ftp://ftp.idsoftware.com/idstuff/quake/
+MASTER_SITES=  ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/quake/
+MASTER_SITES+= ftp://ftp.idsoftware.com/idstuff/quake/
 EXTRACT_SUFX=  .zip
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/rollemup/Makefile
diff -u pkgsrc/games/rollemup/Makefile:1.42 pkgsrc/games/rollemup/Makefile:1.43
--- pkgsrc/games/rollemup/Makefile:1.42 Sat Oct  6 11:54:53 2012
+++ pkgsrc/games/rollemup/Makefile      Thu Jan 19 18:52:10 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.42 2012/10/06 11:54:53 asau Exp $
+# $NetBSD: Makefile,v 1.43 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=      Rollemup
 PKGNAME=       rollemup-1.0
 PKGREVISION=   3
 CATEGORIES=    games
-MASTER_SITES=  http://ftp.giga.or.at/pub/lost-distfiles/ \
-               ftp://ftp.tw.freebsd.org/pub/ports/distfiles/ \
-               http://www.uberstudent.org/archive/programs/games/
+MASTER_SITES=  http://ftp.giga.or.at/pub/lost-distfiles/
+MASTER_SITES+= ftp://ftp.tw.freebsd.org/pub/ports/distfiles/
+MASTER_SITES+= http://www.uberstudent.org/archive/programs/games/
 # was http://usa.lostboys.nl/medialab/rollemup/Linux/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/simgear/Makefile
diff -u pkgsrc/games/simgear/Makefile:1.59 pkgsrc/games/simgear/Makefile:1.60
--- pkgsrc/games/simgear/Makefile:1.59  Mon Jan 16 23:45:12 2017
+++ pkgsrc/games/simgear/Makefile       Thu Jan 19 18:52:10 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.59 2017/01/16 23:45:12 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=      simgear-2.8.0
 PKGREVISION=   32
 CATEGORIES=    games devel
-MASTER_SITES=  ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \
-               ftp://ftp.goflyflightgear.com/simgear/
+MASTER_SITES=  ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/
+MASTER_SITES+= ftp://ftp.goflyflightgear.com/simgear/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/sjeng/Makefile
diff -u pkgsrc/games/sjeng/Makefile:1.19 pkgsrc/games/sjeng/Makefile:1.20
--- pkgsrc/games/sjeng/Makefile:1.19    Sat Oct  6 11:54:55 2012
+++ pkgsrc/games/sjeng/Makefile Thu Jan 19 18:52:10 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2012/10/06 11:54:55 asau Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=      Sjeng-Free-11.0
 PKGNAME=       sjeng-11.0
 PKGREVISION=   5
 CATEGORIES=    games
-MASTER_SITES=  http://sjeng.sourceforge.net/ftp/ \
-               ${MASTER_SITE_SOURCEFORGE:=sjeng/}
+MASTER_SITES=  http://sjeng.sourceforge.net/ftp/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=sjeng/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.sjeng.org/

Index: pkgsrc/games/thew/Makefile
diff -u pkgsrc/games/thew/Makefile:1.5 pkgsrc/games/thew/Makefile:1.6
--- pkgsrc/games/thew/Makefile:1.5      Tue Aug 18 07:31:09 2015
+++ pkgsrc/games/thew/Makefile  Thu Jan 19 18:52:10 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2015/08/18 07:31:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2017/01/19 18:52:10 agc Exp $
 
 DISTNAME=              thew-1.1.1
 PKGREVISION=           3
 CATEGORIES=            games
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=thew/} \
-                       http://dinotte.altervista.org/files/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=thew/}
+MASTER_SITES+=         http://dinotte.altervista.org/files/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            ilfoglionascosto%netcat.it@localhost

Index: pkgsrc/games/xarchon/Makefile
diff -u pkgsrc/games/xarchon/Makefile:1.59 pkgsrc/games/xarchon/Makefile:1.60
--- pkgsrc/games/xarchon/Makefile:1.59  Thu Feb 25 13:19:47 2016
+++ pkgsrc/games/xarchon/Makefile       Thu Jan 19 18:52:10 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.59 2016/02/25 13:19:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.60 2017/01/19 18:52:10 agc Exp $
 #
 
 DISTNAME=      xarchon-0.60
 PKGREVISION=   18
 CATEGORIES=    games x11
-MASTER_SITES=  http://xarchon.seul.org/ \
-               ftp://xarchon.seul.org/pub/xarchon/
+MASTER_SITES=  http://xarchon.seul.org/
+MASTER_SITES+= ftp://xarchon.seul.org/pub/xarchon/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://xarchon.seul.org/

Index: pkgsrc/games/xjump/Makefile
diff -u pkgsrc/games/xjump/Makefile:1.16 pkgsrc/games/xjump/Makefile:1.17
--- pkgsrc/games/xjump/Makefile:1.16    Sat Oct  6 11:55:01 2012
+++ pkgsrc/games/xjump/Makefile Thu Jan 19 18:52:11 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2012/10/06 11:55:01 asau Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/19 18:52:11 agc Exp $
 
 DISTNAME=              xjump_2.7.5.orig
 PKGNAME=               xjump-2.7.5
 PKGREVISION=           4
 CATEGORIES=            games
-MASTER_SITES=          ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/\
-                       http://www.gtlib.cc.gatech.edu/pub/debian/pool/main/x/xjump/
+MASTER_SITES=          ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles
+MASTER_SITES+=         http://www.gtlib.cc.gatech.edu/pub/debian/pool/main/x/xjump/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.gtlib.cc.gatech.edu/pub/debian/pool/main/x/xjump/

Index: pkgsrc/games/xpuyopuyo/Makefile
diff -u pkgsrc/games/xpuyopuyo/Makefile:1.45 pkgsrc/games/xpuyopuyo/Makefile:1.46
--- pkgsrc/games/xpuyopuyo/Makefile:1.45        Sat Jul  4 16:18:35 2015
+++ pkgsrc/games/xpuyopuyo/Makefile     Thu Jan 19 18:52:11 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.45 2015/07/04 16:18:35 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2017/01/19 18:52:11 agc Exp $
 
 DISTNAME=              xpuyopuyo-0.9.1
 PKGREVISION=           9
 CATEGORIES=            games x11
-MASTER_SITES=          http://chaos2.org/xpuyopuyo/ \
-                       http://lenin.dabney.caltech.edu./~justins/xpuyopuyo/
+MASTER_SITES=          http://chaos2.org/xpuyopuyo/
+MASTER_SITES+=         http://lenin.dabney.caltech.edu./~justins/xpuyopuyo/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://chaos2.org/xpuyopuyo/

Index: pkgsrc/geography/epsg/Makefile
diff -u pkgsrc/geography/epsg/Makefile:1.15 pkgsrc/geography/epsg/Makefile:1.16
--- pkgsrc/geography/epsg/Makefile:1.15 Wed Mar 12 00:14:29 2014
+++ pkgsrc/geography/epsg/Makefile      Thu Jan 19 18:52:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/03/12 00:14:29 gdt Exp $
+# $NetBSD: Makefile,v 1.16 2017/01/19 18:52:11 agc Exp $
 #
 
 DISTNAME=              epsg-v${VERS}sql-PostgreSQL
@@ -8,8 +8,8 @@ VER_MINOR=              1
 VERS=                  ${VER_MAJOR}_${VER_MINOR}
 VERS_README=           ${VER_MAJOR}.${VER_MINOR}
 CATEGORIES=            geography databases
-MASTER_SITES+=         http://www.epsg.org/databases/ \
-                       http://www.epsg.org/databases/Arc/${VERS}/
+MASTER_SITES+=         http://www.epsg.org/databases/
+MASTER_SITES+=         http://www.epsg.org/databases/Arc/${VERS}/
 DISTFILES+=            epsg-v${VERS}sql-PostgreSQL.zip \
                        epsg-v${VERS}sql-mySQL.zip
 DIST_SUBDIR=           epsg-${VERS}

Index: pkgsrc/geography/proj-doc/Makefile
diff -u pkgsrc/geography/proj-doc/Makefile:1.2 pkgsrc/geography/proj-doc/Makefile:1.3
--- pkgsrc/geography/proj-doc/Makefile:1.2      Thu Oct  4 09:19:20 2012
+++ pkgsrc/geography/proj-doc/Makefile  Thu Jan 19 18:52:11 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2012/10/04 09:19:20 asau Exp $
+# $NetBSD: Makefile,v 1.3 2017/01/19 18:52:11 agc Exp $
 
 DISTNAME=              proj-pdf-docs
 PKGNAME=               proj-doc-1.1
 PKGREVISION=           1
 CATEGORIES=            geography
-MASTER_SITES=          ftp://ftp.remotesensing.org/pub/proj/ \
-                       http://dl.maptools.org/dl/proj/
+MASTER_SITES=          ftp://ftp.remotesensing.org/pub/proj/
+MASTER_SITES+=         http://dl.maptools.org/dl/proj/
 
 MAINTAINER=            gdt%NetBSD.org@localhost
 HOMEPAGE=              http://www.remotesensing.org/proj/

Index: pkgsrc/graphics/GMT/Makefile
diff -u pkgsrc/graphics/GMT/Makefile:1.46 pkgsrc/graphics/GMT/Makefile:1.47
--- pkgsrc/graphics/GMT/Makefile:1.46   Sun Jan  1 16:06:18 2017
+++ pkgsrc/graphics/GMT/Makefile        Thu Jan 19 18:52:11 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.46 2017/01/01 16:06:18 adam Exp $
+# $NetBSD: Makefile,v 1.47 2017/01/19 18:52:11 agc Exp $
 
 DISTNAME=      GMT4.1.4
 PKGNAME=       GMT-4.1.4
 PKGREVISION=   9
 CATEGORIES=    graphics
-MASTER_SITES=  ftp://ftp.scc.u-tokai.ac.jp/pub/gmt/4/  \
-                               ftp://ftp.iris.washington.edu/pub/gmt/4/
+MASTER_SITES=  ftp://ftp.scc.u-tokai.ac.jp/pub/gmt/4/
+MASTER_SITES+= ftp://ftp.iris.washington.edu/pub/gmt/4/
 DISTFILES=     GMT4.1.4_man.tar.bz2 GMT4.1.4_pdf.tar.bz2       \
                GMT4.1.4_scripts.tar.bz2 GMT4.1.4_share.tar.bz2 \
                GMT4.1.4_src.tar.bz2 GMT4.1.4_suppl.tar.bz2     \

Index: pkgsrc/graphics/GraphicsMagick/Makefile.common
diff -u pkgsrc/graphics/GraphicsMagick/Makefile.common:1.15 pkgsrc/graphics/GraphicsMagick/Makefile.common:1.16
--- pkgsrc/graphics/GraphicsMagick/Makefile.common:1.15 Wed Sep  7 06:29:31 2016
+++ pkgsrc/graphics/GraphicsMagick/Makefile.common      Thu Jan 19 18:52:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2016/09/07 06:29:31 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2017/01/19 18:52:11 agc Exp $
 # used by graphics/GraphicsMagick/Makefile
 # used by graphics/p5-GraphicsMagick/Makefile
 
@@ -7,8 +7,8 @@ GM_MINOR_VER=   25
 DISTVERSION=   ${GM_MAJOR_VER}.${GM_MINOR_VER}
 DISTNAME=      GraphicsMagick-${DISTVERSION}
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
-               ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${GM_MAJOR_VER}/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/}
+MASTER_SITES+= ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${GM_MAJOR_VER}/
 EXTRACT_SUFX=  .tar.xz
 
 DISTINFO_FILE= ${.CURDIR}/../../graphics/GraphicsMagick/distinfo

Index: pkgsrc/graphics/ImageMagick/Makefile.common
diff -u pkgsrc/graphics/ImageMagick/Makefile.common:1.140 pkgsrc/graphics/ImageMagick/Makefile.common:1.141
--- pkgsrc/graphics/ImageMagick/Makefile.common:1.140   Mon Jan 16 12:22:39 2017
+++ pkgsrc/graphics/ImageMagick/Makefile.common Thu Jan 19 18:52:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.140 2017/01/16 12:22:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.141 2017/01/19 18:52:11 agc Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
@@ -21,10 +21,10 @@ DISTVERSION=        ${DISTSUFFIX:S/-/./}
 # are available in the mirrors)
 #
 CATEGORIES=    graphics
-MASTER_SITES=  ftp://ftp.imagemagick.org/pub/ImageMagick/ \
-               ftp://ftp.nluug.nl/pub/ImageMagick/ \
-               ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
-               https://www.imagemagick.org/download/
+MASTER_SITES=  ftp://ftp.imagemagick.org/pub/ImageMagick/
+MASTER_SITES+= ftp://ftp.nluug.nl/pub/ImageMagick/
+MASTER_SITES+= ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/
+MASTER_SITES+= https://www.imagemagick.org/download/
 EXTRACT_SUFX=  .tar.xz
 
 HOMEPAGE=      https://www.imagemagick.org/

Index: pkgsrc/graphics/ImageMagick6/Makefile.common
diff -u pkgsrc/graphics/ImageMagick6/Makefile.common:1.1 pkgsrc/graphics/ImageMagick6/Makefile.common:1.2
--- pkgsrc/graphics/ImageMagick6/Makefile.common:1.1    Wed May 25 12:41:17 2016
+++ pkgsrc/graphics/ImageMagick6/Makefile.common        Thu Jan 19 18:52:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2016/05/25 12:41:17 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.2 2017/01/19 18:52:11 agc Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
@@ -16,10 +16,10 @@ DISTNAME=   ImageMagick-${DISTSUFFIX}
 DISTVERSION=   ${DISTSUFFIX:S/-/./}
 
 CATEGORIES=    graphics
-MASTER_SITES=  ftp://ftp.imagemagick.org/pub/ImageMagick/ \
-               ftp://ftp.nluug.nl/pub/ImageMagick/ \
-               ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
-               http://www.imagemagick.org/download/
+MASTER_SITES=  ftp://ftp.imagemagick.org/pub/ImageMagick/
+MASTER_SITES+= ftp://ftp.nluug.nl/pub/ImageMagick/
+MASTER_SITES+= ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/
+MASTER_SITES+= http://www.imagemagick.org/download/
 EXTRACT_SUFX=  .tar.xz
 
 HOMEPAGE=      http://www.imagemagick.org/

Index: pkgsrc/graphics/Ngraph/Makefile
diff -u pkgsrc/graphics/Ngraph/Makefile:1.24 pkgsrc/graphics/Ngraph/Makefile:1.25
--- pkgsrc/graphics/Ngraph/Makefile:1.24        Sat Oct  6 14:10:40 2012
+++ pkgsrc/graphics/Ngraph/Makefile     Thu Jan 19 18:52:11 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.24 2012/10/06 14:10:40 asau Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/19 18:52:11 agc Exp $
 #
 
 DISTNAME=      Ngraph-6.3.30-src
 PKGREVISION=   3
 PKGNAME=       ${DISTNAME:S/-src//}
 CATEGORIES=    graphics
-MASTER_SITES=  http://www2e.biglobe.ne.jp/~isizaka/bin/ \
-               ftp://ftp.cs.umb.edu/pub/interleaf/CDE/
+MASTER_SITES=  http://www2e.biglobe.ne.jp/~isizaka/bin/
+MASTER_SITES+= ftp://ftp.cs.umb.edu/pub/interleaf/CDE/
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} Ngraph-6.3.30-doc.tar.gz \
                ileaf-widgets.tar.Z
 

Index: pkgsrc/graphics/claraocr/Makefile
diff -u pkgsrc/graphics/claraocr/Makefile:1.20 pkgsrc/graphics/claraocr/Makefile:1.21
--- pkgsrc/graphics/claraocr/Makefile:1.20      Sat Jul  9 06:38:20 2016
+++ pkgsrc/graphics/claraocr/Makefile   Thu Jan 19 18:52:11 2017
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.20 2016/07/09 06:38:20 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:11 agc Exp $
 #
 
 DISTNAME=      clara-0.9.9
 PKGNAME=       ${DISTNAME:S/clara/claraocr/}
 PKGREVISION=   6
 CATEGORIES=    graphics textproc
-MASTER_SITES=  ftp://carroll.cac.psu.edu/pub/linux/distributions/mandrake-devel/projects/claraocr/ \
-               ftp://ftp.wtfo.com/pub/linux/Mandrake-devel/projects/claraocr/ \
-               ftp://gd.tuwien.ac.at/pub/linux/Mandrake-devel/projects/claraocr/ \
-               ftp://mandrake.redbox.cz/Mandrake-devel/projects/claraocr/ \
-               ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrake-devel/projects/claraocr/
+MASTER_SITES=  ftp://carroll.cac.psu.edu/pub/linux/distributions/mandrake-devel/projects/claraocr/
+MASTER_SITES+= ftp://ftp.wtfo.com/pub/linux/Mandrake-devel/projects/claraocr/
+MASTER_SITES+= ftp://gd.tuwien.ac.at/pub/linux/Mandrake-devel/projects/claraocr/
+MASTER_SITES+= ftp://mandrake.redbox.cz/Mandrake-devel/projects/claraocr/
+MASTER_SITES+= ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrake-devel/projects/claraocr/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.geocities.com/claraocr/

Index: pkgsrc/graphics/dvipng/Makefile
diff -u pkgsrc/graphics/dvipng/Makefile:1.27 pkgsrc/graphics/dvipng/Makefile:1.28
--- pkgsrc/graphics/dvipng/Makefile:1.27        Wed Aug  3 10:22:50 2016
+++ pkgsrc/graphics/dvipng/Makefile     Thu Jan 19 18:52:11 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2016/08/03 10:22:50 adam Exp $
+# $NetBSD: Makefile,v 1.28 2017/01/19 18:52:11 agc Exp $
 
 DISTNAME=      dvipng-1.15
 PKGREVISION=   3
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dvipng/} \
-               http://download.savannah.gnu.org/releases/dvipng/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dvipng/}
+MASTER_SITES+= http://download.savannah.gnu.org/releases/dvipng/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://savannah.nongnu.org/projects/dvipng/

Index: pkgsrc/graphics/freetype2/Makefile
diff -u pkgsrc/graphics/freetype2/Makefile:1.109 pkgsrc/graphics/freetype2/Makefile:1.110
--- pkgsrc/graphics/freetype2/Makefile:1.109    Mon Jan 16 13:11:46 2017
+++ pkgsrc/graphics/freetype2/Makefile  Thu Jan 19 18:52:11 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.109 2017/01/16 13:11:46 adam Exp $
+# $NetBSD: Makefile,v 1.110 2017/01/19 18:52:11 agc Exp $
 
 DISTNAME=      freetype-2.7.1
 PKGNAME=       ${DISTNAME:S/-/2-/}
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freetype/} \
-               http://download.savannah.gnu.org/releases/freetype/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freetype/}
+MASTER_SITES+= http://download.savannah.gnu.org/releases/freetype/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/gimp/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.261 pkgsrc/graphics/gimp/Makefile:1.262
--- pkgsrc/graphics/gimp/Makefile:1.261 Tue Nov  8 10:51:27 2016
+++ pkgsrc/graphics/gimp/Makefile       Thu Jan 19 18:52:12 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.261 2016/11/08 10:51:27 wiz Exp $
+# $NetBSD: Makefile,v 1.262 2017/01/19 18:52:12 agc Exp $
 
 DISTNAME=      gimp-2.8.18
 PKGREVISION=   1
 CATEGORIES=    graphics
-MASTER_SITES=  http://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/ \
-               ${MASTER_SITE_GNU:=gimp/v${PKGVERSION_NOREV:R}/} \
-               ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gimp/v${PKGVERSION_NOREV:R}/
+MASTER_SITES=  http://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
+MASTER_SITES+= ${MASTER_SITE_GNU:=gimp/v${PKGVERSION_NOREV:R}/}
+MASTER_SITES+= ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    adam%NetBSD.org@localhost

Index: pkgsrc/graphics/gle/Makefile
diff -u pkgsrc/graphics/gle/Makefile:1.31 pkgsrc/graphics/gle/Makefile:1.32
--- pkgsrc/graphics/gle/Makefile:1.31   Sat Apr 25 14:23:11 2015
+++ pkgsrc/graphics/gle/Makefile        Thu Jan 19 18:52:12 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2015/04/25 14:23:11 tnn Exp $
+# $NetBSD: Makefile,v 1.32 2017/01/19 18:52:12 agc Exp $
 #
 
 DISTNAME=      gle-3.1.0
 PKGREVISION=   4
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gle/}                \
-               http://www.linas.org/gle/pub/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gle/}
+MASTER_SITES+= http://www.linas.org/gle/pub/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.linas.org/gle/

Index: pkgsrc/graphics/libggi/Makefile
diff -u pkgsrc/graphics/libggi/Makefile:1.55 pkgsrc/graphics/libggi/Makefile:1.56
--- pkgsrc/graphics/libggi/Makefile:1.55        Tue Aug 18 07:31:01 2015
+++ pkgsrc/graphics/libggi/Makefile     Thu Jan 19 18:52:12 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.55 2015/08/18 07:31:01 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2017/01/19 18:52:12 agc Exp $
 #
 
 DISTNAME=      libggi-2.2.2.src
 PKGNAME=       ${DISTNAME:S/.src//}
 PKGREVISION=   3
 CATEGORIES=    graphics
-MASTER_SITES=  http://www.ggi-project.org/ftp/ggi/v2.2/ \
-               ${MASTER_SITE_SOURCEFORGE:=ggi/}
+MASTER_SITES=  http://www.ggi-project.org/ftp/ggi/v2.2/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=ggi/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/libggigcp/Makefile
diff -u pkgsrc/graphics/libggigcp/Makefile:1.16 pkgsrc/graphics/libggigcp/Makefile:1.17
--- pkgsrc/graphics/libggigcp/Makefile:1.16     Mon Aug 17 17:11:23 2015
+++ pkgsrc/graphics/libggigcp/Makefile  Thu Jan 19 18:52:12 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.16 2015/08/17 17:11:23 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/19 18:52:12 agc Exp $
 #
 
 DISTNAME=              libggigcp-1.0.2.src
 PKGNAME=               ${DISTNAME:S/.src//}
 PKGREVISION=           1
 CATEGORIES=            graphics
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ggi/} \
-                       http://www.ggi-project.org/ftp/ggi/v2.2/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ggi/}
+MASTER_SITES+=         http://www.ggi-project.org/ftp/ggi/v2.2/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/libggimisc/Makefile
diff -u pkgsrc/graphics/libggimisc/Makefile:1.11 pkgsrc/graphics/libggimisc/Makefile:1.12
--- pkgsrc/graphics/libggimisc/Makefile:1.11    Mon Aug 17 17:11:24 2015
+++ pkgsrc/graphics/libggimisc/Makefile Thu Jan 19 18:52:12 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2015/08/17 17:11:24 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/19 18:52:12 agc Exp $
 
 DISTNAME=              libggimisc-2.2.2.src
 PKGNAME=               ${DISTNAME:S/.src//}
 PKGREVISION=           1
 CATEGORIES=            graphics devel
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ggi/} \
-                       http://www.ggi-project.org/ftp/ggi/v2.2/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ggi/}
+MASTER_SITES+=         http://www.ggi-project.org/ftp/ggi/v2.2/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/libggiwmh/Makefile
diff -u pkgsrc/graphics/libggiwmh/Makefile:1.17 pkgsrc/graphics/libggiwmh/Makefile:1.18
--- pkgsrc/graphics/libggiwmh/Makefile:1.17     Mon Aug 17 17:11:19 2015
+++ pkgsrc/graphics/libggiwmh/Makefile  Thu Jan 19 18:52:12 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.17 2015/08/17 17:11:19 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:12 agc Exp $
 #
 
 DISTNAME=              libggiwmh-0.3.2.src
 PKGNAME=               ${DISTNAME:S/.src//}
 PKGREVISION=           1
 CATEGORIES=            graphics devel
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ggi/} \
-                       http://www.ggi-project.org/ftp/ggi/v2.2/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ggi/}
+MASTER_SITES+=         http://www.ggi-project.org/ftp/ggi/v2.2/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/libgii/Makefile
diff -u pkgsrc/graphics/libgii/Makefile:1.34 pkgsrc/graphics/libgii/Makefile:1.35
--- pkgsrc/graphics/libgii/Makefile:1.34        Thu Mar 12 15:32:05 2015
+++ pkgsrc/graphics/libgii/Makefile     Thu Jan 19 18:52:12 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.34 2015/03/12 15:32:05 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2017/01/19 18:52:12 agc Exp $
 
 DISTNAME=      libgii-1.0.2.src
 PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    graphics
-MASTER_SITES=  http://www.ggi-project.org/ftp/ggi/v2.2/ \
-               ${MASTER_SITE_SOURCEFORGE:=ggi/}
+MASTER_SITES=  http://www.ggi-project.org/ftp/ggi/v2.2/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=ggi/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/libgiigic/Makefile
diff -u pkgsrc/graphics/libgiigic/Makefile:1.8 pkgsrc/graphics/libgiigic/Makefile:1.9
--- pkgsrc/graphics/libgiigic/Makefile:1.8      Sat Oct  6 14:11:04 2012
+++ pkgsrc/graphics/libgiigic/Makefile  Thu Jan 19 18:52:12 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2012/10/06 14:11:04 asau Exp $
+# $NetBSD: Makefile,v 1.9 2017/01/19 18:52:12 agc Exp $
 #
 
 DISTNAME=              libgiigic-1.0.0.src
 PKGNAME=               ${DISTNAME:S/.src//}
 PKGREVISION=           1
 CATEGORIES=            graphics devel
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ggi/} \
-                       http://www.ggi-project.org/ftp/ggi/v2.1/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ggi/}
+MASTER_SITES+=         http://www.ggi-project.org/ftp/ggi/v2.1/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/mng/Makefile
diff -u pkgsrc/graphics/mng/Makefile:1.41 pkgsrc/graphics/mng/Makefile:1.42
--- pkgsrc/graphics/mng/Makefile:1.41   Mon Apr 20 21:51:33 2015
+++ pkgsrc/graphics/mng/Makefile        Thu Jan 19 18:52:12 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2015/04/20 21:51:33 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2017/01/19 18:52:12 agc Exp $
 
 DISTNAME=      libmng-2.0.3
 PKGNAME=       ${DISTNAME:S/lib//}
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libmng/} \
-               http://www.libmng.com/download/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libmng/}
+MASTER_SITES+= http://www.libmng.com/download/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/p5-Image-ExifTool/Makefile
diff -u pkgsrc/graphics/p5-Image-ExifTool/Makefile:1.54 pkgsrc/graphics/p5-Image-ExifTool/Makefile:1.55
--- pkgsrc/graphics/p5-Image-ExifTool/Makefile:1.54     Mon Jan 16 09:32:33 2017
+++ pkgsrc/graphics/p5-Image-ExifTool/Makefile  Thu Jan 19 18:52:12 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.54 2017/01/16 09:32:33 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2017/01/19 18:52:12 agc Exp $
 
 # Author requests that we package only "production" versions.
 # Check http://owl.phy.queensu.ca/~phil/exiftool/history.html
 DISTNAME=      Image-ExifTool-10.40
 PKGNAME=       p5-${DISTNAME}
 CATEGORIES=    graphics perl5
-MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Image/} \
-               http://owl.phy.queensu.ca/~phil/exiftool/
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Image/}
+MASTER_SITES+= http://owl.phy.queensu.ca/~phil/exiftool/
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 # author says www.sno is the same machine, but was never advertised

Index: pkgsrc/graphics/png/Makefile
diff -u pkgsrc/graphics/png/Makefile:1.188 pkgsrc/graphics/png/Makefile:1.189
--- pkgsrc/graphics/png/Makefile:1.188  Thu Jan  5 17:54:44 2017
+++ pkgsrc/graphics/png/Makefile        Thu Jan 19 18:52:12 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.188 2017/01/05 17:54:44 wiz Exp $
+# $NetBSD: Makefile,v 1.189 2017/01/19 18:52:12 agc Exp $
 
 DISTNAME=      libpng-1.6.28
 PKGNAME=       ${DISTNAME:S/lib//}
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libpng/} \
-               ftp://ftp.fu-berlin.de/unix/graphics/png/src/libpng16/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libpng/}
+MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/graphics/png/src/libpng16/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    wiz%NetBSD.org@localhost

Index: pkgsrc/graphics/potrace/Makefile
diff -u pkgsrc/graphics/potrace/Makefile:1.9 pkgsrc/graphics/potrace/Makefile:1.10
--- pkgsrc/graphics/potrace/Makefile:1.9        Fri Mar 15 23:21:39 2013
+++ pkgsrc/graphics/potrace/Makefile    Thu Jan 19 18:52:12 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2013/03/15 23:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/01/19 18:52:12 agc Exp $
 
 DISTNAME=      potrace-1.11
 CATEGORIES=    graphics
-MASTER_SITES=  http://potrace.sourceforge.net/download/ \
-               ${MASTER_SITE_SOURCEFORGE:=potrace/}
+MASTER_SITES=  http://potrace.sourceforge.net/download/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=potrace/}
 
 MAINTAINER=    adam%NetBSD.org@localhost
 HOMEPAGE=      http://potrace.sourceforge.net/

Index: pkgsrc/graphics/povray/Makefile
diff -u pkgsrc/graphics/povray/Makefile:1.54 pkgsrc/graphics/povray/Makefile:1.55
--- pkgsrc/graphics/povray/Makefile:1.54        Sat Feb 16 11:22:23 2013
+++ pkgsrc/graphics/povray/Makefile     Thu Jan 19 18:52:13 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2013/02/16 11:22:23 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2017/01/19 18:52:13 agc Exp $
 
 DISTNAME=      povray-3.6.1
 PKGREVISION=   15
 CATEGORIES=    graphics
-MASTER_SITES=  http://www.povray.org/ftp/pub/povray/Official/Unix/ \
-               ftp://ftp.povray.org/pub/povray/Official/Unix/
+MASTER_SITES=  http://www.povray.org/ftp/pub/povray/Official/Unix/
+MASTER_SITES+= ftp://ftp.povray.org/pub/povray/Official/Unix/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/radiance/Makefile
diff -u pkgsrc/graphics/radiance/Makefile:1.42 pkgsrc/graphics/radiance/Makefile:1.43
--- pkgsrc/graphics/radiance/Makefile:1.42      Sat Oct 17 22:23:25 2015
+++ pkgsrc/graphics/radiance/Makefile   Thu Jan 19 18:52:13 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.42 2015/10/17 22:23:25 dholland Exp $
+# $NetBSD: Makefile,v 1.43 2017/01/19 18:52:13 agc Exp $
 #
 
 DISTNAME=      rad3R6P1
 PKGNAME=       radiance-3.6.1
 PKGREVISION=   16
 CATEGORIES=    graphics
-MASTER_SITES=  http://www.radiance-online.org/software/non-cvs/        \
-               http://www.radiance-online.org/software/
+MASTER_SITES=  http://www.radiance-online.org/software/non-cvs/
+MASTER_SITES+= http://www.radiance-online.org/software/
 DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}supp${EXTRACT_SUFX}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/viewfax/Makefile
diff -u pkgsrc/graphics/viewfax/Makefile:1.11 pkgsrc/graphics/viewfax/Makefile:1.12
--- pkgsrc/graphics/viewfax/Makefile:1.11       Mon Dec 23 11:57:04 2013
+++ pkgsrc/graphics/viewfax/Makefile    Thu Jan 19 18:52:13 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2013/12/23 11:57:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/19 18:52:13 agc Exp $
 
 DISTNAME=      viewfax-2.4
 PKGREVISION=   2
 CATEGORIES=    graphics comms
-MASTER_SITES=  ftp://ftp.hylafax.org/pub/hylafax/contrib/viewfax/ \
-               ftp://ftp.tuwien.ac.at/infosys/fax/hylafax/contrib/viewfax/ \
-               http://gd.tuwien.ac.at/infosys/fax/hylafax/contrib/viewfax/ \
-               ftp://ftp.ips.gov.au/mirror/hylafax/contrib/viewfax/ \
-               ftp://ftp.oce.nl/pub/gnu/hylafax/contrib/viewfax/
+MASTER_SITES=  ftp://ftp.hylafax.org/pub/hylafax/contrib/viewfax/
+MASTER_SITES+= ftp://ftp.tuwien.ac.at/infosys/fax/hylafax/contrib/viewfax/
+MASTER_SITES+= http://gd.tuwien.ac.at/infosys/fax/hylafax/contrib/viewfax/
+MASTER_SITES+= ftp://ftp.ips.gov.au/mirror/hylafax/contrib/viewfax/
+MASTER_SITES+= ftp://ftp.oce.nl/pub/gnu/hylafax/contrib/viewfax/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Tool for displaying fax files in an X Window

Index: pkgsrc/inputmethod/gtk-im-libthai/Makefile
diff -u pkgsrc/inputmethod/gtk-im-libthai/Makefile:1.29 pkgsrc/inputmethod/gtk-im-libthai/Makefile:1.30
--- pkgsrc/inputmethod/gtk-im-libthai/Makefile:1.29     Wed Aug  3 10:22:58 2016
+++ pkgsrc/inputmethod/gtk-im-libthai/Makefile  Thu Jan 19 18:52:13 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2016/08/03 10:22:58 adam Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/19 18:52:13 agc Exp $
 #
 
 DISTNAME=      gtk-im-libthai-0.2.1
 PKGREVISION=   16
 CATEGORIES=    inputmethod
-MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/ \
-               ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
+MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/
+MASTER_SITES+= ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://linux.thai.net/projects/gtk-im-libthai

Index: pkgsrc/inputmethod/ibus-libthai/Makefile
diff -u pkgsrc/inputmethod/ibus-libthai/Makefile:1.8 pkgsrc/inputmethod/ibus-libthai/Makefile:1.9
--- pkgsrc/inputmethod/ibus-libthai/Makefile:1.8        Wed Aug  3 10:22:59 2016
+++ pkgsrc/inputmethod/ibus-libthai/Makefile    Thu Jan 19 18:52:13 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2016/08/03 10:22:59 adam Exp $
+# $NetBSD: Makefile,v 1.9 2017/01/19 18:52:13 agc Exp $
 #
 
 DISTNAME=      ibus-libthai-0.1.2
 PKGREVISION=   3
 CATEGORIES=    inputmethod
-MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/ \
-               ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
+MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/
+MASTER_SITES+= ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/inputmethod/ja-freewnn-lib/Makefile.common
diff -u pkgsrc/inputmethod/ja-freewnn-lib/Makefile.common:1.21 pkgsrc/inputmethod/ja-freewnn-lib/Makefile.common:1.22
--- pkgsrc/inputmethod/ja-freewnn-lib/Makefile.common:1.21      Mon Jun 29 11:06:47 2015
+++ pkgsrc/inputmethod/ja-freewnn-lib/Makefile.common   Thu Jan 19 18:52:13 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.21 2015/06/29 11:06:47 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.22 2017/01/19 18:52:13 agc Exp $
 # used by inputmethod/ja-freewnn-server/Makefile
 # used by inputmethod/ja-freewnn-lib/Makefile
 
 DISTNAME=      FreeWnn-1.1.1-a023
-MASTER_SITES=   ${MASTER_SITE_OSDN:=freewnn/63271/}   \
-                ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/
+MASTER_SITES=   ${MASTER_SITE_OSDN:=freewnn/63271/}
+MASTER_SITES+= ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/
 CATEGORIES=    inputmethod
 
 MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost

Index: pkgsrc/inputmethod/scim-thai/Makefile
diff -u pkgsrc/inputmethod/scim-thai/Makefile:1.29 pkgsrc/inputmethod/scim-thai/Makefile:1.30
--- pkgsrc/inputmethod/scim-thai/Makefile:1.29  Wed Aug  3 10:23:02 2016
+++ pkgsrc/inputmethod/scim-thai/Makefile       Thu Jan 19 18:52:13 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2016/08/03 10:23:02 adam Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/19 18:52:13 agc Exp $
 #
 
 DISTNAME=      scim-thai-0.1.3
 PKGREVISION=   5
 CATEGORIES=    inputmethod
-MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/ \
-               ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
+MASTER_SITES=  http://linux.thai.net/pub/thailinux/software/libthai/
+MASTER_SITES+= ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://linux.thai.net/projects/scim-thai

Index: pkgsrc/inputmethod/skk/Makefile
diff -u pkgsrc/inputmethod/skk/Makefile:1.32 pkgsrc/inputmethod/skk/Makefile:1.33
--- pkgsrc/inputmethod/skk/Makefile:1.32        Sun Oct  2 12:18:40 2016
+++ pkgsrc/inputmethod/skk/Makefile     Thu Jan 19 18:52:13 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2016/10/02 12:18:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2017/01/19 18:52:13 agc Exp $
 #
 
 DISTNAME=      ddskk-16.1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/^ddskk/skk/}
 CATEGORIES=    japanese inputmethod
-MASTER_SITES=  http://openlab.ring.gr.jp/skk/maintrunk/ \
-               http://openlab.ring.gr.jp/skk/maintrunk/old-releases/
+MASTER_SITES=  http://openlab.ring.gr.jp/skk/maintrunk/
+MASTER_SITES+= http://openlab.ring.gr.jp/skk/maintrunk/old-releases/
 
 MAINTAINER=    uebayasi%NetBSD.org@localhost
 HOMEPAGE=      http://openlab.ring.gr.jp/skk/index.html

Index: pkgsrc/inputmethod/tegaki-wagomu/Makefile
diff -u pkgsrc/inputmethod/tegaki-wagomu/Makefile:1.18 pkgsrc/inputmethod/tegaki-wagomu/Makefile:1.19
--- pkgsrc/inputmethod/tegaki-wagomu/Makefile:1.18      Sun Jan  1 14:43:44 2017
+++ pkgsrc/inputmethod/tegaki-wagomu/Makefile   Thu Jan 19 18:52:13 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2017/01/01 14:43:44 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:13 agc Exp $
 
 DISTNAME=      tegaki-wagomu-0.3.1
 PKGREVISION=   6
 CATEGORIES=    inputmethod
-MASTER_SITES=  http://www.tegaki.org/releases/${PKGVERSION_NOREV}/ \
-               http://www.tegaki.org/releases/0.3/
+MASTER_SITES=  http://www.tegaki.org/releases/${PKGVERSION_NOREV}/
+MASTER_SITES+= http://www.tegaki.org/releases/0.3/
 DISTFILES=     tegaki-wagomu-0.3${EXTRACT_SUFX} ${DEFAULT_DISTFILES}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/lang/chicken/Makefile
diff -u pkgsrc/lang/chicken/Makefile:1.56 pkgsrc/lang/chicken/Makefile:1.57
--- pkgsrc/lang/chicken/Makefile:1.56   Wed Jun  8 14:44:54 2016
+++ pkgsrc/lang/chicken/Makefile        Thu Jan 19 18:52:13 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2016/06/08 14:44:54 asau Exp $
+# $NetBSD: Makefile,v 1.57 2017/01/19 18:52:13 agc Exp $
 
 DISTNAME=      chicken-4.11.0
 CATEGORIES=    lang
-MASTER_SITES=  http://code.call-cc.org/releases/$(PKGVERSION_NOREV)/ \
-               http://code.call-cc.org/releases/$(PKGVERSION_NOREV:R)/
+MASTER_SITES=  http://code.call-cc.org/releases/$(PKGVERSION_NOREV)/
+MASTER_SITES+= http://code.call-cc.org/releases/$(PKGVERSION_NOREV:R)/
 
 MAINTAINER=    asau%inbox.ru@localhost #, airhead%users.sourceforge.net@localhost
 HOMEPAGE=      http://www.call-cc.org/

Index: pkgsrc/lang/gcc-aux/Makefile
diff -u pkgsrc/lang/gcc-aux/Makefile:1.26 pkgsrc/lang/gcc-aux/Makefile:1.27
--- pkgsrc/lang/gcc-aux/Makefile:1.26   Sat Jul  9 06:38:24 2016
+++ pkgsrc/lang/gcc-aux/Makefile        Thu Jan 19 18:52:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/07/09 06:38:24 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2017/01/19 18:52:13 agc Exp $
 #
 
 PKGNAME=       gcc-aux-${SNAPSHOT}
@@ -157,8 +157,8 @@ FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:
 
 # for port maintenance, invoke "make mdi PLUS_BOOTSTRAPS=1"
 .if defined(PLUS_BOOTSTRAPS)
-MASTER_SITES= http://downloads.dragonlace.net/src/ \
-   ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
+MASTER_SITES=  http://downloads.dragonlace.net/src/
+MASTER_SITES+= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 DISTFILES= \
    ${DISTNAME}.tar.bz2 \
    ada-bootstrap.i386.dragonfly.36A.tar.bz2 \

Index: pkgsrc/lang/gcc5-aux/Makefile
diff -u pkgsrc/lang/gcc5-aux/Makefile:1.6 pkgsrc/lang/gcc5-aux/Makefile:1.7
--- pkgsrc/lang/gcc5-aux/Makefile:1.6   Thu Dec  8 19:32:10 2016
+++ pkgsrc/lang/gcc5-aux/Makefile       Thu Jan 19 18:52:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/12/08 19:32:10 marino Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/19 18:52:13 agc Exp $
 #
 
 PKGNAME=       gcc5-aux-${SNAPSHOT}
@@ -155,8 +155,8 @@ FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:
 
 # for port maintenance, invoke "make mdi PLUS_BOOTSTRAPS=1"
 .if defined(PLUS_BOOTSTRAPS)
-MASTER_SITES= http://downloads.dragonlace.net/src/ \
-   ${MASTER_SITE_GNU:=gcc/${IDENTIFICATION}/}
+MASTER_SITES=  http://downloads.dragonlace.net/src/
+MASTER_SITES+= ${MASTER_SITE_GNU:=gcc/${IDENTIFICATION}/}
 DISTFILES= \
    ${DISTNAME}.tar.bz2 \
    ada-bootstrap.i386.freebsd.84.tar.bz2 \

Index: pkgsrc/lang/gprolog/Makefile
diff -u pkgsrc/lang/gprolog/Makefile:1.19 pkgsrc/lang/gprolog/Makefile:1.20
--- pkgsrc/lang/gprolog/Makefile:1.19   Thu Jun 13 16:31:55 2013
+++ pkgsrc/lang/gprolog/Makefile        Thu Jan 19 18:52:13 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2013/06/13 16:31:55 asau Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:13 agc Exp $
 
 DISTNAME=              gprolog-1.4.4
 CATEGORIES=            lang
-MASTER_SITES=          ${HOMEPAGE} \
-                       http://gprolog.univ-paris1.fr/
+MASTER_SITES=          ${HOMEPAGE}
+MASTER_SITES+=         http://gprolog.univ-paris1.fr/
 
 MAINTAINER=            brook%nmsu.edu@localhost
 HOMEPAGE=              http://www.gprolog.org/

Index: pkgsrc/lang/gwydion-dylan/Makefile
diff -u pkgsrc/lang/gwydion-dylan/Makefile:1.21 pkgsrc/lang/gwydion-dylan/Makefile:1.22
--- pkgsrc/lang/gwydion-dylan/Makefile:1.21     Sat Jul  9 06:38:25 2016
+++ pkgsrc/lang/gwydion-dylan/Makefile  Thu Jan 19 18:52:14 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2016/07/09 06:38:25 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:14 agc Exp $
 #
 
 DISTNAME=              gwydion-dylan-${DYLAN_VERSION}
 PKGREVISION=           8
 CATEGORIES=            lang
-MASTER_SITES=          ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/src/tar/ \
-                       ftp://ftp.ntua.gr/pub/lang/gwydion/src/tar/
+MASTER_SITES=          ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/src/tar/
+MASTER_SITES+=         ftp://ftp.ntua.gr/pub/lang/gwydion/src/tar/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.opendylan.org/

Index: pkgsrc/lang/lua51/Makefile
diff -u pkgsrc/lang/lua51/Makefile:1.6 pkgsrc/lang/lua51/Makefile:1.7
--- pkgsrc/lang/lua51/Makefile:1.6      Sun Dec  6 00:25:26 2015
+++ pkgsrc/lang/lua51/Makefile  Thu Jan 19 18:52:14 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2015/12/06 00:25:26 alnsn Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/19 18:52:14 agc Exp $
 
 DISTNAME=      lua-${LUA_VERSION}
 PKGNAME=       lua51-${LUA_VERSION}
 PKGREVISION=   3
 CATEGORIES=    lang
-MASTER_SITES=  http://www.lua.org/ftp/ \
-               http://www.tecgraf.puc-rio.br/lua/ftp/
+MASTER_SITES=  http://www.lua.org/ftp/
+MASTER_SITES+= http://www.tecgraf.puc-rio.br/lua/ftp/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.lua.org/

Index: pkgsrc/lang/lua52/Makefile
diff -u pkgsrc/lang/lua52/Makefile:1.9 pkgsrc/lang/lua52/Makefile:1.10
--- pkgsrc/lang/lua52/Makefile:1.9      Sun Dec  6 00:25:26 2015
+++ pkgsrc/lang/lua52/Makefile  Thu Jan 19 18:52:14 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2015/12/06 00:25:26 alnsn Exp $
+# $NetBSD: Makefile,v 1.10 2017/01/19 18:52:14 agc Exp $
 
 DISTNAME=      lua-${LUA_VERSION}
 PKGNAME=       lua52-${LUA_VERSION}
 PKGREVISION=   1
 CATEGORIES=    lang
-MASTER_SITES=  http://www.lua.org/ftp/ \
-               http://www.tecgraf.puc-rio.br/lua/ftp/
+MASTER_SITES=  http://www.lua.org/ftp/
+MASTER_SITES+= http://www.tecgraf.puc-rio.br/lua/ftp/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.lua.org/

Index: pkgsrc/lang/lua53/Makefile
diff -u pkgsrc/lang/lua53/Makefile:1.2 pkgsrc/lang/lua53/Makefile:1.3
--- pkgsrc/lang/lua53/Makefile:1.2      Sat Dec  5 22:50:26 2015
+++ pkgsrc/lang/lua53/Makefile  Thu Jan 19 18:52:14 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2015/12/05 22:50:26 alnsn Exp $
+# $NetBSD: Makefile,v 1.3 2017/01/19 18:52:14 agc Exp $
 
 DISTNAME=      lua-${LUA_VERSION}
 PKGNAME=       lua53-${LUA_VERSION}
 CATEGORIES=    lang
-MASTER_SITES=  http://www.lua.org/ftp/ \
-               http://www.tecgraf.puc-rio.br/lua/ftp/
+MASTER_SITES=  http://www.lua.org/ftp/
+MASTER_SITES+= http://www.tecgraf.puc-rio.br/lua/ftp/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.lua.org/

Index: pkgsrc/lang/maude/Makefile
diff -u pkgsrc/lang/maude/Makefile:1.26 pkgsrc/lang/maude/Makefile:1.27
--- pkgsrc/lang/maude/Makefile:1.26     Sat Dec 17 13:38:55 2016
+++ pkgsrc/lang/maude/Makefile  Thu Jan 19 18:52:14 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2016/12/17 13:38:55 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2017/01/19 18:52:14 agc Exp $
 #
 
 DISTNAME=      Maude-2.6
 PKGNAME=       maude-2.6
 CATEGORIES=    lang
-MASTER_SITES=  http://maude.cs.uiuc.edu/download/ \
-               http://maude.cs.uiuc.edu/download/current/
+MASTER_SITES=  http://maude.cs.uiuc.edu/download/
+MASTER_SITES+= http://maude.cs.uiuc.edu/download/current/
 
 MAINTAINER=    kristerw%NetBSD.org@localhost
 HOMEPAGE=      http://maude.cs.uiuc.edu/

Index: pkgsrc/lang/mercury/Makefile
diff -u pkgsrc/lang/mercury/Makefile:1.59 pkgsrc/lang/mercury/Makefile:1.60
--- pkgsrc/lang/mercury/Makefile:1.59   Sat Jul  9 06:38:26 2016
+++ pkgsrc/lang/mercury/Makefile        Thu Jan 19 18:52:14 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.59 2016/07/09 06:38:26 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2017/01/19 18:52:14 agc Exp $
 
 DISTNAME=              mercury-srcdist-14.01.1
 PKGNAME=               mercury-14.01.1
 PKGREVISION=           7
 CATEGORIES=            lang
-MASTER_SITES=          http://dl.mercurylang.org/release/ \
-                       ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/ \
-                       http://www.mercury.cs.mu.oz.au/download/files/ \
-                       ${MASTER_SITE_SUNSITE:=devel/lang/mercury/}
+MASTER_SITES=          http://dl.mercurylang.org/release/
+MASTER_SITES+=         ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/
+MASTER_SITES+=         http://www.mercury.cs.mu.oz.au/download/files/
+MASTER_SITES+=         ${MASTER_SITE_SUNSITE:=devel/lang/mercury/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.mercurylang.org/

Index: pkgsrc/lang/pcc/Makefile
diff -u pkgsrc/lang/pcc/Makefile:1.14 pkgsrc/lang/pcc/Makefile:1.15
--- pkgsrc/lang/pcc/Makefile:1.14       Tue Oct  2 20:11:48 2012
+++ pkgsrc/lang/pcc/Makefile    Thu Jan 19 18:52:14 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2012/10/02 20:11:48 asau Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:14 agc Exp $
 
 DISTNAME=      pcc-1.0.0
 CATEGORIES=    lang
-MASTER_SITES=  ftp://pcc.ludd.ltu.se/pub/pcc-releases/ \
-               http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
+MASTER_SITES=  ftp://pcc.ludd.ltu.se/pub/pcc-releases/
+MASTER_SITES+= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    reed%reedmedia.net@localhost

Index: pkgsrc/lang/racket/Makefile
diff -u pkgsrc/lang/racket/Makefile:1.56 pkgsrc/lang/racket/Makefile:1.57
--- pkgsrc/lang/racket/Makefile:1.56    Mon Dec 19 15:43:42 2016
+++ pkgsrc/lang/racket/Makefile Thu Jan 19 18:52:14 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.56 2016/12/19 15:43:42 asau Exp $
+# $NetBSD: Makefile,v 1.57 2017/01/19 18:52:14 agc Exp $
 
 PKGNAME=       racket-6.7
 DISTNAME=      $(PKGNAME_NOREV)-src
 CATEGORIES=    lang
-MASTER_SITES_PLT=      http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)/ \
-               http://www.eecs.northwestern.edu/racket/$(PKGVERSION_NOREV)/ \
-               http://www.cs.utah.edu/plt/installers/$(PKGVERSION_NOREV)/ \
-               http://mirror.informatik.uni-tuebingen.de/mirror/racket/$(PKGVERSION_NOREV)/ \
-               ftp://infogroep.be/pub/racket/installers/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT=      http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT+=     http://www.eecs.northwestern.edu/racket/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT+=     http://www.cs.utah.edu/plt/installers/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT+=     http://mirror.informatik.uni-tuebingen.de/mirror/racket/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT+=     ftp://infogroep.be/pub/racket/installers/$(PKGVERSION_NOREV)/
 # Pre-release:
 #MASTER_SITES_PLT=     http://pre-release.racket-lang.org/installers/
 MASTER_SITES=  $(MASTER_SITES_PLT)

Index: pkgsrc/lang/racket-textual/Makefile
diff -u pkgsrc/lang/racket-textual/Makefile:1.30 pkgsrc/lang/racket-textual/Makefile:1.31
--- pkgsrc/lang/racket-textual/Makefile:1.30    Mon Dec 12 12:08:57 2016
+++ pkgsrc/lang/racket-textual/Makefile Thu Jan 19 18:52:14 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.30 2016/12/12 12:08:57 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2017/01/19 18:52:14 agc Exp $
 
 PKGNAME=       racket-minimal-6.7
 DISTNAME=      $(PKGNAME_NOREV)-src
 CATEGORIES=    lang
-MASTER_SITES_PLT=      http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)/ \
-               http://www.eecs.northwestern.edu/racket/$(PKGVERSION_NOREV)/ \
-               http://www.cs.utah.edu/plt/installers/$(PKGVERSION_NOREV)/ \
-               http://mirror.informatik.uni-tuebingen.de/mirror/racket/$(PKGVERSION_NOREV)/ \
-               ftp://infogroep.be/pub/racket/installers/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT=      http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT+=     http://www.eecs.northwestern.edu/racket/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT+=     http://www.cs.utah.edu/plt/installers/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT+=     http://mirror.informatik.uni-tuebingen.de/mirror/racket/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT+=     ftp://infogroep.be/pub/racket/installers/$(PKGVERSION_NOREV)/
 # Pre-release:
 #MASTER_SITES_PLT=     http://pre-release.racket-lang.org/installers/
 MASTER_SITES=  $(MASTER_SITES_PLT)

Index: pkgsrc/lang/rexx-imc/Makefile
diff -u pkgsrc/lang/rexx-imc/Makefile:1.14 pkgsrc/lang/rexx-imc/Makefile:1.15
--- pkgsrc/lang/rexx-imc/Makefile:1.14  Tue Oct  2 20:11:51 2012
+++ pkgsrc/lang/rexx-imc/Makefile       Thu Jan 19 18:52:14 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2012/10/02 20:11:51 asau Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:14 agc Exp $
 #
 
 DISTNAME=      rexx-imc-1.76
 PKGREVISION=   2
 CATEGORIES=    lang
-MASTER_SITES=  http://users.comlab.ox.ac.uk/ian.collier/distribution/ \
-               ftp://ftp.sai.msu.su/pub/unix/rexx/
+MASTER_SITES=  http://users.comlab.ox.ac.uk/ian.collier/distribution/
+MASTER_SITES+= ftp://ftp.sai.msu.su/pub/unix/rexx/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://users.comlab.ox.ac.uk/ian.collier/Rexx/

Index: pkgsrc/lang/runawk/Makefile
diff -u pkgsrc/lang/runawk/Makefile:1.17 pkgsrc/lang/runawk/Makefile:1.18
--- pkgsrc/lang/runawk/Makefile:1.17    Wed Jan  7 12:50:47 2015
+++ pkgsrc/lang/runawk/Makefile Thu Jan 19 18:52:14 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2015/01/07 12:50:47 cheusov Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:14 agc Exp $
 #
 
 DISTNAME=      runawk-1.6.0
 CATEGORIES=    lang devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=runawk/} \
-               http://mova.org/~cheusov/pub/runawk/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=runawk/}
+MASTER_SITES+= http://mova.org/~cheusov/pub/runawk/
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      http://sourceforge.net/projects/runawk

Index: pkgsrc/lang/snobol/Makefile
diff -u pkgsrc/lang/snobol/Makefile:1.31 pkgsrc/lang/snobol/Makefile:1.32
--- pkgsrc/lang/snobol/Makefile:1.31    Fri Apr  1 12:24:14 2016
+++ pkgsrc/lang/snobol/Makefile Thu Jan 19 18:52:14 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2016/04/01 12:24:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.32 2017/01/19 18:52:14 agc Exp $
 #
 
 DISTNAME=      snobol4-1.3
@@ -6,10 +6,10 @@ DIST_SUBDIR=  snobol4-1.3bis
 PKGNAME=       snobol-1.3
 PKGREVISION=   1
 CATEGORIES=    lang
-MASTER_SITES=  ftp://ftp.snobol4.org/snobol/ \
-               ftp://ftp.ultimate.com/snobol/ \
-               ftp://ftp.snobol4.org/snobol/old/ \
-               ftp://ftp.ultimate.com/snobol/old/
+MASTER_SITES=  ftp://ftp.snobol4.org/snobol/
+MASTER_SITES+= ftp://ftp.ultimate.com/snobol/
+MASTER_SITES+= ftp://ftp.snobol4.org/snobol/old/
+MASTER_SITES+= ftp://ftp.ultimate.com/snobol/old/
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} vanilla.tar.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/lang/spl/Makefile
diff -u pkgsrc/lang/spl/Makefile:1.29 pkgsrc/lang/spl/Makefile:1.30
--- pkgsrc/lang/spl/Makefile:1.29       Sun Dec  4 05:17:31 2016
+++ pkgsrc/lang/spl/Makefile    Thu Jan 19 18:52:15 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2016/12/04 05:17:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/19 18:52:15 agc Exp $
 #
 
 DISTNAME=      spl-1.0pre3
 PKGREVISION=   15
 CATEGORIES=    lang
-MASTER_SITES=  http://www.clifford.at/spl/releases/ \
-               http://www.clifford.at/spl/releases/OLD/
+MASTER_SITES=  http://www.clifford.at/spl/releases/
+MASTER_SITES+= http://www.clifford.at/spl/releases/OLD/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.clifford.at/spl/

Index: pkgsrc/lang/squeak-vm/Makefile
diff -u pkgsrc/lang/squeak-vm/Makefile:1.37 pkgsrc/lang/squeak-vm/Makefile:1.38
--- pkgsrc/lang/squeak-vm/Makefile:1.37 Thu Aug  4 17:03:36 2016
+++ pkgsrc/lang/squeak-vm/Makefile      Thu Jan 19 18:52:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2016/08/04 17:03:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2017/01/19 18:52:15 agc Exp $
 #
 
 SQUEAK_VERSION=        4.10.2.2614
@@ -7,8 +7,8 @@ DISTNAME=       Squeak-${SQUEAK_VERSION}-src
 PKGNAME=       squeak-vm-${SQUEAK_VERSION:C/-/./}
 PKGREVISION=   11
 CATEGORIES=    lang
-MASTER_SITES=  http://squeakvm.org/unix/release/ \
-               http://ftp.squeak.org/3.10/unix-linux/
+MASTER_SITES=  http://squeakvm.org/unix/release/
+MASTER_SITES+= http://ftp.squeak.org/3.10/unix-linux/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://squeakvm.org/unix/

Index: pkgsrc/lang/swi-prolog-lite/Makefile.common
diff -u pkgsrc/lang/swi-prolog-lite/Makefile.common:1.13 pkgsrc/lang/swi-prolog-lite/Makefile.common:1.14
--- pkgsrc/lang/swi-prolog-lite/Makefile.common:1.13    Sat Feb 21 14:09:50 2015
+++ pkgsrc/lang/swi-prolog-lite/Makefile.common Thu Jan 19 18:52:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2015/02/21 14:09:50 mef Exp $
+# $NetBSD: Makefile.common,v 1.14 2017/01/19 18:52:15 agc Exp $
 #
 # used by lang/swi-prolog/Makefile
 # used by lang/swi-prolog-packages/Makefile
@@ -7,8 +7,8 @@
 SWIPLVERS=             6.6.6
 DISTNAME=              pl-${SWIPLVERS}
 CATEGORIES=            lang
-MASTER_SITES=          http://www.swi-prolog.org/download/stable/src/ \
-                       http://www.swi-prolog.org/download/devel/src/
+MASTER_SITES=          http://www.swi-prolog.org/download/stable/src/
+MASTER_SITES+=         http://www.swi-prolog.org/download/devel/src/
 
 HOMEPAGE=              http://www.swi-prolog.org/
 LICENSE=               gnu-lgpl-v2.1

Index: pkgsrc/lang/vscm/Makefile
diff -u pkgsrc/lang/vscm/Makefile:1.20 pkgsrc/lang/vscm/Makefile:1.21
--- pkgsrc/lang/vscm/Makefile:1.20      Fri Dec 21 04:23:45 2012
+++ pkgsrc/lang/vscm/Makefile   Thu Jan 19 18:52:15 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2012/12/21 04:23:45 dholland Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=      vscmV1R2
 PKGNAME=       vscm-1.4
 PKGREVISION=   1
 CATEGORIES=    lang
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vscm/} \
-       ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/vscm/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vscm/}
+MASTER_SITES+= ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/vscm/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://www.cs.princeton.edu/~blume/vscm/

Index: pkgsrc/lang/yap/Makefile
diff -u pkgsrc/lang/yap/Makefile:1.24 pkgsrc/lang/yap/Makefile:1.25
--- pkgsrc/lang/yap/Makefile:1.24       Thu Jan  5 16:33:58 2017
+++ pkgsrc/lang/yap/Makefile    Thu Jan 19 18:52:15 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2017/01/05 16:33:58 roy Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=              yap-6.3.3
 PKGREVISION=           4
 CATEGORIES=            lang
 # MASTER_SITES=                ${MASTER_SITE_SOURCEFORGE:=yap/}
-MASTER_SITES=          http://www.dcc.fc.up.pt/~vsc/Yap/ \
-                       http://www.dcc.fc.up.pt/~vsc/Yap/current/
+MASTER_SITES=          http://www.dcc.fc.up.pt/~vsc/Yap/
+MASTER_SITES+=         http://www.dcc.fc.up.pt/~vsc/Yap/current/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.ncc.up.pt/~vsc/Yap/

Index: pkgsrc/mail/amavis-perl/Makefile
diff -u pkgsrc/mail/amavis-perl/Makefile:1.11 pkgsrc/mail/amavis-perl/Makefile:1.12
--- pkgsrc/mail/amavis-perl/Makefile:1.11       Sat Jul  9 06:38:27 2016
+++ pkgsrc/mail/amavis-perl/Makefile    Thu Jan 19 18:52:15 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 06:38:27 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=      amavisd-${VERSION}
 PKGNAME=       amavis-perl-${VERSION}
 PKGREVISION=   14
 CATEGORIES=    mail security
-MASTER_SITES=  http://www.amavis.org/dist/perl/ \
-               ${MASTER_SITE_SOURCEFORGE:=amavis/}
+MASTER_SITES=  http://www.amavis.org/dist/perl/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=amavis/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.amavis.org/

Index: pkgsrc/mail/amavisd-new/Makefile
diff -u pkgsrc/mail/amavisd-new/Makefile:1.19 pkgsrc/mail/amavisd-new/Makefile:1.20
--- pkgsrc/mail/amavisd-new/Makefile:1.19       Wed Sep 14 18:20:30 2016
+++ pkgsrc/mail/amavisd-new/Makefile    Thu Jan 19 18:52:15 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2016/09/14 18:20:30 spz Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=      amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=       amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
 CATEGORIES=    mail security
-MASTER_SITES=  http://www.ijs.si/software/amavisd/ \
-               http://mirrors.catpipe.net/amavisd-new/ \
-               http://mirror.mainloop.se/amavisd/ \
-               http://mirror.cedratnet.com/amavisd-new/ \
-               http://mirror.omroep.nl/amavisd-new/
+MASTER_SITES=  http://www.ijs.si/software/amavisd/
+MASTER_SITES+= http://mirrors.catpipe.net/amavisd-new/
+MASTER_SITES+= http://mirror.mainloop.se/amavisd/
+MASTER_SITES+= http://mirror.cedratnet.com/amavisd-new/
+MASTER_SITES+= http://mirror.omroep.nl/amavisd-new/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    spz%NetBSD.org@localhost

Index: pkgsrc/mail/cyrus-imapd/Makefile
diff -u pkgsrc/mail/cyrus-imapd/Makefile:1.106 pkgsrc/mail/cyrus-imapd/Makefile:1.107
--- pkgsrc/mail/cyrus-imapd/Makefile:1.106      Sat Jul  9 06:38:28 2016
+++ pkgsrc/mail/cyrus-imapd/Makefile    Thu Jan 19 18:52:15 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.106 2016/07/09 06:38:28 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=      cyrus-imapd-2.2.13p1
 PKGREVISION=   15
 CATEGORIES=    mail
-MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-               ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
+MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITES+= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.cyrusimap.org/

Index: pkgsrc/mail/cyrus-imapd23/Makefile
diff -u pkgsrc/mail/cyrus-imapd23/Makefile:1.43 pkgsrc/mail/cyrus-imapd23/Makefile:1.44
--- pkgsrc/mail/cyrus-imapd23/Makefile:1.43     Sun Dec  4 05:17:32 2016
+++ pkgsrc/mail/cyrus-imapd23/Makefile  Thu Jan 19 18:52:15 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2016/12/04 05:17:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=      cyrus-imapd-2.3.18
 PKGREVISION=   21
 CATEGORIES=    mail
-MASTER_SITES=  http://cyrusimap.org/releases/ \
-               ftp://ftp.cyrusimap.org/cyrus-imapd/ \
-               ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
+MASTER_SITES=  http://cyrusimap.org/releases/
+MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/
+MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.cyrusimap.org/

Index: pkgsrc/mail/cyrus-imapd24/Makefile
diff -u pkgsrc/mail/cyrus-imapd24/Makefile:1.47 pkgsrc/mail/cyrus-imapd24/Makefile:1.48
--- pkgsrc/mail/cyrus-imapd24/Makefile:1.47     Sun Dec  4 05:17:32 2016
+++ pkgsrc/mail/cyrus-imapd24/Makefile  Thu Jan 19 18:52:15 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.47 2016/12/04 05:17:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=      cyrus-imapd-2.4.17
 PKGREVISION=   18
 CATEGORIES=    mail
-MASTER_SITES=  http://cyrusimap.org/releases/ \
-               ftp://ftp.cyrusimap.org/cyrus-imapd/ \
-               ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
+MASTER_SITES=  http://cyrusimap.org/releases/
+MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/
+MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.cyrusimap.org/

Index: pkgsrc/mail/dovecot2-antispam-plugin/Makefile
diff -u pkgsrc/mail/dovecot2-antispam-plugin/Makefile:1.6 pkgsrc/mail/dovecot2-antispam-plugin/Makefile:1.7
--- pkgsrc/mail/dovecot2-antispam-plugin/Makefile:1.6   Mon Sep 19 13:04:23 2016
+++ pkgsrc/mail/dovecot2-antispam-plugin/Makefile       Thu Jan 19 18:52:15 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2016/09/19 13:04:23 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=              dovecot-antispam-plugin-20130429
 PKGREVISION=           4
 CATEGORIES=            mail
-MASTER_SITES=          http://olgeni.olgeni.com/~olgeni/distfiles/ \
-                       http://distcache.FreeBSD.org/local-distfiles/olgeni/
+MASTER_SITES=          http://olgeni.olgeni.com/~olgeni/distfiles/
+MASTER_SITES+=         http://distcache.FreeBSD.org/local-distfiles/olgeni/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            schmonz%NetBSD.org@localhost

Index: pkgsrc/mail/exim/Makefile
diff -u pkgsrc/mail/exim/Makefile:1.151 pkgsrc/mail/exim/Makefile:1.152
--- pkgsrc/mail/exim/Makefile:1.151     Sun Dec 25 11:29:54 2016
+++ pkgsrc/mail/exim/Makefile   Thu Jan 19 18:52:15 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.151 2016/12/25 11:29:54 wiedi Exp $
+# $NetBSD: Makefile,v 1.152 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=      exim-4.88
 CATEGORIES=    mail net
-MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/ \
-               http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
+MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/
+MASTER_SITES+= http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    abs%NetBSD.org@localhost

Index: pkgsrc/mail/exim-html/Makefile
diff -u pkgsrc/mail/exim-html/Makefile:1.33 pkgsrc/mail/exim-html/Makefile:1.34
--- pkgsrc/mail/exim-html/Makefile:1.33 Sun Apr 24 10:42:18 2016
+++ pkgsrc/mail/exim-html/Makefile      Thu Jan 19 18:52:15 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2016/04/24 10:42:18 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2017/01/19 18:52:15 agc Exp $
 
 DISTNAME=      exim-html-4.87
 CATEGORIES=    mail net
-MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/ \
-               ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/
+MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/
+MASTER_SITES+= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    abs%NetBSD.org@localhost

Index: pkgsrc/mail/exim3/Makefile
diff -u pkgsrc/mail/exim3/Makefile:1.49 pkgsrc/mail/exim3/Makefile:1.50
--- pkgsrc/mail/exim3/Makefile:1.49     Sun Oct  9 21:42:00 2016
+++ pkgsrc/mail/exim3/Makefile  Thu Jan 19 18:52:16 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2016/10/09 21:42:00 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2017/01/19 18:52:16 agc Exp $
 
 DISTNAME=      exim-3.36
 PKGREVISION=   17
 CATEGORIES=    mail net
-MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
-               http://public.planetmirror.com.au/pub/exim/exim3/
+MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/
+MASTER_SITES+= http://public.planetmirror.com.au/pub/exim/exim3/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/mail/hypermail/Makefile
diff -u pkgsrc/mail/hypermail/Makefile:1.18 pkgsrc/mail/hypermail/Makefile:1.19
--- pkgsrc/mail/hypermail/Makefile:1.18 Mon Oct  8 12:19:13 2012
+++ pkgsrc/mail/hypermail/Makefile      Thu Jan 19 18:52:16 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2012/10/08 12:19:13 asau Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:16 agc Exp $
 #
 
 DISTNAME=      hypermail-2.3.0
 CATEGORIES=    mail www
-MASTER_SITES=  ${HOMEPAGE} \
-               ${MASTER_SITE_SOURCEFORGE:=hypermail/}
+MASTER_SITES=  ${HOMEPAGE}
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=hypermail/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.hypermail-project.org/

Index: pkgsrc/mail/imp/Makefile
diff -u pkgsrc/mail/imp/Makefile:1.63 pkgsrc/mail/imp/Makefile:1.64
--- pkgsrc/mail/imp/Makefile:1.63       Thu Dec  1 14:48:02 2016
+++ pkgsrc/mail/imp/Makefile    Thu Jan 19 18:52:16 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.63 2016/12/01 14:48:02 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2017/01/19 18:52:16 agc Exp $
 
 DISTNAME=      imp-h3-${IMPVER}
 PKGNAME=       imp-${IMPVER}
 PKGREVISION=   2
 CATEGORIES=    mail www
-MASTER_SITES=  http://ftp.horde.org/pub/imp/ \
-               ftp://ftp.horde.org/pub/imp/
+MASTER_SITES=  http://ftp.horde.org/pub/imp/
+MASTER_SITES+= ftp://ftp.horde.org/pub/imp/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.horde.org/imp/

Index: pkgsrc/mail/ingo/Makefile
diff -u pkgsrc/mail/ingo/Makefile:1.24 pkgsrc/mail/ingo/Makefile:1.25
--- pkgsrc/mail/ingo/Makefile:1.24      Sun Sep 11 17:03:26 2016
+++ pkgsrc/mail/ingo/Makefile   Thu Jan 19 18:52:16 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2016/09/11 17:03:26 taca Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/19 18:52:16 agc Exp $
 
 DISTNAME=      ingo-h3-${INGOVER}
 PKGNAME=       ingo-${INGOVER}
 PKGREVISION=   2
 CATEGORIES=    mail www
-MASTER_SITES=  http://ftp.horde.org/pub/ingo/ \
-               ftp://ftp.horde.org/pub/ingo/
+MASTER_SITES=  http://ftp.horde.org/pub/ingo/
+MASTER_SITES+= ftp://ftp.horde.org/pub/ingo/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.horde.org/apps/ingo/

Index: pkgsrc/mail/mailgraph/Makefile
diff -u pkgsrc/mail/mailgraph/Makefile:1.22 pkgsrc/mail/mailgraph/Makefile:1.23
--- pkgsrc/mail/mailgraph/Makefile:1.22 Sat Jul  9 06:38:30 2016
+++ pkgsrc/mail/mailgraph/Makefile      Thu Jan 19 18:52:16 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2016/07/09 06:38:30 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:16 agc Exp $
 #
 
 DISTNAME=      mailgraph-1.14
 PKGREVISION=   3
 CATEGORIES=    mail
-MASTER_SITES=  http://mailgraph.schweikert.ch/pub/     \
-               http://mailgraph.schweikert.ch/pub/old
+MASTER_SITES=  http://mailgraph.schweikert.ch/pub/
+MASTER_SITES+= http://mailgraph.schweikert.ch/pub/old
 
 MAINTAINER=    kim%tac.nyc.ny.us@localhost
 HOMEPAGE=      http://mailgraph.schweikert.ch/

Index: pkgsrc/mail/majordomo/Makefile
diff -u pkgsrc/mail/majordomo/Makefile:1.51 pkgsrc/mail/majordomo/Makefile:1.52
--- pkgsrc/mail/majordomo/Makefile:1.51 Sat Jul  9 06:38:30 2016
+++ pkgsrc/mail/majordomo/Makefile      Thu Jan 19 18:52:16 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.51 2016/07/09 06:38:30 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2017/01/19 18:52:16 agc Exp $
 
 DISTNAME=              majordomo-1.94.5
 PKGREVISION=           21
 CATEGORIES=            mail
-MASTER_SITES=          ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
-                       ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
+MASTER_SITES=          ftp://ftp.sgi.com/other/majordomo/1.94.5/
+MASTER_SITES+=         ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
 EXTRACT_SUFX=          .tgz
 
 MAINTAINER=            spz%NetBSD.org@localhost

Index: pkgsrc/mail/metamail/Makefile
diff -u pkgsrc/mail/metamail/Makefile:1.51 pkgsrc/mail/metamail/Makefile:1.52
--- pkgsrc/mail/metamail/Makefile:1.51  Thu Oct  9 14:06:39 2014
+++ pkgsrc/mail/metamail/Makefile       Thu Jan 19 18:52:16 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.51 2014/10/09 14:06:39 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2017/01/19 18:52:16 agc Exp $
 
 DISTNAME=      mm2.7
 PKGNAME=       metamail-2.7
 PKGREVISION=   11
 CATEGORIES=    mail
-MASTER_SITES=  http://ftp.funet.fi/pub/unix/mail/metamail/     \
-               ftp://ftp.research.telcordia.com/pub/nsb/
+MASTER_SITES=  http://ftp.funet.fi/pub/unix/mail/metamail/
+MASTER_SITES+= ftp://ftp.research.telcordia.com/pub/nsb/
 EXTRACT_SUFX=  .tar.Z
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/mail/mimp/Makefile
diff -u pkgsrc/mail/mimp/Makefile:1.5 pkgsrc/mail/mimp/Makefile:1.6
--- pkgsrc/mail/mimp/Makefile:1.5       Sun Sep 11 17:03:26 2016
+++ pkgsrc/mail/mimp/Makefile   Thu Jan 19 18:52:16 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2016/09/11 17:03:26 taca Exp $
+# $NetBSD: Makefile,v 1.6 2017/01/19 18:52:16 agc Exp $
 
 DISTNAME=      mimp-h3-${MIMPVER}
 PKGNAME=       mimp-${MIMPVER}
 PKGREVISION=   2
 CATEGORIES=    mail www
-MASTER_SITES=  http://ftp.horde.org/pub/mimp/ \
-               ftp://ftp.horde.org/pub/mimp/
+MASTER_SITES=  http://ftp.horde.org/pub/mimp/
+MASTER_SITES+= ftp://ftp.horde.org/pub/mimp/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.horde.org/apps/mimp/

Index: pkgsrc/mail/p5-Mail-Milter/Makefile
diff -u pkgsrc/mail/p5-Mail-Milter/Makefile:1.20 pkgsrc/mail/p5-Mail-Milter/Makefile:1.21
--- pkgsrc/mail/p5-Mail-Milter/Makefile:1.20    Wed Jun  8 19:23:59 2016
+++ pkgsrc/mail/p5-Mail-Milter/Makefile Thu Jan 19 18:52:16 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2016/06/08 19:23:59 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:16 agc Exp $
 #
 
 DISTNAME=      Mail-Milter-0.07
 PKGNAME=       p5-${DISTNAME}
 PKGREVISION=   8
 CATEGORIES=    mail perl5
-MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Mail/} \
-               ${MASTER_SITE_SOURCEFORGE:=pmilter/}
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Mail/}
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pmilter/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://pmilter.sourceforge.net/

Index: pkgsrc/mail/pine/Makefile
diff -u pkgsrc/mail/pine/Makefile:1.134 pkgsrc/mail/pine/Makefile:1.135
--- pkgsrc/mail/pine/Makefile:1.134     Sat Mar  5 11:28:50 2016
+++ pkgsrc/mail/pine/Makefile   Thu Jan 19 18:52:16 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.134 2016/03/05 11:28:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.135 2017/01/19 18:52:16 agc Exp $
 
 DISTNAME=      pine4.64
 PKGNAME=       pine-4.64
 PKGREVISION=   13
 CATEGORIES=    mail news
-MASTER_SITES=  ftp://ftp.cac.washington.edu/pine/ \
-               ftp://ftp.fu-berlin.de/unix/mail/pine/
+MASTER_SITES=  ftp://ftp.cac.washington.edu/pine/
+MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/mail/pine/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/mail/popa3d/Makefile
diff -u pkgsrc/mail/popa3d/Makefile:1.54 pkgsrc/mail/popa3d/Makefile:1.55
--- pkgsrc/mail/popa3d/Makefile:1.54    Fri Sep 12 21:50:49 2014
+++ pkgsrc/mail/popa3d/Makefile Thu Jan 19 18:52:16 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2014/09/12 21:50:49 shattered Exp $
+# $NetBSD: Makefile,v 1.55 2017/01/19 18:52:16 agc Exp $
 #
 
 DISTNAME=      popa3d-1.0.3
 CATEGORIES=    mail
-MASTER_SITES=  http://www.openwall.com/popa3d/ \
-               ftp://ftp.openwall.com/pub/projects/popa3d/
+MASTER_SITES=  http://www.openwall.com/popa3d/
+MASTER_SITES+= ftp://ftp.openwall.com/pub/projects/popa3d/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.openwall.com/popa3d/

Index: pkgsrc/mail/qpopper/Makefile.common
diff -u pkgsrc/mail/qpopper/Makefile.common:1.22 pkgsrc/mail/qpopper/Makefile.common:1.23
--- pkgsrc/mail/qpopper/Makefile.common:1.22    Thu Mar 22 14:13:28 2012
+++ pkgsrc/mail/qpopper/Makefile.common Thu Jan 19 18:52:16 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.22 2012/03/22 14:13:28 taca Exp $
+# $NetBSD: Makefile.common,v 1.23 2017/01/19 18:52:16 agc Exp $
 # used by mail/poppassd/Makefile
 
-QPOPPER_MASTER_SITES+= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
-                       http://core.ring.gr.jp/archives/net/mail/qpopper/
+QPOPPER_MASTER_SITES+= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
+QPOPPER_MASTER_SITES+= http://core.ring.gr.jp/archives/net/mail/qpopper/
 QPOPPER_HOMEPAGE=      http://www.eudora.com/products/unsupported/qpopper/
 #QPOPPER_PATCHSITES+=  http://www.imasy.or.jp/~ume/ipv6/
 #QPOPPER_PATCHFILES=   qpopper4.0.9-ipv6-20060626.diff.gz

Index: pkgsrc/mail/sendmail/Makefile.common
diff -u pkgsrc/mail/sendmail/Makefile.common:1.64 pkgsrc/mail/sendmail/Makefile.common:1.65
--- pkgsrc/mail/sendmail/Makefile.common:1.64   Fri May 20 12:11:39 2016
+++ pkgsrc/mail/sendmail/Makefile.common        Thu Jan 19 18:52:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.64 2016/05/20 12:11:39 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.65 2017/01/19 18:52:17 agc Exp $
 #
 # used by mail/libmilter/Makefile
 # used by mail/sendmail/Makefile
@@ -8,9 +8,9 @@
 
 DISTNAME=      sendmail.${DIST_VERS}
 CATEGORIES=    mail
-MASTER_SITES=  ftp://ftp.sendmail.org/pub/sendmail/ \
-               ftp://ftp.sendmail.org/pub/sendmail/past-releases/ \
-               ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/
+MASTER_SITES=  ftp://ftp.sendmail.org/pub/sendmail/
+MASTER_SITES+= ftp://ftp.sendmail.org/pub/sendmail/past-releases/
+MASTER_SITES+= ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/
 
 OWNER?=                jnemeth%NetBSD.org@localhost
 HOMEPAGE=      http://www.sendmail.org/

Index: pkgsrc/mail/sympa/Makefile
diff -u pkgsrc/mail/sympa/Makefile:1.63 pkgsrc/mail/sympa/Makefile:1.64
--- pkgsrc/mail/sympa/Makefile:1.63     Wed Jun  8 19:24:01 2016
+++ pkgsrc/mail/sympa/Makefile  Thu Jan 19 18:52:17 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.63 2016/06/08 19:24:01 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      sympa-6.2.7
 PKGREVISION=   3
 CATEGORIES=    mail
-MASTER_SITES=  http://www.sympa.org/distribution/ \
-               http://www.sympa.org/distribution/old/
+MASTER_SITES=  http://www.sympa.org/distribution/
+MASTER_SITES+= http://www.sympa.org/distribution/old/
 
 MAINTAINER=    bouyer%NetBSD.org@localhost
 HOMEPAGE=      http://www.sympa.org/

Index: pkgsrc/mail/turba/Makefile
diff -u pkgsrc/mail/turba/Makefile:1.43 pkgsrc/mail/turba/Makefile:1.44
--- pkgsrc/mail/turba/Makefile:1.43     Sat Jul  9 06:38:32 2016
+++ pkgsrc/mail/turba/Makefile  Thu Jan 19 18:52:17 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2016/07/09 06:38:32 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      turba-h3-${TURBAVER}
 PKGNAME=       turba-${TURBAVER}
 PKGREVISION=   7
 CATEGORIES=    mail www
-MASTER_SITES=  http://ftp.horde.org/pub/turba/ \
-               ftp://ftp.horde.org/pub/turba/
+MASTER_SITES=  http://ftp.horde.org/pub/turba/
+MASTER_SITES+= ftp://ftp.horde.org/pub/turba/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.horde.org/turba/

Index: pkgsrc/mail/vm/Makefile
diff -u pkgsrc/mail/vm/Makefile:1.42 pkgsrc/mail/vm/Makefile:1.43
--- pkgsrc/mail/vm/Makefile:1.42        Sat Apr  6 20:27:24 2013
+++ pkgsrc/mail/vm/Makefile     Thu Jan 19 18:52:17 2017
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.42 2013/04/06 20:27:24 rodent Exp $
+# $NetBSD: Makefile,v 1.43 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      vm-7.19
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   4
 CATEGORIES=    mail
-MASTER_SITES=  ftp://ftp.uni-mainz.de/pub/software/gnu/vm/ \
-               ftp://tug.org/vm/ \
-               ftp://psg.com/pub/vm/ \
-               ftp://sunsite.cnlab-switch.ch/mirror/vm/ \
-               http://www.interhack.net/projects/vm/ \
-               http://ftp.lip6.fr/pub/unix/mail/vm/ \
-               http://ftp.jussieu.fr/pub/unix/mail/vm/ \
-               ftp://ftp.surfnet.nl/pub/mail/vm/
+MASTER_SITES=  ftp://ftp.uni-mainz.de/pub/software/gnu/vm/
+MASTER_SITES+= ftp://tug.org/vm/
+MASTER_SITES+= ftp://psg.com/pub/vm/
+MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/vm/
+MASTER_SITES+= http://www.interhack.net/projects/vm/
+MASTER_SITES+= http://ftp.lip6.fr/pub/unix/mail/vm/
+MASTER_SITES+= http://ftp.jussieu.fr/pub/unix/mail/vm/
+MASTER_SITES+= ftp://ftp.surfnet.nl/pub/mail/vm/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.wonderworks.com/vm/

Index: pkgsrc/math/cln/Makefile
diff -u pkgsrc/math/cln/Makefile:1.27 pkgsrc/math/cln/Makefile:1.28
--- pkgsrc/math/cln/Makefile:1.27       Thu Feb 25 15:26:55 2016
+++ pkgsrc/math/cln/Makefile    Thu Jan 19 18:52:17 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2016/02/25 15:26:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      cln-1.3.4
 CATEGORIES=    math
-MASTER_SITES=  http://www.ginac.de/CLN/ \
-               ftp://ftpthep.physik.uni-mainz.de/pub/gnu/
+MASTER_SITES=  http://www.ginac.de/CLN/
+MASTER_SITES+= ftp://ftpthep.physik.uni-mainz.de/pub/gnu/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    adam%NetBSD.org@localhost

Index: pkgsrc/math/fftw/Makefile
diff -u pkgsrc/math/fftw/Makefile:1.52 pkgsrc/math/fftw/Makefile:1.53
--- pkgsrc/math/fftw/Makefile:1.52      Fri Aug 19 12:40:18 2016
+++ pkgsrc/math/fftw/Makefile   Thu Jan 19 18:52:17 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2016/08/19 12:40:18 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      fftw-3.3.5
 CATEGORIES=    math
-MASTER_SITES=  ftp://ftp.fftw.org/pub/fftw/ \
-               http://www.fftw.org/
+MASTER_SITES=  ftp://ftp.fftw.org/pub/fftw/
+MASTER_SITES+= http://www.fftw.org/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.fftw.org/

Index: pkgsrc/math/fftw2/Makefile
diff -u pkgsrc/math/fftw2/Makefile:1.25 pkgsrc/math/fftw2/Makefile:1.26
--- pkgsrc/math/fftw2/Makefile:1.25     Thu Oct  9 14:06:41 2014
+++ pkgsrc/math/fftw2/Makefile  Thu Jan 19 18:52:17 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2014/10/09 14:06:41 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      fftw-2.1.5
 PKGNAME=       fftw2-2.1.5
 PKGREVISION=   3
 CATEGORIES=    math
-MASTER_SITES=  ftp://ftp.fftw.org/pub/fftw/ \
-               http://www.fftw.org/
+MASTER_SITES=  ftp://ftp.fftw.org/pub/fftw/
+MASTER_SITES+= http://www.fftw.org/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.fftw.org/

Index: pkgsrc/math/fftwf/Makefile
diff -u pkgsrc/math/fftwf/Makefile:1.22 pkgsrc/math/fftwf/Makefile:1.23
--- pkgsrc/math/fftwf/Makefile:1.22     Fri Aug 19 12:40:18 2016
+++ pkgsrc/math/fftwf/Makefile  Thu Jan 19 18:52:17 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2016/08/19 12:40:18 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      fftw-3.3.5
 PKGNAME=       ${DISTNAME:C/fftw/fftwf/}
 CATEGORIES=    math
-MASTER_SITES=  ftp://ftp.fftw.org/pub/fftw/ \
-               http://www.fftw.org/
+MASTER_SITES=  ftp://ftp.fftw.org/pub/fftw/
+MASTER_SITES+= http://www.fftw.org/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.fftw.org/

Index: pkgsrc/math/gap/Makefile
diff -u pkgsrc/math/gap/Makefile:1.29 pkgsrc/math/gap/Makefile:1.30
--- pkgsrc/math/gap/Makefile:1.29       Sat Apr  6 14:22:40 2013
+++ pkgsrc/math/gap/Makefile    Thu Jan 19 18:52:17 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.29 2013/04/06 14:22:40 rodent Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/19 18:52:17 agc Exp $
 #
 
 DISTNAME=      gap4r3
 PKGNAME=       gap-4.3.5
 PKGREVISION=   1
 CATEGORIES=    math
-MASTER_SITES=  ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/ \
-               ftp://ftp.math.rwth-aachen.de/pub/gap/gap4/ \
-               ftp://ftp.ccs.neu.edu/pub/mirrors/ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/
+MASTER_SITES=  ftp://ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/
+MASTER_SITES+= ftp://ftp.math.rwth-aachen.de/pub/gap/gap4/
+MASTER_SITES+= ftp://ftp.ccs.neu.edu/pub/mirrors/ftp-gap.dcs.st-and.ac.uk/pub/gap/gap4/
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}      \
                        fix4r3n5.tar.gz
 

Index: pkgsrc/math/grace/Makefile
diff -u pkgsrc/math/grace/Makefile:1.63 pkgsrc/math/grace/Makefile:1.64
--- pkgsrc/math/grace/Makefile:1.63     Fri Jan  6 10:58:56 2017
+++ pkgsrc/math/grace/Makefile  Thu Jan 19 18:52:17 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.63 2017/01/06 10:58:56 fhajny Exp $
+# $NetBSD: Makefile,v 1.64 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      grace-5.1.25
 CATEGORIES=    math graphics x11
-MASTER_SITES=  ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/ \
-               ftp://ftp.fu-berlin.de/unix/graphics/grace/src/stable/ \
-               ftp://ftp.ru.xemacs.org/pub/math/grace/src/stable/ \
-               ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/grace/src/stable/
+MASTER_SITES=  ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/
+MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/graphics/grace/src/stable/
+MASTER_SITES+= ftp://ftp.ru.xemacs.org/pub/math/grace/src/stable/
+MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/grace/src/stable/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://plasma-gate.weizmann.ac.il/Grace/

Index: pkgsrc/math/mpcomplex/Makefile
diff -u pkgsrc/math/mpcomplex/Makefile:1.8 pkgsrc/math/mpcomplex/Makefile:1.9
--- pkgsrc/math/mpcomplex/Makefile:1.8  Sat Feb 21 09:16:37 2015
+++ pkgsrc/math/mpcomplex/Makefile      Thu Jan 19 18:52:17 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2015/02/21 09:16:37 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      mpc-1.0.3
 PKGNAME=       ${DISTNAME:S/mpc/mpcomplex/}
 CATEGORIES=    math
-MASTER_SITES=  http://www.multiprecision.org/mpc/download/ \
-               ${MASTER_SITE_GNU:=mpc/}
+MASTER_SITES=  http://www.multiprecision.org/mpc/download/
+MASTER_SITES+= ${MASTER_SITE_GNU:=mpc/}
 
 MAINTAINER=    MarkoSchuetz%web.de@localhost
 HOMEPAGE=      http://www.multiprecision.org/mpc/

Index: pkgsrc/math/py-Scientific-doc/Makefile
diff -u pkgsrc/math/py-Scientific-doc/Makefile:1.10 pkgsrc/math/py-Scientific-doc/Makefile:1.11
--- pkgsrc/math/py-Scientific-doc/Makefile:1.10 Sun Jul 24 20:44:51 2016
+++ pkgsrc/math/py-Scientific-doc/Makefile      Thu Jan 19 18:52:17 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2016/07/24 20:44:51 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2017/01/19 18:52:17 agc Exp $
 
 DISTNAME=      ScientificPython-2.4.5
 PKGNAME=       py-${DISTNAME:S/Python/-doc/}
 PKGREVISION=   1
 CATEGORIES=    math python
-MASTER_SITES=  http://starship.python.net/crew/hinsen/ScientificPython/ \
-               http://dirac.cnrs-orleans.fr/programs/ScientificPython/
+MASTER_SITES=  http://starship.python.net/crew/hinsen/ScientificPython/
+MASTER_SITES+= http://dirac.cnrs-orleans.fr/programs/ScientificPython/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://starship.python.net/crew/hinsen/scientific.html

Index: pkgsrc/math/py-mpmath/Makefile
diff -u pkgsrc/math/py-mpmath/Makefile:1.12 pkgsrc/math/py-mpmath/Makefile:1.13
--- pkgsrc/math/py-mpmath/Makefile:1.12 Fri Jun 10 09:06:41 2016
+++ pkgsrc/math/py-mpmath/Makefile      Thu Jan 19 18:52:18 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2016/06/10 09:06:41 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2017/01/19 18:52:18 agc Exp $
 
 DISTNAME=      mpmath-0.19
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math
-MASTER_SITES=  ${MASTER_SITE_PYPI:=m/mpmath/} \
-               http://mpmath.org/files/
+MASTER_SITES=  ${MASTER_SITE_PYPI:=m/mpmath/}
+MASTER_SITES+= http://mpmath.org/files/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://mpmath.org/

Index: pkgsrc/math/xlispstat/Makefile
diff -u pkgsrc/math/xlispstat/Makefile:1.27 pkgsrc/math/xlispstat/Makefile:1.28
--- pkgsrc/math/xlispstat/Makefile:1.27 Thu Feb 25 15:26:55 2016
+++ pkgsrc/math/xlispstat/Makefile      Thu Jan 19 18:52:18 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2016/02/25 15:26:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2017/01/19 18:52:18 agc Exp $
 
 DISTNAME=              xlispstat-3-52-20
 PKGNAME=               xlispstat-3.52.20
 CATEGORIES=            math lang
-MASTER_SITES=          http://lib.stat.cmu.edu/xlispstat/Src/3-52/ \
-                       ftp://ftp.stat.umn.edu/pub/xlispstat/3-52/
+MASTER_SITES=          http://lib.stat.cmu.edu/xlispstat/Src/3-52/
+MASTER_SITES+=         ftp://ftp.stat.umn.edu/pub/xlispstat/3-52/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.stat.uiowa.edu/~luke/xls/xlsinfo/

Index: pkgsrc/mbone/mdp/Makefile
diff -u pkgsrc/mbone/mdp/Makefile:1.21 pkgsrc/mbone/mdp/Makefile:1.22
--- pkgsrc/mbone/mdp/Makefile:1.21      Fri Apr 24 12:40:15 2015
+++ pkgsrc/mbone/mdp/Makefile   Thu Jan 19 18:52:18 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2015/04/24 12:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:18 agc Exp $
 
 DISTNAME=      src-mdp-1.9a5
 PKGNAME=       ${DISTNAME:S/src-//}
 PKGREVISION=   1
 CATEGORIES=    mbone
-MASTER_SITES=  http://downloads.pf.itd.nrl.navy.mil/mdp/ \
-               http://downloads.pf.itd.nrl.navy.mil/protolib/
+MASTER_SITES=  http://downloads.pf.itd.nrl.navy.mil/mdp/
+MASTER_SITES+= http://downloads.pf.itd.nrl.navy.mil/protolib/
 DISTFILES=     src-mdp-1.9a5.tgz src-protolib-1.0a3d.tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/misc/astrolog/Makefile
diff -u pkgsrc/misc/astrolog/Makefile:1.39 pkgsrc/misc/astrolog/Makefile:1.40
--- pkgsrc/misc/astrolog/Makefile:1.39  Sat Jul  4 16:18:38 2015
+++ pkgsrc/misc/astrolog/Makefile       Thu Jan 19 18:52:18 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.39 2015/07/04 16:18:38 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2017/01/19 18:52:18 agc Exp $
 
 DISTNAME=      ast54unx
 PKGNAME=       astrolog-5.40
 PKGREVISION=     1
 CATEGORIES=    misc
-MASTER_SITES=  http://www.astrolog.org/ftp/ephem/ \
-               http://www.astrolog.org/ftp/
+MASTER_SITES=  http://www.astrolog.org/ftp/ephem/
+MASTER_SITES+= http://www.astrolog.org/ftp/
 DISTFILES=     ${DISTNAME}.shr ${EPHEM}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/misc/elscreen/Makefile
diff -u pkgsrc/misc/elscreen/Makefile:1.22 pkgsrc/misc/elscreen/Makefile:1.23
--- pkgsrc/misc/elscreen/Makefile:1.22  Fri Feb 13 14:05:07 2015
+++ pkgsrc/misc/elscreen/Makefile       Thu Jan 19 18:52:18 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.22 2015/02/13 14:05:07 pho Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:18 agc Exp $
 #
 
 DISTNAME=      elscreen-1.4.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   2
 CATEGORIES=    misc
-MASTER_SITES=  ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/ \
-               ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/old/
+MASTER_SITES=  ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/
+MASTER_SITES+= ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/old/
 DISTFILES=     ${DISTNAME}.tar.gz \
                elscreen-color-theme-0.0.0.tar.gz \
                elscreen-dired-0.1.0.tar.gz \

Index: pkgsrc/misc/epm/Makefile
diff -u pkgsrc/misc/epm/Makefile:1.5 pkgsrc/misc/epm/Makefile:1.6
--- pkgsrc/misc/epm/Makefile:1.5        Mon Oct  8 09:57:21 2012
+++ pkgsrc/misc/epm/Makefile    Thu Jan 19 18:52:18 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2012/10/08 09:57:21 asau Exp $
+# $NetBSD: Makefile,v 1.6 2017/01/19 18:52:18 agc Exp $
 #
 
 DISTNAME=      epm-4.2-source
 PKGNAME=       ${DISTNAME:S/-source//}
 CATEGORIES=    misc
-MASTER_SITES=  http://ftp.easysw.com/pub/epm/${VERSION}/ \
-               http://ftp2.easysw.com/pub/epm/${VERSION}/ \
-               http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/epm/${VERSION}/
+MASTER_SITES=  http://ftp.easysw.com/pub/epm/${VERSION}/
+MASTER_SITES+= http://ftp2.easysw.com/pub/epm/${VERSION}/
+MASTER_SITES+= http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/epm/${VERSION}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    cheusov%NetBSD.org@localhost

Index: pkgsrc/misc/iselect/Makefile
diff -u pkgsrc/misc/iselect/Makefile:1.27 pkgsrc/misc/iselect/Makefile:1.28
--- pkgsrc/misc/iselect/Makefile:1.27   Wed Jan  4 21:54:26 2017
+++ pkgsrc/misc/iselect/Makefile        Thu Jan 19 18:52:18 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2017/01/04 21:54:26 roy Exp $
+# $NetBSD: Makefile,v 1.28 2017/01/19 18:52:18 agc Exp $
 #
 
 DISTNAME=              iselect-1.4.0
 PKGREVISION=           2
 CATEGORIES=            misc
-MASTER_SITES=          ftp://ftp.ossp.org/pkg/tool/iselect/ \
-                       ftp://ftp.ntua.gr/pub/utils/ossp/tool/iselect/
+MASTER_SITES=          ftp://ftp.ossp.org/pkg/tool/iselect/
+MASTER_SITES+=         ftp://ftp.ntua.gr/pub/utils/ossp/tool/iselect/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.ossp.org/pkg/tool/iselect/

Index: pkgsrc/misc/logsurfer/Makefile
diff -u pkgsrc/misc/logsurfer/Makefile:1.22 pkgsrc/misc/logsurfer/Makefile:1.23
--- pkgsrc/misc/logsurfer/Makefile:1.22 Mon Oct  8 09:57:29 2012
+++ pkgsrc/misc/logsurfer/Makefile      Thu Jan 19 18:52:18 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2012/10/08 09:57:29 asau Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:18 agc Exp $
 
 DISTNAME=      logsurfer-1.8
 PKGNAME=       logsurfer-1.8
 CATEGORIES=    misc
-MASTER_SITES=  http://kerryt.orcon.net.nz/ \
-               http://www.crypt.gen.nz/logsurfer/
+MASTER_SITES=  http://kerryt.orcon.net.nz/
+MASTER_SITES+= http://www.crypt.gen.nz/logsurfer/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.crypt.gen.nz/logsurfer/

Index: pkgsrc/misc/pty-redir/Makefile
diff -u pkgsrc/misc/pty-redir/Makefile:1.8 pkgsrc/misc/pty-redir/Makefile:1.9
--- pkgsrc/misc/pty-redir/Makefile:1.8  Mon Oct  8 09:57:35 2012
+++ pkgsrc/misc/pty-redir/Makefile      Thu Jan 19 18:52:18 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 09:57:35 asau Exp $
+# $NetBSD: Makefile,v 1.9 2017/01/19 18:52:18 agc Exp $
 
 DISTNAME=      pty-redir-0.1
 CATEGORIES=    misc
-MASTER_SITES=  ${MASTER_SITE_BACKUP} \
-               http://bleu.west.spy.net/~dustin/soft/
+MASTER_SITES=  ${MASTER_SITE_BACKUP}
+MASTER_SITES+= http://bleu.west.spy.net/~dustin/soft/
 
 MAINTAINER=    dustin%spy.net@localhost
 COMMENT=       Attach a program's stdio to a pty

Index: pkgsrc/misc/vfu/Makefile
diff -u pkgsrc/misc/vfu/Makefile:1.57 pkgsrc/misc/vfu/Makefile:1.58
--- pkgsrc/misc/vfu/Makefile:1.57       Wed Jan  4 21:46:09 2017
+++ pkgsrc/misc/vfu/Makefile    Thu Jan 19 18:52:18 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.57 2017/01/04 21:46:09 roy Exp $
+# $NetBSD: Makefile,v 1.58 2017/01/19 18:52:18 agc Exp $
 #
 
 DISTNAME=      vfu-3.04
 PKGREVISION=   11
 CATEGORIES=    misc
-MASTER_SITES=  http://cade.datamax.bg/vfu/ \
-               ${MASTER_SITE_SUNSITE:=utils/file/managers/}
+MASTER_SITES=  http://cade.datamax.bg/vfu/
+MASTER_SITES+= ${MASTER_SITE_SUNSITE:=utils/file/managers/}
 EXTRACT_SUFX=  .src.tar.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/misc/zorro/Makefile
diff -u pkgsrc/misc/zorro/Makefile:1.28 pkgsrc/misc/zorro/Makefile:1.29
--- pkgsrc/misc/zorro/Makefile:1.28     Mon Oct  8 09:57:42 2012
+++ pkgsrc/misc/zorro/Makefile  Thu Jan 19 18:52:18 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.28 2012/10/08 09:57:42 asau Exp $
+# $NetBSD: Makefile,v 1.29 2017/01/19 18:52:18 agc Exp $
 
 DISTNAME=      zorro-1.1p8
 PKGNAME=       zorro-1.1.8
 PKGREVISION=   1
 CATEGORIES=    misc tk
-MASTER_SITES=  ftp://ftp.nuug.no/pub/anders/distfiles/ \
-               http://atreides.freenix.no/~anders/     \
-               ftp://totem.fix.no/pub/mirrors/misc/
+MASTER_SITES=  ftp://ftp.nuug.no/pub/anders/distfiles/
+MASTER_SITES+= http://atreides.freenix.no/~anders/
+MASTER_SITES+= ftp://totem.fix.no/pub/mirrors/misc/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Simple to-do list manager

Index: pkgsrc/multimedia/gopchop/Makefile
diff -u pkgsrc/multimedia/gopchop/Makefile:1.47 pkgsrc/multimedia/gopchop/Makefile:1.48
--- pkgsrc/multimedia/gopchop/Makefile:1.47     Wed Aug  3 10:23:11 2016
+++ pkgsrc/multimedia/gopchop/Makefile  Thu Jan 19 18:52:18 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.47 2016/08/03 10:23:11 adam Exp $
+# $NetBSD: Makefile,v 1.48 2017/01/19 18:52:18 agc Exp $
 #
 
 DISTNAME=              gopchop-1.1.8
 PKGREVISION=           24
 CATEGORIES=            multimedia
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gopchop/} \
-                       http://outflux.net/unix/software/GOPchop/download/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gopchop/}
+MASTER_SITES+=         http://outflux.net/unix/software/GOPchop/download/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://outflux.net/unix/software/GOPchop/

Index: pkgsrc/multimedia/handbrake/Makefile
diff -u pkgsrc/multimedia/handbrake/Makefile:1.39 pkgsrc/multimedia/handbrake/Makefile:1.40
--- pkgsrc/multimedia/handbrake/Makefile:1.39   Wed Aug  3 10:23:11 2016
+++ pkgsrc/multimedia/handbrake/Makefile        Thu Jan 19 18:52:18 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.39 2016/08/03 10:23:11 adam Exp $
+# $NetBSD: Makefile,v 1.40 2017/01/19 18:52:18 agc Exp $
 #
 
 DISTNAME=      HandBrake-0.9.3
 PKGNAME=       ${DISTNAME:S/HandBrake/handbrake/}
 PKGREVISION=   30
 CATEGORIES=    multimedia
-MASTER_SITES=  http://download.m0k.org/handbrake/releases/ \
-               http://download.m0k.org/handbrake/contrib/ \
-               ${MASTER_SITE_FREEBSD:=handbrake/}
+MASTER_SITES=  http://download.m0k.org/handbrake/releases/
+MASTER_SITES+= http://download.m0k.org/handbrake/contrib/
+MASTER_SITES+= ${MASTER_SITE_FREEBSD:=handbrake/}
 
 DIST_SUBDIR=   handbrake
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}

Index: pkgsrc/multimedia/realplayer-codecs/Makefile
diff -u pkgsrc/multimedia/realplayer-codecs/Makefile:1.17 pkgsrc/multimedia/realplayer-codecs/Makefile:1.18
--- pkgsrc/multimedia/realplayer-codecs/Makefile:1.17   Mon Oct  8 09:21:11 2012
+++ pkgsrc/multimedia/realplayer-codecs/Makefile        Thu Jan 19 18:52:19 2017
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 09:21:11 asau Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:19 agc Exp $
 #
 
 DISTNAME=      rp8codecs${RP_ARCH}-20050115
 PKGNAME=       realplayer-codecs-8.20050115
 PKGREVISION=   1
 CATEGORIES=    multimedia
-MASTER_SITES=  ftp://ftp2.mplayerhq.hu/MPlayer/releases/codecs/ \
-               ftp://ftp5.mplayerhq.hu/MPlayer/releases/codecs/ \
-               http://www1.mplayerhq.hu/MPlayer/releases/codecs/ \
-               http://www2.mplayerhq.hu/MPlayer/releases/codecs/
+MASTER_SITES=  ftp://ftp2.mplayerhq.hu/MPlayer/releases/codecs/
+MASTER_SITES+= ftp://ftp5.mplayerhq.hu/MPlayer/releases/codecs/
+MASTER_SITES+= http://www1.mplayerhq.hu/MPlayer/releases/codecs/
+MASTER_SITES+= http://www2.mplayerhq.hu/MPlayer/releases/codecs/
 EXTRACT_SUFX=  .tar.bz2
 # for easier 'make mdi'
 #DISTFILES=    rp8codecs-20040626.tar.bz2 rp8codecs-ppc-20050115.tar.bz2 rp8codecs-alpha-20050115.tar.bz2

Index: pkgsrc/multimedia/vlc/Makefile
diff -u pkgsrc/multimedia/vlc/Makefile:1.196 pkgsrc/multimedia/vlc/Makefile:1.197
--- pkgsrc/multimedia/vlc/Makefile:1.196        Mon Jan 16 23:45:15 2017
+++ pkgsrc/multimedia/vlc/Makefile      Thu Jan 19 18:52:19 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.196 2017/01/16 23:45:15 wiz Exp $
+# $NetBSD: Makefile,v 1.197 2017/01/19 18:52:19 agc Exp $
 
 DISTNAME=              vlc-${VLC_VERSION}
 PKGREVISION=           2
 CATEGORIES=            multimedia
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vlc/} \
-                       http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vlc/}
+MASTER_SITES+=         http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=          .tar.xz
 
 VLC_VERSION=           2.2.4

Index: pkgsrc/multimedia/vlc20/Makefile
diff -u pkgsrc/multimedia/vlc20/Makefile:1.9 pkgsrc/multimedia/vlc20/Makefile:1.10
--- pkgsrc/multimedia/vlc20/Makefile:1.9        Mon Jan 16 23:45:15 2017
+++ pkgsrc/multimedia/vlc20/Makefile    Thu Jan 19 18:52:19 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2017/01/16 23:45:15 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/01/19 18:52:19 agc Exp $
 
 DISTNAME=              vlc-${VLC_VERSION}
 PKGREVISION=           29
 CATEGORIES=            multimedia
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vlc/} \
-                       http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vlc/}
+MASTER_SITES+=         http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=          .tar.xz
 
 VLC_VERSION=           2.0.9

Index: pkgsrc/multimedia/win32-codecs/Makefile
diff -u pkgsrc/multimedia/win32-codecs/Makefile:1.34 pkgsrc/multimedia/win32-codecs/Makefile:1.35
--- pkgsrc/multimedia/win32-codecs/Makefile:1.34        Mon Oct  8 09:21:14 2012
+++ pkgsrc/multimedia/win32-codecs/Makefile     Thu Jan 19 18:52:19 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.34 2012/10/08 09:21:14 asau Exp $
+# $NetBSD: Makefile,v 1.35 2017/01/19 18:52:19 agc Exp $
 
 DISTNAME=      windows-all-20071007
 PKGNAME=       win32-codecs-071007
 CATEGORIES=    multimedia
-MASTER_SITES=  ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/ \
-               http://www1.mplayerhq.hu/MPlayer/releases/codecs/ \
-               http://www2.mplayerhq.hu/MPlayer/releases/codecs/ \
-               ftp://ftp5.mplayerhq.hu/MPlayer/releases/codecs/
+MASTER_SITES=  ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/
+MASTER_SITES+= http://www1.mplayerhq.hu/MPlayer/releases/codecs/
+MASTER_SITES+= http://www2.mplayerhq.hu/MPlayer/releases/codecs/
+MASTER_SITES+= ftp://ftp5.mplayerhq.hu/MPlayer/releases/codecs/
 EXTRACT_SUFX=  .zip
 DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=    rp9codecs-win32-20050115.tar.bz2

Index: pkgsrc/multimedia/x265/Makefile
diff -u pkgsrc/multimedia/x265/Makefile:1.15 pkgsrc/multimedia/x265/Makefile:1.16
--- pkgsrc/multimedia/x265/Makefile:1.15        Sun Jan  1 16:31:44 2017
+++ pkgsrc/multimedia/x265/Makefile     Thu Jan 19 18:52:19 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2017/01/01 16:31:44 adam Exp $
+# $NetBSD: Makefile,v 1.16 2017/01/19 18:52:19 agc Exp $
 
 DISTNAME=      x265_2.2
 PKGNAME=       ${DISTNAME:S/_/-/}
 CATEGORIES=    multimedia
-MASTER_SITES=  https://bitbucket.org/multicoreware/x265/downloads/ \
-               http://download.videolan.org/videolan/x265/
+MASTER_SITES=  https://bitbucket.org/multicoreware/x265/downloads/
+MASTER_SITES+= http://download.videolan.org/videolan/x265/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.x265.org/

Index: pkgsrc/multimedia/xanim/Makefile
diff -u pkgsrc/multimedia/xanim/Makefile:1.21 pkgsrc/multimedia/xanim/Makefile:1.22
--- pkgsrc/multimedia/xanim/Makefile:1.21       Sat Aug 31 14:52:50 2013
+++ pkgsrc/multimedia/xanim/Makefile    Thu Jan 19 18:52:19 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.21 2013/08/31 14:52:50 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:19 agc Exp $
 
 DISTNAME=      xanim2920
 PKGNAME=       xanim-2.92.0
 PKGREVISION=   3
 CATEGORIES=    multimedia x11
-MASTER_SITES=  ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/ \
-               ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/modules/ \
-               ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/ \
-               ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/modules/
+MASTER_SITES=  ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/
+MASTER_SITES+= ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/modules/
+MASTER_SITES+= ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/
+MASTER_SITES+= ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/modules/
 DISTFILES=     ${EXTRACT_ONLY} ${CODEC_FILES}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/net/cftp/Makefile
diff -u pkgsrc/net/cftp/Makefile:1.20 pkgsrc/net/cftp/Makefile:1.21
--- pkgsrc/net/cftp/Makefile:1.20       Wed Dec 12 10:44:10 2012
+++ pkgsrc/net/cftp/Makefile    Thu Jan 19 18:52:19 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2012/12/12 10:44:10 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:19 agc Exp $
 #
 
 DISTNAME=      cftp-0.12
 PKGREVISION=   2
 CATEGORIES=    net
-MASTER_SITES=  http://ftp.giga.or.at/pub/nih/cftp/ \
-               ftp://ftp.giga.or.at/pub/nih/cftp/
+MASTER_SITES=  http://ftp.giga.or.at/pub/nih/cftp/
+MASTER_SITES+= ftp://ftp.giga.or.at/pub/nih/cftp/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ftp.giga.or.at/pub/nih/cftp/

Index: pkgsrc/net/csup/Makefile
diff -u pkgsrc/net/csup/Makefile:1.11 pkgsrc/net/csup/Makefile:1.12
--- pkgsrc/net/csup/Makefile:1.11       Sat Mar  5 11:29:03 2016
+++ pkgsrc/net/csup/Makefile    Thu Jan 19 18:52:19 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2016/03/05 11:29:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/19 18:52:19 agc Exp $
 #
 
 DISTNAME=      csup-snap-20100404
 PKGNAME=       ${DISTNAME:S/-snap//}
 PKGREVISION=   3
 CATEGORIES=    net devel
-MASTER_SITES=  http://distfiles.aydogan.net/net/ \
-                               http://www.plhk.ru/static/csup/
+MASTER_SITES=  http://distfiles.aydogan.net/net/
+MASTER_SITES+= http://www.plhk.ru/static/csup/
 
 MAINTAINER=    imil%gcu.info@localhost
 HOMEPAGE=      http://www.mu.org/~mux/csup.html

Index: pkgsrc/net/delegate/Makefile
diff -u pkgsrc/net/delegate/Makefile:1.44 pkgsrc/net/delegate/Makefile:1.45
--- pkgsrc/net/delegate/Makefile:1.44   Mon Apr  8 11:17:17 2013
+++ pkgsrc/net/delegate/Makefile        Thu Jan 19 18:52:19 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2013/04/08 11:17:17 rodent Exp $
+# $NetBSD: Makefile,v 1.45 2017/01/19 18:52:19 agc Exp $
 
 DISTNAME=      delegate9.9.1
 PKGNAME=       delegate-9.9.1
 PKGREVISION=   1
 CATEGORIES=    net
-MASTER_SITES=  http://www.delegate.org/anonftp/DeleGate/ \
-               ftp://ftp.u-aizu.ac.jp/pub/net/DeleGate/delegate.org/
+MASTER_SITES=  http://www.delegate.org/anonftp/DeleGate/
+MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/DeleGate/delegate.org/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.delegate.org/delegate/

Index: pkgsrc/net/dtcpclient/Makefile
diff -u pkgsrc/net/dtcpclient/Makefile:1.24 pkgsrc/net/dtcpclient/Makefile:1.25
--- pkgsrc/net/dtcpclient/Makefile:1.24 Sat Mar  5 11:29:03 2016
+++ pkgsrc/net/dtcpclient/Makefile      Thu Jan 19 18:52:19 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2016/03/05 11:29:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/19 18:52:19 agc Exp $
 #
 
 DISTNAME=      dtcpclient-20090812
 PKGREVISION=   2
 CATEGORIES=    net
-MASTER_SITES=  http://www.imasy.or.jp/~ume/ipv6/ \
-               http://home.jp.FreeBSD.org/~ume/ipv6/
+MASTER_SITES=  http://www.imasy.or.jp/~ume/ipv6/
+MASTER_SITES+= http://home.jp.FreeBSD.org/~ume/ipv6/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.imasy.or.jp/~ume/dtcp/

Index: pkgsrc/net/ftpproxy/Makefile
diff -u pkgsrc/net/ftpproxy/Makefile:1.17 pkgsrc/net/ftpproxy/Makefile:1.18
--- pkgsrc/net/ftpproxy/Makefile:1.17   Thu Feb 25 16:20:50 2016
+++ pkgsrc/net/ftpproxy/Makefile        Thu Jan 19 18:52:19 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2016/02/25 16:20:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:19 agc Exp $
 #
 
 DISTNAME=      ftpproxy-${VERSION}
 CATEGORIES=    net
-MASTER_SITES=  http://www.ftpproxy.org/download/ \
-               http://www.ftpproxy.org/download/older_releases/
+MASTER_SITES=  http://www.ftpproxy.org/download/
+MASTER_SITES+= http://www.ftpproxy.org/download/older_releases/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/net/ipv6calc/Makefile
diff -u pkgsrc/net/ipv6calc/Makefile:1.37 pkgsrc/net/ipv6calc/Makefile:1.38
--- pkgsrc/net/ipv6calc/Makefile:1.37   Mon Oct 21 09:22:43 2013
+++ pkgsrc/net/ipv6calc/Makefile        Thu Jan 19 18:52:19 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2013/10/21 09:22:43 fhajny Exp $
+# $NetBSD: Makefile,v 1.38 2017/01/19 18:52:19 agc Exp $
 #
 
 DISTNAME=      ipv6calc-0.94.1
 CATEGORIES=    net
-MASTER_SITES=  ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ \
-               ftp://sunsite.icm.edu.pl/pub/Linux/ipv6/bipv6/ipv6calc/
+MASTER_SITES=  ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
+MASTER_SITES+= ftp://sunsite.icm.edu.pl/pub/Linux/ipv6/bipv6/ipv6calc/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.deepspace6.net/projects/ipv6calc.html

Index: pkgsrc/net/isc-dhcp4/Makefile.common
diff -u pkgsrc/net/isc-dhcp4/Makefile.common:1.32 pkgsrc/net/isc-dhcp4/Makefile.common:1.33
--- pkgsrc/net/isc-dhcp4/Makefile.common:1.32   Thu Dec  1 14:48:02 2016
+++ pkgsrc/net/isc-dhcp4/Makefile.common        Thu Jan 19 18:52:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2016/12/01 14:48:02 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33 2017/01/19 18:52:20 agc Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
@@ -8,8 +8,8 @@
 DISTNAME=              dhcp-${VERSION}
 DHVER=                 ${DISTNAME:S/dhcp-//:S/-P/p/}
 CATEGORIES=            net
-MASTER_SITES=          ftp://ftp.isc.org/isc/dhcp/${VERSION}/ \
-                       http://ftp.isc.org/isc/dhcp/${VERSION}/
+MASTER_SITES=          ftp://ftp.isc.org/isc/dhcp/${VERSION}/
+MASTER_SITES+=         http://ftp.isc.org/isc/dhcp/${VERSION}/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://www.isc.org/sw/dhcp

Index: pkgsrc/net/lambdamoo-core/Makefile
diff -u pkgsrc/net/lambdamoo-core/Makefile:1.13 pkgsrc/net/lambdamoo-core/Makefile:1.14
--- pkgsrc/net/lambdamoo-core/Makefile:1.13     Tue Oct 23 17:18:32 2012
+++ pkgsrc/net/lambdamoo-core/Makefile  Thu Jan 19 18:52:20 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2012/10/23 17:18:32 asau Exp $
+# $NetBSD: Makefile,v 1.14 2017/01/19 18:52:20 agc Exp $
 
 DISTNAME=      LambdaCore-12Apr99.db
 PKGNAME=       lambdamoo-core-990412
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lambdamoo/} \
-               ftp://ftp.kanga.nu/pub/mirrors/ftp.lambda.moo.mud.org/pub/MOO/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lambdamoo/}
+MASTER_SITES+= ftp://ftp.kanga.nu/pub/mirrors/ftp.lambda.moo.mud.org/pub/MOO/
 EXTRACT_SUFX=  .gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/net/lambdamoo-doc/Makefile
diff -u pkgsrc/net/lambdamoo-doc/Makefile:1.13 pkgsrc/net/lambdamoo-doc/Makefile:1.14
--- pkgsrc/net/lambdamoo-doc/Makefile:1.13      Tue Oct 23 17:18:32 2012
+++ pkgsrc/net/lambdamoo-doc/Makefile   Thu Jan 19 18:52:20 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2012/10/23 17:18:32 asau Exp $
+# $NetBSD: Makefile,v 1.14 2017/01/19 18:52:20 agc Exp $
 
 DISTNAME=      lambdamoo-doc-1.8.0p6
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lambdamoo/} \
-               ftp://ftp.kanga.nu/pub/mirrors/ftp.lambda.moo.mud.org/pub/MOO/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lambdamoo/}
+MASTER_SITES+= ftp://ftp.kanga.nu/pub/mirrors/ftp.lambda.moo.mud.org/pub/MOO/
 EXTRACT_SUFX=
 DISTFILES=     ProgrammersManual.texinfo HelpSystem-02Jun93.txt
 

Index: pkgsrc/net/lftp/Makefile
diff -u pkgsrc/net/lftp/Makefile:1.118 pkgsrc/net/lftp/Makefile:1.119
--- pkgsrc/net/lftp/Makefile:1.118      Mon Sep 19 13:04:25 2016
+++ pkgsrc/net/lftp/Makefile    Thu Jan 19 18:52:20 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.118 2016/09/19 13:04:25 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2017/01/19 18:52:20 agc Exp $
 
 DISTNAME=      lftp-4.7.2
 PKGREVISION=   2
 CATEGORIES=    net
-MASTER_SITES=  http://lftp.yar.ru/ftp/ \
-               ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \
-               ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ \
-               ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
-               http://lftp.cybermirror.org/
+MASTER_SITES=  http://lftp.yar.ru/ftp/
+MASTER_SITES+= ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/
+MASTER_SITES+= ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/
+MASTER_SITES+= ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
+MASTER_SITES+= http://lftp.cybermirror.org/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pettai%NetBSD.org@localhost

Index: pkgsrc/net/mrtg/Makefile
diff -u pkgsrc/net/mrtg/Makefile:1.120 pkgsrc/net/mrtg/Makefile:1.121
--- pkgsrc/net/mrtg/Makefile:1.120      Wed Aug  3 10:23:16 2016
+++ pkgsrc/net/mrtg/Makefile    Thu Jan 19 18:52:20 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.120 2016/08/03 10:23:16 adam Exp $
+# $NetBSD: Makefile,v 1.121 2017/01/19 18:52:20 agc Exp $
 
 DISTNAME=      mrtg-2.17.4
 PKGREVISION=   9
 CATEGORIES=    net
-MASTER_SITES=  http://oss.oetiker.ch/mrtg/pub/ \
-               http://oss.oetiker.ch/mrtg/pub/old/
+MASTER_SITES=  http://oss.oetiker.ch/mrtg/pub/
+MASTER_SITES+= http://oss.oetiker.ch/mrtg/pub/old/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://oss.oetiker.ch/mrtg/

Index: pkgsrc/net/nslint/Makefile
diff -u pkgsrc/net/nslint/Makefile:1.12 pkgsrc/net/nslint/Makefile:1.13
--- pkgsrc/net/nslint/Makefile:1.12     Mon Mar  7 23:14:39 2016
+++ pkgsrc/net/nslint/Makefile  Thu Jan 19 18:52:20 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2016/03/07 23:14:39 nros Exp $
+# $NetBSD: Makefile,v 1.13 2017/01/19 18:52:20 agc Exp $
 
 DISTNAME=      nslint-3.1
 CATEGORIES=    net
-MASTER_SITES=  ftp://ftp.ee.lbl.gov/ \
-               ftp://ftp.ee.lbl.gov/old/
+MASTER_SITES=  ftp://ftp.ee.lbl.gov/
+MASTER_SITES+= ftp://ftp.ee.lbl.gov/old/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ee.lbl.gov/ftp.html

Index: pkgsrc/net/ocsinventory-agent/Makefile
diff -u pkgsrc/net/ocsinventory-agent/Makefile:1.14 pkgsrc/net/ocsinventory-agent/Makefile:1.15
--- pkgsrc/net/ocsinventory-agent/Makefile:1.14 Sat Jul  9 06:38:44 2016
+++ pkgsrc/net/ocsinventory-agent/Makefile      Thu Jan 19 18:52:20 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 06:38:44 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:20 agc Exp $
 #
 VERS=                  1.1.2.1
 PKGREVISION=           9
 DISTNAME=              Ocsinventory-Agent-${VERS}
 PKGNAME=               ocsinventory-agent-${VERS}
 CATEGORIES=            net
-MASTER_SITES=          http://launchpad.net/ocsinventory-unix-agent/stable-1.1.2/ocsinventory-unix-agent-1.1.2.1/+download/ \
-                       http://launchpadlibrarian.net/57513674/
+MASTER_SITES=          http://launchpad.net/ocsinventory-unix-agent/stable-1.1.2/ocsinventory-unix-agent-1.1.2.1/+download/
+MASTER_SITES+=         http://launchpadlibrarian.net/57513674/
 
 MAINTAINER=            bouyer%NetBSD.org@localhost
 HOMEPAGE=              http://www.ocsinventory-ng.org/

Index: pkgsrc/net/p5-Net-DNS/Makefile
diff -u pkgsrc/net/p5-Net-DNS/Makefile:1.72 pkgsrc/net/p5-Net-DNS/Makefile:1.73
--- pkgsrc/net/p5-Net-DNS/Makefile:1.72 Sun Jan  1 14:04:23 2017
+++ pkgsrc/net/p5-Net-DNS/Makefile      Thu Jan 19 18:52:20 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.72 2017/01/01 14:04:23 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2017/01/19 18:52:20 agc Exp $
 
 DISTNAME=              Net-DNS-1.07
 PKGNAME=               p5-${DISTNAME}
 CATEGORIES=            net perl5
-MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Net/}          \
-                       http://www.net-dns.org/download/
+MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Net/}
+MASTER_SITES+=         http://www.net-dns.org/download/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.net-dns.org/

Index: pkgsrc/net/parpd/Makefile
diff -u pkgsrc/net/parpd/Makefile:1.10 pkgsrc/net/parpd/Makefile:1.11
--- pkgsrc/net/parpd/Makefile:1.10      Tue Oct 23 17:18:56 2012
+++ pkgsrc/net/parpd/Makefile   Thu Jan 19 18:52:20 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2012/10/23 17:18:56 asau Exp $
+# $NetBSD: Makefile,v 1.11 2017/01/19 18:52:20 agc Exp $
 #
 
 DISTNAME=              parpd-1.5
 CATEGORIES=            net
-MASTER_SITES=          ftp://roy.marples.name/pub/parpd/ \
-                                       http://roy.aydogan.net/parpd/
+MASTER_SITES=          ftp://roy.marples.name/pub/parpd/
+MASTER_SITES+=         http://roy.aydogan.net/parpd/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            roy%NetBSD.org@localhost

Index: pkgsrc/net/proftpd/Makefile.common
diff -u pkgsrc/net/proftpd/Makefile.common:1.3 pkgsrc/net/proftpd/Makefile.common:1.4
--- pkgsrc/net/proftpd/Makefile.common:1.3      Mon Mar 14 22:47:10 2016
+++ pkgsrc/net/proftpd/Makefile.common  Thu Jan 19 18:52:20 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.3 2016/03/14 22:47:10 wiedi Exp $
+# $NetBSD: Makefile.common,v 1.4 2017/01/19 18:52:20 agc Exp $
 
 # used by net/proftpd/Makefile
 # used by net/proftpd/Makefile.module
 
 DISTNAME=      proftpd-1.3.5b
 CATEGORIES=    net
-MASTER_SITES=  ftp://ftp.proftpd.org/distrib/source/ \
-               ftp://ftp.servus.at/ProFTPD/distrib/source/ \
-               ftp://ftp.fsn.hu/pub/proftpd/distrib/source/
+MASTER_SITES=  ftp://ftp.proftpd.org/distrib/source/
+MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/
+MASTER_SITES+= ftp://ftp.fsn.hu/pub/proftpd/distrib/source/
 
 MAINTAINER=    kim%tac.nyc.ny.us@localhost
 HOMEPAGE=      http://www.proftpd.org/

Index: pkgsrc/net/pure-ftpd/Makefile
diff -u pkgsrc/net/pure-ftpd/Makefile:1.36 pkgsrc/net/pure-ftpd/Makefile:1.37
--- pkgsrc/net/pure-ftpd/Makefile:1.36  Sun Oct  9 21:42:02 2016
+++ pkgsrc/net/pure-ftpd/Makefile       Thu Jan 19 18:52:20 2017
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.36 2016/10/09 21:42:02 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2017/01/19 18:52:20 agc Exp $
 
 DISTNAME=      pure-ftpd-1.0.35
 PKGREVISION=   6
 CATEGORIES=    net
-MASTER_SITES=  ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
-               http://download.pureftpd.org/pub/pure-ftpd/releases/ \
-               ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
-               ftp://ftp3.fr.pureftpd.org/pure-ftpd/releases/ \
-               ftp://ftp.dk.pureftpd.org/mirrors/pure-ftpd/releases/ \
-               ftp://ftp.nl.pureftpd.org/pub/pure-ftpd/releases/ \
-               ftp://ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
-               ftp://ftp.cn.pureftpd.org/pub/pureftpd/pure-ftpd/releases/ \
-               ${MASTER_SITE_SOURCEFORGE:=pureftpd/}
+MASTER_SITES=  ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/
+MASTER_SITES+= http://download.pureftpd.org/pub/pure-ftpd/releases/
+MASTER_SITES+= ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/
+MASTER_SITES+= ftp://ftp3.fr.pureftpd.org/pure-ftpd/releases/
+MASTER_SITES+= ftp://ftp.dk.pureftpd.org/mirrors/pure-ftpd/releases/
+MASTER_SITES+= ftp://ftp.nl.pureftpd.org/pub/pure-ftpd/releases/
+MASTER_SITES+= ftp://ftp.fr.pureftpd.org/pub/pure-ftpd/releases/
+MASTER_SITES+= ftp://ftp.cn.pureftpd.org/pub/pureftpd/pure-ftpd/releases/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pureftpd/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    dawszy%arhea.net@localhost

Index: pkgsrc/net/rsync/Makefile
diff -u pkgsrc/net/rsync/Makefile:1.103 pkgsrc/net/rsync/Makefile:1.104
--- pkgsrc/net/rsync/Makefile:1.103     Wed Dec 23 19:53:24 2015
+++ pkgsrc/net/rsync/Makefile   Thu Jan 19 18:52:20 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.103 2015/12/23 19:53:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.104 2017/01/19 18:52:20 agc Exp $
 
 DISTNAME=      rsync-3.1.2
 CATEGORIES=    net
-MASTER_SITES=  http://rsync.samba.org/ftp/rsync/ \
-               http://rsync.samba.org/ftp/rsync/old-versions/  \
-               ftp://ftp.fu-berlin.de/unix/network/rsync/
+MASTER_SITES=  http://rsync.samba.org/ftp/rsync/
+MASTER_SITES+= http://rsync.samba.org/ftp/rsync/old-versions/
+MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/network/rsync/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://rsync.samba.org/

Index: pkgsrc/net/snort/Makefile
diff -u pkgsrc/net/snort/Makefile:1.54 pkgsrc/net/snort/Makefile:1.55
--- pkgsrc/net/snort/Makefile:1.54      Sun Oct  9 21:42:02 2016
+++ pkgsrc/net/snort/Makefile   Thu Jan 19 18:52:21 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.54 2016/10/09 21:42:02 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2017/01/19 18:52:21 agc Exp $
 #
 
 DISTNAME=              snort-2.8.5.1
 PKGREVISION=           9
 CATEGORIES=            net security
-MASTER_SITES=          http://www.snort.org/dl/ \
-                       http://www.snort.org/dl/current/ \
-                       http://www.snort.org/dl/old/
+MASTER_SITES=          http://www.snort.org/dl/
+MASTER_SITES+=         http://www.snort.org/dl/current/
+MASTER_SITES+=         http://www.snort.org/dl/old/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.snort.org/

Index: pkgsrc/net/teamspeak-server/Makefile
diff -u pkgsrc/net/teamspeak-server/Makefile:1.12 pkgsrc/net/teamspeak-server/Makefile:1.13
--- pkgsrc/net/teamspeak-server/Makefile:1.12   Fri Jul 12 10:45:01 2013
+++ pkgsrc/net/teamspeak-server/Makefile        Thu Jan 19 18:52:21 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2013/07/12 10:45:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2017/01/19 18:52:21 agc Exp $
 
 PKGNAME=               teamspeak-server-2.0.24.01
 DISTNAME=              ts2_server_rc2_202319
 PKGREVISION=           1
 CATEGORIES=            net audio
-MASTER_SITES=          ftp://ftp.freenet.de/pub/4players/teamspeak.org/developer/server/202401/ \
-                       ftp://ftp.freenet.de/pub/4players/teamspeak.org/developer/server/202319/
+MASTER_SITES=          ftp://ftp.freenet.de/pub/4players/teamspeak.org/developer/server/202401/
+MASTER_SITES+=         ftp://ftp.freenet.de/pub/4players/teamspeak.org/developer/server/202319/
 EXTRACT_SUFX=          .tar.bz2
 EXTRACT_ONLY=          ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} server_linux

Index: pkgsrc/net/tinyfugue/Makefile
diff -u pkgsrc/net/tinyfugue/Makefile:1.32 pkgsrc/net/tinyfugue/Makefile:1.33
--- pkgsrc/net/tinyfugue/Makefile:1.32  Thu Apr 21 16:02:45 2016
+++ pkgsrc/net/tinyfugue/Makefile       Thu Jan 19 18:52:21 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2016/04/21 16:02:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.33 2017/01/19 18:52:21 agc Exp $
 
 DISTNAME=      tf-40s1
 PKGNAME=       tf-4.0s1
 PKGREVISION=   9
 CATEGORIES=    net games
-MASTER_SITES=  ftp://laurel.actlab.utexas.edu/pub/tinyfugue/ \
-               ${MASTER_SITE_SOURCEFORGE:=tinyfugue/}
+MASTER_SITES=  ftp://laurel.actlab.utexas.edu/pub/tinyfugue/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=tinyfugue/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://tinyfugue.sourceforge.net/

Index: pkgsrc/net/traceroute-nanog/Makefile
diff -u pkgsrc/net/traceroute-nanog/Makefile:1.8 pkgsrc/net/traceroute-nanog/Makefile:1.9
--- pkgsrc/net/traceroute-nanog/Makefile:1.8    Thu Feb 25 16:20:53 2016
+++ pkgsrc/net/traceroute-nanog/Makefile        Thu Jan 19 18:52:21 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2016/02/25 16:20:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2017/01/19 18:52:21 agc Exp $
 
 DISTNAME=      traceroute-nanog_6.4.2.orig
 PKGNAME=       ${DISTNAME:S/.orig//:S/_/-/}
 CATEGORIES=    net
-MASTER_SITES=  ftp://unix.hensa.ac.uk/sites/archive.ubuntu.com/ubuntu/pool/universe/t/traceroute-nanog/ \
-               http://www.ftp.uni-erlangen.de/pub/pc/TheOpenCD/old-images/ubuntu/pool/universe/t/traceroute-nanog/ \
-               http://traceroute-nanog.sourcearchive.com/downloads/6.4.2-1/
+MASTER_SITES=  ftp://unix.hensa.ac.uk/sites/archive.ubuntu.com/ubuntu/pool/universe/t/traceroute-nanog/
+MASTER_SITES+= http://www.ftp.uni-erlangen.de/pub/pc/TheOpenCD/old-images/ubuntu/pool/universe/t/traceroute-nanog/
+MASTER_SITES+= http://traceroute-nanog.sourcearchive.com/downloads/6.4.2-1/
 
 # for the man page:
 PATCH_SITES=   ${MASTER_SITES}

Index: pkgsrc/net/wu-ftpd/Makefile
diff -u pkgsrc/net/wu-ftpd/Makefile:1.41 pkgsrc/net/wu-ftpd/Makefile:1.42
--- pkgsrc/net/wu-ftpd/Makefile:1.41    Sun Apr 24 10:34:44 2016
+++ pkgsrc/net/wu-ftpd/Makefile Thu Jan 19 18:52:21 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.41 2016/04/24 10:34:44 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2017/01/19 18:52:21 agc Exp $
 
 DISTNAME=      wu-ftpd-2.6.2
 PKGREVISION=   3
 CATEGORIES=    net
-MASTER_SITES=  ftp://ftp.freenet.de/pub/ftp.wu-ftpd.org/pub/wu-ftpd/ \
-               ftp://ftp.nl.uu.net/pub/unix/ftp/wu-ftpd/ \
-               ftp://ftp.u-aizu.ac.jp/pub/net/ftpd/wu-ftpd/wu-ftpd.org/wu-ftpd/ \
-               http://gd.tuwien.ac.at/infosys/servers/ftp/wu-ftpd/wu-ftpd/
+MASTER_SITES=  ftp://ftp.freenet.de/pub/ftp.wu-ftpd.org/pub/wu-ftpd/
+MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/ftp/wu-ftpd/
+MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/ftpd/wu-ftpd/wu-ftpd.org/wu-ftpd/
+MASTER_SITES+= http://gd.tuwien.ac.at/infosys/servers/ftp/wu-ftpd/wu-ftpd/
 
 PATCHFILES=    realpath.patch connect-dos.patch
 #PATCH_SITES=  ftp://ftp.sunet.se/pub/nir/ftp/servers/wuarchive-ftpd/wu-ftpd/patches/apply_to_2.6.2/

Index: pkgsrc/news/inn/Makefile
diff -u pkgsrc/news/inn/Makefile:1.123 pkgsrc/news/inn/Makefile:1.124
--- pkgsrc/news/inn/Makefile:1.123      Wed Jun  8 19:24:16 2016
+++ pkgsrc/news/inn/Makefile    Thu Jan 19 18:52:21 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.123 2016/06/08 19:24:16 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2017/01/19 18:52:21 agc Exp $
 
 DISTNAME=              inn-2.5.5
 PKGREVISION=           2
 CATEGORIES=            news
-MASTER_SITES=          ftp://ftp.isc.org/isc/inn/ \
-                       ftp://ftp.fu-berlin.de/unix/news/inn/
+MASTER_SITES=          ftp://ftp.isc.org/isc/inn/
+MASTER_SITES+=         ftp://ftp.fu-berlin.de/unix/news/inn/
 
 MAINTAINER=            spz%NetBSD.org@localhost
 HOMEPAGE=              http://www.isc.org/software/inn/

Index: pkgsrc/news/tin/Makefile
diff -u pkgsrc/news/tin/Makefile:1.72 pkgsrc/news/tin/Makefile:1.73
--- pkgsrc/news/tin/Makefile:1.72       Wed Jan 11 02:15:56 2017
+++ pkgsrc/news/tin/Makefile    Thu Jan 19 18:52:21 2017
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.72 2017/01/11 02:15:56 roy Exp $
+# $NetBSD: Makefile,v 1.73 2017/01/19 18:52:21 agc Exp $
 #
 
 DISTNAME=      tin-2.2.1
 PKGREVISION=   11
 CATEGORIES=    news
-MASTER_SITES=  ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
-               ftp://ftp.funet.fi/pub/unix/news/tin-unoff/ \
-               ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/ \
-               ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/stable/ \
-               ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/stable/ \
-               ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/ \
-               ftp://sunsite.icm.edu.pl/pub/unix/news/tin/stable/
+MASTER_SITES=  ftp://ftp.tin.org/pub/news/clients/tin/stable/
+MASTER_SITES+= ftp://ftp.funet.fi/pub/unix/news/tin-unoff/
+MASTER_SITES+= ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/
+MASTER_SITES+= ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/stable/
+MASTER_SITES+= ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/stable/
+MASTER_SITES+= ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/
+MASTER_SITES+= ftp://sunsite.icm.edu.pl/pub/unix/news/tin/stable/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/parallel/paexec/Makefile
diff -u pkgsrc/parallel/paexec/Makefile:1.16 pkgsrc/parallel/paexec/Makefile:1.17
--- pkgsrc/parallel/paexec/Makefile:1.16        Thu Aug 14 06:15:54 2014
+++ pkgsrc/parallel/paexec/Makefile     Thu Jan 19 18:52:21 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2014/08/14 06:15:54 cheusov Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/19 18:52:21 agc Exp $
 #
 
 DISTNAME=      paexec-1.0.1
 CATEGORIES=    parallel sysutils
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=paexec/} \
-               http://mova.org/~cheusov/pub/paexec/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=paexec/}
+MASTER_SITES+= http://mova.org/~cheusov/pub/paexec/
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      http://sourceforge.net/projects/paexec

Index: pkgsrc/parallel/slurm/Makefile
diff -u pkgsrc/parallel/slurm/Makefile:1.21 pkgsrc/parallel/slurm/Makefile:1.22
--- pkgsrc/parallel/slurm/Makefile:1.21 Mon Dec 19 15:47:09 2016
+++ pkgsrc/parallel/slurm/Makefile      Thu Jan 19 18:52:21 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2016/12/19 15:47:09 asau Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:21 agc Exp $
 
 DISTNAME=      slurm-2.6.4
 PKGREVISION=   9
 CATEGORIES=    parallel
-MASTER_SITES=  http://www.schedmd.com/download/archive/ \
-               http://www.schedmd.com/download/latest/ \
-               http://www.schedmd.com/download/development/
+MASTER_SITES=  http://www.schedmd.com/download/archive/
+MASTER_SITES+= http://www.schedmd.com/download/latest/
+MASTER_SITES+= http://www.schedmd.com/download/development/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    asau%inbox.ru@localhost

Index: pkgsrc/pkgtools/distbb/Makefile
diff -u pkgsrc/pkgtools/distbb/Makefile:1.21 pkgsrc/pkgtools/distbb/Makefile:1.22
--- pkgsrc/pkgtools/distbb/Makefile:1.21        Sun Jun 12 16:05:40 2016
+++ pkgsrc/pkgtools/distbb/Makefile     Thu Jan 19 18:52:21 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2016/06/12 16:05:40 cheusov Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:21 agc Exp $
 #
 
 DISTNAME=      distbb-0.47.2
 CATEGORIES=    pkgtools
-MASTER_SITES=  ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/distbb/ \
-               http://mova.org/~cheusov/pub/distbb/
+MASTER_SITES=  ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/distbb/
+MASTER_SITES+= http://mova.org/~cheusov/pub/distbb/
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      http://mova.org/~cheusov/pub/distbb/

Index: pkgsrc/pkgtools/nih/Makefile
diff -u pkgsrc/pkgtools/nih/Makefile:1.23 pkgsrc/pkgtools/nih/Makefile:1.24
--- pkgsrc/pkgtools/nih/Makefile:1.23   Sat Nov  7 18:20:49 2015
+++ pkgsrc/pkgtools/nih/Makefile        Thu Jan 19 18:52:21 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2015/11/07 18:20:49 cheusov Exp $
+# $NetBSD: Makefile,v 1.24 2017/01/19 18:52:21 agc Exp $
 
 DISTNAME=      pkgnih-0.14.1
 PKGNAME=       ${DISTNAME:S/pkgnih/nih/}
 CATEGORIES=    pkgtools
-MASTER_SITES=  ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/nih/ \
-               http://mova.org/~cheusov/pub/pkgnih/
+MASTER_SITES=  ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/nih/
+MASTER_SITES+= http://mova.org/~cheusov/pub/pkgnih/
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/cheusov/pkgnih

Index: pkgsrc/pkgtools/pkg_online-server/Makefile.common
diff -u pkgsrc/pkgtools/pkg_online-server/Makefile.common:1.8 pkgsrc/pkgtools/pkg_online-server/Makefile.common:1.9
--- pkgsrc/pkgtools/pkg_online-server/Makefile.common:1.8       Sun Nov 25 20:51:03 2012
+++ pkgsrc/pkgtools/pkg_online-server/Makefile.common   Thu Jan 19 18:52:21 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.8 2012/11/25 20:51:03 cheusov Exp $
+# $NetBSD: Makefile.common,v 1.9 2017/01/19 18:52:21 agc Exp $
 #
 # used by pkgtools/pkg_online-client/Makefile
 # used by pkgtools/pkg_online-server/Makefile
 
 DISTNAME=      pkg_online-${VERSION}
-MASTER_SITES=  http://mova.org/~cheusov/pub/pkg_online/ \
-               ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/pkg_online/
+MASTER_SITES=  http://mova.org/~cheusov/pub/pkg_online/
+MASTER_SITES+= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/pkg_online/
 
 VERSION=       0.13.1
 

Index: pkgsrc/pkgtools/pkg_summary-utils/Makefile
diff -u pkgsrc/pkgtools/pkg_summary-utils/Makefile:1.36 pkgsrc/pkgtools/pkg_summary-utils/Makefile:1.37
--- pkgsrc/pkgtools/pkg_summary-utils/Makefile:1.36     Sun Mar  1 14:58:47 2015
+++ pkgsrc/pkgtools/pkg_summary-utils/Makefile  Thu Jan 19 18:52:21 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2015/03/01 14:58:47 cheusov Exp $
+# $NetBSD: Makefile,v 1.37 2017/01/19 18:52:21 agc Exp $
 
 DISTNAME=      pkg_summary-utils-0.66.0
 CATEGORIES=    pkgtools
-MASTER_SITES=  ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/psu/ \
-               http://www.mova.org/~cheusov/pub/pkg_summary-utils/
+MASTER_SITES=  ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/psu/
+MASTER_SITES+= http://www.mova.org/~cheusov/pub/pkg_summary-utils/
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
 HOMEPAGE=      http://www.mova.org/~cheusov/pub/pkg_summary-utils/

Index: pkgsrc/print/LPRng-core/Makefile
diff -u pkgsrc/print/LPRng-core/Makefile:1.40 pkgsrc/print/LPRng-core/Makefile:1.41
--- pkgsrc/print/LPRng-core/Makefile:1.40       Sat May  7 10:08:48 2016
+++ pkgsrc/print/LPRng-core/Makefile    Thu Jan 19 18:52:22 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.40 2016/05/07 10:08:48 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2017/01/19 18:52:22 agc Exp $
 
 DISTNAME=      LPRng-3.8.28
 PKGNAME=       LPRng-core-3.8.28
 PKGREVISION=   3
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.lprng.com/pub/LPRng/LPRng/ \
-               http://www.lprng.com/DISTRIB/LPRng/
+MASTER_SITES=  ftp://ftp.lprng.com/pub/LPRng/LPRng/
+MASTER_SITES+= http://www.lprng.com/DISTRIB/LPRng/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/print/a2ps/Makefile
diff -u pkgsrc/print/a2ps/Makefile:1.81 pkgsrc/print/a2ps/Makefile:1.82
--- pkgsrc/print/a2ps/Makefile:1.81     Sat Jul  9 06:38:49 2016
+++ pkgsrc/print/a2ps/Makefile  Thu Jan 19 18:52:22 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.81 2016/07/09 06:38:49 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2017/01/19 18:52:22 agc Exp $
 
 DISTNAME=              a2ps-4.14
 PKGREVISION=           9
 CATEGORIES=            print
-MASTER_SITES=          ${MASTER_SITE_GNU:=a2ps/} \
-                       ftp://ftp.enst.fr/pub/unix/a2ps/
+MASTER_SITES=          ${MASTER_SITE_GNU:=a2ps/}
+MASTER_SITES+=         ftp://ftp.enst.fr/pub/unix/a2ps/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www-inf.enst.fr/~demaille/a2ps/

Index: pkgsrc/print/cnprint/Makefile
diff -u pkgsrc/print/cnprint/Makefile:1.16 pkgsrc/print/cnprint/Makefile:1.17
--- pkgsrc/print/cnprint/Makefile:1.16  Sun Dec 21 12:47:48 2014
+++ pkgsrc/print/cnprint/Makefile       Thu Jan 19 18:52:22 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2014/12/21 12:47:48 mef Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/19 18:52:22 agc Exp $
 
 DISTNAME=              #
 PKGNAME=               cnprint-3.30b
 PKGREVISION=           1
 CATEGORIES=            print
-MASTER_SITES=          http://www.ywpw.com/cai/software/cnp/ \
-                       http://www.ywpw.com/cai/software/cnp/fonts/ \
-                       http://www.ywpw.com/cai/software/cnp/metrics/ \
-                       ftp://ftp.csc.cuhk.edu.hk/pub/chinese/ifcss/software/fonts/misc/
+MASTER_SITES=          http://www.ywpw.com/cai/software/cnp/
+MASTER_SITES+=         http://www.ywpw.com/cai/software/cnp/fonts/
+MASTER_SITES+=         http://www.ywpw.com/cai/software/cnp/metrics/
+MASTER_SITES+=         ftp://ftp.csc.cuhk.edu.hk/pub/chinese/ifcss/software/fonts/misc/
 EXTRACT_SUFX=          #empty
 DISTFILES+=            cnprint330b.c \
                        cnprint330b.readme \

Index: pkgsrc/print/cups15/Makefile
diff -u pkgsrc/print/cups15/Makefile:1.15 pkgsrc/print/cups15/Makefile:1.16
--- pkgsrc/print/cups15/Makefile:1.15   Mon Dec 12 14:22:03 2016
+++ pkgsrc/print/cups15/Makefile        Thu Jan 19 18:52:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/12/12 14:22:03 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2017/01/19 18:52:22 agc Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -15,9 +15,9 @@ PATCH_SITES=  http://www.cups.org/strfile
 PATCHFILES=    str4609-1.5.patch
 
 CATEGORIES=    print
-MASTER_SITES=  http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
-               ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
-               ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/
+MASTER_SITES=  http://ftp.easysw.com/pub/cups/${BASE_VERS}/
+MASTER_SITES+= ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/
+MASTER_SITES+= ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    sbd%NetBSD.org@localhost

Index: pkgsrc/print/foomatic-ppds/Makefile
diff -u pkgsrc/print/foomatic-ppds/Makefile:1.11 pkgsrc/print/foomatic-ppds/Makefile:1.12
--- pkgsrc/print/foomatic-ppds/Makefile:1.11    Mon Oct  8 13:45:38 2012
+++ pkgsrc/print/foomatic-ppds/Makefile Thu Jan 19 18:52:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/08 13:45:38 asau Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/19 18:52:22 agc Exp $
 
 .include "Makefile.common"
 
@@ -11,8 +11,8 @@ PKGNAME=      ${DISTNAME:S/-filters-/-/}
 # copy at MASTER_SITE_LOCAL periodically and update this package
 # accordingly.
 #
-MASTER_SITES=  ${MASTER_SITE_LOCAL} \
-               http://www.linuxprinting.org/download/foomatic/
+MASTER_SITES=  ${MASTER_SITE_LOCAL}
+MASTER_SITES+= http://www.linuxprinting.org/download/foomatic/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Foomatic PPDs collection

Index: pkgsrc/print/mpage/Makefile
diff -u pkgsrc/print/mpage/Makefile:1.23 pkgsrc/print/mpage/Makefile:1.24
--- pkgsrc/print/mpage/Makefile:1.23    Tue Dec  9 07:17:45 2014
+++ pkgsrc/print/mpage/Makefile Thu Jan 19 18:52:22 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2014/12/09 07:17:45 mef Exp $
+# $NetBSD: Makefile,v 1.24 2017/01/19 18:52:22 agc Exp $
 #
 
 DISTNAME=      mpage-2.5.6
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.mesa.nl/pub/mpage/    \
-               http://www.mesa.nl/pub/mpage/
+MASTER_SITES=  ftp://ftp.mesa.nl/pub/mpage/
+MASTER_SITES+= http://www.mesa.nl/pub/mpage/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/print/p5-PostScript-MailLabels/Makefile
diff -u pkgsrc/print/p5-PostScript-MailLabels/Makefile:1.29 pkgsrc/print/p5-PostScript-MailLabels/Makefile:1.30
--- pkgsrc/print/p5-PostScript-MailLabels/Makefile:1.29 Wed Jun  8 19:24:17 2016
+++ pkgsrc/print/p5-PostScript-MailLabels/Makefile      Thu Jan 19 18:52:22 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2016/06/08 19:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/19 18:52:22 agc Exp $
 
 DISTNAME=      PostScript-MailLabels-2.32
 PKGNAME=       p5-${DISTNAME}
 PKGREVISION=   2
 CATEGORIES=    print perl5
-MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=PostScript/} \
-               http://oplnk.net/~ajackson/software/
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=PostScript/}
+MASTER_SITES+= http://oplnk.net/~ajackson/software/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://oplnk.net/~ajackson/software/maillabels/

Index: pkgsrc/print/xpdf/Makefile
diff -u pkgsrc/print/xpdf/Makefile:1.82 pkgsrc/print/xpdf/Makefile:1.83
--- pkgsrc/print/xpdf/Makefile:1.82     Sat Mar  7 15:30:58 2015
+++ pkgsrc/print/xpdf/Makefile  Thu Jan 19 18:52:22 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.82 2015/03/07 15:30:58 mef Exp $
+# $NetBSD: Makefile,v 1.83 2017/01/19 18:52:22 agc Exp $
 
 DISTNAME=      xpdf-3.04
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/}
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/print/xpdf-arabic/Makefile
diff -u pkgsrc/print/xpdf-arabic/Makefile:1.18 pkgsrc/print/xpdf-arabic/Makefile:1.19
--- pkgsrc/print/xpdf-arabic/Makefile:1.18      Sun Dec 14 13:47:49 2014
+++ pkgsrc/print/xpdf-arabic/Makefile   Thu Jan 19 18:52:22 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2014/12/14 13:47:49 mef Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:22 agc Exp $
 #
 
 DISTNAME=      xpdf-arabic-2011-aug-15
 PKGNAME=       xpdf-arabic-20110815
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-chinese-simplified/Makefile
diff -u pkgsrc/print/xpdf-chinese-simplified/Makefile:1.23 pkgsrc/print/xpdf-chinese-simplified/Makefile:1.24
--- pkgsrc/print/xpdf-chinese-simplified/Makefile:1.23  Tue Dec 16 23:37:48 2014
+++ pkgsrc/print/xpdf-chinese-simplified/Makefile       Thu Jan 19 18:52:22 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.23 2014/12/16 23:37:48 dholland Exp $
+# $NetBSD: Makefile,v 1.24 2017/01/19 18:52:22 agc Exp $
 #
 
 DISTNAME=      xpdf-chinese-simplified-2011-sep-02
 PKGNAME=       xpdf-chinese-simplified-20110902
 PKGREVISION=   1
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-chinese-traditional/Makefile
diff -u pkgsrc/print/xpdf-chinese-traditional/Makefile:1.21 pkgsrc/print/xpdf-chinese-traditional/Makefile:1.22
--- pkgsrc/print/xpdf-chinese-traditional/Makefile:1.21 Tue Dec 16 23:37:48 2014
+++ pkgsrc/print/xpdf-chinese-traditional/Makefile      Thu Jan 19 18:52:22 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2014/12/16 23:37:48 dholland Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:22 agc Exp $
 #
 
 DISTNAME=      xpdf-chinese-traditional-2011-sep-02
 PKGNAME=       xpdf-chinese-traditional-20110902
 PKGREVISION=   1
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-cyrillic/Makefile
diff -u pkgsrc/print/xpdf-cyrillic/Makefile:1.20 pkgsrc/print/xpdf-cyrillic/Makefile:1.21
--- pkgsrc/print/xpdf-cyrillic/Makefile:1.20    Sun Dec 14 13:47:49 2014
+++ pkgsrc/print/xpdf-cyrillic/Makefile Thu Jan 19 18:52:22 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2014/12/14 13:47:49 mef Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:22 agc Exp $
 #
 
 DISTNAME=      xpdf-cyrillic-2011-aug-15
 PKGNAME=       xpdf-cyrillic-20110815
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-greek/Makefile
diff -u pkgsrc/print/xpdf-greek/Makefile:1.20 pkgsrc/print/xpdf-greek/Makefile:1.21
--- pkgsrc/print/xpdf-greek/Makefile:1.20       Sun Dec 14 13:47:49 2014
+++ pkgsrc/print/xpdf-greek/Makefile    Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2014/12/14 13:47:49 mef Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:23 agc Exp $
 #
 
 DISTNAME=      xpdf-greek-2011-aug-15
 PKGNAME=       xpdf-greek-20110815
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-hebrew/Makefile
diff -u pkgsrc/print/xpdf-hebrew/Makefile:1.19 pkgsrc/print/xpdf-hebrew/Makefile:1.20
--- pkgsrc/print/xpdf-hebrew/Makefile:1.19      Sun Dec 14 13:47:49 2014
+++ pkgsrc/print/xpdf-hebrew/Makefile   Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2014/12/14 13:47:49 mef Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:23 agc Exp $
 #
 
 DISTNAME=      xpdf-hebrew-2011-aug-15
 PKGNAME=       xpdf-hebrew-20110815
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-japanese/Makefile
diff -u pkgsrc/print/xpdf-japanese/Makefile:1.23 pkgsrc/print/xpdf-japanese/Makefile:1.24
--- pkgsrc/print/xpdf-japanese/Makefile:1.23    Tue Dec 16 23:37:48 2014
+++ pkgsrc/print/xpdf-japanese/Makefile Thu Jan 19 18:52:23 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.23 2014/12/16 23:37:48 dholland Exp $
+# $NetBSD: Makefile,v 1.24 2017/01/19 18:52:23 agc Exp $
 #
 
 DISTNAME=      xpdf-japanese-2011-sep-02
 PKGNAME=       xpdf-japanese-20110902
 PKGREVISION=   1
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-korean/Makefile
diff -u pkgsrc/print/xpdf-korean/Makefile:1.25 pkgsrc/print/xpdf-korean/Makefile:1.26
--- pkgsrc/print/xpdf-korean/Makefile:1.25      Tue Dec 16 23:51:57 2014
+++ pkgsrc/print/xpdf-korean/Makefile   Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2014/12/16 23:51:57 dholland Exp $
+# $NetBSD: Makefile,v 1.26 2017/01/19 18:52:23 agc Exp $
 
 DISTNAME=      xpdf-korean-2011-sep-02
 PKGNAME=       xpdf-korean-20110902
 PKGREVISION=   1
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-latin2/Makefile
diff -u pkgsrc/print/xpdf-latin2/Makefile:1.22 pkgsrc/print/xpdf-latin2/Makefile:1.23
--- pkgsrc/print/xpdf-latin2/Makefile:1.22      Sun Dec 14 13:47:49 2014
+++ pkgsrc/print/xpdf-latin2/Makefile   Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2014/12/14 13:47:49 mef Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:23 agc Exp $
 #
 
 DISTNAME=      xpdf-latin2-2011-aug-15
 PKGNAME=       xpdf-latin2-20110815
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-thai/Makefile
diff -u pkgsrc/print/xpdf-thai/Makefile:1.21 pkgsrc/print/xpdf-thai/Makefile:1.22
--- pkgsrc/print/xpdf-thai/Makefile:1.21        Sun Dec 14 13:47:49 2014
+++ pkgsrc/print/xpdf-thai/Makefile     Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2014/12/14 13:47:49 mef Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:23 agc Exp $
 #
 
 DISTNAME=      xpdf-thai-2011-aug-15
 PKGNAME=       xpdf-thai-20110815
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/print/xpdf-turkish/Makefile
diff -u pkgsrc/print/xpdf-turkish/Makefile:1.21 pkgsrc/print/xpdf-turkish/Makefile:1.22
--- pkgsrc/print/xpdf-turkish/Makefile:1.21     Sun Dec 14 13:47:49 2014
+++ pkgsrc/print/xpdf-turkish/Makefile  Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2014/12/14 13:47:49 mef Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:23 agc Exp $
 #
 
 DISTNAME=      xpdf-turkish-2011-aug-15
 PKGNAME=       xpdf-turkish-20110815
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/ \
-               http://gd.tuwien.ac.at/publishing/xpdf/
+MASTER_SITES=  ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES+= http://gd.tuwien.ac.at/publishing/xpdf/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/

Index: pkgsrc/security/cyrus-sasl/Makefile.common
diff -u pkgsrc/security/cyrus-sasl/Makefile.common:1.24 pkgsrc/security/cyrus-sasl/Makefile.common:1.25
--- pkgsrc/security/cyrus-sasl/Makefile.common:1.24     Sun Sep 11 06:11:15 2016
+++ pkgsrc/security/cyrus-sasl/Makefile.common  Thu Jan 19 18:52:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2016/09/11 06:11:15 richard Exp $
+# $NetBSD: Makefile.common,v 1.25 2017/01/19 18:52:23 agc Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -19,8 +19,8 @@
 
 DISTNAME=      cyrus-sasl-2.1.26
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.cyrusimap.org/cyrus-sasl/ \
-               ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
+MASTER_SITES=  ftp://ftp.cyrusimap.org/cyrus-sasl/
+MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
 PATCHFILES+=   cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2
 SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \
                -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d

Index: pkgsrc/security/fsh/Makefile
diff -u pkgsrc/security/fsh/Makefile:1.25 pkgsrc/security/fsh/Makefile:1.26
--- pkgsrc/security/fsh/Makefile:1.25   Sat May 17 16:10:48 2014
+++ pkgsrc/security/fsh/Makefile        Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2014/05/17 16:10:48 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2017/01/19 18:52:23 agc Exp $
 #
 
 DISTNAME=      fsh-1.2
 PKGREVISION=   6
 CATEGORIES=    security net
-MASTER_SITES=  ftp://ftp.lysator.liu.se/pub/unix/fsh/ \
-               http://www.lysator.liu.se/fsh/
+MASTER_SITES=  ftp://ftp.lysator.liu.se/pub/unix/fsh/
+MASTER_SITES+= http://www.lysator.liu.se/fsh/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.lysator.liu.se/fsh/

Index: pkgsrc/security/gnupg/Makefile
diff -u pkgsrc/security/gnupg/Makefile:1.136 pkgsrc/security/gnupg/Makefile:1.137
--- pkgsrc/security/gnupg/Makefile:1.136        Sun Jan  1 16:06:35 2017
+++ pkgsrc/security/gnupg/Makefile      Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.136 2017/01/01 16:06:35 adam Exp $
+# $NetBSD: Makefile,v 1.137 2017/01/19 18:52:23 agc Exp $
 
 DISTNAME=      gnupg-1.4.21
 PKGREVISION=   2
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gnupg/ \
-               http://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \
-               ftp://ftp.ring.gr.jp/pub/net/gnupg/gnupg/
+MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gnupg/
+MASTER_SITES+= http://gd.tuwien.ac.at/privacy/gnupg/gnupg/
+MASTER_SITES+= ftp://ftp.ring.gr.jp/pub/net/gnupg/gnupg/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/gss/Makefile
diff -u pkgsrc/security/gss/Makefile:1.22 pkgsrc/security/gss/Makefile:1.23
--- pkgsrc/security/gss/Makefile:1.22   Thu Oct  9 14:06:52 2014
+++ pkgsrc/security/gss/Makefile        Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:52 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:23 agc Exp $
 #
 
 DISTNAME=              gss-0.0.15
 PKGREVISION=           2
 CATEGORIES=            security
-MASTER_SITES=          http://josefsson.org/gss/releases/ \
-                       ${MASTER_SITE_GNU:=gss/}
+MASTER_SITES=          http://josefsson.org/gss/releases/
+MASTER_SITES+=         ${MASTER_SITE_GNU:=gss/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.gnu.org/software/gss/

Index: pkgsrc/security/libgcrypt/Makefile
diff -u pkgsrc/security/libgcrypt/Makefile:1.86 pkgsrc/security/libgcrypt/Makefile:1.87
--- pkgsrc/security/libgcrypt/Makefile:1.86     Fri Dec 30 00:41:35 2016
+++ pkgsrc/security/libgcrypt/Makefile  Thu Jan 19 18:52:23 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.86 2016/12/30 00:41:35 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2017/01/19 18:52:23 agc Exp $
 
 DISTNAME=      libgcrypt-1.7.5
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
-               http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
+MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+MASTER_SITES+= http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/libgpg-error/Makefile
diff -u pkgsrc/security/libgpg-error/Makefile:1.55 pkgsrc/security/libgpg-error/Makefile:1.56
--- pkgsrc/security/libgpg-error/Makefile:1.55  Fri Dec 30 00:42:53 2016
+++ pkgsrc/security/libgpg-error/Makefile       Thu Jan 19 18:52:23 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.55 2016/12/30 00:42:53 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2017/01/19 18:52:23 agc Exp $
 
 DISTNAME=      libgpg-error-1.26
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
-               ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/ \
-               ftp://mirror.switch.ch/mirror/gnupg/libgpg-error/ \
-               ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/libgpg-error/
+MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/libgpg-error/
+MASTER_SITES+= ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/
+MASTER_SITES+= ftp://mirror.switch.ch/mirror/gnupg/libgpg-error/
+MASTER_SITES+= ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/libgpg-error/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    minskim%NetBSD.org@localhost

Index: pkgsrc/security/lsh/Makefile
diff -u pkgsrc/security/lsh/Makefile:1.21 pkgsrc/security/lsh/Makefile:1.22
--- pkgsrc/security/lsh/Makefile:1.21   Tue Oct 23 18:16:35 2012
+++ pkgsrc/security/lsh/Makefile        Thu Jan 19 18:52:24 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2012/10/23 18:16:35 asau Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:24 agc Exp $
 #
 
 DISTNAME=              lsh-2.0.4
 PKGREVISION=           2
 CATEGORIES=            security
-MASTER_SITES=          http://www.lysator.liu.se/~nisse/archive/ \
-                       ftp://ftp.lysator.liu.se/pub/security/lsh/
+MASTER_SITES=          http://www.lysator.liu.se/~nisse/archive/
+MASTER_SITES+=         ftp://ftp.lysator.liu.se/pub/security/lsh/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.lysator.liu.se/~nisse/lsh/

Index: pkgsrc/security/nettle/Makefile
diff -u pkgsrc/security/nettle/Makefile:1.17 pkgsrc/security/nettle/Makefile:1.18
--- pkgsrc/security/nettle/Makefile:1.17        Mon Oct  3 12:28:19 2016
+++ pkgsrc/security/nettle/Makefile     Thu Jan 19 18:52:24 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2016/10/03 12:28:19 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:24 agc Exp $
 
 DISTNAME=      nettle-3.3
 CATEGORIES=    devel security
-MASTER_SITES=  http://www.lysator.liu.se/~nisse/archive/ \
-               ftp://ftp.lysator.liu.se/pub/security/lsh/
+MASTER_SITES=  http://www.lysator.liu.se/~nisse/archive/
+MASTER_SITES+= ftp://ftp.lysator.liu.se/pub/security/lsh/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.lysator.liu.se/~nisse/nettle/

Index: pkgsrc/security/pam-ldap/Makefile
diff -u pkgsrc/security/pam-ldap/Makefile:1.45 pkgsrc/security/pam-ldap/Makefile:1.46
--- pkgsrc/security/pam-ldap/Makefile:1.45      Sat Mar  5 11:29:23 2016
+++ pkgsrc/security/pam-ldap/Makefile   Thu Jan 19 18:52:24 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.45 2016/03/05 11:29:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.46 2017/01/19 18:52:24 agc Exp $
 
 DISTNAME=      pam_ldap-186
 PKGNAME=       ${DISTNAME:S/_/-/}
 PKGREVISION=   6
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.padl.com/pub/ \
-               http://www.padl.com/download/
+MASTER_SITES=  ftp://ftp.padl.com/pub/
+MASTER_SITES+= http://www.padl.com/download/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.padl.com/pam_ldap.html

Index: pkgsrc/security/pgp2/Makefile
diff -u pkgsrc/security/pgp2/Makefile:1.56 pkgsrc/security/pgp2/Makefile:1.57
--- pkgsrc/security/pgp2/Makefile:1.56  Mon Oct  3 08:15:50 2016
+++ pkgsrc/security/pgp2/Makefile       Thu Jan 19 18:52:24 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.56 2016/10/03 08:15:50 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2017/01/19 18:52:24 agc Exp $
 
 DISTNAME=      pgp263is
 PKGREVISION=   1
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
-               ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
+MASTER_SITES=  ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/
+MASTER_SITES+= ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.pgpi.org/

Index: pkgsrc/security/pgp5/Makefile
diff -u pkgsrc/security/pgp5/Makefile:1.45 pkgsrc/security/pgp5/Makefile:1.46
--- pkgsrc/security/pgp5/Makefile:1.45  Mon Oct  3 08:15:51 2016
+++ pkgsrc/security/pgp5/Makefile       Thu Jan 19 18:52:24 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.45 2016/10/03 08:15:51 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2017/01/19 18:52:24 agc Exp $
 
 DISTNAME=      pgp50i-unix-src
 PKGNAME=       pgp5-5.0i
 PKGREVISION=   6
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \
-               ftp://ftp.au.pgpi.com/pub/pgp/5.0/unix/
+MASTER_SITES=  ftp://ftp.pgpi.com/pub/pgp/5.0/unix/
+MASTER_SITES+= ftp://ftp.au.pgpi.com/pub/pgp/5.0/unix/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.pgpi.org/

Index: pkgsrc/security/pinepgp/Makefile
diff -u pkgsrc/security/pinepgp/Makefile:1.17 pkgsrc/security/pinepgp/Makefile:1.18
--- pkgsrc/security/pinepgp/Makefile:1.17       Sat Sep 27 01:34:58 2014
+++ pkgsrc/security/pinepgp/Makefile    Thu Jan 19 18:52:24 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2014/09/27 01:34:58 mspo Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:24 agc Exp $
 #
 
 DISTNAME=              pinepgp-0.18.0
 PKGREVISION=           4
 CATEGORIES=            security mail
-MASTER_SITES=          http://hany.sk/~hany/_data/pinepgp/     \
-                       http://terminus.sk/~hany/_data/pinepgp/
+MASTER_SITES=          http://hany.sk/~hany/_data/pinepgp/
+MASTER_SITES+=         http://terminus.sk/~hany/_data/pinepgp/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://hany.sk/~hany/software/pinepgp/stable.html

Index: pkgsrc/security/pks/Makefile
diff -u pkgsrc/security/pks/Makefile:1.32 pkgsrc/security/pks/Makefile:1.33
--- pkgsrc/security/pks/Makefile:1.32   Fri Jul 12 10:45:02 2013
+++ pkgsrc/security/pks/Makefile        Thu Jan 19 18:52:24 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2013/07/12 10:45:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.33 2017/01/19 18:52:24 agc Exp $
 
 DISTNAME=      pks-0.9.4
 PKGREVISION=   5
 CATEGORIES=    security www
-MASTER_SITES+= http://www.mit.edu/people/marc/pks/ \
-       ${MASTER_SITE_SOURCEFORGE:=pks/}
+MASTER_SITES+= http://www.mit.edu/people/marc/pks/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pks/}
 PATCH_SITES=   http://www.mit.edu/people/marc/pks/
 PATCHFILES=    pks094-patch2 \
                pks094-patch3

Index: pkgsrc/security/prelude-manager/Makefile
diff -u pkgsrc/security/prelude-manager/Makefile:1.43 pkgsrc/security/prelude-manager/Makefile:1.44
--- pkgsrc/security/prelude-manager/Makefile:1.43       Mon Sep 19 13:04:28 2016
+++ pkgsrc/security/prelude-manager/Makefile    Thu Jan 19 18:52:24 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.43 2016/09/19 13:04:28 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/01/19 18:52:24 agc Exp $
 #
 
 DISTNAME=              prelude-manager-0.9.15
 PKGREVISION=           10
 CATEGORIES=            security
-MASTER_SITES=          http://www.prelude-ids.com/download/releases/prelude-manager/ \
-                       http://www.prelude-ids.org/download/releases/ \
-                       http://www.prelude-ids.org/download/releases/old/
+MASTER_SITES=          http://www.prelude-ids.com/download/releases/prelude-manager/
+MASTER_SITES+=         http://www.prelude-ids.org/download/releases/
+MASTER_SITES+=         http://www.prelude-ids.org/download/releases/old/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.prelude-ids.org/download/releases/

Index: pkgsrc/security/pwsafe/Makefile
diff -u pkgsrc/security/pwsafe/Makefile:1.18 pkgsrc/security/pwsafe/Makefile:1.19
--- pkgsrc/security/pwsafe/Makefile:1.18        Thu Jan  5 09:39:02 2017
+++ pkgsrc/security/pwsafe/Makefile     Thu Jan 19 18:52:24 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2017/01/05 09:39:02 roy Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:24 agc Exp $
 #
 
 DISTNAME=              pwsafe-0.2.0
 PKGREVISION=           9
 CATEGORIES=            security
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=pwsafe/} \
-                       http://nsd.dyndns.org/pwsafe/releases/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=pwsafe/}
+MASTER_SITES+=         http://nsd.dyndns.org/pwsafe/releases/
 
 MAINTAINER=            mishka%NetBSD.org@localhost
 HOMEPAGE=              http://nsd.dyndns.org/pwsafe/

Index: pkgsrc/security/py-prewikka/Makefile
diff -u pkgsrc/security/py-prewikka/Makefile:1.43 pkgsrc/security/py-prewikka/Makefile:1.44
--- pkgsrc/security/py-prewikka/Makefile:1.43   Sun Jan  1 14:43:56 2017
+++ pkgsrc/security/py-prewikka/Makefile        Thu Jan 19 18:52:24 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2017/01/01 14:43:56 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/01/19 18:52:24 agc Exp $
 
 DISTNAME=              prewikka-${VERSION}
 PKGNAME=               ${PYPKGPREFIX}-prewikka-${VERSION}
 PKGREVISION=           1
 CATEGORIES=            security
-MASTER_SITES=          http://www.prelude-ids.org/download/releases/prewikka/ \
-                       http://www.prelude-ids.org/download/releases/old/
+MASTER_SITES=          http://www.prelude-ids.org/download/releases/prewikka/
+MASTER_SITES+=         http://www.prelude-ids.org/download/releases/old/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://prelude-ids.org/download/releases/

Index: pkgsrc/security/sudo/Makefile
diff -u pkgsrc/security/sudo/Makefile:1.152 pkgsrc/security/sudo/Makefile:1.153
--- pkgsrc/security/sudo/Makefile:1.152 Mon Sep 12 17:12:24 2016
+++ pkgsrc/security/sudo/Makefile       Thu Jan 19 18:52:24 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.152 2016/09/12 17:12:24 taca Exp $
+# $NetBSD: Makefile,v 1.153 2017/01/19 18:52:24 agc Exp $
 
 DISTNAME=      sudo-1.8.17p1
 CATEGORIES=    security
-MASTER_SITES=  http://www.sudo.ws/dist/ \
-               ftp://ftp.sudo.ws/pub/sudo/ \
-               ftp://ftp.uwsg.indiana.edu/pub/security/sudo/ \
-               ftp://ftp.twaren.net/Unix/Security/Sudo/ \
-               http://ftp.tux.org/pub/security/sudo/
+MASTER_SITES=  http://www.sudo.ws/dist/
+MASTER_SITES+= ftp://ftp.sudo.ws/pub/sudo/
+MASTER_SITES+= ftp://ftp.uwsg.indiana.edu/pub/security/sudo/
+MASTER_SITES+= ftp://ftp.twaren.net/Unix/Security/Sudo/
+MASTER_SITES+= http://ftp.tux.org/pub/security/sudo/
 
 MAINTAINER=    kim%tac.nyc.ny.us@localhost
 HOMEPAGE=      http://www.sudo.ws/

Index: pkgsrc/shells/bash/Makefile
diff -u pkgsrc/shells/bash/Makefile:1.78 pkgsrc/shells/bash/Makefile:1.79
--- pkgsrc/shells/bash/Makefile:1.78    Sun Nov 20 08:02:26 2016
+++ pkgsrc/shells/bash/Makefile Thu Jan 19 18:52:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2016/11/20 08:02:26 wen Exp $
+# $NetBSD: Makefile,v 1.79 2017/01/19 18:52:24 agc Exp $
 
 BASH_VERSION=          4.4
 BASH_PATCHLEVEL=       005
@@ -6,8 +6,8 @@ BASH_PATCHLEVEL=        005
 DISTNAME=      bash-${BASH_VERSION}
 PKGNAME=       bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
 CATEGORIES=    shells
-MASTER_SITES=  ${MASTER_SITE_GNU:=bash/} \
-               ftp://ftp.cwru.edu/pub/bash/
+MASTER_SITES=  ${MASTER_SITE_GNU:=bash/}
+MASTER_SITES+= ftp://ftp.cwru.edu/pub/bash/
 
 PATCH_SITES=   ${MASTER_SITES:=bash-4.4-patches/}
 PATCHFILES+=   bash44-001 bash44-002 bash44-003 bash44-004 bash44-005

Index: pkgsrc/shells/bash2/Makefile
diff -u pkgsrc/shells/bash2/Makefile:1.90 pkgsrc/shells/bash2/Makefile:1.91
--- pkgsrc/shells/bash2/Makefile:1.90   Fri Feb 26 09:43:09 2016
+++ pkgsrc/shells/bash2/Makefile        Thu Jan 19 18:52:25 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.90 2016/02/26 09:43:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.91 2017/01/19 18:52:25 agc Exp $
 #
 
 DISTNAME=      bash-2.05b
 PKGNAME=       bash-2.05.2.13
 CATEGORIES=    shells
-MASTER_SITES=  ${MASTER_SITE_GNU:=bash/} \
-               ftp://ftp.cwru.edu/pub/bash/
+MASTER_SITES=  ${MASTER_SITE_GNU:=bash/}
+MASTER_SITES+= ftp://ftp.cwru.edu/pub/bash/
 
 PATCH_SITES=   ${MASTER_SITES:=bash-2.05b-patches/}
 PATCHFILES=    bash205b-001 bash205b-002 bash205b-003 bash205b-004 \

Index: pkgsrc/shells/bash2-doc/Makefile
diff -u pkgsrc/shells/bash2-doc/Makefile:1.15 pkgsrc/shells/bash2-doc/Makefile:1.16
--- pkgsrc/shells/bash2-doc/Makefile:1.15       Tue Sep 11 23:25:07 2012
+++ pkgsrc/shells/bash2-doc/Makefile    Thu Jan 19 18:52:25 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2012/09/11 23:25:07 asau Exp $
+# $NetBSD: Makefile,v 1.16 2017/01/19 18:52:25 agc Exp $
 
 DISTNAME=      bash-doc-2.05b
 PKGNAME=       bash-doc-2.05.2
 CATEGORIES=    shells
-MASTER_SITES=  ${MASTER_SITE_GNU:=bash/} \
-               ftp://ftp.cwru.edu/pub/bash/
+MASTER_SITES=  ${MASTER_SITE_GNU:=bash/}
+MASTER_SITES+= ftp://ftp.cwru.edu/pub/bash/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/bash/bash.html

Index: pkgsrc/shells/mksh/Makefile
diff -u pkgsrc/shells/mksh/Makefile:1.33 pkgsrc/shells/mksh/Makefile:1.34
--- pkgsrc/shells/mksh/Makefile:1.33    Sat Jul  9 06:38:57 2016
+++ pkgsrc/shells/mksh/Makefile Thu Jan 19 18:52:25 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2016/07/09 06:38:57 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2017/01/19 18:52:25 agc Exp $
 
 DISTNAME=                      mksh-R51
 PKGNAME=                       ${DISTNAME:S/-R/-/}
 PKGREVISION=                   1
 CATEGORIES=                    shells
-MASTER_SITES=                  http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
-                               http://pub.allbsd.org/MirOS/dist/mir/mksh/
+MASTER_SITES=                  http://www.mirbsd.org/MirOS/dist/mir/mksh/
+MASTER_SITES+=                 http://pub.allbsd.org/MirOS/dist/mir/mksh/
 SITES.${DISTNAME}.cat1.gz=     ${MASTER_SITES:S/dist/cats/}
 
 EXTRACT_SUFX=                  .tgz

Index: pkgsrc/shells/pdksh/Makefile
diff -u pkgsrc/shells/pdksh/Makefile:1.24 pkgsrc/shells/pdksh/Makefile:1.25
--- pkgsrc/shells/pdksh/Makefile:1.24   Sun Jun  5 04:44:56 2016
+++ pkgsrc/shells/pdksh/Makefile        Thu Jan 19 18:52:25 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2016/06/05 04:44:56 richard Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/19 18:52:25 agc Exp $
 #
 
 DISTNAME=      pdksh-5.2.14
 PKGREVISION=   7
 CATEGORIES=    shells
-MASTER_SITES=  ftp://ftp.cs.mun.ca/pub/pdksh/ \
-               http://gd.tuwien.ac.at/utils/shells/pdksh/ \
-               ftp://ftp.lip6.fr/pub/unix/shells/pdksh/ \
-               ftp://ftp.demon.net/pub/mirrors/pdksh/
+MASTER_SITES=  ftp://ftp.cs.mun.ca/pub/pdksh/
+MASTER_SITES+= http://gd.tuwien.ac.at/utils/shells/pdksh/
+MASTER_SITES+= ftp://ftp.lip6.fr/pub/unix/shells/pdksh/
+MASTER_SITES+= ftp://ftp.demon.net/pub/mirrors/pdksh/
 MASTER_SITES=  # maintained locally
 DISTFILES=     # empty
 

Index: pkgsrc/shells/scsh/Makefile
diff -u pkgsrc/shells/scsh/Makefile:1.44 pkgsrc/shells/scsh/Makefile:1.45
--- pkgsrc/shells/scsh/Makefile:1.44    Sun Jan  4 04:04:23 2015
+++ pkgsrc/shells/scsh/Makefile Thu Jan 19 18:52:25 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.44 2015/01/04 04:04:23 dholland Exp $
+# $NetBSD: Makefile,v 1.45 2017/01/19 18:52:25 agc Exp $
 
 DISTNAME=              scsh-0.6.7
 PKGREVISION=           1
 CATEGORIES=            shells lang
-MASTER_SITES=          http://ftp.scsh.net/pub/scsh/0.6/  \
-                       ${MASTER_SITE_SOURCEFORGE:=scsh/}
+MASTER_SITES=          http://ftp.scsh.net/pub/scsh/0.6/
+MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=scsh/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.scsh.net/

Index: pkgsrc/shells/tcsh/Makefile
diff -u pkgsrc/shells/tcsh/Makefile:1.83 pkgsrc/shells/tcsh/Makefile:1.84
--- pkgsrc/shells/tcsh/Makefile:1.83    Sat Dec 24 13:18:43 2016
+++ pkgsrc/shells/tcsh/Makefile Thu Jan 19 18:52:25 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.83 2016/12/24 13:18:43 kim Exp $
+# $NetBSD: Makefile,v 1.84 2017/01/19 18:52:25 agc Exp $
 
 DISTNAME=      tcsh-6.20.00
 PKGREVISION=   1
 CATEGORIES=    shells
-MASTER_SITES=  ftp://ftp.astron.com/pub/tcsh/ \
-               ftp://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/
+MASTER_SITES=  ftp://ftp.astron.com/pub/tcsh/
+MASTER_SITES+= ftp://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/
 
 MAINTAINER=    kimmo%suominen.com@localhost
 HOMEPAGE=      http://www.tcsh.org/

Index: pkgsrc/sysutils/asapm/Makefile
diff -u pkgsrc/sysutils/asapm/Makefile:1.42 pkgsrc/sysutils/asapm/Makefile:1.43
--- pkgsrc/sysutils/asapm/Makefile:1.42 Tue Oct 23 19:50:51 2012
+++ pkgsrc/sysutils/asapm/Makefile      Thu Jan 19 18:52:25 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.42 2012/10/23 19:50:51 asau Exp $
+# $NetBSD: Makefile,v 1.43 2017/01/19 18:52:25 agc Exp $
 #
 
 DISTNAME=              asapm-2.11
 PKGREVISION=   4
 CATEGORIES=            sysutils x11
-MASTER_SITES=          http://www.tigr.net/afterstep/download/asapm/ \
-                       ftp://ftp.afterstep.org/apps/asapm/
+MASTER_SITES=          http://www.tigr.net/afterstep/download/asapm/
+MASTER_SITES+=         ftp://ftp.afterstep.org/apps/asapm/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.tigr.net/afterstep/view.php?applet=asapm/data

Index: pkgsrc/sysutils/cfengine2/Makefile
diff -u pkgsrc/sysutils/cfengine2/Makefile:1.44 pkgsrc/sysutils/cfengine2/Makefile:1.45
--- pkgsrc/sysutils/cfengine2/Makefile:1.44     Sat Jul  9 06:38:58 2016
+++ pkgsrc/sysutils/cfengine2/Makefile  Thu Jan 19 18:52:25 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2016/07/09 06:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2017/01/19 18:52:25 agc Exp $
 
 DISTNAME=      cfengine-2.2.10
 PKGREVISION=   8
 CATEGORIES=    sysutils net
-MASTER_SITES=  http://www.cfengine.org/tarballs/ \
-               http://ftp.osuosl.org/pub/cfengine/ \
-               ftp://sunsite.uio.no/pub/cfengine/
+MASTER_SITES=  http://www.cfengine.org/tarballs/
+MASTER_SITES+= http://ftp.osuosl.org/pub/cfengine/
+MASTER_SITES+= ftp://sunsite.uio.no/pub/cfengine/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.cfengine.org/

Index: pkgsrc/sysutils/dc-tools/Makefile
diff -u pkgsrc/sysutils/dc-tools/Makefile:1.13 pkgsrc/sysutils/dc-tools/Makefile:1.14
--- pkgsrc/sysutils/dc-tools/Makefile:1.13      Fri Jul  8 08:30:30 2016
+++ pkgsrc/sysutils/dc-tools/Makefile   Thu Jan 19 18:52:25 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2016/07/08 08:30:30 abs Exp $
+# $NetBSD: Makefile,v 1.14 2017/01/19 18:52:25 agc Exp $
 
 DISTNAME=      dc-tools-1.6
 CATEGORIES=    sysutils
-MASTER_SITES=  http://mc.pp.se/dc/files/ \
-               https://github.com/abs0/dc-burn-netbsd/archive/
+MASTER_SITES=  http://mc.pp.se/dc/files/
+MASTER_SITES+= https://github.com/abs0/dc-burn-netbsd/archive/
 DIST_SUBDIR=   dc-tools
 DISTFILES=     makeip.tar.gz scramble.c ip_slave.tar.gz serial_slave.tar.gz \
                ${DCBURN_DISTFILE}

Index: pkgsrc/sysutils/dtpstree/Makefile
diff -u pkgsrc/sysutils/dtpstree/Makefile:1.4 pkgsrc/sysutils/dtpstree/Makefile:1.5
--- pkgsrc/sysutils/dtpstree/Makefile:1.4       Tue Aug 18 07:31:17 2015
+++ pkgsrc/sysutils/dtpstree/Makefile   Thu Jan 19 18:52:25 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2015/08/18 07:31:17 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2017/01/19 18:52:25 agc Exp $
 #
 
 DISTNAME=      dtpstree-1.0.3
 PKGREVISION=   1
 CATEGORIES=    sysutils
-MASTER_SITES=  http://code.douglasthrift.net/files/dtpstree/ \
-               http://apt.douglasthrift.net/files/dtpstree/
+MASTER_SITES=  http://code.douglasthrift.net/files/dtpstree/
+MASTER_SITES+= http://apt.douglasthrift.net/files/dtpstree/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    douglas%douglasthrift.net@localhost

Index: pkgsrc/sysutils/fam/Makefile
diff -u pkgsrc/sysutils/fam/Makefile:1.41 pkgsrc/sysutils/fam/Makefile:1.42
--- pkgsrc/sysutils/fam/Makefile:1.41   Fri Feb 26 10:24:12 2016
+++ pkgsrc/sysutils/fam/Makefile        Thu Jan 19 18:52:25 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.41 2016/02/26 10:24:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.42 2017/01/19 18:52:25 agc Exp $
 #
 
 DISTNAME=              fam-2.7.0
 PKGREVISION=           9
 CATEGORIES=            sysutils devel
-MASTER_SITES=          ftp://oss.sgi.com/projects/fam/download/stable/ \
-                       ${MASTER_SITE_GENTOO:=distfiles/}
+MASTER_SITES=          ftp://oss.sgi.com/projects/fam/download/stable/
+MASTER_SITES+=         ${MASTER_SITE_GENTOO:=distfiles/}
 
 CONFLICTS+=            gamin-[0-9]*
 

Index: pkgsrc/sysutils/ipw-firmware/Makefile
diff -u pkgsrc/sysutils/ipw-firmware/Makefile:1.10 pkgsrc/sysutils/ipw-firmware/Makefile:1.11
--- pkgsrc/sysutils/ipw-firmware/Makefile:1.10  Fri Mar  6 21:54:56 2015
+++ pkgsrc/sysutils/ipw-firmware/Makefile       Thu Jan 19 18:52:25 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2015/03/06 21:54:56 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2017/01/19 18:52:25 agc Exp $
 
 DISTNAME=      ipw2100-fw-1.2
 PKGNAME=       ipw-firmware-1.0
 CATEGORIES=    sysutils
-MASTER_SITES=  http://damien.bergamini.free.fr/ipwfw/ \
-               http://firmware.openbsd.org/firmware-dist/
+MASTER_SITES=  http://damien.bergamini.free.fr/ipwfw/
+MASTER_SITES+= http://firmware.openbsd.org/firmware-dist/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    Damien.Bergamini%Free.FR@localhost

Index: pkgsrc/sysutils/iwi-firmware/Makefile
diff -u pkgsrc/sysutils/iwi-firmware/Makefile:1.14 pkgsrc/sysutils/iwi-firmware/Makefile:1.15
--- pkgsrc/sysutils/iwi-firmware/Makefile:1.14  Fri Mar  6 21:54:56 2015
+++ pkgsrc/sysutils/iwi-firmware/Makefile       Thu Jan 19 18:52:26 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2015/03/06 21:54:56 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:26 agc Exp $
 #
 
 DISTNAME=              ipw2200-fw-2.3
 PKGNAME=               iwi-firmware-2.3
 PKGREVISION=           2
 CATEGORIES=            sysutils
-MASTER_SITES=          http://damien.bergamini.free.fr/iwifw/ \
-                       http://firmware.openbsd.org/firmware-dist/
+MASTER_SITES=          http://damien.bergamini.free.fr/iwifw/
+MASTER_SITES+=         http://firmware.openbsd.org/firmware-dist/
 EXTRACT_SUFX=          .tgz
 
 MAINTAINER=            Damien.Bergamini%Free.FR@localhost

Index: pkgsrc/sysutils/iwi-firmware3/Makefile
diff -u pkgsrc/sysutils/iwi-firmware3/Makefile:1.5 pkgsrc/sysutils/iwi-firmware3/Makefile:1.6
--- pkgsrc/sysutils/iwi-firmware3/Makefile:1.5  Fri Mar  6 21:54:56 2015
+++ pkgsrc/sysutils/iwi-firmware3/Makefile      Thu Jan 19 18:52:26 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/03/06 21:54:56 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2017/01/19 18:52:26 agc Exp $
 #
 
 DISTNAME=              ipw2200-fw-3.0
 PKGNAME=               iwi-firmware3-3.0
 CATEGORIES=            sysutils
-MASTER_SITES=          http://damien.bergamini.free.fr/iwifw/ \
-                       http://firmware.openbsd.org/firmware-dist/
+MASTER_SITES=          http://damien.bergamini.free.fr/iwifw/
+MASTER_SITES+=         http://firmware.openbsd.org/firmware-dist/
 EXTRACT_SUFX=          .tgz
 
 MAINTAINER=            Damien.Bergamini%Free.FR@localhost

Index: pkgsrc/sysutils/iwn-firmware/Makefile
diff -u pkgsrc/sysutils/iwn-firmware/Makefile:1.3 pkgsrc/sysutils/iwn-firmware/Makefile:1.4
--- pkgsrc/sysutils/iwn-firmware/Makefile:1.3   Fri Mar  6 21:54:56 2015
+++ pkgsrc/sysutils/iwn-firmware/Makefile       Thu Jan 19 18:52:26 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2015/03/06 21:54:56 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2017/01/19 18:52:26 agc Exp $
 #
 
 DISTNAME=              iwlwifi-4965-ucode-${PKG_VERSION}
 PKGNAME=               iwn-firmware-${PKG_VERSION}
 CATEGORIES=            sysutils
-MASTER_SITES=          http://intellinuxwireless.org/iwlwifi/downloads/ \
-                       http://firmware.openbsd.org/firmware-dist/
+MASTER_SITES=          http://intellinuxwireless.org/iwlwifi/downloads/
+MASTER_SITES+=         http://firmware.openbsd.org/firmware-dist/
 EXTRACT_SUFX=          .tgz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/sysutils/lilo/Makefile
diff -u pkgsrc/sysutils/lilo/Makefile:1.11 pkgsrc/sysutils/lilo/Makefile:1.12
--- pkgsrc/sysutils/lilo/Makefile:1.11  Sat Jul  9 06:39:01 2016
+++ pkgsrc/sysutils/lilo/Makefile       Thu Jan 19 18:52:26 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 06:39:01 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/19 18:52:26 agc Exp $
 
 DISTNAME=              lilo-22.8.src
 PKGREVISION=           6
 PKGNAME=               ${DISTNAME:S/.src//}
 CATEGORIES=            sysutils
-MASTER_SITES=          ${MASTER_SITE_SUNSITE:=system/boot/lilo/} \
-                       http://home.san.rr.com/johninsd/pub/linux/lilo/
+MASTER_SITES=          ${MASTER_SITE_SUNSITE:=system/boot/lilo/}
+MASTER_SITES+=         http://home.san.rr.com/johninsd/pub/linux/lilo/
 
 MAINTAINER=            reed%reedmedia.net@localhost
 HOMEPAGE=              http://lilo.go.dyndns.org/

Index: pkgsrc/sysutils/lsof/Makefile
diff -u pkgsrc/sysutils/lsof/Makefile:1.122 pkgsrc/sysutils/lsof/Makefile:1.123
--- pkgsrc/sysutils/lsof/Makefile:1.122 Sat Jul  9 06:39:01 2016
+++ pkgsrc/sysutils/lsof/Makefile       Thu Jan 19 18:52:26 2017
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.122 2016/07/09 06:39:01 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2017/01/19 18:52:26 agc Exp $
 
 DISTNAME=              lsof_4.88
 PKGNAME=               ${DISTNAME:S/_/-/}
 PKGREVISION=           1
 CATEGORIES=            sysutils
-MASTER_SITES=          ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  \
-                       ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \
-                       ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/ \
-                       ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \
-                       ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/NEW/ \
-                       ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/OLD/ \
-                       ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ \
-                       ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/NEW/ \
-                       ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/OLD/ \
-                       ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ \
-                       ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/NEW/ \
-                       ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/OLD/ \
-                       ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ \
-                       ftp://sunsite.ualberta.ca/pub/Mirror/lsof/NEW/ \
-                       ftp://sunsite.ualberta.ca/pub/Mirror/lsof/OLD/
+MASTER_SITES=          ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
+MASTER_SITES+=         ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/
+MASTER_SITES+=         ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/
+MASTER_SITES+=         ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/
+MASTER_SITES+=         ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/NEW/
+MASTER_SITES+=         ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/OLD/
+MASTER_SITES+=         ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/
+MASTER_SITES+=         ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/NEW/
+MASTER_SITES+=         ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/OLD/
+MASTER_SITES+=         ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/
+MASTER_SITES+=         ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/NEW/
+MASTER_SITES+=         ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/OLD/
+MASTER_SITES+=         ftp://sunsite.ualberta.ca/pub/Mirror/lsof/
+MASTER_SITES+=         ftp://sunsite.ualberta.ca/pub/Mirror/lsof/NEW/
+MASTER_SITES+=         ftp://sunsite.ualberta.ca/pub/Mirror/lsof/OLD/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/sysutils/mc46/Makefile
diff -u pkgsrc/sysutils/mc46/Makefile:1.18 pkgsrc/sysutils/mc46/Makefile:1.19
--- pkgsrc/sysutils/mc46/Makefile:1.18  Sat Jul  9 06:39:01 2016
+++ pkgsrc/sysutils/mc46/Makefile       Thu Jan 19 18:52:26 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2016/07/09 06:39:01 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:26 agc Exp $
 
 DISTNAME=      mc-4.6.1
 PKGREVISION=   20
 CATEGORIES=    sysutils
-MASTER_SITES=  http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \
-               ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
+MASTER_SITES=  http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/
+MASTER_SITES+= ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
 
 MAINTAINER=    pavel.arnost%clnet.cz@localhost
 HOMEPAGE=      http://www.ibiblio.org/mc/

Index: pkgsrc/sysutils/mktemp/Makefile
diff -u pkgsrc/sysutils/mktemp/Makefile:1.11 pkgsrc/sysutils/mktemp/Makefile:1.12
--- pkgsrc/sysutils/mktemp/Makefile:1.11        Tue Oct 23 19:51:13 2012
+++ pkgsrc/sysutils/mktemp/Makefile     Thu Jan 19 18:52:26 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 19:51:13 asau Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/19 18:52:26 agc Exp $
 #
 
 DISTNAME=      mktemp-1.7
 CATEGORIES=    sysutils security
-MASTER_SITES=  ftp://ftp.mktemp.org/pub/mktemp/ \
-               ftp://ftp.usa.openbsd.org/pub/mktemp/
+MASTER_SITES=  ftp://ftp.mktemp.org/pub/mktemp/
+MASTER_SITES+= ftp://ftp.usa.openbsd.org/pub/mktemp/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.mktemp.org/

Index: pkgsrc/sysutils/pciutils/Makefile
diff -u pkgsrc/sysutils/pciutils/Makefile:1.32 pkgsrc/sysutils/pciutils/Makefile:1.33
--- pkgsrc/sysutils/pciutils/Makefile:1.32      Fri Oct  7 06:07:01 2016
+++ pkgsrc/sysutils/pciutils/Makefile   Thu Jan 19 18:52:26 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2016/10/07 06:07:01 msaitoh Exp $
+# $NetBSD: Makefile,v 1.33 2017/01/19 18:52:26 agc Exp $
 
 DISTNAME=      pciutils-3.5.2
 CATEGORIES=    sysutils
-MASTER_SITES=  ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
-               ftp://ftp.kernel.org/pub/software/utils/pciutils/
+MASTER_SITES=  ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
+MASTER_SITES+= ftp://ftp.kernel.org/pub/software/utils/pciutils/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://mj.ucw.cz/pciutils.shtml

Index: pkgsrc/sysutils/py-notify-python/Makefile
diff -u pkgsrc/sysutils/py-notify-python/Makefile:1.16 pkgsrc/sysutils/py-notify-python/Makefile:1.17
--- pkgsrc/sysutils/py-notify-python/Makefile:1.16      Sun Jan  1 14:43:58 2017
+++ pkgsrc/sysutils/py-notify-python/Makefile   Thu Jan 19 18:52:26 2017
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2017/01/01 14:43:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/19 18:52:26 agc Exp $
 
 DISTNAME=      notify-python-0.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=   27
 CATEGORIES=    sysutils
-MASTER_SITES= \
- http://www.galago-project.org/files/releases/source/notify-python/
+MASTER_SITES=  http://www.galago-project.org/files/releases/source/notify-python/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/sysutils/rtty/Makefile
diff -u pkgsrc/sysutils/rtty/Makefile:1.32 pkgsrc/sysutils/rtty/Makefile:1.33
--- pkgsrc/sysutils/rtty/Makefile:1.32  Sat Aug  9 11:27:31 2014
+++ pkgsrc/sysutils/rtty/Makefile       Thu Jan 19 18:52:26 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2014/08/09 11:27:31 kim Exp $
+# $NetBSD: Makefile,v 1.33 2017/01/19 18:52:26 agc Exp $
 
 DISTNAME=      rtty-3.2
 PKGREVISION=   2
 CATEGORIES=    sysutils
-MASTER_SITES=  http://gatekeeper.hpl.hp.com/archive/pub/misc/vixie/ \
-               ftp://gatekeeper.hpl.hp.com/pub/misc/vixie/
+MASTER_SITES=  http://gatekeeper.hpl.hp.com/archive/pub/misc/vixie/
+MASTER_SITES+= ftp://gatekeeper.hpl.hp.com/pub/misc/vixie/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Multiuser "tip"/"cu" replacement with logging

Index: pkgsrc/sysutils/whowatch/Makefile
diff -u pkgsrc/sysutils/whowatch/Makefile:1.22 pkgsrc/sysutils/whowatch/Makefile:1.23
--- pkgsrc/sysutils/whowatch/Makefile:1.22      Tue Jan  3 22:19:10 2017
+++ pkgsrc/sysutils/whowatch/Makefile   Thu Jan 19 18:52:26 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2017/01/03 22:19:10 roy Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:26 agc Exp $
 
 DISTNAME=      whowatch-1.4
 PKGREVISION=   6
 CATEGORIES=    sysutils
-MASTER_SITES=  http://wizard.ae.krakow.pl/~mike/download/ \
-               http://janek.ae.krakow.pl/~suszyckm/download/
+MASTER_SITES=  http://wizard.ae.krakow.pl/~mike/download/
+MASTER_SITES+= http://janek.ae.krakow.pl/~suszyckm/download/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://wizard.ae.krakow.pl/~mike/\#whowatch

Index: pkgsrc/sysutils/wpi-firmware2/Makefile
diff -u pkgsrc/sysutils/wpi-firmware2/Makefile:1.5 pkgsrc/sysutils/wpi-firmware2/Makefile:1.6
--- pkgsrc/sysutils/wpi-firmware2/Makefile:1.5  Fri Mar  6 21:54:56 2015
+++ pkgsrc/sysutils/wpi-firmware2/Makefile      Thu Jan 19 18:52:26 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2015/03/06 21:54:56 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2017/01/19 18:52:26 agc Exp $
 #
 
 VERSION=               2.14.4
 DISTNAME=              iwlwifi-3945-ucode-${VERSION}
 PKGNAME=               wpi-firmware2-${VERSION}
 CATEGORIES=            sysutils
-MASTER_SITES=          http://intellinuxwireless.org/iwlwifi/downloads/ \
-                       http://firmware.openbsd.org/firmware-dist/
+MASTER_SITES=          http://intellinuxwireless.org/iwlwifi/downloads/
+MASTER_SITES+=         http://firmware.openbsd.org/firmware-dist/
 EXTRACT_SUFX=          .tgz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/textproc/WordNet/Makefile
diff -u pkgsrc/textproc/WordNet/Makefile:1.12 pkgsrc/textproc/WordNet/Makefile:1.13
--- pkgsrc/textproc/WordNet/Makefile:1.12       Mon Jan 20 19:20:08 2014
+++ pkgsrc/textproc/WordNet/Makefile    Thu Jan 19 18:52:27 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2014/01/20 19:20:08 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2017/01/19 18:52:27 agc Exp $
 #
 
 DISTNAME=              WordNet-3.0
 PKGREVISION=           7
 CATEGORIES=            textproc
-MASTER_SITES=          http://wordnet.princeton.edu/3.0/ \
-                       ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/
+MASTER_SITES=          http://wordnet.princeton.edu/3.0/
+MASTER_SITES+=         ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/
 
 PATCHFILES=            wordnet.patch.2
 PATCH_SITES=           http://www.ocert.org/analysis/2008-014/

Index: pkgsrc/textproc/dict-mueller7/Makefile
diff -u pkgsrc/textproc/dict-mueller7/Makefile:1.10 pkgsrc/textproc/dict-mueller7/Makefile:1.11
--- pkgsrc/textproc/dict-mueller7/Makefile:1.10 Sat Jul  9 06:39:04 2016
+++ pkgsrc/textproc/dict-mueller7/Makefile      Thu Jan 19 18:52:27 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2016/07/09 06:39:04 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2017/01/19 18:52:27 agc Exp $
 
 DISTNAME=      Mueller7GPL
 PKGNAME=       dict-mueller7-1.2
 PKGREVISION=   5
 CATEGORIES=    textproc
-MASTER_SITES=  http://dict.osdn.org.ua/ \
-               http://mova.org/~cheusov/pub/dict-mueller/
+MASTER_SITES=  http://dict.osdn.org.ua/
+MASTER_SITES+= http://mova.org/~cheusov/pub/dict-mueller/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    cheusov%NetBSD.org@localhost

Index: pkgsrc/textproc/dict-server/Makefile.common
diff -u pkgsrc/textproc/dict-server/Makefile.common:1.6 pkgsrc/textproc/dict-server/Makefile.common:1.7
--- pkgsrc/textproc/dict-server/Makefile.common:1.6     Thu Oct 25 06:55:46 2012
+++ pkgsrc/textproc/dict-server/Makefile.common Thu Jan 19 18:52:27 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.6 2012/10/25 06:55:46 asau Exp $
+# $NetBSD: Makefile.common,v 1.7 2017/01/19 18:52:27 agc Exp $
 # used by textproc/colorit/Makefile
 # used by textproc/dict-server/Makefile
 # used by textproc/dict-client/Makefile
 DISTNAME=      dictd-1.12.1
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dict/} \
-               ftp://ftp.dict.org/pub/dict/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dict/}
+MASTER_SITES+= ftp://ftp.dict.org/pub/dict/
 
 MAINTAINER?=           cheusov%NetBSD.org@localhost
 HOMEPAGE=              http://www.dict.org/

Index: pkgsrc/textproc/dictem/Makefile
diff -u pkgsrc/textproc/dictem/Makefile:1.12 pkgsrc/textproc/dictem/Makefile:1.13
--- pkgsrc/textproc/dictem/Makefile:1.12        Sun Feb 17 19:18:08 2013
+++ pkgsrc/textproc/dictem/Makefile     Thu Jan 19 18:52:27 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2013/02/17 19:18:08 dholland Exp $
+# $NetBSD: Makefile,v 1.13 2017/01/19 18:52:27 agc Exp $
 
 DISTNAME=              dictem-1.0.4
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=           1
 CATEGORIES=            textproc editors
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=dictem/} \
-                        http://www.mova.org/~cheusov/pub/dictem/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=dictem/}
+MASTER_SITES+=         http://www.mova.org/~cheusov/pub/dictem/
 
 MAINTAINER=            cheusov%NetBSD.org@localhost
 HOMEPAGE=              http://freshmeat.net/projects/dictem/

Index: pkgsrc/textproc/eb/Makefile
diff -u pkgsrc/textproc/eb/Makefile:1.53 pkgsrc/textproc/eb/Makefile:1.54
--- pkgsrc/textproc/eb/Makefile:1.53    Sun Jul 10 11:31:31 2016
+++ pkgsrc/textproc/eb/Makefile Thu Jan 19 18:52:27 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.53 2016/07/10 11:31:31 rillig Exp $
+# $NetBSD: Makefile,v 1.54 2017/01/19 18:52:27 agc Exp $
 
 DISTNAME=      eb-4.3
 PKGREVISION=   8
 CATEGORIES=    textproc japanese
-MASTER_SITES=  ftp://ftp.sra.co.jp/pub/misc/eb/appendix/ \
-               ftp://ftp.sra.co.jp/pub/misc/eb/
+MASTER_SITES=  ftp://ftp.sra.co.jp/pub/misc/eb/appendix/
+MASTER_SITES+= ftp://ftp.sra.co.jp/pub/misc/eb/
 DISTFILES=     ${EB_DISTFILES} \
                ${EB_APPENDICES}
 

Index: pkgsrc/textproc/html2text/Makefile
diff -u pkgsrc/textproc/html2text/Makefile:1.18 pkgsrc/textproc/html2text/Makefile:1.19
--- pkgsrc/textproc/html2text/Makefile:1.18     Mon Dec 23 11:57:06 2013
+++ pkgsrc/textproc/html2text/Makefile  Thu Jan 19 18:52:27 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2013/12/23 11:57:06 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:27 agc Exp $
 
 DISTNAME=      html2text-1.3.2a
 CATEGORIES=    textproc
-MASTER_SITES=  http://www.mbayer.de/html2text/downloads/       \
-               ${MASTER_SITE_SUNSITE:=apps/www/converters/}
+MASTER_SITES=  http://www.mbayer.de/html2text/downloads/
+MASTER_SITES+= ${MASTER_SITE_SUNSITE:=apps/www/converters/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.mbayer.de/html2text/

Index: pkgsrc/textproc/html2wml/Makefile
diff -u pkgsrc/textproc/html2wml/Makefile:1.26 pkgsrc/textproc/html2wml/Makefile:1.27
--- pkgsrc/textproc/html2wml/Makefile:1.26      Sat Jul  9 06:39:05 2016
+++ pkgsrc/textproc/html2wml/Makefile   Thu Jan 19 18:52:27 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2016/07/09 06:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2017/01/19 18:52:27 agc Exp $
 
 DISTNAME=      html2wml-0.4.8r2
 PKGNAME=       html2wml-0.4.8.2
 PKGREVISION=   9
 CATEGORIES=    textproc converters
-MASTER_SITES=  http://maddingue.free.fr/softwares/download/Html2Wml/html2wml-0.4.x/    \
-               ${MASTER_SITE_SOURCEFORGE:=htmlwml/}
+MASTER_SITES=  http://maddingue.free.fr/softwares/download/Html2Wml/html2wml-0.4.x/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=htmlwml/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 # HOMEPAGE=    http://maddingue.free.fr/softwares/html2wml.html

Index: pkgsrc/textproc/hyperestraier/Makefile.common
diff -u pkgsrc/textproc/hyperestraier/Makefile.common:1.9 pkgsrc/textproc/hyperestraier/Makefile.common:1.10
--- pkgsrc/textproc/hyperestraier/Makefile.common:1.9   Sun Mar 15 17:09:00 2015
+++ pkgsrc/textproc/hyperestraier/Makefile.common       Thu Jan 19 18:52:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2015/03/15 17:09:00 hiramatsu Exp $
+# $NetBSD: Makefile.common,v 1.10 2017/01/19 18:52:27 agc Exp $
 #
 # used by textproc/java-native-hyperestraier/Makefile
 # used by textproc/java-pure-hyperestraier/Makefile
@@ -8,8 +8,8 @@
 
 DISTNAME=      hyperestraier-${HYPERESTRAIER_VERSION}
 CATEGORIES=    japanese textproc www
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=hyperestraier/}              \
-               http://hyperestraier.sourceforge.net/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=hyperestraier/}
+MASTER_SITES+= http://hyperestraier.sourceforge.net/
 HYPERESTRAIER_VERSION=1.4.13
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/textproc/intltool/Makefile
diff -u pkgsrc/textproc/intltool/Makefile:1.65 pkgsrc/textproc/intltool/Makefile:1.66
--- pkgsrc/textproc/intltool/Makefile:1.65      Sat Jul  9 06:39:06 2016
+++ pkgsrc/textproc/intltool/Makefile   Thu Jan 19 18:52:27 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.65 2016/07/09 06:39:06 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2017/01/19 18:52:27 agc Exp $
 
 DISTNAME=              intltool-0.51.0
 PKGREVISION=           2
 CATEGORIES=            textproc devel gnome
-MASTER_SITES=          https://launchpad.net/intltool/trunk/${PKGVERSION_NOREV}/+download/ \
-                       http://launchpadlibrarian.net/94524169/
+MASTER_SITES=          https://launchpad.net/intltool/trunk/${PKGVERSION_NOREV}/+download/
+MASTER_SITES+=         http://launchpadlibrarian.net/94524169/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://launchpad.net/intltool/

Index: pkgsrc/textproc/libxml2/Makefile.common
diff -u pkgsrc/textproc/libxml2/Makefile.common:1.5 pkgsrc/textproc/libxml2/Makefile.common:1.6
--- pkgsrc/textproc/libxml2/Makefile.common:1.5 Fri Dec 30 02:17:48 2016
+++ pkgsrc/textproc/libxml2/Makefile.common     Thu Jan 19 18:52:27 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.5 2016/12/30 02:17:48 dholland Exp $
+# $NetBSD: Makefile.common,v 1.6 2017/01/19 18:52:27 agc Exp $
 #
 # used by textproc/libxml2/Makefile
 # used by textproc/py-libxml2/Makefile
 
 DISTNAME=      libxml2-2.9.4
 CATEGORIES=    textproc
-MASTER_SITES=  ftp://xmlsoft.org/libxml2/ \
-               http://xmlsoft.org/sources/
+MASTER_SITES=  ftp://xmlsoft.org/libxml2/
+MASTER_SITES+= http://xmlsoft.org/sources/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://xmlsoft.org/

Index: pkgsrc/textproc/libxslt/Makefile.common
diff -u pkgsrc/textproc/libxslt/Makefile.common:1.1 pkgsrc/textproc/libxslt/Makefile.common:1.2
--- pkgsrc/textproc/libxslt/Makefile.common:1.1 Sun May 29 21:06:46 2016
+++ pkgsrc/textproc/libxslt/Makefile.common     Thu Jan 19 18:52:27 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.1 2016/05/29 21:06:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2017/01/19 18:52:27 agc Exp $
 #
 # used by textproc/libxslt/Makefile
 # used by textproc/py-libxslt/Makefile
 
 DISTNAME=      libxslt-1.1.29
 CATEGORIES=    textproc
-MASTER_SITES=  ftp://xmlsoft.org/libxslt/ \
-               http://xmlsoft.org/sources/
+MASTER_SITES=  ftp://xmlsoft.org/libxslt/
+MASTER_SITES+= http://xmlsoft.org/sources/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://xmlsoft.org/XSLT/

Index: pkgsrc/textproc/markdown2social/Makefile
diff -u pkgsrc/textproc/markdown2social/Makefile:1.4 pkgsrc/textproc/markdown2social/Makefile:1.5
--- pkgsrc/textproc/markdown2social/Makefile:1.4        Sun Jan  1 14:44:00 2017
+++ pkgsrc/textproc/markdown2social/Makefile    Thu Jan 19 18:52:27 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2017/01/01 14:44:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2017/01/19 18:52:27 agc Exp $
 
 DISTNAME=      markdown2social-0.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    textproc
-MASTER_SITES=  ${MASTER_SITE_PYPI:M=/markdown2social/} \
-               ${MASTER_SITE_GITHUB:=jmmv/markdown2social/releases/download/${DISTNAME}/}
+MASTER_SITES=  ${MASTER_SITE_PYPI:M=/markdown2social/}
+MASTER_SITES+= ${MASTER_SITE_GITHUB:=jmmv/markdown2social/releases/download/${DISTNAME}/}
 
 MAINTAINER=    jmmv%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/jmmv/markdown2social/

Index: pkgsrc/textproc/rtfm/Makefile
diff -u pkgsrc/textproc/rtfm/Makefile:1.10 pkgsrc/textproc/rtfm/Makefile:1.11
--- pkgsrc/textproc/rtfm/Makefile:1.10  Thu Oct 25 06:56:55 2012
+++ pkgsrc/textproc/rtfm/Makefile       Thu Jan 19 18:52:27 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2012/10/25 06:56:55 asau Exp $
+# $NetBSD: Makefile,v 1.11 2017/01/19 18:52:27 agc Exp $
 
 DISTNAME=      rtfm-1.0
 CATEGORIES=    textproc
-MASTER_SITES=  ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/      \
-               ftp://ftp.pl.freebsd.org/pub/FreeBSD/ports/distfiles/
+MASTER_SITES=  ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/
+MASTER_SITES+= ftp://ftp.pl.freebsd.org/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       NetBSD documentation and GNU Texinfo files search mechanism

Index: pkgsrc/textproc/swath/Makefile
diff -u pkgsrc/textproc/swath/Makefile:1.4 pkgsrc/textproc/swath/Makefile:1.5
--- pkgsrc/textproc/swath/Makefile:1.4  Sun Mar 15 17:15:01 2015
+++ pkgsrc/textproc/swath/Makefile      Thu Jan 19 18:52:28 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2015/03/15 17:15:01 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.5 2017/01/19 18:52:28 agc Exp $
 #
 
 DISTNAME=      swath-0.4.3
 CATEGORIES=    textproc
-MASTER_SITES=  ftp://linux.thai.net/pub/ThaiLinux/software/swath/      \
-               http://linux.thai.net/pub/ThaiLinux/software/swath/
+MASTER_SITES=  ftp://linux.thai.net/pub/ThaiLinux/software/swath/
+MASTER_SITES+= http://linux.thai.net/pub/ThaiLinux/software/swath/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://linux.thai.net/projects/thailatex

Index: pkgsrc/textproc/urlview/Makefile
diff -u pkgsrc/textproc/urlview/Makefile:1.24 pkgsrc/textproc/urlview/Makefile:1.25
--- pkgsrc/textproc/urlview/Makefile:1.24       Wed Jan  4 13:23:24 2017
+++ pkgsrc/textproc/urlview/Makefile    Thu Jan 19 18:52:28 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2017/01/04 13:23:24 roy Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=      urlview-0.9
 PKGREVISION=   7
 CATEGORIES=    textproc
-MASTER_SITES=  ftp://ftp.mutt.org/pub/mutt/contrib/ \
-               ftp://ftp.uib.no/pub/mutt/contrib/
+MASTER_SITES=  ftp://ftp.mutt.org/pub/mutt/contrib/
+MASTER_SITES+= ftp://ftp.uib.no/pub/mutt/contrib/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Extract URLs from text files and display them in a menu

Index: pkgsrc/time/kronolith/Makefile
diff -u pkgsrc/time/kronolith/Makefile:1.25 pkgsrc/time/kronolith/Makefile:1.26
--- pkgsrc/time/kronolith/Makefile:1.25 Sun Sep 11 17:03:28 2016
+++ pkgsrc/time/kronolith/Makefile      Thu Jan 19 18:52:28 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2016/09/11 17:03:28 taca Exp $
+# $NetBSD: Makefile,v 1.26 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=      kronolith-h3-${KRONOLITHVER}
 PKGNAME=       kronolith-${KRONOLITHVER}
 PKGREVISION=   3
 CATEGORIES=    www time
-MASTER_SITES=  http://ftp.horde.org/pub/kronolith/ \
-               ftp://ftp.horde.org/pub/kronolith/
+MASTER_SITES=  http://ftp.horde.org/pub/kronolith/
+MASTER_SITES+= ftp://ftp.horde.org/pub/kronolith/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.horde.org/kronolith/

Index: pkgsrc/time/rclock/Makefile
diff -u pkgsrc/time/rclock/Makefile:1.14 pkgsrc/time/rclock/Makefile:1.15
--- pkgsrc/time/rclock/Makefile:1.14    Sat Jul  4 16:18:40 2015
+++ pkgsrc/time/rclock/Makefile Thu Jan 19 18:52:28 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:40 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=              rxvt-2.7.10
 PKGNAME=               rclock-2.7.10
 CATEGORIES=            x11 time
-MASTER_SITES=           ftp://ftp.rxvt.org/pub/rxvt/ \
-                        ftp://mason.primenet.com.au/pub/rxvt/
+MASTER_SITES=           ftp://ftp.rxvt.org/pub/rxvt/
+MASTER_SITES+=         ftp://mason.primenet.com.au/pub/rxvt/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/wm/fvwm/Makefile
diff -u pkgsrc/wm/fvwm/Makefile:1.35 pkgsrc/wm/fvwm/Makefile:1.36
--- pkgsrc/wm/fvwm/Makefile:1.35        Sun Jul 24 20:12:34 2016
+++ pkgsrc/wm/fvwm/Makefile     Thu Jan 19 18:52:28 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2016/07/24 20:12:34 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=      fvwm-${FVWM_VER}
 PKGREVISION=   7
 CATEGORIES=    x11 wm
-MASTER_SITES=  ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
-               http://www.fvwm.org/generated/icon_download/
+MASTER_SITES=  ftp://ftp.fvwm.org/pub/fvwm/version-2/
+MASTER_SITES+= http://www.fvwm.org/generated/icon_download/
 DISTFILES+=    fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/amaya/Makefile
diff -u pkgsrc/www/amaya/Makefile:1.99 pkgsrc/www/amaya/Makefile:1.100
--- pkgsrc/www/amaya/Makefile:1.99      Sun Jan  1 16:06:38 2017
+++ pkgsrc/www/amaya/Makefile   Thu Jan 19 18:52:28 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.99 2017/01/01 16:06:38 adam Exp $
+# $NetBSD: Makefile,v 1.100 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=      amaya-fullsrc-11.3.1
 PKGNAME=       ${DISTNAME:S/-fullsrc//}
 PKGREVISION=   32
 CATEGORIES=    www
-MASTER_SITES=  http://www.w3.org/Amaya/Distribution/ \
-               ftp://ftp.w3.org/pub/amaya/ \
-               ftp://mirror.aarnet.edu.au/pub/amaya/
+MASTER_SITES=  http://www.w3.org/Amaya/Distribution/
+MASTER_SITES+= ftp://ftp.w3.org/pub/amaya/
+MASTER_SITES+= ftp://mirror.aarnet.edu.au/pub/amaya/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/analog/Makefile
diff -u pkgsrc/www/analog/Makefile:1.62 pkgsrc/www/analog/Makefile:1.63
--- pkgsrc/www/analog/Makefile:1.62     Fri Jan 22 08:33:09 2016
+++ pkgsrc/www/analog/Makefile  Thu Jan 19 18:52:28 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.62 2016/01/22 08:33:09 zafer Exp $
+# $NetBSD: Makefile,v 1.63 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=      analog-6.0
 PKGREVISION=   2
 CATEGORIES=    www
-MASTER_SITES=  ${HOMEPAGE} \
-               http://www.web42.com/analog/
+MASTER_SITES=  ${HOMEPAGE}
+MASTER_SITES+= http://www.web42.com/analog/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.analog.cx/

Index: pkgsrc/www/apache22/Makefile
diff -u pkgsrc/www/apache22/Makefile:1.111 pkgsrc/www/apache22/Makefile:1.112
--- pkgsrc/www/apache22/Makefile:1.111  Mon Jan 16 14:34:42 2017
+++ pkgsrc/www/apache22/Makefile        Thu Jan 19 18:52:28 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.111 2017/01/16 14:34:42 adam Exp $
+# $NetBSD: Makefile,v 1.112 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=      httpd-2.2.32
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
 CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/} \
-               http://archive.apache.org/dist/httpd/ \
-               http://archive.eu.apache.org/dist/httpd/
+MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/}
+MASTER_SITES+= http://archive.apache.org/dist/httpd/
+MASTER_SITES+= http://archive.eu.apache.org/dist/httpd/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/apache24/Makefile
diff -u pkgsrc/www/apache24/Makefile:1.52 pkgsrc/www/apache24/Makefile:1.53
--- pkgsrc/www/apache24/Makefile:1.52   Sun Jan  1 16:06:38 2017
+++ pkgsrc/www/apache24/Makefile        Thu Jan 19 18:52:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2017/01/01 16:06:38 adam Exp $
+# $NetBSD: Makefile,v 1.53 2017/01/19 18:52:28 agc Exp $
 #
 # When updating this package, make sure that no strings like
 # "PR 12345" are in the commit message. Upstream likes
@@ -9,9 +9,9 @@ DISTNAME=       httpd-2.4.25
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
 PKGREVISION=   1
 CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/} \
-               http://archive.apache.org/dist/httpd/ \
-               http://archive.eu.apache.org/dist/httpd/
+MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/}
+MASTER_SITES+= http://archive.apache.org/dist/httpd/
+MASTER_SITES+= http://archive.eu.apache.org/dist/httpd/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    ryoon%NetBSD.org@localhost

Index: pkgsrc/www/bluefish/Makefile
diff -u pkgsrc/www/bluefish/Makefile:1.127 pkgsrc/www/bluefish/Makefile:1.128
--- pkgsrc/www/bluefish/Makefile:1.127  Sun Jan  1 14:44:02 2017
+++ pkgsrc/www/bluefish/Makefile        Thu Jan 19 18:52:28 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.127 2017/01/01 14:44:02 wiz Exp $
+# $NetBSD: Makefile,v 1.128 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=      bluefish-2.2.8
 PKGREVISION=   2
 CATEGORIES=    www
-MASTER_SITES=  http://bluefish.mrball.net/stable/source/               \
-               http://www.bennewitz.com/bluefish/stable/source/
+MASTER_SITES=  http://bluefish.mrball.net/stable/source/
+MASTER_SITES+= http://www.bennewitz.com/bluefish/stable/source/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/elinks/Makefile
diff -u pkgsrc/www/elinks/Makefile:1.61 pkgsrc/www/elinks/Makefile:1.62
--- pkgsrc/www/elinks/Makefile:1.61     Mon Sep 19 13:04:28 2016
+++ pkgsrc/www/elinks/Makefile  Thu Jan 19 18:52:28 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.61 2016/09/19 13:04:28 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=              elinks-0.12pre6
 PKGNAME=               ${DISTNAME:S/pre/rc/}
 PKGREVISION=           11
 CATEGORIES=            www
-MASTER_SITES=          http://elinks.or.cz/download/ \
-                       http://ftp.icm.edu.pl/packages/elinks/
+MASTER_SITES=          http://elinks.or.cz/download/
+MASTER_SITES+=         http://ftp.icm.edu.pl/packages/elinks/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/horde/Makefile
diff -u pkgsrc/www/horde/Makefile:1.78 pkgsrc/www/horde/Makefile:1.79
--- pkgsrc/www/horde/Makefile:1.78      Thu Dec  1 14:48:02 2016
+++ pkgsrc/www/horde/Makefile   Thu Jan 19 18:52:28 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.78 2016/12/01 14:48:02 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2017/01/19 18:52:28 agc Exp $
 
 DISTNAME=      horde-3.3.13
 PKGREVISION=   2
 CATEGORIES=    www
-MASTER_SITES=  http://ftp.horde.org/pub/horde/ \
-               ftp://ftp.horde.org/pub/horde/
+MASTER_SITES=  http://ftp.horde.org/pub/horde/
+MASTER_SITES+= ftp://ftp.horde.org/pub/horde/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.horde.org/

Index: pkgsrc/www/htdig/Makefile
diff -u pkgsrc/www/htdig/Makefile:1.41 pkgsrc/www/htdig/Makefile:1.42
--- pkgsrc/www/htdig/Makefile:1.41      Sun Oct 28 06:30:17 2012
+++ pkgsrc/www/htdig/Makefile   Thu Jan 19 18:52:29 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.41 2012/10/28 06:30:17 asau Exp $
+# $NetBSD: Makefile,v 1.42 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=      htdig-3.2.0b6
 PKGREVISION=   1
 CATEGORIES=    www databases
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=htdig/} \
-               http://www.htdig.org/files/ \
-               http://www.it.htdig.org/files/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=htdig/}
+MASTER_SITES+= http://www.htdig.org/files/
+MASTER_SITES+= http://www.it.htdig.org/files/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/lynx/Makefile
diff -u pkgsrc/www/lynx/Makefile:1.125 pkgsrc/www/lynx/Makefile:1.126
--- pkgsrc/www/lynx/Makefile:1.125      Wed Jan  4 14:49:38 2017
+++ pkgsrc/www/lynx/Makefile    Thu Jan 19 18:52:29 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.125 2017/01/04 14:49:38 roy Exp $
+# $NetBSD: Makefile,v 1.126 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=      lynx2.8.8rel.2
 PKGNAME=       ${DISTNAME:S/lynx/lynx-/:S/rel//}
 PKGREVISION=   7
 CATEGORIES=    www
-MASTER_SITES=  http://lynx.isc.org/${SUBDIR:Q}/ \
-               ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/
+MASTER_SITES=  http://lynx.isc.org/${SUBDIR:Q}/
+MASTER_SITES+= ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/nspluginwrapper/Makefile
diff -u pkgsrc/www/nspluginwrapper/Makefile:1.53 pkgsrc/www/nspluginwrapper/Makefile:1.54
--- pkgsrc/www/nspluginwrapper/Makefile:1.53    Sun Jan  1 16:06:39 2017
+++ pkgsrc/www/nspluginwrapper/Makefile Thu Jan 19 18:52:29 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.53 2017/01/01 16:06:39 adam Exp $
+# $NetBSD: Makefile,v 1.54 2017/01/19 18:52:29 agc Exp $
 #
 
 DISTNAME=      nspluginwrapper-1.4.4
 PKGREVISION=   6
 CATEGORIES=    www
-MASTER_SITES=  http://nspluginwrapper.org/download/ \
-               http://teokurebsd.org/netbsd/packages/distfiles/nspluginwrapper/
+MASTER_SITES=  http://nspluginwrapper.org/download/
+MASTER_SITES+= http://teokurebsd.org/netbsd/packages/distfiles/nspluginwrapper/
 DISTFILES=     ${DISTNAME}.tar.gz ${DISTNAME}-suse121-generic.${WRAPPER_ARCH}.tar.gz
 
 MAINTAINER=    tsutsui%NetBSD.org@localhost

Index: pkgsrc/www/p5-HTML-Template/Makefile
diff -u pkgsrc/www/p5-HTML-Template/Makefile:1.35 pkgsrc/www/p5-HTML-Template/Makefile:1.36
--- pkgsrc/www/p5-HTML-Template/Makefile:1.35   Mon Sep 19 01:04:02 2016
+++ pkgsrc/www/p5-HTML-Template/Makefile        Thu Jan 19 18:52:29 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2016/09/19 01:04:02 mef Exp $
+# $NetBSD: Makefile,v 1.36 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=              HTML-Template-2.95
 PKGNAME=               p5-${DISTNAME}
 PKGREVISION=           3
 CATEGORIES=            www perl5
-MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=HTML/} \
-                       ${MASTER_SITE_SOURCEFORGE:=html-template/}
+MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=HTML/}
+MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=html-template/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://html-template.sourceforge.net/

Index: pkgsrc/www/p5-HTML-Template-Expr/Makefile
diff -u pkgsrc/www/p5-HTML-Template-Expr/Makefile:1.7 pkgsrc/www/p5-HTML-Template-Expr/Makefile:1.8
--- pkgsrc/www/p5-HTML-Template-Expr/Makefile:1.7       Wed Jun  8 19:25:05 2016
+++ pkgsrc/www/p5-HTML-Template-Expr/Makefile   Thu Jan 19 18:52:29 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2016/06/08 19:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=              HTML-Template-Expr-0.07
 PKGNAME=               p5-${DISTNAME}
 PKGREVISION=           5
 CATEGORIES=            www perl5
-MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=HTML/} \
-                       ${MASTER_SITE_SOURCEFORGE:=html-template/}
+MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=HTML/}
+MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=html-template/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://search.cpan.org/dist/HTML-Template-Expr/

Index: pkgsrc/www/py-mechanize/Makefile
diff -u pkgsrc/www/py-mechanize/Makefile:1.17 pkgsrc/www/py-mechanize/Makefile:1.18
--- pkgsrc/www/py-mechanize/Makefile:1.17       Sun Jan  1 14:44:05 2017
+++ pkgsrc/www/py-mechanize/Makefile    Thu Jan 19 18:52:29 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2017/01/01 14:44:05 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=      mechanize-0.2.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_PYPI:=m/mechanize/} \
-               http://wwwsearch.sourceforge.net/mechanize/src/
+MASTER_SITES=  ${MASTER_SITE_PYPI:=m/mechanize/}
+MASTER_SITES+= http://wwwsearch.sourceforge.net/mechanize/src/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://wwwsearch.sourceforge.net/mechanize/

Index: pkgsrc/www/py-webcolors/Makefile
diff -u pkgsrc/www/py-webcolors/Makefile:1.6 pkgsrc/www/py-webcolors/Makefile:1.7
--- pkgsrc/www/py-webcolors/Makefile:1.6        Sun Mar 15 20:13:23 2015
+++ pkgsrc/www/py-webcolors/Makefile    Thu Jan 19 18:52:29 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2015/03/15 20:13:23 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=      webcolors-1.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    www
-MASTER_SITES=  http://bitbucket.org/ubernostrum/webcolors/downloads/ \
-               http://pypi.python.org/packages/source/w/webcolors/
+MASTER_SITES=  http://bitbucket.org/ubernostrum/webcolors/downloads/
+MASTER_SITES+= http://pypi.python.org/packages/source/w/webcolors/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.bitbucket.org/ubernostrum/webcolors/overview/

Index: pkgsrc/www/ruby-borges/Makefile
diff -u pkgsrc/www/ruby-borges/Makefile:1.20 pkgsrc/www/ruby-borges/Makefile:1.21
--- pkgsrc/www/ruby-borges/Makefile:1.20        Sun Oct 28 06:31:02 2012
+++ pkgsrc/www/ruby-borges/Makefile     Thu Jan 19 18:52:29 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2012/10/28 06:31:02 asau Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=      borges-1.1.0
 PKGREVISION=   2
 CATEGORIES=    www ruby
-MASTER_SITES=  http://rubyforge.org/frs/download.php/574/ \
-               http://segment7.net/projects/ruby/borges/
+MASTER_SITES=  http://rubyforge.org/frs/download.php/574/
+MASTER_SITES+= http://segment7.net/projects/ruby/borges/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://borges.rubyforge.org/

Index: pkgsrc/www/squid3/Makefile
diff -u pkgsrc/www/squid3/Makefile:1.70 pkgsrc/www/squid3/Makefile:1.71
--- pkgsrc/www/squid3/Makefile:1.70     Sun Dec 18 03:18:57 2016
+++ pkgsrc/www/squid3/Makefile  Thu Jan 19 18:52:29 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.70 2016/12/18 03:18:57 taca Exp $
+# $NetBSD: Makefile,v 1.71 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=      squid-3.5.23
 CATEGORIES=    www
-MASTER_SITES=  http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
-               ftp://ftp.squid-cache.org/pub/squid/ \
-               http://ftp.nluug.nl/internet/squid/
+MASTER_SITES=  http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/
+MASTER_SITES+= ftp://ftp.squid-cache.org/pub/squid/
+MASTER_SITES+= http://ftp.nluug.nl/internet/squid/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/squidGuard/Makefile
diff -u pkgsrc/www/squidGuard/Makefile:1.33 pkgsrc/www/squidGuard/Makefile:1.34
--- pkgsrc/www/squidGuard/Makefile:1.33 Sat Jul  9 06:39:14 2016
+++ pkgsrc/www/squidGuard/Makefile      Thu Jan 19 18:52:29 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2016/07/09 06:39:14 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=      squidGuard-1.4
 PKGREVISION=   12
 CATEGORIES=    www
-MASTER_SITES=  http://www.squidguard.org/Downloads/ \
-               http://www.squidguard.org/Downloads/Patches/1.4/
+MASTER_SITES=  http://www.squidguard.org/Downloads/
+MASTER_SITES+= http://www.squidguard.org/Downloads/Patches/1.4/
 DISTFILES=     ${DEFAULT_DISTFILES} \
                squidGuard-1.4-patch-20091015.tar.gz \
                squidGuard-1.4-patch-20091019.tar.gz

Index: pkgsrc/www/webalizer/Makefile
diff -u pkgsrc/www/webalizer/Makefile:1.65 pkgsrc/www/webalizer/Makefile:1.66
--- pkgsrc/www/webalizer/Makefile:1.65  Wed Aug  3 10:23:32 2016
+++ pkgsrc/www/webalizer/Makefile       Thu Jan 19 18:52:29 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.65 2016/08/03 10:23:32 adam Exp $
+# $NetBSD: Makefile,v 1.66 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=      webalizer-2.21-02-src
 PKGNAME=       webalizer-2.21.2
 PKGREVISION=   13
 CATEGORIES=    www
-MASTER_SITES=  ftp://ftp.mrunix.net/pub/webalizer/ \
-               http://gd.tuwien.ac.at/infosys/logeval/webalizer/
+MASTER_SITES=  ftp://ftp.mrunix.net/pub/webalizer/
+MASTER_SITES+= http://gd.tuwien.ac.at/infosys/logeval/webalizer/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/x11/fltk/Makefile
diff -u pkgsrc/x11/fltk/Makefile:1.83 pkgsrc/x11/fltk/Makefile:1.84
--- pkgsrc/x11/fltk/Makefile:1.83       Sat Apr 25 14:25:03 2015
+++ pkgsrc/x11/fltk/Makefile    Thu Jan 19 18:52:29 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.83 2015/04/25 14:25:03 tnn Exp $
+# $NetBSD: Makefile,v 1.84 2017/01/19 18:52:29 agc Exp $
 
 DISTNAME=      fltk-1.1.10-source
 PKGNAME=       ${DISTNAME:S/-source//}
 VERS=          ${DISTNAME:S/fltk-//:S/-source//}
 PKGREVISION=   7
 CATEGORIES=    x11
-MASTER_SITES=  http://ftp.easysw.com/pub/fltk/${VERS}/ \
-               ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \
-               ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
+MASTER_SITES=  http://ftp.easysw.com/pub/fltk/${VERS}/
+MASTER_SITES+= ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/
+MASTER_SITES+= ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/x11/fltk2/Makefile
diff -u pkgsrc/x11/fltk2/Makefile:1.19 pkgsrc/x11/fltk2/Makefile:1.20
--- pkgsrc/x11/fltk2/Makefile:1.19      Sat Apr 25 14:25:04 2015
+++ pkgsrc/x11/fltk2/Makefile   Thu Jan 19 18:52:29 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2015/04/25 14:25:04 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:29 agc Exp $
 
 VERS=          6129
 PKGREVISION=   13
 DISTNAME=      fltk-2.0.x-r${VERS}
 PKGNAME=       fltk2-2.0pre${VERS}
 CATEGORIES=    x11
-MASTER_SITES=  http://ftp.easysw.com/pub/fltk/snapshots/ \
-               ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/ \
-               ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/snapshots/
+MASTER_SITES=  http://ftp.easysw.com/pub/fltk/snapshots/
+MASTER_SITES+= ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
+MASTER_SITES+= ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/snapshots/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/x11/matchbox-common/Makefile
diff -u pkgsrc/x11/matchbox-common/Makefile:1.19 pkgsrc/x11/matchbox-common/Makefile:1.20
--- pkgsrc/x11/matchbox-common/Makefile:1.19    Sat Jan 23 06:23:59 2016
+++ pkgsrc/x11/matchbox-common/Makefile Thu Jan 19 18:52:30 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2016/01/23 06:23:59 zafer Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/19 18:52:30 agc Exp $
 #
 
 DISTNAME=              matchbox-common-0.9.1
 PKGREVISION=           10
 CATEGORIES=            x11
-MASTER_SITES=          http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/0.9/ \
-                       http://mirrors.kernel.org/yocto/matchbox/matchbox-common/0.9/
+MASTER_SITES=          http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/0.9/
+MASTER_SITES+=         http://mirrors.kernel.org/yocto/matchbox/matchbox-common/0.9/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/x11/qt3-libs/Makefile.common
diff -u pkgsrc/x11/qt3-libs/Makefile.common:1.78 pkgsrc/x11/qt3-libs/Makefile.common:1.79
--- pkgsrc/x11/qt3-libs/Makefile.common:1.78    Sat Jul  4 16:18:42 2015
+++ pkgsrc/x11/qt3-libs/Makefile.common Thu Jan 19 18:52:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.78 2015/07/04 16:18:42 joerg Exp $
+# $NetBSD: Makefile.common,v 1.79 2017/01/19 18:52:30 agc Exp $
 # used by x11/qt3-docs/Makefile
 # used by x11/qt3-libs/Makefile
 # used by x11/qt3-tools/Makefile
@@ -7,9 +7,9 @@
 
 DISTNAME=      qt-x11-free-${QTVERSION}
 CATEGORIES=    x11
-MASTER_SITES=  ftp://ftp.trolltech.com/qt/source/ \
-               ftp://ftp.bero.org/pub/qt/source/ \
-               http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/
+MASTER_SITES=  ftp://ftp.trolltech.com/qt/source/
+MASTER_SITES+= ftp://ftp.bero.org/pub/qt/source/
+MASTER_SITES+= http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/
 EXTRACT_SUFX=  .tar.bz2
 
 .include "../../x11/qt3/Makefile.common"

Index: pkgsrc/x11/rxvt/Makefile
diff -u pkgsrc/x11/rxvt/Makefile:1.58 pkgsrc/x11/rxvt/Makefile:1.59
--- pkgsrc/x11/rxvt/Makefile:1.58       Fri Feb 26 11:27:17 2016
+++ pkgsrc/x11/rxvt/Makefile    Thu Jan 19 18:52:30 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.58 2016/02/26 11:27:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.59 2017/01/19 18:52:30 agc Exp $
 
 DISTNAME=              rxvt-2.7.10
 PKGREVISION=           6
 CATEGORIES=            x11
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=rxvt/} \
-                       ftp://mason.primenet.com.au/pub/rxvt/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=rxvt/}
+MASTER_SITES+=         ftp://mason.primenet.com.au/pub/rxvt/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            gcw%rxvt.org@localhost

Index: pkgsrc/x11/rxvt-unicode/Makefile
diff -u pkgsrc/x11/rxvt-unicode/Makefile:1.56 pkgsrc/x11/rxvt-unicode/Makefile:1.57
--- pkgsrc/x11/rxvt-unicode/Makefile:1.56       Wed Jun  8 19:25:20 2016
+++ pkgsrc/x11/rxvt-unicode/Makefile    Thu Jan 19 18:52:30 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.56 2016/06/08 19:25:20 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2017/01/19 18:52:30 agc Exp $
 
 DISTNAME=      rxvt-unicode-9.22
 PKGREVISION=   1
 CATEGORIES=    x11
-MASTER_SITES=  http://dist.schmorp.de/rxvt-unicode/ \
-               http://dist.schmorp.de/rxvt-unicode/Attic/
+MASTER_SITES=  http://dist.schmorp.de/rxvt-unicode/
+MASTER_SITES+= http://dist.schmorp.de/rxvt-unicode/Attic/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/x11/xkeycaps/Makefile
diff -u pkgsrc/x11/xkeycaps/Makefile:1.18 pkgsrc/x11/xkeycaps/Makefile:1.19
--- pkgsrc/x11/xkeycaps/Makefile:1.18   Mon Oct 29 05:07:13 2012
+++ pkgsrc/x11/xkeycaps/Makefile        Thu Jan 19 18:52:30 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2012/10/29 05:07:13 asau Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:30 agc Exp $
 #
 
 DISTNAME=      xkeycaps-2.46
 PKGREVISION=   3
 CATEGORIES=    x11
-MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=applications/} \
-               http://www.jwz.org/xkeycaps/
+MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=applications/}
+MASTER_SITES+= http://www.jwz.org/xkeycaps/
 EXTRACT_SUFX=  .tar.Z
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/x11/xless/Makefile
diff -u pkgsrc/x11/xless/Makefile:1.23 pkgsrc/x11/xless/Makefile:1.24
--- pkgsrc/x11/xless/Makefile:1.23      Mon Oct 29 05:07:14 2012
+++ pkgsrc/x11/xless/Makefile   Thu Jan 19 18:52:30 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2012/10/29 05:07:14 asau Exp $
+# $NetBSD: Makefile,v 1.24 2017/01/19 18:52:30 agc Exp $
 
 DISTNAME=      xless-1.7
 PKGREVISION=   4
 CATEGORIES=    misc
-MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=applications/} \
-               ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
+MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=applications/}
+MASTER_SITES+= ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       X11 text viewer; useful as an add-on tool for other apps

Index: pkgsrc/x11/xlockmore/Makefile.common
diff -u pkgsrc/x11/xlockmore/Makefile.common:1.74 pkgsrc/x11/xlockmore/Makefile.common:1.75
--- pkgsrc/x11/xlockmore/Makefile.common:1.74   Sat Jul  4 16:18:43 2015
+++ pkgsrc/x11/xlockmore/Makefile.common        Thu Jan 19 18:52:30 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.74 2015/07/04 16:18:43 joerg Exp $
+# $NetBSD: Makefile.common,v 1.75 2017/01/19 18:52:30 agc Exp $
 #
 # used by x11/xlockmore/Makefile
 # used by x11/xlockmore-lite/Makefile
 
 DISTNAME=      xlockmore-5.46
 CATEGORIES=    x11
-MASTER_SITES=  http://www.tux.org/~bagleyd/xlock/ \
-               ftp://ibiblio.org/pub/Linux/X11/screensavers/
+MASTER_SITES=  http://www.tux.org/~bagleyd/xlock/
+MASTER_SITES+= ftp://ibiblio.org/pub/Linux/X11/screensavers/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/x11/xmindpath/Makefile
diff -u pkgsrc/x11/xmindpath/Makefile:1.20 pkgsrc/x11/xmindpath/Makefile:1.21
--- pkgsrc/x11/xmindpath/Makefile:1.20  Sat Apr  6 14:58:21 2013
+++ pkgsrc/x11/xmindpath/Makefile       Thu Jan 19 18:52:30 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2013/04/06 14:58:21 rodent Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:30 agc Exp $
 
 DISTNAME=      magicpoint-1.09a
 PKGNAME=       xmindpath-1.09a
 PKGREVISION=   1
 CATEGORIES=    x11
-MASTER_SITES=  ftp://ftp.riken.go.jp/pub/misc/Japan/MagicPoint/ \
-                               ftp://ftp.icm.edu.pl/packages/mgp/
+MASTER_SITES=  ftp://ftp.riken.go.jp/pub/misc/Japan/MagicPoint/
+MASTER_SITES+= ftp://ftp.icm.edu.pl/packages/mgp/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       MindPath PocketPoint user-level driver for X11

Index: pkgsrc/x11/xscript/Makefile
diff -u pkgsrc/x11/xscript/Makefile:1.17 pkgsrc/x11/xscript/Makefile:1.18
--- pkgsrc/x11/xscript/Makefile:1.17    Mon Dec 24 21:17:12 2012
+++ pkgsrc/x11/xscript/Makefile Thu Jan 19 18:52:30 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.17 2012/12/24 21:17:12 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2017/01/19 18:52:30 agc Exp $
 #
 
 DISTNAME=      xscript.tar
 PKGNAME=       xscript-19930228
 PKGREVISION=   2
 CATEGORIES=    x11
-MASTER_SITES=  ftp://ftp.x.org/R5contrib/ \
-               ftp://ftp.gwdg.de/pub/x11/x.org/R5contrib/
+MASTER_SITES=  ftp://ftp.x.org/R5contrib/
+MASTER_SITES+= ftp://ftp.gwdg.de/pub/x11/x.org/R5contrib/
 EXTRACT_SUFX=  .Z
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost



Home | Main Index | Thread Index | Old Index