summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/abcmidi/Makefile6
-rw-r--r--audio/aumix/Makefile.common8
-rw-r--r--audio/gmp3info/Makefile6
-rw-r--r--audio/gmpc-alarm/Makefile6
-rw-r--r--audio/gmpc-jamendo/Makefile6
-rw-r--r--audio/gmpc-libnotify/Makefile6
-rw-r--r--audio/gmpc-magnatune/Makefile6
-rw-r--r--audio/gmpc-wikipedia/Makefile6
-rw-r--r--audio/gmpc/Makefile6
-rw-r--r--audio/libmpd/Makefile6
-rw-r--r--audio/libofa/Makefile6
-rw-r--r--audio/libtunepimp/Makefile6
-rw-r--r--audio/muse/Makefile6
-rw-r--r--audio/sound-juicer/Makefile6
-rw-r--r--benchmarks/benchfft/Makefile6
-rw-r--r--biology/clustalw/Makefile6
-rw-r--r--biology/hmmer/Makefile8
-rw-r--r--cad/gnucap/Makefile6
-rw-r--r--chat/centerim/Makefile6
-rw-r--r--chat/ekg/Makefile6
-rw-r--r--chat/epic4-doc/Makefile10
-rw-r--r--chat/epic4/Makefile6
-rw-r--r--chat/i2cbd/Makefile6
-rw-r--r--chat/irchat-pj/Makefile6
-rw-r--r--chat/ircservices/Makefile6
-rw-r--r--chat/silc-client/Makefile6
-rw-r--r--chat/silc-server/Makefile6
-rw-r--r--comms/asterisk/Makefile8
-rw-r--r--comms/asterisk13/Makefile8
-rw-r--r--comms/asterisk14/Makefile8
-rw-r--r--comms/asterisk18/Makefile8
-rw-r--r--comms/xisp/Makefile6
-rw-r--r--converters/jcode-perl/Makefile6
-rw-r--r--converters/latex2rtf/Makefile6
-rw-r--r--converters/py-jpCodecs/Makefile6
-rw-r--r--converters/py-zhCodecs/Makefile6
-rw-r--r--databases/cstore/Makefile6
-rw-r--r--databases/db4/Makefile6
-rw-r--r--databases/db5/Makefile6
-rw-r--r--databases/geneweb/Makefile6
-rw-r--r--databases/openldap-doc/Makefile20
-rw-r--r--databases/openldap/Makefile.common20
-rw-r--r--databases/sqlite/Makefile6
-rw-r--r--databases/sqlite3/Makefile.version6
-rw-r--r--devel/automake/Makefile6
-rw-r--r--devel/bin86/Makefile6
-rw-r--r--devel/cdecl/Makefile6
-rw-r--r--devel/chrpath/Makefile6
-rw-r--r--devel/doxygen/Makefile6
-rw-r--r--devel/elf/Makefile6
-rw-r--r--devel/ffcall/Makefile6
-rw-r--r--devel/gmp/Makefile6
-rw-r--r--devel/libdatrie/Makefile6
-rw-r--r--devel/libfreefare/Makefile5
-rw-r--r--devel/libidn/Makefile6
-rw-r--r--devel/libslang/Makefile6
-rw-r--r--devel/libslang2/Makefile6
-rw-r--r--devel/libstatgrab/Makefile12
-rw-r--r--devel/libthai/Makefile6
-rw-r--r--devel/lmdbg/Makefile6
-rw-r--r--devel/lua-alt-getopt/Makefile6
-rw-r--r--devel/mk-configure/Makefile6
-rw-r--r--devel/ncurses/Makefile.common8
-rw-r--r--devel/p5-Cache-Cache/Makefile6
-rw-r--r--devel/p5-Cache/Makefile6
-rw-r--r--devel/p5-Glib-Object-Introspection/Makefile6
-rw-r--r--devel/pcc-libs/Makefile6
-rw-r--r--devel/pcre/Makefile6
-rw-r--r--devel/pcre2/Makefile6
-rw-r--r--devel/rdp/Makefile6
-rw-r--r--devel/silc-toolkit/Makefile6
-rw-r--r--devel/xulrunner17/dist.mk6
-rw-r--r--devel/zlib/Makefile6
-rw-r--r--editors/ce/Makefile.common6
-rw-r--r--editors/emacs20/Makefile6
-rw-r--r--editors/jed/Makefile.common10
-rw-r--r--editors/lyx/Makefile14
-rw-r--r--editors/nedit/Makefile6
-rw-r--r--editors/pico/Makefile6
-rw-r--r--editors/ve/Makefile6
-rw-r--r--emulators/cygwin_esound/Makefile8
-rw-r--r--emulators/snes9x/Makefile6
-rw-r--r--emulators/wine-devel/Makefile6
-rw-r--r--emulators/wine/Makefile6
-rw-r--r--fonts/cyr-rfx-share/Makefile.common7
-rw-r--r--fonts/freefonts/Makefile6
-rw-r--r--fonts/ghostscript-fonts/Makefile6
-rw-r--r--fonts/ipaexfont/Makefile6
-rw-r--r--fonts/ja-elisau/Makefile6
-rw-r--r--fonts/jisx0212fonts/Makefile6
-rw-r--r--fonts/ko-hanyang/Makefile6
-rw-r--r--fonts/mplayer-fonts/Makefile8
-rw-r--r--fonts/ttf-tlwg/Makefile6
-rw-r--r--games/civctp-demo/Makefile8
-rw-r--r--games/doom1/Makefile6
-rw-r--r--games/eus-demo/Makefile8
-rw-r--r--games/finalbattle/Makefile6
-rw-r--r--games/flightgear-data/Makefile8
-rw-r--r--games/flightgear/Makefile8
-rw-r--r--games/fltk-sudoku/Makefile16
-rw-r--r--games/frotz/Makefile6
-rw-r--r--games/heretic2-demo/Makefile8
-rw-r--r--games/quake/Makefile6
-rw-r--r--games/quakedata/Makefile6
-rw-r--r--games/rollemup/Makefile8
-rw-r--r--games/simgear/Makefile6
-rw-r--r--games/sjeng/Makefile6
-rw-r--r--games/thew/Makefile6
-rw-r--r--games/xarchon/Makefile6
-rw-r--r--games/xjump/Makefile6
-rw-r--r--games/xpuyopuyo/Makefile6
-rw-r--r--geography/epsg/Makefile6
-rw-r--r--geography/proj-doc/Makefile6
-rw-r--r--graphics/GMT/Makefile6
-rwxr-xr-xgraphics/GraphicsMagick/Makefile.common6
-rw-r--r--graphics/ImageMagick/Makefile.common10
-rw-r--r--graphics/ImageMagick6/Makefile.common10
-rw-r--r--graphics/Ngraph/Makefile6
-rw-r--r--graphics/claraocr/Makefile12
-rw-r--r--graphics/dvipng/Makefile6
-rw-r--r--graphics/freetype2/Makefile6
-rw-r--r--graphics/gimp/Makefile8
-rw-r--r--graphics/gle/Makefile6
-rw-r--r--graphics/libggi/Makefile6
-rw-r--r--graphics/libggigcp/Makefile6
-rw-r--r--graphics/libggimisc/Makefile6
-rw-r--r--graphics/libggiwmh/Makefile6
-rw-r--r--graphics/libgii/Makefile6
-rw-r--r--graphics/libgiigic/Makefile6
-rw-r--r--graphics/mng/Makefile6
-rw-r--r--graphics/p5-Image-ExifTool/Makefile6
-rw-r--r--graphics/png/Makefile6
-rw-r--r--graphics/potrace/Makefile6
-rw-r--r--graphics/povray/Makefile6
-rw-r--r--graphics/radiance/Makefile6
-rw-r--r--graphics/viewfax/Makefile12
-rw-r--r--inputmethod/gtk-im-libthai/Makefile6
-rw-r--r--inputmethod/ibus-libthai/Makefile6
-rw-r--r--inputmethod/ja-freewnn-lib/Makefile.common6
-rw-r--r--inputmethod/scim-thai/Makefile6
-rw-r--r--inputmethod/skk/Makefile6
-rw-r--r--inputmethod/tegaki-wagomu/Makefile6
-rw-r--r--lang/chicken/Makefile6
-rw-r--r--lang/gcc-aux/Makefile6
-rw-r--r--lang/gcc5-aux/Makefile6
-rw-r--r--lang/gprolog/Makefile6
-rw-r--r--lang/gwydion-dylan/Makefile6
-rw-r--r--lang/lua51/Makefile6
-rw-r--r--lang/lua52/Makefile6
-rw-r--r--lang/lua53/Makefile6
-rw-r--r--lang/maude/Makefile6
-rw-r--r--lang/mercury/Makefile10
-rw-r--r--lang/pcc/Makefile6
-rw-r--r--lang/racket-textual/Makefile12
-rw-r--r--lang/racket/Makefile12
-rw-r--r--lang/rexx-imc/Makefile6
-rw-r--r--lang/runawk/Makefile6
-rw-r--r--lang/snobol/Makefile10
-rw-r--r--lang/spl/Makefile6
-rw-r--r--lang/squeak-vm/Makefile6
-rw-r--r--lang/swi-prolog-lite/Makefile.common6
-rw-r--r--lang/vscm/Makefile6
-rw-r--r--lang/yap/Makefile6
-rw-r--r--mail/amavis-perl/Makefile6
-rw-r--r--mail/amavisd-new/Makefile12
-rw-r--r--mail/cyrus-imapd/Makefile6
-rw-r--r--mail/cyrus-imapd23/Makefile8
-rw-r--r--mail/cyrus-imapd24/Makefile8
-rw-r--r--mail/dovecot2-antispam-plugin/Makefile6
-rw-r--r--mail/exim-html/Makefile6
-rw-r--r--mail/exim/Makefile6
-rw-r--r--mail/exim3/Makefile6
-rw-r--r--mail/hypermail/Makefile6
-rw-r--r--mail/imp/Makefile6
-rw-r--r--mail/ingo/Makefile6
-rw-r--r--mail/mailgraph/Makefile6
-rw-r--r--mail/majordomo/Makefile6
-rw-r--r--mail/metamail/Makefile6
-rw-r--r--mail/mimp/Makefile6
-rw-r--r--mail/p5-Mail-Milter/Makefile6
-rw-r--r--mail/pine/Makefile6
-rw-r--r--mail/popa3d/Makefile6
-rw-r--r--mail/qpopper/Makefile.common6
-rw-r--r--mail/sendmail/Makefile.common8
-rw-r--r--mail/sympa/Makefile6
-rw-r--r--mail/turba/Makefile6
-rw-r--r--mail/vm/Makefile18
-rw-r--r--math/cln/Makefile6
-rw-r--r--math/fftw/Makefile6
-rw-r--r--math/fftw2/Makefile6
-rw-r--r--math/fftwf/Makefile6
-rw-r--r--math/gap/Makefile8
-rw-r--r--math/grace/Makefile10
-rw-r--r--math/mpcomplex/Makefile6
-rw-r--r--math/py-Scientific-doc/Makefile6
-rw-r--r--math/py-mpmath/Makefile6
-rw-r--r--math/xlispstat/Makefile6
-rw-r--r--mbone/mdp/Makefile6
-rw-r--r--misc/astrolog/Makefile6
-rw-r--r--misc/elscreen/Makefile6
-rw-r--r--misc/epm/Makefile8
-rw-r--r--misc/iselect/Makefile6
-rw-r--r--misc/logsurfer/Makefile6
-rw-r--r--misc/pty-redir/Makefile6
-rw-r--r--misc/vfu/Makefile6
-rw-r--r--misc/zorro/Makefile8
-rw-r--r--multimedia/gopchop/Makefile6
-rw-r--r--multimedia/handbrake/Makefile8
-rw-r--r--multimedia/realplayer-codecs/Makefile10
-rw-r--r--multimedia/vlc/Makefile6
-rw-r--r--multimedia/vlc20/Makefile6
-rw-r--r--multimedia/win32-codecs/Makefile10
-rw-r--r--multimedia/x265/Makefile6
-rw-r--r--multimedia/xanim/Makefile10
-rw-r--r--net/cftp/Makefile6
-rw-r--r--net/csup/Makefile6
-rw-r--r--net/delegate/Makefile6
-rw-r--r--net/dtcpclient/Makefile6
-rw-r--r--net/ftpproxy/Makefile6
-rw-r--r--net/ipv6calc/Makefile6
-rw-r--r--net/isc-dhcp4/Makefile.common6
-rw-r--r--net/lambdamoo-core/Makefile6
-rw-r--r--net/lambdamoo-doc/Makefile6
-rw-r--r--net/lftp/Makefile12
-rw-r--r--net/mrtg/Makefile6
-rw-r--r--net/nslint/Makefile6
-rw-r--r--net/ocsinventory-agent/Makefile6
-rw-r--r--net/p5-Net-DNS/Makefile6
-rw-r--r--net/parpd/Makefile6
-rw-r--r--net/proftpd/Makefile.common8
-rw-r--r--net/pure-ftpd/Makefile20
-rw-r--r--net/rsync/Makefile8
-rw-r--r--net/snort/Makefile8
-rw-r--r--net/teamspeak-server/Makefile6
-rw-r--r--net/tinyfugue/Makefile6
-rw-r--r--net/traceroute-nanog/Makefile8
-rw-r--r--net/wu-ftpd/Makefile10
-rw-r--r--news/inn/Makefile6
-rw-r--r--news/tin/Makefile16
-rw-r--r--parallel/paexec/Makefile6
-rw-r--r--parallel/slurm/Makefile8
-rw-r--r--pkgtools/distbb/Makefile6
-rw-r--r--pkgtools/nih/Makefile6
-rw-r--r--pkgtools/pkg_online-server/Makefile.common6
-rw-r--r--pkgtools/pkg_summary-utils/Makefile6
-rw-r--r--print/LPRng-core/Makefile6
-rw-r--r--print/a2ps/Makefile6
-rw-r--r--print/cnprint/Makefile10
-rw-r--r--print/cups15/Makefile8
-rw-r--r--print/foomatic-ppds/Makefile6
-rw-r--r--print/mpage/Makefile6
-rw-r--r--print/p5-PostScript-MailLabels/Makefile6
-rw-r--r--print/xpdf-arabic/Makefile6
-rw-r--r--print/xpdf-chinese-simplified/Makefile6
-rw-r--r--print/xpdf-chinese-traditional/Makefile6
-rw-r--r--print/xpdf-cyrillic/Makefile6
-rw-r--r--print/xpdf-greek/Makefile6
-rw-r--r--print/xpdf-hebrew/Makefile6
-rw-r--r--print/xpdf-japanese/Makefile6
-rw-r--r--print/xpdf-korean/Makefile6
-rw-r--r--print/xpdf-latin2/Makefile6
-rw-r--r--print/xpdf-thai/Makefile6
-rw-r--r--print/xpdf-turkish/Makefile6
-rw-r--r--print/xpdf/Makefile8
-rw-r--r--security/cyrus-sasl/Makefile.common6
-rw-r--r--security/fsh/Makefile6
-rw-r--r--security/gnupg/Makefile8
-rw-r--r--security/gss/Makefile6
-rw-r--r--security/libgcrypt/Makefile6
-rw-r--r--security/libgpg-error/Makefile10
-rw-r--r--security/lsh/Makefile6
-rw-r--r--security/nettle/Makefile6
-rw-r--r--security/pam-ldap/Makefile6
-rw-r--r--security/pgp2/Makefile6
-rw-r--r--security/pgp5/Makefile6
-rw-r--r--security/pinepgp/Makefile6
-rw-r--r--security/pks/Makefile6
-rw-r--r--security/prelude-manager/Makefile8
-rw-r--r--security/pwsafe/Makefile6
-rw-r--r--security/py-prewikka/Makefile6
-rw-r--r--security/sudo/Makefile12
-rw-r--r--shells/bash/Makefile6
-rw-r--r--shells/bash2-doc/Makefile6
-rw-r--r--shells/bash2/Makefile6
-rw-r--r--shells/mksh/Makefile6
-rw-r--r--shells/pdksh/Makefile10
-rw-r--r--shells/scsh/Makefile6
-rw-r--r--shells/tcsh/Makefile6
-rw-r--r--sysutils/asapm/Makefile6
-rw-r--r--sysutils/cfengine2/Makefile8
-rw-r--r--sysutils/dc-tools/Makefile6
-rw-r--r--sysutils/dtpstree/Makefile6
-rw-r--r--sysutils/fam/Makefile6
-rw-r--r--sysutils/ipw-firmware/Makefile6
-rw-r--r--sysutils/iwi-firmware/Makefile6
-rw-r--r--sysutils/iwi-firmware3/Makefile6
-rw-r--r--sysutils/iwn-firmware/Makefile6
-rw-r--r--sysutils/lilo/Makefile6
-rw-r--r--sysutils/lsof/Makefile32
-rw-r--r--sysutils/mc46/Makefile6
-rw-r--r--sysutils/mktemp/Makefile6
-rw-r--r--sysutils/pciutils/Makefile6
-rw-r--r--sysutils/py-notify-python/Makefile5
-rw-r--r--sysutils/rtty/Makefile6
-rw-r--r--sysutils/whowatch/Makefile6
-rw-r--r--sysutils/wpi-firmware2/Makefile6
-rw-r--r--textproc/WordNet/Makefile6
-rw-r--r--textproc/dict-mueller7/Makefile6
-rw-r--r--textproc/dict-server/Makefile.common6
-rw-r--r--textproc/dictem/Makefile6
-rw-r--r--textproc/eb/Makefile6
-rw-r--r--textproc/html2text/Makefile6
-rw-r--r--textproc/html2wml/Makefile6
-rw-r--r--textproc/hyperestraier/Makefile.common6
-rw-r--r--textproc/intltool/Makefile6
-rw-r--r--textproc/libxml2/Makefile.common6
-rw-r--r--textproc/libxslt/Makefile.common6
-rw-r--r--textproc/markdown2social/Makefile6
-rw-r--r--textproc/rtfm/Makefile6
-rw-r--r--textproc/swath/Makefile6
-rw-r--r--textproc/urlview/Makefile6
-rw-r--r--time/kronolith/Makefile6
-rw-r--r--time/rclock/Makefile6
-rw-r--r--wm/fvwm/Makefile6
-rw-r--r--www/amaya/Makefile8
-rw-r--r--www/analog/Makefile6
-rw-r--r--www/apache22/Makefile8
-rw-r--r--www/apache24/Makefile8
-rw-r--r--www/bluefish/Makefile6
-rw-r--r--www/elinks/Makefile6
-rw-r--r--www/horde/Makefile6
-rw-r--r--www/htdig/Makefile8
-rw-r--r--www/lynx/Makefile6
-rw-r--r--www/nspluginwrapper/Makefile6
-rw-r--r--www/p5-HTML-Template-Expr/Makefile6
-rw-r--r--www/p5-HTML-Template/Makefile6
-rw-r--r--www/py-mechanize/Makefile6
-rw-r--r--www/py-webcolors/Makefile6
-rw-r--r--www/ruby-borges/Makefile6
-rw-r--r--www/squid3/Makefile8
-rw-r--r--www/squidGuard/Makefile6
-rw-r--r--www/webalizer/Makefile6
-rw-r--r--x11/fltk/Makefile8
-rw-r--r--x11/fltk2/Makefile8
-rw-r--r--x11/matchbox-common/Makefile6
-rw-r--r--x11/qt3-libs/Makefile.common8
-rw-r--r--x11/rxvt-unicode/Makefile6
-rw-r--r--x11/rxvt/Makefile6
-rw-r--r--x11/xkeycaps/Makefile6
-rw-r--r--x11/xless/Makefile6
-rw-r--r--x11/xlockmore/Makefile.common6
-rw-r--r--x11/xmindpath/Makefile6
-rw-r--r--x11/xscript/Makefile6
353 files changed, 1204 insertions, 1207 deletions
diff --git a/audio/abcmidi/Makefile b/audio/abcmidi/Makefile
index 13466488361..49ef0bc3292 100644
--- a/audio/abcmidi/Makefile
+++ b/audio/abcmidi/Makefile
@@ -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
diff --git a/audio/aumix/Makefile.common b/audio/aumix/Makefile.common
index 362cf8844f2..ea8e4a81e24 100644
--- a/audio/aumix/Makefile.common
+++ b/audio/aumix/Makefile.common
@@ -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
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index 90a5e8576f9..f9f07d2e527 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -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
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index ad727a68d32..0376d196541 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -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
HOMEPAGE= http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALARM
diff --git a/audio/gmpc-jamendo/Makefile b/audio/gmpc-jamendo/Makefile
index 5148ccc70c8..dce41f4cd1c 100644
--- a/audio/gmpc-jamendo/Makefile
+++ b/audio/gmpc-jamendo/Makefile
@@ -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
HOMEPAGE= http://gmpc.wikia.com/wiki/GMPC_PLUGIN_JAMENDO
diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile
index 50b4ff429d1..6c0d4cd3ab1 100644
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@@ -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
HOMEPAGE= http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LIBNOTIFY
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index 0ea9fd705cc..d2ace55d125 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -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
HOMEPAGE= http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MAGNATUNE
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index 62877597a61..8e3bd8f7062 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -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
HOMEPAGE= http://gmpc.wikia.com/wiki/GMPC_PLUGIN_WIKIPEDIA
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 9fcff5c6d8c..ae0ec271593 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -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
HOMEPAGE= http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index fd00e798028..c038672f8f1 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -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
HOMEPAGE= http://gmpc.wikia.com/?title=Libmpd
diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
index 7434ab9154e..76765b9b818 100644
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@@ -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
HOMEPAGE= http://code.google.com/p/musicip-libofa/
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 13e507cb3e9..009f2ee07af 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -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
HOMEPAGE= http://musicbrainz.org/doc/libtunepimp
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 3af234f9955..6e3fa51bf33 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -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
HOMEPAGE= http://muse.dyne.org/
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 2886babd31b..b7da71fc5c8 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -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
HOMEPAGE= http://www.burtonini.com/computing/
diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile
index 4135fdcc21c..50a0c603c91 100644
--- a/benchmarks/benchfft/Makefile
+++ b/benchmarks/benchfft/Makefile
@@ -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
diff --git a/biology/clustalw/Makefile b/biology/clustalw/Makefile
index caca51ba2c7..efae7a86617 100644
--- a/biology/clustalw/Makefile
+++ b/biology/clustalw/Makefile
@@ -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
HOMEPAGE= http://bips.u-strasbg.fr/fr/Documentation/ClustalW/
diff --git a/biology/hmmer/Makefile b/biology/hmmer/Makefile
index ea5d6825762..9fa6fe4f43a 100644
--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@@ -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
HOMEPAGE= http://hmmer.janelia.org/
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index ce0e21a9ad0..5946ce7133b 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -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
HOMEPAGE= http://www.gnucap.org/
diff --git a/chat/centerim/Makefile b/chat/centerim/Makefile
index b5de263c43e..1bd345c6196 100644
--- a/chat/centerim/Makefile
+++ b/chat/centerim/Makefile
@@ -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
HOMEPAGE= http://www.centerim.org/
diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index 76aefad3a7d..13af7d54d03 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -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
HOMEPAGE= http://ekg.chmurka.net/
diff --git a/chat/epic4-doc/Makefile b/chat/epic4-doc/Makefile
index 51b03c07da3..52cd5e4fb69 100644
--- a/chat/epic4-doc/Makefile
+++ b/chat/epic4-doc/Makefile
@@ -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
HOMEPAGE= http://www.epicsol.org/
diff --git a/chat/epic4/Makefile b/chat/epic4/Makefile
index c1c33a136d4..098d42aa458 100644
--- a/chat/epic4/Makefile
+++ b/chat/epic4/Makefile
@@ -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
diff --git a/chat/i2cbd/Makefile b/chat/i2cbd/Makefile
index 0b5adf44b58..3591c4cb274 100644
--- a/chat/i2cbd/Makefile
+++ b/chat/i2cbd/Makefile
@@ -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
HOMEPAGE= http://www.draga.com/~jwise/i2cb/
diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile
index c8b036d7283..b06a836674c 100644
--- a/chat/irchat-pj/Makefile
+++ b/chat/irchat-pj/Makefile
@@ -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
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index f03d02be5dd..20676776e4c 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -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
HOMEPAGE= http://www.ircservices.za.net/
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 6f931a09ff9..f246bffc7f7 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -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
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 3f096368af9..5ac2775ccfa 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -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
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 67be60e09dd..5c48e2dd085 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -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}
diff --git a/comms/asterisk13/Makefile b/comms/asterisk13/Makefile
index 0e427903d24..c3bc569e490 100644
--- a/comms/asterisk13/Makefile
+++ b/comms/asterisk13/Makefile
@@ -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}
diff --git a/comms/asterisk14/Makefile b/comms/asterisk14/Makefile
index 103773f5707..d76a1b5bf48 100644
--- a/comms/asterisk14/Makefile
+++ b/comms/asterisk14/Makefile
@@ -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}
diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index cd75b2c5a52..364213cb007 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -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
HOMEPAGE= http://www.asterisk.org/
diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index 9f785b09ff5..4cdfea47415 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -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
HOMEPAGE= http://xisp.hellug.gr/
diff --git a/converters/jcode-perl/Makefile b/converters/jcode-perl/Makefile
index ef7bdef9f2e..41857119af4 100644
--- a/converters/jcode-perl/Makefile
+++ b/converters/jcode-perl/Makefile
@@ -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
diff --git a/converters/latex2rtf/Makefile b/converters/latex2rtf/Makefile
index b2d0d7ce798..bcc82a01f0d 100644
--- a/converters/latex2rtf/Makefile
+++ b/converters/latex2rtf/Makefile
@@ -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
HOMEPAGE= http://latex2rtf.sourceforge.net/
diff --git a/converters/py-jpCodecs/Makefile b/converters/py-jpCodecs/Makefile
index dcaf5f2f43c..641a046a1c0 100644
--- a/converters/py-jpCodecs/Makefile
+++ b/converters/py-jpCodecs/Makefile
@@ -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
HOMEPAGE= http://www.asahi-net.or.jp/~rd6t-kjym/python/
diff --git a/converters/py-zhCodecs/Makefile b/converters/py-zhCodecs/Makefile
index c9a922ebc7f..7ddebad4e69 100644
--- a/converters/py-zhCodecs/Makefile
+++ b/converters/py-zhCodecs/Makefile
@@ -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
HOMEPAGE= http://sourceforge.net/projects/python-codecs/
diff --git a/databases/cstore/Makefile b/databases/cstore/Makefile
index 4a882e669bb..8413c1ec02c 100644
--- a/databases/cstore/Makefile
+++ b/databases/cstore/Makefile
@@ -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
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index cc3206ea860..43e9287b780 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -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/
diff --git a/databases/db5/Makefile b/databases/db5/Makefile
index 0b41563e171..acf9a66d708 100644
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@@ -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
HOMEPAGE= http://www.oracle.com/database/berkeley-db/db/index.html
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index 9ebeca23036..ae17ccb8363 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -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
HOMEPAGE= http://www.geneweb.org/
diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile
index 84de3647235..bf179c2d056 100644
--- a/databases/openldap-doc/Makefile
+++ b/databases/openldap-doc/Makefile
@@ -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
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index e63b9ca673d..688e9a2b9ac 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -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
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index 1f0bb389ff7..195ae0f9a45 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -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
HOMEPAGE= http://www.hwaci.com/sw/sqlite/
diff --git a/databases/sqlite3/Makefile.version b/databases/sqlite3/Makefile.version
index 098b85021ac..1f7a44b90c7 100644
--- a/databases/sqlite3/Makefile.version
+++ b/databases/sqlite3/Makefile.version
@@ -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/
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 444c07e6e61..009ee5a30f9 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -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
diff --git a/devel/bin86/Makefile b/devel/bin86/Makefile
index f5b8e55e066..2c12a8cc717 100644
--- a/devel/bin86/Makefile
+++ b/devel/bin86/Makefile
@@ -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
HOMEPAGE= http://www.debath.co.uk/
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index bed2ccca2cf..ab3f0d5b15c 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -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
COMMENT= Utility to explain and compose C and C++ declarations
diff --git a/devel/chrpath/Makefile b/devel/chrpath/Makefile
index 7ace4f66819..8104c737c20 100644
--- a/devel/chrpath/Makefile
+++ b/devel/chrpath/Makefile
@@ -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
HOMEPAGE= http://freshmeat.net/projects/chrpath/
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 2ef1681fa11..8a46e733c53 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -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
HOMEPAGE= http://www.doxygen.org/
diff --git a/devel/elf/Makefile b/devel/elf/Makefile
index ce835dc6f04..15b4d1593a8 100644
--- a/devel/elf/Makefile
+++ b/devel/elf/Makefile
@@ -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
HOMEPAGE= http://www.kerneled.com/projects/elf/
diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index 87d03af015d..6ab1aaf3dbc 100644
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@@ -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
HOMEPAGE= http://www.haible.de/bruno/packages-ffcall.html
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 876473ec4b4..c099191ade5 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -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
diff --git a/devel/libdatrie/Makefile b/devel/libdatrie/Makefile
index 66657605384..0f831ed60df 100644
--- a/devel/libdatrie/Makefile
+++ b/devel/libdatrie/Makefile
@@ -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
diff --git a/devel/libfreefare/Makefile b/devel/libfreefare/Makefile
index 8d0c527c6c9..8d95c534bd2 100644
--- a/devel/libfreefare/Makefile
+++ b/devel/libfreefare/Makefile
@@ -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
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index f9f39fcbf3f..ace8d2fc5ac 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -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
HOMEPAGE= http://www.gnu.org/software/libidn/
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 72083dd06e0..0226ba260e7 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -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
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index a23ca11e219..161a985b6d8 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -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
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index 9303cf1f8b6..24c1a521423 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -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
HOMEPAGE= http://www.i-scream.org/libstatgrab/
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index 0ca49cd5e34..2a13c86669f 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -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
diff --git a/devel/lmdbg/Makefile b/devel/lmdbg/Makefile
index f44fb481ee9..1e4af5b0faa 100644
--- a/devel/lmdbg/Makefile
+++ b/devel/lmdbg/Makefile
@@ -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
HOMEPAGE= http://sourceforge.net/projects/lmdbg/
diff --git a/devel/lua-alt-getopt/Makefile b/devel/lua-alt-getopt/Makefile
index a5ebd1ce00c..637d149dee2 100644
--- a/devel/lua-alt-getopt/Makefile
+++ b/devel/lua-alt-getopt/Makefile
@@ -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
HOMEPAGE= https://sourceforge.net/projects/lua-alt-getopt/
diff --git a/devel/mk-configure/Makefile b/devel/mk-configure/Makefile
index 3e409d2fb8e..d2c3c09ce6f 100644
--- a/devel/mk-configure/Makefile
+++ b/devel/mk-configure/Makefile
@@ -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
HOMEPAGE= http://sourceforge.net/projects/mk-configure
diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common
index 2fc8e0a796c..523cf6f4158 100644
--- a/devel/ncurses/Makefile.common
+++ b/devel/ncurses/Makefile.common
@@ -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
HOMEPAGE= http://invisible-island.net/ncurses/ncurses.html
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index 07a162eabea..faff1b69b37 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -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
HOMEPAGE= http://perl-cache.sourceforge.net/
diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile
index 3783dad231d..053bd503f5d 100644
--- a/devel/p5-Cache/Makefile
+++ b/devel/p5-Cache/Makefile
@@ -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
HOMEPAGE= http://perl-cache.sourceforge.net/
diff --git a/devel/p5-Glib-Object-Introspection/Makefile b/devel/p5-Glib-Object-Introspection/Makefile
index de7218c0c64..00e448c52b7 100644
--- a/devel/p5-Glib-Object-Introspection/Makefile
+++ b/devel/p5-Glib-Object-Introspection/Makefile
@@ -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
HOMEPAGE= http://gtk2-perl.sourceforge.net/
diff --git a/devel/pcc-libs/Makefile b/devel/pcc-libs/Makefile
index 38bd491ef6f..26c3149c318 100644
--- a/devel/pcc-libs/Makefile
+++ b/devel/pcc-libs/Makefile
@@ -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/
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 7d03202ea28..01ad3ca3706 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -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
diff --git a/devel/pcre2/Makefile b/devel/pcre2/Makefile
index a71fb993cdc..689669d5373 100644
--- a/devel/pcre2/Makefile
+++ b/devel/pcre2/Makefile
@@ -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
diff --git a/devel/rdp/Makefile b/devel/rdp/Makefile
index bbbb24bf612..cd04730f022 100644
--- a/devel/rdp/Makefile
+++ b/devel/rdp/Makefile
@@ -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
diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index d916a00400e..8067fe6146f 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -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
diff --git a/devel/xulrunner17/dist.mk b/devel/xulrunner17/dist.mk
index f9f40d33f25..7af354b7be5 100644
--- a/devel/xulrunner17/dist.mk
+++ b/devel/xulrunner17/dist.mk
@@ -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
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile
index ac15b02eb0e..4e4f39f0cf7 100644
--- a/devel/zlib/Makefile
+++ b/devel/zlib/Makefile
@@ -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
diff --git a/editors/ce/Makefile.common b/editors/ce/Makefile.common
index 11501669c64..14ac180da00 100644
--- a/editors/ce/Makefile.common
+++ b/editors/ce/Makefile.common
@@ -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
HOMEPAGE= http://tiswww.case.edu/php/chet/
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 00404c8d9a1..cf5a0a9f203 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -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}
diff --git a/editors/jed/Makefile.common b/editors/jed/Makefile.common
index 78bd2298da2..58dad272cc6 100644
--- a/editors/jed/Makefile.common
+++ b/editors/jed/Makefile.common
@@ -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
diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile
index 6e45ce9db30..6be8f60d487 100644
--- a/editors/lyx/Makefile
+++ b/editors/lyx/Makefile
@@ -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
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index b2767a83647..2190e2187c7 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -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
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 5ba42a10518..6e71be42280 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -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
diff --git a/editors/ve/Makefile b/editors/ve/Makefile
index 6ae8f632de5..8b545594ca9 100644
--- a/editors/ve/Makefile
+++ b/editors/ve/Makefile
@@ -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
diff --git a/emulators/cygwin_esound/Makefile b/emulators/cygwin_esound/Makefile
index 01403fbfcaf..c98bf21f8eb 100644
--- a/emulators/cygwin_esound/Makefile
+++ b/emulators/cygwin_esound/Makefile
@@ -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 \
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index e79fc4a5ab9..1a607e93178 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -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
HOMEPAGE= http://www.snes9x.com/
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index f4fb00ad9ff..739db8dd2d4 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -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
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index ae258b77e0e..e6d280e48be 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -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
diff --git a/fonts/cyr-rfx-share/Makefile.common b/fonts/cyr-rfx-share/Makefile.common
index e13f6f3f153..aa9cbd33f1c 100644
--- a/fonts/cyr-rfx-share/Makefile.common
+++ b/fonts/cyr-rfx-share/Makefile.common
@@ -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
diff --git a/fonts/freefonts/Makefile b/fonts/freefonts/Makefile
index 168fba8de1d..70e8c03aec4 100644
--- a/fonts/freefonts/Makefile
+++ b/fonts/freefonts/Makefile
@@ -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
COMMENT= Collection of 79 freely available fonts
diff --git a/fonts/ghostscript-fonts/Makefile b/fonts/ghostscript-fonts/Makefile
index 775ff6b4466..a985e6a6e8b 100644
--- a/fonts/ghostscript-fonts/Makefile
+++ b/fonts/ghostscript-fonts/Makefile
@@ -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
diff --git a/fonts/ipaexfont/Makefile b/fonts/ipaexfont/Makefile
index 3120da8b11f..e77dac11b1e 100644
--- a/fonts/ipaexfont/Makefile
+++ b/fonts/ipaexfont/Makefile
@@ -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
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index c80d10806e2..6997e738960 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -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
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index 410c2c0f77f..7bf7e9560a1 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -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
diff --git a/fonts/ko-hanyang/Makefile b/fonts/ko-hanyang/Makefile
index 972425793aa..0f7eeef57c6 100644
--- a/fonts/ko-hanyang/Makefile
+++ b/fonts/ko-hanyang/Makefile
@@ -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
COMMENT= X11 fonts for KSC 5601 standard
diff --git a/fonts/mplayer-fonts/Makefile b/fonts/mplayer-fonts/Makefile
index fceb70f2368..1f10482bbc4 100644
--- a/fonts/mplayer-fonts/Makefile
+++ b/fonts/mplayer-fonts/Makefile
@@ -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 \
diff --git a/fonts/ttf-tlwg/Makefile b/fonts/ttf-tlwg/Makefile
index 72a30da2bd1..f002ccb3964 100644
--- a/fonts/ttf-tlwg/Makefile
+++ b/fonts/ttf-tlwg/Makefile
@@ -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
diff --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile
index 084c0273bc8..b5daea4382f 100644
--- a/games/civctp-demo/Makefile
+++ b/games/civctp-demo/Makefile
@@ -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
HOMEPAGE= http://www.lokigames.com/products/civctp/
diff --git a/games/doom1/Makefile b/games/doom1/Makefile
index 7b582012a8a..bf6c8f2d628 100644
--- a/games/doom1/Makefile
+++ b/games/doom1/Makefile
@@ -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
diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile
index 86c1857d41e..d610639a0f8 100644
--- a/games/eus-demo/Makefile
+++ b/games/eus-demo/Makefile
@@ -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
HOMEPAGE= http://www.lokigames.com/products/eus/
diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile
index 5e5459597ca..536ce80293f 100644
--- a/games/finalbattle/Makefile
+++ b/games/finalbattle/Makefile
@@ -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
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 2847bc8320f..01314f7ed1e 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -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
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 4b4111fbde2..b20dd3b7d70 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -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
diff --git a/games/fltk-sudoku/Makefile b/games/fltk-sudoku/Makefile
index b9f52b15f0e..68eae1fb524 100644
--- a/games/fltk-sudoku/Makefile
+++ b/games/fltk-sudoku/Makefile
@@ -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
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 8d7b7afa863..31ad21f475f 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -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
HOMEPAGE= http://frotz.sourceforge.net/
diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile
index 2f7b54e06fb..cc73b261488 100644
--- a/games/heretic2-demo/Makefile
+++ b/games/heretic2-demo/Makefile
@@ -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
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 46c38417463..f9b7d4880db 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -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
diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile
index 895aa67f154..ff71069e128 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -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
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index c41de48b1c1..e8add5f0956 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -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
diff --git a/games/simgear/Makefile b/games/simgear/Makefile
index 8b842b7cba0..4974f47b1ca 100644
--- a/games/simgear/Makefile
+++ b/games/simgear/Makefile
@@ -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
diff --git a/games/sjeng/Makefile b/games/sjeng/Makefile
index faeca8782f7..22afe078ef7 100644
--- a/games/sjeng/Makefile
+++ b/games/sjeng/Makefile
@@ -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
HOMEPAGE= http://www.sjeng.org/
diff --git a/games/thew/Makefile b/games/thew/Makefile
index 2172b5c093b..a4f40ae33cd 100644
--- a/games/thew/Makefile
+++ b/games/thew/Makefile
@@ -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
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index 4916b43462d..4202374952e 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -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
HOMEPAGE= http://xarchon.seul.org/
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index e0f722aa685..d83e6094649 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -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
HOMEPAGE= http://www.gtlib.cc.gatech.edu/pub/debian/pool/main/x/xjump/
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 4ca34bbd676..38722fa74a6 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -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
HOMEPAGE= http://chaos2.org/xpuyopuyo/
diff --git a/geography/epsg/Makefile b/geography/epsg/Makefile
index 0b52935c203..40b17f0db16 100644
--- a/geography/epsg/Makefile
+++ b/geography/epsg/Makefile
@@ -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}
diff --git a/geography/proj-doc/Makefile b/geography/proj-doc/Makefile
index 2dc9c4896e3..dea2eeeb07b 100644
--- a/geography/proj-doc/Makefile
+++ b/geography/proj-doc/Makefile
@@ -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
HOMEPAGE= http://www.remotesensing.org/proj/
diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
index 4781d54b90d..5be1e7a8134 100644
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -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 \
diff --git a/graphics/GraphicsMagick/Makefile.common b/graphics/GraphicsMagick/Makefile.common
index 23648728bda..a6c46152dcc 100755
--- a/graphics/GraphicsMagick/Makefile.common
+++ b/graphics/GraphicsMagick/Makefile.common
@@ -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
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index ee650c830df..81c8c3f4694 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -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/
diff --git a/graphics/ImageMagick6/Makefile.common b/graphics/ImageMagick6/Makefile.common
index 0d3a05d8faa..16170c05e74 100644
--- a/graphics/ImageMagick6/Makefile.common
+++ b/graphics/ImageMagick6/Makefile.common
@@ -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/
diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile
index 295f5790619..58e5117066a 100644
--- a/graphics/Ngraph/Makefile
+++ b/graphics/Ngraph/Makefile
@@ -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
diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile
index 08a42f28bcb..92962505a63 100644
--- a/graphics/claraocr/Makefile
+++ b/graphics/claraocr/Makefile
@@ -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
HOMEPAGE= http://www.geocities.com/claraocr/
diff --git a/graphics/dvipng/Makefile b/graphics/dvipng/Makefile
index 52db2feb581..10bc284d7ae 100644
--- a/graphics/dvipng/Makefile
+++ b/graphics/dvipng/Makefile
@@ -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
HOMEPAGE= http://savannah.nongnu.org/projects/dvipng/
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 2e9b4e68741..e3cbfef86bb 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -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
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 3a1440ebf82..c686220b323 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -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
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 7444d7a50d7..90ea5a797c1 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -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
HOMEPAGE= http://www.linas.org/gle/
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 34210db09b1..3b609af99ea 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -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
diff --git a/graphics/libggigcp/Makefile b/graphics/libggigcp/Makefile
index a5b1d93097c..20249668f61 100644
--- a/graphics/libggigcp/Makefile
+++ b/graphics/libggigcp/Makefile
@@ -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
diff --git a/graphics/libggimisc/Makefile b/graphics/libggimisc/Makefile
index 211ed239305..68914f8c934 100644
--- a/graphics/libggimisc/Makefile
+++ b/graphics/libggimisc/Makefile
@@ -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
diff --git a/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile
index 5c0ca354673..225d2db8b11 100644
--- a/graphics/libggiwmh/Makefile
+++ b/graphics/libggiwmh/Makefile
@@ -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
diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile
index 57ed153ffd0..c7f4c453cf4 100644
--- a/graphics/libgii/Makefile
+++ b/graphics/libgii/Makefile
@@ -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
diff --git a/graphics/libgiigic/Makefile b/graphics/libgiigic/Makefile
index 8e3653af37b..b142026249e 100644
--- a/graphics/libgiigic/Makefile
+++ b/graphics/libgiigic/Makefile
@@ -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
diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile
index b3547f8f455..a31e2202732 100644
--- a/graphics/mng/Makefile
+++ b/graphics/mng/Makefile
@@ -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
diff --git a/graphics/p5-Image-ExifTool/Makefile b/graphics/p5-Image-ExifTool/Makefile
index 8e264218c8a..4ae03a36418 100644
--- a/graphics/p5-Image-ExifTool/Makefile
+++ b/graphics/p5-Image-ExifTool/Makefile
@@ -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
# author says www.sno is the same machine, but was never advertised
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 51fc60fb64f..beabb0d9cb1 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -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
diff --git a/graphics/potrace/Makefile b/graphics/potrace/Makefile
index 6ef4663240d..a4623f96daf 100644
--- a/graphics/potrace/Makefile
+++ b/graphics/potrace/Makefile
@@ -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
HOMEPAGE= http://potrace.sourceforge.net/
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 7e5e84a3646..504820e677e 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -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
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index 24d7bfa297e..f57216594b5 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -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
diff --git a/graphics/viewfax/Makefile b/graphics/viewfax/Makefile
index a26e2f60a1d..b22ee66799a 100644
--- a/graphics/viewfax/Makefile
+++ b/graphics/viewfax/Makefile
@@ -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
COMMENT= Tool for displaying fax files in an X Window
diff --git a/inputmethod/gtk-im-libthai/Makefile b/inputmethod/gtk-im-libthai/Makefile
index 06da7c30b37..dc0ba1d1d3d 100644
--- a/inputmethod/gtk-im-libthai/Makefile
+++ b/inputmethod/gtk-im-libthai/Makefile
@@ -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
HOMEPAGE= http://linux.thai.net/projects/gtk-im-libthai
diff --git a/inputmethod/ibus-libthai/Makefile b/inputmethod/ibus-libthai/Makefile
index 052a2a78f9f..2dd0068e359 100644
--- a/inputmethod/ibus-libthai/Makefile
+++ b/inputmethod/ibus-libthai/Makefile
@@ -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
diff --git a/inputmethod/ja-freewnn-lib/Makefile.common b/inputmethod/ja-freewnn-lib/Makefile.common
index a6e70f83fbe..6aec31920a3 100644
--- a/inputmethod/ja-freewnn-lib/Makefile.common
+++ b/inputmethod/ja-freewnn-lib/Makefile.common
@@ -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
diff --git a/inputmethod/scim-thai/Makefile b/inputmethod/scim-thai/Makefile
index f726aaa5c15..2dad8803178 100644
--- a/inputmethod/scim-thai/Makefile
+++ b/inputmethod/scim-thai/Makefile
@@ -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
HOMEPAGE= http://linux.thai.net/projects/scim-thai
diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile
index b199e7a0b0e..efb97d148fd 100644
--- a/inputmethod/skk/Makefile
+++ b/inputmethod/skk/Makefile
@@ -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
HOMEPAGE= http://openlab.ring.gr.jp/skk/index.html
diff --git a/inputmethod/tegaki-wagomu/Makefile b/inputmethod/tegaki-wagomu/Makefile
index 46ce9bfd086..f40a6b7e438 100644
--- a/inputmethod/tegaki-wagomu/Makefile
+++ b/inputmethod/tegaki-wagomu/Makefile
@@ -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
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 7de4dc325b2..5c9b25897d0 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -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 #, airhead@users.sourceforge.net
HOMEPAGE= http://www.call-cc.org/
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index b03b3a3acec..0dec043f31b 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -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:/bin:/usr/sbin:/usr/bin:${PREFIX}/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 \
diff --git a/lang/gcc5-aux/Makefile b/lang/gcc5-aux/Makefile
index d492a557bf3..719815d8b71 100644
--- a/lang/gcc5-aux/Makefile
+++ b/lang/gcc5-aux/Makefile
@@ -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:/bin:/usr/sbin:/usr/bin:${PREFIX}/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 \
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index 522652a13f4..624ff40e1fe 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -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
HOMEPAGE= http://www.gprolog.org/
diff --git a/lang/gwydion-dylan/Makefile b/lang/gwydion-dylan/Makefile
index 224431bc162..0e91b54c0f1 100644
--- a/lang/gwydion-dylan/Makefile
+++ b/lang/gwydion-dylan/Makefile
@@ -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
HOMEPAGE= http://www.opendylan.org/
diff --git a/lang/lua51/Makefile b/lang/lua51/Makefile
index 9d5f01e7f77..cf6eb36f401 100644
--- a/lang/lua51/Makefile
+++ b/lang/lua51/Makefile
@@ -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
HOMEPAGE= http://www.lua.org/
diff --git a/lang/lua52/Makefile b/lang/lua52/Makefile
index d0db9c16a41..4b743c98204 100644
--- a/lang/lua52/Makefile
+++ b/lang/lua52/Makefile
@@ -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
HOMEPAGE= http://www.lua.org/
diff --git a/lang/lua53/Makefile b/lang/lua53/Makefile
index b054d4d9ea3..32e1d22650d 100644
--- a/lang/lua53/Makefile
+++ b/lang/lua53/Makefile
@@ -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
HOMEPAGE= http://www.lua.org/
diff --git a/lang/maude/Makefile b/lang/maude/Makefile
index 9904d0d7342..eecc1f692b5 100644
--- a/lang/maude/Makefile
+++ b/lang/maude/Makefile
@@ -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
HOMEPAGE= http://maude.cs.uiuc.edu/
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 17d92c9d4f0..44d8f096c71 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -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
HOMEPAGE= http://www.mercurylang.org/
diff --git a/lang/pcc/Makefile b/lang/pcc/Makefile
index a881e2eeb66..2dc8c6a32c7 100644
--- a/lang/pcc/Makefile
+++ b/lang/pcc/Makefile
@@ -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
diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile
index 946d9f221d1..6d19c6015d4 100644
--- a/lang/racket-textual/Makefile
+++ b/lang/racket-textual/Makefile
@@ -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)
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index e1b2e1e540c..5312b642055 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -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)
diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index cc67c156c80..f0614c9194b 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -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
HOMEPAGE= http://users.comlab.ox.ac.uk/ian.collier/Rexx/
diff --git a/lang/runawk/Makefile b/lang/runawk/Makefile
index 301c04ca2b2..39bd5fc1dc9 100644
--- a/lang/runawk/Makefile
+++ b/lang/runawk/Makefile
@@ -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
HOMEPAGE= http://sourceforge.net/projects/runawk
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index fb832969cf7..198e63e07b8 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -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
diff --git a/lang/spl/Makefile b/lang/spl/Makefile
index 5b37166b5c9..4d2e666072d 100644
--- a/lang/spl/Makefile
+++ b/lang/spl/Makefile
@@ -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
HOMEPAGE= http://www.clifford.at/spl/
diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile
index 2e8f2573bb5..718cc7e04f2 100644
--- a/lang/squeak-vm/Makefile
+++ b/lang/squeak-vm/Makefile
@@ -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
HOMEPAGE= http://squeakvm.org/unix/
diff --git a/lang/swi-prolog-lite/Makefile.common b/lang/swi-prolog-lite/Makefile.common
index 30ec278ab35..ee444c0802c 100644
--- a/lang/swi-prolog-lite/Makefile.common
+++ b/lang/swi-prolog-lite/Makefile.common
@@ -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
diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile
index 717d876d0dd..f7a70c6a8d4 100644
--- a/lang/vscm/Makefile
+++ b/lang/vscm/Makefile
@@ -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
#HOMEPAGE= http://www.cs.princeton.edu/~blume/vscm/
diff --git a/lang/yap/Makefile b/lang/yap/Makefile
index 68bff0b2d6e..0c6dc109cc0 100644
--- a/lang/yap/Makefile
+++ b/lang/yap/Makefile
@@ -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
HOMEPAGE= http://www.ncc.up.pt/~vsc/Yap/
diff --git a/mail/amavis-perl/Makefile b/mail/amavis-perl/Makefile
index 1b3196174dd..cb4f188f7d6 100644
--- a/mail/amavis-perl/Makefile
+++ b/mail/amavis-perl/Makefile
@@ -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
HOMEPAGE= http://www.amavis.org/
diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile
index 21384aaa4cb..e346b4cde60 100644
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@@ -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
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 975defe4b8b..48582751185 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -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
HOMEPAGE= http://www.cyrusimap.org/
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 023b8f146c8..23ecad624a2 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -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
HOMEPAGE= http://www.cyrusimap.org/
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 5771f00e27b..2a18d0dc3fb 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -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
HOMEPAGE= http://www.cyrusimap.org/
diff --git a/mail/dovecot2-antispam-plugin/Makefile b/mail/dovecot2-antispam-plugin/Makefile
index 00d0d68419a..977e90c8fc2 100644
--- a/mail/dovecot2-antispam-plugin/Makefile
+++ b/mail/dovecot2-antispam-plugin/Makefile
@@ -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
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 510a4ce67b0..4d62a6e45e6 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -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
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index be7a41baad3..54645c2ae1b 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -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
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index a0c279e6938..7c202c049ab 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -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
diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile
index e712dfacd49..3f264c8b11b 100644
--- a/mail/hypermail/Makefile
+++ b/mail/hypermail/Makefile
@@ -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
HOMEPAGE= http://www.hypermail-project.org/
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 8ad5dbe5512..b759f53e8af 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -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
HOMEPAGE= http://www.horde.org/imp/
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index 2a95cb2eaff..e2f79925349 100644
--- a/mail/ingo/Makefile
+++ b/mail/ingo/Makefile
@@ -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
HOMEPAGE= http://www.horde.org/apps/ingo/
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index dd427156942..33aa7f038cc 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -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
HOMEPAGE= http://mailgraph.schweikert.ch/
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index d58a159cb8c..88a33bd7edf 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -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
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 0cc9aa208d7..8be6fb854fb 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -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
diff --git a/mail/mimp/Makefile b/mail/mimp/Makefile
index f7ed26582e1..2e7649d7232 100644
--- a/mail/mimp/Makefile
+++ b/mail/mimp/Makefile
@@ -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
HOMEPAGE= http://www.horde.org/apps/mimp/
diff --git a/mail/p5-Mail-Milter/Makefile b/mail/p5-Mail-Milter/Makefile
index 0f9edf93f6f..6a9d45f4d4e 100644
--- a/mail/p5-Mail-Milter/Makefile
+++ b/mail/p5-Mail-Milter/Makefile
@@ -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
HOMEPAGE= http://pmilter.sourceforge.net/
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index b1a51791450..ac3b2cb822d 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -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
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 44c897bf0d5..780bf2121b3 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -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
HOMEPAGE= http://www.openwall.com/popa3d/
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index 6a6d7fdfd7c..f118ff4ff40 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -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
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index b930ca1a3da..5a034c3a2bf 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -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
HOMEPAGE= http://www.sendmail.org/
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index c9eb7c1bab9..799bbe852f7 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -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
HOMEPAGE= http://www.sympa.org/
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 5551a7a84bb..412bd4ec3bc 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -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
HOMEPAGE= http://www.horde.org/turba/
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 0d65336f90c..4cae1a0e631 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -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
HOMEPAGE= http://www.wonderworks.com/vm/
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 170e985e3b7..6607ee7ee0c 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -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
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 374b5e4f808..b9fe3e82d63 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -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
HOMEPAGE= http://www.fftw.org/
diff --git a/math/fftw2/Makefile b/math/fftw2/Makefile
index cf651a0713e..82ef58384f7 100644
--- a/math/fftw2/Makefile
+++ b/math/fftw2/Makefile
@@ -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
HOMEPAGE= http://www.fftw.org/
diff --git a/math/fftwf/Makefile b/math/fftwf/Makefile
index 8a6defd59ed..4ea934f276e 100644
--- a/math/fftwf/Makefile
+++ b/math/fftwf/Makefile
@@ -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
HOMEPAGE= http://www.fftw.org/
diff --git a/math/gap/Makefile b/math/gap/Makefile
index f074e01fabb..43450ce3cf9 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -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
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 57db297b309..d7f4b8d1a03 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -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
HOMEPAGE= http://plasma-gate.weizmann.ac.il/Grace/
diff --git a/math/mpcomplex/Makefile b/math/mpcomplex/Makefile
index ec89d328a7f..0a45da9d396 100644
--- a/math/mpcomplex/Makefile
+++ b/math/mpcomplex/Makefile
@@ -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
HOMEPAGE= http://www.multiprecision.org/mpc/
diff --git a/math/py-Scientific-doc/Makefile b/math/py-Scientific-doc/Makefile
index fd58f1f840f..e5d6a970546 100644
--- a/math/py-Scientific-doc/Makefile
+++ b/math/py-Scientific-doc/Makefile
@@ -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
HOMEPAGE= http://starship.python.net/crew/hinsen/scientific.html
diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile
index e856ffa7fff..9c38c18ecc8 100644
--- a/math/py-mpmath/Makefile
+++ b/math/py-mpmath/Makefile
@@ -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
HOMEPAGE= http://mpmath.org/
diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index 8f94b2a8766..8b1bea572df 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -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
HOMEPAGE= http://www.stat.uiowa.edu/~luke/xls/xlsinfo/
diff --git a/mbone/mdp/Makefile b/mbone/mdp/Makefile
index 489de5a4a2f..c8ea7b7a1a1 100644
--- a/mbone/mdp/Makefile
+++ b/mbone/mdp/Makefile
@@ -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
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index b3a480602c0..4da404504a0 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -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
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 407847ab285..4f272fdfa67 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -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 \
diff --git a/misc/epm/Makefile b/misc/epm/Makefile
index 12e3a06684b..332fce09a2a 100644
--- a/misc/epm/Makefile
+++ b/misc/epm/Makefile
@@ -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
diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index d59e4d86603..93fd9ea77a3 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -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
HOMEPAGE= http://www.ossp.org/pkg/tool/iselect/
diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
index ed704800602..a31565a7568 100644
--- a/misc/logsurfer/Makefile
+++ b/misc/logsurfer/Makefile
@@ -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
HOMEPAGE= http://www.crypt.gen.nz/logsurfer/
diff --git a/misc/pty-redir/Makefile b/misc/pty-redir/Makefile
index a2ff0e593f8..298b6589e79 100644
--- a/misc/pty-redir/Makefile
+++ b/misc/pty-redir/Makefile
@@ -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
COMMENT= Attach a program's stdio to a pty
diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile
index 2435e860a2e..b8316c0c79b 100644
--- a/misc/vfu/Makefile
+++ b/misc/vfu/Makefile
@@ -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
diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile
index 7190c92fc28..32ac75b72cf 100644
--- a/misc/zorro/Makefile
+++ b/misc/zorro/Makefile
@@ -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
COMMENT= Simple to-do list manager
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 69628756eb4..6c421477d4a 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -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
HOMEPAGE= http://outflux.net/unix/software/GOPchop/
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 5cafe8cacb6..9a7cd06fb7e 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -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}
diff --git a/multimedia/realplayer-codecs/Makefile b/multimedia/realplayer-codecs/Makefile
index 69ba1145b8c..c426a3af9c0 100644
--- a/multimedia/realplayer-codecs/Makefile
+++ b/multimedia/realplayer-codecs/Makefile
@@ -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
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 35462fa7b46..83b88a6e6c2 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -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
diff --git a/multimedia/vlc20/Makefile b/multimedia/vlc20/Makefile
index 703ebb28f90..4e968b85314 100644
--- a/multimedia/vlc20/Makefile
+++ b/multimedia/vlc20/Makefile
@@ -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
diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index 3b758f0cc8f..adf5e95f959 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -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
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 22c68ab14e6..360e9c91ca6 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -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
HOMEPAGE= http://www.x265.org/
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 5cf12ae1cb3..91a155a4064 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -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
diff --git a/net/cftp/Makefile b/net/cftp/Makefile
index b8559366378..4c5392b2377 100644
--- a/net/cftp/Makefile
+++ b/net/cftp/Makefile
@@ -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
HOMEPAGE= http://ftp.giga.or.at/pub/nih/cftp/
diff --git a/net/csup/Makefile b/net/csup/Makefile
index 190da7f4f23..2bab3e5d1c4 100644
--- a/net/csup/Makefile
+++ b/net/csup/Makefile
@@ -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
HOMEPAGE= http://www.mu.org/~mux/csup.html
diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index bb3157fd9ab..b27dfa9809f 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -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
HOMEPAGE= http://www.delegate.org/delegate/
diff --git a/net/dtcpclient/Makefile b/net/dtcpclient/Makefile
index de103334a46..e179346355e 100644
--- a/net/dtcpclient/Makefile
+++ b/net/dtcpclient/Makefile
@@ -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
HOMEPAGE= http://www.imasy.or.jp/~ume/dtcp/
diff --git a/net/ftpproxy/Makefile b/net/ftpproxy/Makefile
index cb447c8210d..5f310f7ae8b 100644
--- a/net/ftpproxy/Makefile
+++ b/net/ftpproxy/Makefile
@@ -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
diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index a9a7ea5a66d..2b54fe86340 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -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
HOMEPAGE= http://www.deepspace6.net/projects/ipv6calc.html
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 06e93998d64..9eeddef718f 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -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
HOMEPAGE= https://www.isc.org/sw/dhcp
diff --git a/net/lambdamoo-core/Makefile b/net/lambdamoo-core/Makefile
index 6232631027f..4046ec53b32 100644
--- a/net/lambdamoo-core/Makefile
+++ b/net/lambdamoo-core/Makefile
@@ -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
diff --git a/net/lambdamoo-doc/Makefile b/net/lambdamoo-doc/Makefile
index 84c4a058531..e28c7a8a4c4 100644
--- a/net/lambdamoo-doc/Makefile
+++ b/net/lambdamoo-doc/Makefile
@@ -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
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 9f68b47ea47..babdc294559 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -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
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index ce26da19cfe..d7db02690b5 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -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
HOMEPAGE= http://oss.oetiker.ch/mrtg/
diff --git a/net/nslint/Makefile b/net/nslint/Makefile
index 0410baa9386..53aff522381 100644
--- a/net/nslint/Makefile
+++ b/net/nslint/Makefile
@@ -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
HOMEPAGE= http://ee.lbl.gov/ftp.html
diff --git a/net/ocsinventory-agent/Makefile b/net/ocsinventory-agent/Makefile
index c63edeb3d5f..7f53af2a8dc 100644
--- a/net/ocsinventory-agent/Makefile
+++ b/net/ocsinventory-agent/Makefile
@@ -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
HOMEPAGE= http://www.ocsinventory-ng.org/
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index 3f779ae7994..0959a85134a 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -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
HOMEPAGE= http://www.net-dns.org/
diff --git a/net/parpd/Makefile b/net/parpd/Makefile
index ee3e85fb3da..f2a50ababd5 100644
--- a/net/parpd/Makefile
+++ b/net/parpd/Makefile
@@ -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
diff --git a/net/proftpd/Makefile.common b/net/proftpd/Makefile.common
index 9f458f706d2..10c1cf2e3dc 100644
--- a/net/proftpd/Makefile.common
+++ b/net/proftpd/Makefile.common
@@ -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
HOMEPAGE= http://www.proftpd.org/
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index a30248928d3..a855ae72818 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -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
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 4aced20b29c..25f536e8b6e 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -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
HOMEPAGE= http://rsync.samba.org/
diff --git a/net/snort/Makefile b/net/snort/Makefile
index 0507859b57b..810de2c7132 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -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
HOMEPAGE= http://www.snort.org/
diff --git a/net/teamspeak-server/Makefile b/net/teamspeak-server/Makefile
index c8f2b87f044..174bf439358 100644
--- a/net/teamspeak-server/Makefile
+++ b/net/teamspeak-server/Makefile
@@ -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
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 373460dd869..06288dd4dbf 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -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
HOMEPAGE= http://tinyfugue.sourceforge.net/
diff --git a/net/traceroute-nanog/Makefile b/net/traceroute-nanog/Makefile
index 71099c95104..702285b46ff 100644
--- a/net/traceroute-nanog/Makefile
+++ b/net/traceroute-nanog/Makefile
@@ -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}
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 24f8bd4acc0..704a8eab257 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -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/
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 3354e04e566..b87e0c6c430 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -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
HOMEPAGE= http://www.isc.org/software/inn/
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 47fdfd35ca4..3bc82f2e6e5 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -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
diff --git a/parallel/paexec/Makefile b/parallel/paexec/Makefile
index 192c805764a..182ecff86f6 100644
--- a/parallel/paexec/Makefile
+++ b/parallel/paexec/Makefile
@@ -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
HOMEPAGE= http://sourceforge.net/projects/paexec
diff --git a/parallel/slurm/Makefile b/parallel/slurm/Makefile
index 9025cc65786..0fa1116e3ae 100644
--- a/parallel/slurm/Makefile
+++ b/parallel/slurm/Makefile
@@ -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
diff --git a/pkgtools/distbb/Makefile b/pkgtools/distbb/Makefile
index 4c83080e245..b9c1ace877b 100644
--- a/pkgtools/distbb/Makefile
+++ b/pkgtools/distbb/Makefile
@@ -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
HOMEPAGE= http://mova.org/~cheusov/pub/distbb/
diff --git a/pkgtools/nih/Makefile b/pkgtools/nih/Makefile
index f187b0f6dcf..37e2979c343 100644
--- a/pkgtools/nih/Makefile
+++ b/pkgtools/nih/Makefile
@@ -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
HOMEPAGE= https://github.com/cheusov/pkgnih
diff --git a/pkgtools/pkg_online-server/Makefile.common b/pkgtools/pkg_online-server/Makefile.common
index 1abbee98a2c..4d28d0669e6 100644
--- a/pkgtools/pkg_online-server/Makefile.common
+++ b/pkgtools/pkg_online-server/Makefile.common
@@ -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
diff --git a/pkgtools/pkg_summary-utils/Makefile b/pkgtools/pkg_summary-utils/Makefile
index 3fbdde60c79..4cd5c57fbc9 100644
--- a/pkgtools/pkg_summary-utils/Makefile
+++ b/pkgtools/pkg_summary-utils/Makefile
@@ -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
HOMEPAGE= http://www.mova.org/~cheusov/pub/pkg_summary-utils/
diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index ba3fd8e8127..2f0441b3e22 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -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
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 82cc5aca312..b0cf7529af3 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -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
HOMEPAGE= http://www-inf.enst.fr/~demaille/a2ps/
diff --git a/print/cnprint/Makefile b/print/cnprint/Makefile
index 3d8e6dfa365..a56a4f95e62 100644
--- a/print/cnprint/Makefile
+++ b/print/cnprint/Makefile
@@ -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 \
diff --git a/print/cups15/Makefile b/print/cups15/Makefile
index 9163b36881e..31c1c72538f 100644
--- a/print/cups15/Makefile
+++ b/print/cups15/Makefile
@@ -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/strfiles.php/3482/
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
diff --git a/print/foomatic-ppds/Makefile b/print/foomatic-ppds/Makefile
index 11379eaa771..47d58e237a2 100644
--- a/print/foomatic-ppds/Makefile
+++ b/print/foomatic-ppds/Makefile
@@ -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
COMMENT= Foomatic PPDs collection
diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index 9b6b6be2844..1228af1bdad 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -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
diff --git a/print/p5-PostScript-MailLabels/Makefile b/print/p5-PostScript-MailLabels/Makefile
index e927d33f173..48d86d255fc 100644
--- a/print/p5-PostScript-MailLabels/Makefile
+++ b/print/p5-PostScript-MailLabels/Makefile
@@ -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
HOMEPAGE= http://oplnk.net/~ajackson/software/maillabels/
diff --git a/print/xpdf-arabic/Makefile b/print/xpdf-arabic/Makefile
index 2fae94b92c0..dab60c79378 100644
--- a/print/xpdf-arabic/Makefile
+++ b/print/xpdf-arabic/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-chinese-simplified/Makefile b/print/xpdf-chinese-simplified/Makefile
index 5dbb7818737..2109129d8d9 100644
--- a/print/xpdf-chinese-simplified/Makefile
+++ b/print/xpdf-chinese-simplified/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-chinese-traditional/Makefile b/print/xpdf-chinese-traditional/Makefile
index 859ee952fb6..f0ea3f7544c 100644
--- a/print/xpdf-chinese-traditional/Makefile
+++ b/print/xpdf-chinese-traditional/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-cyrillic/Makefile b/print/xpdf-cyrillic/Makefile
index 4f2d5214dad..fab32573819 100644
--- a/print/xpdf-cyrillic/Makefile
+++ b/print/xpdf-cyrillic/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-greek/Makefile b/print/xpdf-greek/Makefile
index f4c993420d1..6e4b49acab0 100644
--- a/print/xpdf-greek/Makefile
+++ b/print/xpdf-greek/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-hebrew/Makefile b/print/xpdf-hebrew/Makefile
index a684a4a6ad7..8b79bce3108 100644
--- a/print/xpdf-hebrew/Makefile
+++ b/print/xpdf-hebrew/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-japanese/Makefile b/print/xpdf-japanese/Makefile
index c2576ffd8e9..48a429bd6fa 100644
--- a/print/xpdf-japanese/Makefile
+++ b/print/xpdf-japanese/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index 03e48291c35..09ff5330a82 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-latin2/Makefile b/print/xpdf-latin2/Makefile
index 22d0c2c06de..b935bb96753 100644
--- a/print/xpdf-latin2/Makefile
+++ b/print/xpdf-latin2/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-thai/Makefile b/print/xpdf-thai/Makefile
index 015ea193668..62ebafa1bbc 100644
--- a/print/xpdf-thai/Makefile
+++ b/print/xpdf-thai/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf-turkish/Makefile b/print/xpdf-turkish/Makefile
index e2804857cee..7a401bd2828 100644
--- a/print/xpdf-turkish/Makefile
+++ b/print/xpdf-turkish/Makefile
@@ -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
HOMEPAGE= http://www.foolabs.com/xpdf/
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 51fc3606b95..9390d51c4a1 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -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
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common
index 6f36860a41c..d7693e97221 100644
--- a/security/cyrus-sasl/Makefile.common
+++ b/security/cyrus-sasl/Makefile.common
@@ -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
diff --git a/security/fsh/Makefile b/security/fsh/Makefile
index 4ce9dfd83bd..b43e5d15a0f 100644
--- a/security/fsh/Makefile
+++ b/security/fsh/Makefile
@@ -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
HOMEPAGE= http://www.lysator.liu.se/fsh/
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index f09b387eab0..97562ce31ed 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -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
diff --git a/security/gss/Makefile b/security/gss/Makefile
index da3dcedf26e..6085a0cbd31 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -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
HOMEPAGE= http://www.gnu.org/software/gss/
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 8342324dcab..e2ab6d64469 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -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
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 8272dc0dc99..c4091d610ce 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -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
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 0d04b2fbc56..eee12f19f1d 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -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
HOMEPAGE= http://www.lysator.liu.se/~nisse/lsh/
diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index cf68de1274a..ab62337a39d 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -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
HOMEPAGE= http://www.lysator.liu.se/~nisse/nettle/
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 20f0eb6357b..11d1a95d40e 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -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
HOMEPAGE= http://www.padl.com/pam_ldap.html
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index 559cb48daa1..39e77a94c9e 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -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
HOMEPAGE= http://www.pgpi.org/
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 054a09354a2..11c43458bd4 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -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
HOMEPAGE= http://www.pgpi.org/
diff --git a/security/pinepgp/Makefile b/security/pinepgp/Makefile
index e71caaabb28..c44bea52375 100644
--- a/security/pinepgp/Makefile
+++ b/security/pinepgp/Makefile
@@ -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
HOMEPAGE= http://hany.sk/~hany/software/pinepgp/stable.html
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 7ee6573a2a6..b2f9b00c752 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -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
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index bc4d0ee8525..77328eca72f 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -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
HOMEPAGE= http://www.prelude-ids.org/download/releases/
diff --git a/security/pwsafe/Makefile b/security/pwsafe/Makefile
index e4c5e8aba37..61051023e1c 100644
--- a/security/pwsafe/Makefile
+++ b/security/pwsafe/Makefile
@@ -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
HOMEPAGE= http://nsd.dyndns.org/pwsafe/
diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile
index 2e86fcc2004..2ed42b33c1d 100644
--- a/security/py-prewikka/Makefile
+++ b/security/py-prewikka/Makefile
@@ -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
HOMEPAGE= http://prelude-ids.org/download/releases/
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 835ea6969f9..400eff85728 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -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
HOMEPAGE= http://www.sudo.ws/
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index b535a685931..55ce79191f8 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -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
diff --git a/shells/bash2-doc/Makefile b/shells/bash2-doc/Makefile
index bb77e2ca656..7b2eeb1be54 100644
--- a/shells/bash2-doc/Makefile
+++ b/shells/bash2-doc/Makefile
@@ -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
HOMEPAGE= http://www.gnu.org/software/bash/bash.html
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 95881d831ed..8682d0f73d1 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -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 \
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index b30f6314872..7901dfb52dd 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -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
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 43c72abb5ad..e855e9ad804 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -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
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index ce246ba33cc..c65292bb447 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -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
HOMEPAGE= http://www.scsh.net/
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 0046286d203..20ad48f3764 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -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
HOMEPAGE= http://www.tcsh.org/
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index afbe569049e..684576b908e 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -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
HOMEPAGE= http://www.tigr.net/afterstep/view.php?applet=asapm/data
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 277164ce8fd..c504181e955 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -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
HOMEPAGE= http://www.cfengine.org/
diff --git a/sysutils/dc-tools/Makefile b/sysutils/dc-tools/Makefile
index 626001f892a..ad1fbb3350e 100644
--- a/sysutils/dc-tools/Makefile
+++ b/sysutils/dc-tools/Makefile
@@ -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}
diff --git a/sysutils/dtpstree/Makefile b/sysutils/dtpstree/Makefile
index 4a6bf001926..6d65f6d5754 100644
--- a/sysutils/dtpstree/Makefile
+++ b/sysutils/dtpstree/Makefile
@@ -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
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index 5a6792529af..9e5016def31 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -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]*
diff --git a/sysutils/ipw-firmware/Makefile b/sysutils/ipw-firmware/Makefile
index c6ceec83973..c6aecbf47f1 100644
--- a/sysutils/ipw-firmware/Makefile
+++ b/sysutils/ipw-firmware/Makefile
@@ -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
diff --git a/sysutils/iwi-firmware/Makefile b/sysutils/iwi-firmware/Makefile
index 698a6fd1bd5..e0d5039f649 100644
--- a/sysutils/iwi-firmware/Makefile
+++ b/sysutils/iwi-firmware/Makefile
@@ -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
diff --git a/sysutils/iwi-firmware3/Makefile b/sysutils/iwi-firmware3/Makefile
index d5d8d2a3569..956db872590 100644
--- a/sysutils/iwi-firmware3/Makefile
+++ b/sysutils/iwi-firmware3/Makefile
@@ -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
diff --git a/sysutils/iwn-firmware/Makefile b/sysutils/iwn-firmware/Makefile
index 7901f422d1d..be1c01cca3b 100644
--- a/sysutils/iwn-firmware/Makefile
+++ b/sysutils/iwn-firmware/Makefile
@@ -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
diff --git a/sysutils/lilo/Makefile b/sysutils/lilo/Makefile
index eee1bea171a..bbb705665cb 100644
--- a/sysutils/lilo/Makefile
+++ b/sysutils/lilo/Makefile
@@ -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
HOMEPAGE= http://lilo.go.dyndns.org/
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 012d310ec34..f4fc01abd34 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -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
diff --git a/sysutils/mc46/Makefile b/sysutils/mc46/Makefile
index c165887f05c..5aec4eb1b8f 100644
--- a/sysutils/mc46/Makefile
+++ b/sysutils/mc46/Makefile
@@ -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
HOMEPAGE= http://www.ibiblio.org/mc/
diff --git a/sysutils/mktemp/Makefile b/sysutils/mktemp/Makefile
index 35a4abecc6c..edd7e045583 100644
--- a/sysutils/mktemp/Makefile
+++ b/sysutils/mktemp/Makefile
@@ -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
HOMEPAGE= http://www.mktemp.org/
diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index 7b7250ae2a2..6c7a0c7e6d7 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -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
HOMEPAGE= http://mj.ucw.cz/pciutils.shtml
diff --git a/sysutils/py-notify-python/Makefile b/sysutils/py-notify-python/Makefile
index 73ae4c5044d..d9bb95b8d10 100644
--- a/sysutils/py-notify-python/Makefile
+++ b/sysutils/py-notify-python/Makefile
@@ -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
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index 981f8301bc0..028215a7373 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -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
COMMENT= Multiuser "tip"/"cu" replacement with logging
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
index 3aa6234eb99..32828551754 100644
--- a/sysutils/whowatch/Makefile
+++ b/sysutils/whowatch/Makefile
@@ -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
HOMEPAGE= http://wizard.ae.krakow.pl/~mike/\#whowatch
diff --git a/sysutils/wpi-firmware2/Makefile b/sysutils/wpi-firmware2/Makefile
index 3622c831411..62a8a6b702c 100644
--- a/sysutils/wpi-firmware2/Makefile
+++ b/sysutils/wpi-firmware2/Makefile
@@ -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
diff --git a/textproc/WordNet/Makefile b/textproc/WordNet/Makefile
index 985a65e7316..46c6ed33513 100644
--- a/textproc/WordNet/Makefile
+++ b/textproc/WordNet/Makefile
@@ -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/
diff --git a/textproc/dict-mueller7/Makefile b/textproc/dict-mueller7/Makefile
index 2d8146e3b45..50fd95862c8 100644
--- a/textproc/dict-mueller7/Makefile
+++ b/textproc/dict-mueller7/Makefile
@@ -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
diff --git a/textproc/dict-server/Makefile.common b/textproc/dict-server/Makefile.common
index c04a122f708..6ce287f39bc 100644
--- a/textproc/dict-server/Makefile.common
+++ b/textproc/dict-server/Makefile.common
@@ -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
HOMEPAGE= http://www.dict.org/
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index 00bbdfb442b..6918d1c1f33 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -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
HOMEPAGE= http://freshmeat.net/projects/dictem/
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index e2d9494b6ae..03884f4e4c6 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -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}
diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile
index 23e4042408e..64be8a4a7a1 100644
--- a/textproc/html2text/Makefile
+++ b/textproc/html2text/Makefile
@@ -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
HOMEPAGE= http://www.mbayer.de/html2text/
diff --git a/textproc/html2wml/Makefile b/textproc/html2wml/Makefile
index 14fa576bc6a..deeb58ac03b 100644
--- a/textproc/html2wml/Makefile
+++ b/textproc/html2wml/Makefile
@@ -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
# HOMEPAGE= http://maddingue.free.fr/softwares/html2wml.html
diff --git a/textproc/hyperestraier/Makefile.common b/textproc/hyperestraier/Makefile.common
index cc005d22e5d..1d16fe51b21 100644
--- a/textproc/hyperestraier/Makefile.common
+++ b/textproc/hyperestraier/Makefile.common
@@ -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
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 0f40b61842b..cce90123003 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -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
HOMEPAGE= http://launchpad.net/intltool/
diff --git a/textproc/libxml2/Makefile.common b/textproc/libxml2/Makefile.common
index 0603382f416..43bc907f44b 100644
--- a/textproc/libxml2/Makefile.common
+++ b/textproc/libxml2/Makefile.common
@@ -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
HOMEPAGE= http://xmlsoft.org/
diff --git a/textproc/libxslt/Makefile.common b/textproc/libxslt/Makefile.common
index c8c03e31223..2ad1ab8461e 100644
--- a/textproc/libxslt/Makefile.common
+++ b/textproc/libxslt/Makefile.common
@@ -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
HOMEPAGE= http://xmlsoft.org/XSLT/
diff --git a/textproc/markdown2social/Makefile b/textproc/markdown2social/Makefile
index 5116baaf5ba..b24b42bf425 100644
--- a/textproc/markdown2social/Makefile
+++ b/textproc/markdown2social/Makefile
@@ -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
HOMEPAGE= https://github.com/jmmv/markdown2social/
diff --git a/textproc/rtfm/Makefile b/textproc/rtfm/Makefile
index 205244d35f8..222b128782b 100644
--- a/textproc/rtfm/Makefile
+++ b/textproc/rtfm/Makefile
@@ -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
COMMENT= NetBSD documentation and GNU Texinfo files search mechanism
diff --git a/textproc/swath/Makefile b/textproc/swath/Makefile
index 0a59486f43a..c2230eac356 100644
--- a/textproc/swath/Makefile
+++ b/textproc/swath/Makefile
@@ -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
HOMEPAGE= http://linux.thai.net/projects/thailatex
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index 6ea86b8315d..a8b5b3b3db8 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -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
COMMENT= Extract URLs from text files and display them in a menu
diff --git a/time/kronolith/Makefile b/time/kronolith/Makefile
index 8c9395eaa79..51351cf9444 100644
--- a/time/kronolith/Makefile
+++ b/time/kronolith/Makefile
@@ -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
HOMEPAGE= http://www.horde.org/kronolith/
diff --git a/time/rclock/Makefile b/time/rclock/Makefile
index 0106f271b1c..d1206618dca 100644
--- a/time/rclock/Makefile
+++ b/time/rclock/Makefile
@@ -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
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile
index 2702c9c30e4..5aec9f809f4 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -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
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index c6d9c595fae..07a9d2248b9 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -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
diff --git a/www/analog/Makefile b/www/analog/Makefile
index aafccdc3bb9..9df8f401742 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -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
HOMEPAGE= http://www.analog.cx/
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index c9900a68b9b..159ad8db1b3 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -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
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 16cf526e03e..24d4153af1d 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -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
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 42561f94238..d68ec3200da 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -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
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 56bd979c9e3..570816cd291 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -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
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 66b84e90ec5..59cadfbbc32 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -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
HOMEPAGE= http://www.horde.org/
diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index a2f543e7c7f..2e71fa72876 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -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
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 338d355850b..ff0d53ed81e 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -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
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index bc3b5d859be..f9704dc1e11 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -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
diff --git a/www/p5-HTML-Template-Expr/Makefile b/www/p5-HTML-Template-Expr/Makefile
index 10ef5740400..adaf10f08e4 100644
--- a/www/p5-HTML-Template-Expr/Makefile
+++ b/www/p5-HTML-Template-Expr/Makefile
@@ -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
HOMEPAGE= http://search.cpan.org/dist/HTML-Template-Expr/
diff --git a/www/p5-HTML-Template/Makefile b/www/p5-HTML-Template/Makefile
index 7ca357c7dee..aef4d687927 100644
--- a/www/p5-HTML-Template/Makefile
+++ b/www/p5-HTML-Template/Makefile
@@ -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
HOMEPAGE= http://html-template.sourceforge.net/
diff --git a/www/py-mechanize/Makefile b/www/py-mechanize/Makefile
index b687f90381b..c67ee1d7380 100644
--- a/www/py-mechanize/Makefile
+++ b/www/py-mechanize/Makefile
@@ -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
HOMEPAGE= http://wwwsearch.sourceforge.net/mechanize/
diff --git a/www/py-webcolors/Makefile b/www/py-webcolors/Makefile
index 3be2f1aab63..adb286128e6 100644
--- a/www/py-webcolors/Makefile
+++ b/www/py-webcolors/Makefile
@@ -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
HOMEPAGE= http://www.bitbucket.org/ubernostrum/webcolors/overview/
diff --git a/www/ruby-borges/Makefile b/www/ruby-borges/Makefile
index d4662c4e21c..07b4922840f 100644
--- a/www/ruby-borges/Makefile
+++ b/www/ruby-borges/Makefile
@@ -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
HOMEPAGE= http://borges.rubyforge.org/
diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 190bdc41ea7..c6f220c1b54 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -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
diff --git a/www/squidGuard/Makefile b/www/squidGuard/Makefile
index 5d28699d713..274c083466e 100644
--- a/www/squidGuard/Makefile
+++ b/www/squidGuard/Makefile
@@ -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
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index d68d486c2ef..0a7ac258db1 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -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
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 6c037cf23c0..58857f752df 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -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
diff --git a/x11/fltk2/Makefile b/x11/fltk2/Makefile
index 8ee638bacdb..d5e30126981 100644
--- a/x11/fltk2/Makefile
+++ b/x11/fltk2/Makefile
@@ -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
diff --git a/x11/matchbox-common/Makefile b/x11/matchbox-common/Makefile
index 9808512e753..72cb46c49c3 100644
--- a/x11/matchbox-common/Makefile
+++ b/x11/matchbox-common/Makefile
@@ -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
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index c24096bb9a8..cd95afe367e 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -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"
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 41fe0bf86e3..ef7779897e5 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -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
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index b0a508feb06..e261dc9b82f 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -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
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index 71db7af6d64..1b93a2582b9 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -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
diff --git a/x11/xless/Makefile b/x11/xless/Makefile
index 9ad21232462..4a1468f8cd5 100644
--- a/x11/xless/Makefile
+++ b/x11/xless/Makefile
@@ -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
COMMENT= X11 text viewer; useful as an add-on tool for other apps
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 9390739bceb..46bf18ecc4a 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -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
diff --git a/x11/xmindpath/Makefile b/x11/xmindpath/Makefile
index e57361eb34e..3f7079b5eca 100644
--- a/x11/xmindpath/Makefile
+++ b/x11/xmindpath/Makefile
@@ -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
COMMENT= MindPath PocketPoint user-level driver for X11
diff --git a/x11/xscript/Makefile b/x11/xscript/Makefile
index f29511d6f38..a6bce29068a 100644
--- a/x11/xscript/Makefile
+++ b/x11/xscript/Makefile
@@ -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