Use MASTER_SITE_XEMACS.

Reorder variables to satisfy portlint.

Approved by:	Jing-Tang Keith Jang <keith@freebsd.sinica.edu.tw>
		(MAINTAINER of chinese/xemacs)
		KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
		(MAINTAINER of xemacs-*-packages)

13 files changed, 39 insertions, 118 deletions

diff --git a/editors/xemacs-basic-mule-packages/Makefile b/editors/xemacs-basic-mule-packages/Makefile
index 0105c7cfb4cb..bda2b5c00df6 100644
--- a/editors/xemacs-basic-mule-packages/Makefile
+++ b/editors/xemacs-basic-mule-packages/Makefile
@@ -2,31 +2,24 @@
 # Date created:		03 June 2000
 # Whom:			KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
 #
-# $FreeBSD$$
+# $FreeBSD$
 #
 
 PORTNAME=	xemacs-basic-mule-packages
 PORTVERSION=	1.1
 CATEGORIES=	editors elisp
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
-
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	packages
 DISTFILES=	\
 		egg-its-1.22-pkg.tar.gz \
 		elib-1.06-pkg.tar.gz \
 		locale-1.16-pkg.tar.gz \
 		mule-base-1.34-pkg.tar.gz \
 		skk-1.16-pkg.tar.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-DIST_SUBDIR=	xemacs
-MASTER_SITE_SUBDIR=${DIST_SUBDIR}
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/mule-packages
 
diff --git a/editors/xemacs-comm-packages/Makefile b/editors/xemacs-comm-packages/Makefile
index 0fd9616d872c..13e800c47499 100644
--- a/editors/xemacs-comm-packages/Makefile
+++ b/editors/xemacs-comm-packages/Makefile
@@ -8,13 +8,8 @@
 PORTNAME=	xemacs-comm-packages
 PORTVERSION=	2.1
 CATEGORIES=	editors elisp
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
-
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	packages
 DISTFILES=	\
 		bbdb-1.09-pkg.tar.gz \
 		eicq-1.01-pkg.tar.gz \
@@ -29,12 +24,10 @@ DISTFILES=	\
 		tm-1.23-pkg.tar.gz \
 		vm-1.24-pkg.tar.gz \
 		zenirc-1.07-pkg.tar.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-DIST_SUBDIR=	xemacs
-MASTER_SITE_SUBDIR=${DIST_SUBDIR}
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xemacs-packages
 
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index b67c4df03c27..314aa07449be 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -8,12 +8,10 @@
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
 CATEGORIES+=	editors
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-${XEMACS_REL}/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-${XEMACS_REL}/
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX}
+DIST_SUBDIR=	xemacs
 
 MAINTAINER?=	gj@FreeBSD.org
 
@@ -26,8 +24,6 @@ XEMACS_REL=	21.1
 XEMACS_VER=	21.1.12
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
-DIST_SUBDIR=	xemacs
-
 SLAVEDIRS+=	editors/xemacs21-mule
 USE_XLIB=	yes
 USE_XPM=	yes
diff --git a/editors/xemacs-games-packages/Makefile b/editors/xemacs-games-packages/Makefile
index 042e62f7364c..686cb85368ed 100644
--- a/editors/xemacs-games-packages/Makefile
+++ b/editors/xemacs-games-packages/Makefile
@@ -8,24 +8,17 @@
 PORTNAME=	xemacs-games-packages
 PORTVERSION=	1.1
 CATEGORIES=	editors elisp
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
-
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	packages
 DISTFILES=	\
 		cookie-1.12-pkg.tar.gz \
 		games-1.12-pkg.tar.gz \
 		mine-1.12-pkg.tar.gz \
 		misc-games-1.14-pkg.tar.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-DIST_SUBDIR=	xemacs
-MASTER_SITE_SUBDIR=${DIST_SUBDIR}
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xemacs-packages
 
diff --git a/editors/xemacs-libs-packages/Makefile b/editors/xemacs-libs-packages/Makefile
index f5c47b8d9790..db848762ee68 100644
--- a/editors/xemacs-libs-packages/Makefile
+++ b/editors/xemacs-libs-packages/Makefile
@@ -8,25 +8,18 @@
 PORTNAME=	xemacs-libs-packages
 PORTVERSION=	1.1
 CATEGORIES=	editors elisp
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
-
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	packages
 DISTFILES=	\
 		Sun-1.12-pkg.tar.gz \
 		edebug-1.10-pkg.tar.gz \
 		sounds-au-1.09-pkg.tar.gz \
 		sounds-wav-1.09-pkg.tar.gz \
 		tooltalk-1.11-pkg.tar.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-DIST_SUBDIR=	xemacs
-MASTER_SITE_SUBDIR=${DIST_SUBDIR}
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xemacs-packages
 
diff --git a/editors/xemacs-mule-packages/Makefile b/editors/xemacs-mule-packages/Makefile
index e21a5ccef03d..65e97d09fbe5 100644
--- a/editors/xemacs-mule-packages/Makefile
+++ b/editors/xemacs-mule-packages/Makefile
@@ -8,23 +8,16 @@
 PORTNAME=	xemacs-mule-packages
 PORTVERSION=	1.0
 CATEGORIES=	editors elisp
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
-
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	packages
 DISTFILES=	\
 		edict-1.09-pkg.tar.gz \
 		leim-1.15-pkg.tar.gz \
 		lookup-1.04-pkg.tar.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-DIST_SUBDIR=	xemacs
-MASTER_SITE_SUBDIR=${DIST_SUBDIR}
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/mule-packages
 
diff --git a/editors/xemacs-oa-packages/Makefile b/editors/xemacs-oa-packages/Makefile
index 682da7c1c8ed..674863bbee9a 100644
--- a/editors/xemacs-oa-packages/Makefile
+++ b/editors/xemacs-oa-packages/Makefile
@@ -8,13 +8,8 @@
 PORTNAME=	xemacs-oa-packages
 PORTVERSION=	1.1
 CATEGORIES=	editors elisp
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
-
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	packages
 DISTFILES=	\
 		calc-1.12-pkg.tar.gz \
 		calendar-1.14-pkg.tar.gz \
@@ -24,12 +19,10 @@ DISTFILES=	\
 		slider-1.11-pkg.tar.gz \
 		speedbar-1.16-pkg.tar.gz \
 		strokes-1.06-pkg.tar.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-DIST_SUBDIR=	xemacs
-MASTER_SITE_SUBDIR=${DIST_SUBDIR}
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xemacs-packages
 
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index bdf4eda3f4d4..daf21a9bd3fc 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -8,13 +8,8 @@
 PORTNAME=	xemacs-packages
 PORTVERSION=	1.6
 CATEGORIES=	editors elisp
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
-
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	packages
 DISTFILES=	\
 		apel-1.18-pkg.tar.gz \
 		auctex-1.21-pkg.tar.gz \
@@ -45,12 +40,10 @@ DISTFILES=	\
 		w3-1.15-pkg.tar.gz \
 		xemacs-base-1.43-pkg.tar.gz \
 		xemacs-devel-1.28-pkg.tar.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-DIST_SUBDIR=	xemacs
-MASTER_SITE_SUBDIR=${DIST_SUBDIR}
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xemacs-packages
 
diff --git a/editors/xemacs-prog-packages/Makefile b/editors/xemacs-prog-packages/Makefile
index 59ab853cec99..ded38c91ea44 100644
--- a/editors/xemacs-prog-packages/Makefile
+++ b/editors/xemacs-prog-packages/Makefile
@@ -8,13 +8,8 @@
 PORTNAME=	xemacs-prog-packages
 PORTVERSION=	2.1
 CATEGORIES=	editors elisp
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
-
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	packages
 DISTFILES=	\
 		ada-1.08-pkg.tar.gz \
 		ediff-1.26-pkg.tar.gz \
@@ -25,12 +20,10 @@ DISTFILES=	\
 		semantic-1.02-pkg.tar.gz \
 		vc-cc-1.14-pkg.tar.gz \
 		vhdl-1.10-pkg.tar.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-DIST_SUBDIR=	xemacs
-MASTER_SITE_SUBDIR=${DIST_SUBDIR}
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xemacs-packages
 
diff --git a/editors/xemacs-wp-packages/Makefile b/editors/xemacs-wp-packages/Makefile
index ee5c780da6d6..7f2a6b4c756f 100644
--- a/editors/xemacs-wp-packages/Makefile
+++ b/editors/xemacs-wp-packages/Makefile
@@ -8,25 +8,18 @@
 PORTNAME=	xemacs-wp-packages
 PORTVERSION=	1.1
 CATEGORIES=	editors elisp
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
-
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	packages
 DISTFILES=	\
 		crisp-1.11-pkg.tar.gz \
 		edt-1.09-pkg.tar.gz \
 		reftex-1.20-pkg.tar.gz \
 		textools-1.10-pkg.tar.gz \
 		tpu-1.10-pkg.tar.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-DIST_SUBDIR=	xemacs
-MASTER_SITE_SUBDIR=${DIST_SUBDIR}
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xemacs-packages
 
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index b67c4df03c27..314aa07449be 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -8,12 +8,10 @@
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
 CATEGORIES+=	editors
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-${XEMACS_REL}/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-${XEMACS_REL}/
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX}
+DIST_SUBDIR=	xemacs
 
 MAINTAINER?=	gj@FreeBSD.org
 
@@ -26,8 +24,6 @@ XEMACS_REL=	21.1
 XEMACS_VER=	21.1.12
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
-DIST_SUBDIR=	xemacs
-
 SLAVEDIRS+=	editors/xemacs21-mule
 USE_XLIB=	yes
 USE_XPM=	yes
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index 2b2b0321de13..b1ffe0c54367 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -8,12 +8,8 @@
 PORTNAME=	xemacs
 PORTVERSION=	20.4
 CATEGORIES=	editors
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/${DISTNAME}/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/${DISTNAME}/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/${DISTNAME}/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/${DISTNAME}/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${DISTNAME}/
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	${DISTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MULEDISTFILE}
 
 MAINTAINER=	gj@FreeBSD.org
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index b67c4df03c27..314aa07449be 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -8,12 +8,10 @@
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
 CATEGORIES+=	editors
-MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-${XEMACS_REL}/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-${XEMACS_REL}/
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX}
+DIST_SUBDIR=	xemacs
 
 MAINTAINER?=	gj@FreeBSD.org
 
@@ -26,8 +24,6 @@ XEMACS_REL=	21.1
 XEMACS_VER=	21.1.12
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
-DIST_SUBDIR=	xemacs
-
 SLAVEDIRS+=	editors/xemacs21-mule
 USE_XLIB=	yes
 USE_XPM=	yes