Convert all occurrences (353 by my count) of

	MASTER_SITES= 	site1 \
			site2

style continuation lines to be simple repeated

	MASTER_SITES+= site1
	MASTER_SITES+= site2

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

29 files changed, 90 insertions, 91 deletions

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