From a16b650423ebac0d6db54146c732a10b971237a4 Mon Sep 17 00:00:00 2001 From: agc Date: Thu, 19 Jan 2017 18:52:01 +0000 Subject: 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. --- editors/ce/Makefile.common | 6 +++--- editors/emacs20/Makefile | 6 +++--- editors/jed/Makefile.common | 10 +++++----- editors/lyx/Makefile | 14 +++++++------- editors/nedit/Makefile | 6 +++--- editors/pico/Makefile | 6 +++--- editors/ve/Makefile | 6 +++--- 7 files changed, 27 insertions(+), 27 deletions(-) (limited to 'editors') 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 -- cgit v1.2.3