14 files changed, 20 insertions, 16 deletions

diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index f2751d543e70..9f9a9036c31a 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -17,7 +17,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}
 
 MAINTAINER?=	gj@FreeBSD.org
 
-RUN_DEPENDS+=    ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
+RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
@@ -27,6 +27,7 @@ XEMACS_REL=	21.1
 XEMACS_VER=	21.1.9
 DIST_SUBDIR=	xemacs
 
+SLAVEDIRS+=	editors/xemacs21-mule
 USE_XLIB=	yes
 USE_GMAKE=	yes
 STRIP=
diff --git a/editors/xemacs-devel/pkg-descr b/editors/xemacs-devel/pkg-descr
index 878196cc3b08..8902e19d257f 100644
--- a/editors/xemacs-devel/pkg-descr
+++ b/editors/xemacs-devel/pkg-descr
@@ -18,4 +18,4 @@ display model, including support for Motif menu and scroll bars and the
 ability to run as a widget inside other applications. Many people say
 it looks nicer than GNU Emacs.
 
-Web site: http://www.xemacs.org
+WWW: http://www.xemacs.org
diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist
index 99cad805bf8e..bfa183b6a4c8 100644
--- a/editors/xemacs-devel/pkg-plist
+++ b/editors/xemacs-devel/pkg-plist
@@ -1143,4 +1143,3 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-9
 @dirrm lib/xemacs-%%XEMACS_VER%%/info
 @dirrm lib/xemacs-%%XEMACS_VER%%
 @unexec rmdir %D/lib/xemacs 2>/dev/null || true
-
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index f2751d543e70..9f9a9036c31a 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -17,7 +17,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}
 
 MAINTAINER?=	gj@FreeBSD.org
 
-RUN_DEPENDS+=    ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
+RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
@@ -27,6 +27,7 @@ XEMACS_REL=	21.1
 XEMACS_VER=	21.1.9
 DIST_SUBDIR=	xemacs
 
+SLAVEDIRS+=	editors/xemacs21-mule
 USE_XLIB=	yes
 USE_GMAKE=	yes
 STRIP=
diff --git a/editors/xemacs/pkg-descr b/editors/xemacs/pkg-descr
index 878196cc3b08..8902e19d257f 100644
--- a/editors/xemacs/pkg-descr
+++ b/editors/xemacs/pkg-descr
@@ -18,4 +18,4 @@ display model, including support for Motif menu and scroll bars and the
 ability to run as a widget inside other applications. Many people say
 it looks nicer than GNU Emacs.
 
-Web site: http://www.xemacs.org
+WWW: http://www.xemacs.org
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index 99cad805bf8e..bfa183b6a4c8 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -1143,4 +1143,3 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-9
 @dirrm lib/xemacs-%%XEMACS_VER%%/info
 @dirrm lib/xemacs-%%XEMACS_VER%%
 @unexec rmdir %D/lib/xemacs 2>/dev/null || true
-
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index a13f4ccec6c8..0d87c50cd251 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -11,9 +11,9 @@ 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.usyd.edu.au/pub/Xemacs/${DISTNAME}/ \
 		ftp://ftp.lab.kdd.co.jp/xemacs/${DISTNAME}/ \
-		ftp://ftp.th-darmstadt.de:/pub/editors/xemacs/${DISTNAME}/
+		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${DISTNAME}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MULEDISTFILE}
 
 MAINTAINER=	gj@FreeBSD.org
diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile
index 86892146ad3c..9efad8989a13 100644
--- a/editors/xemacs21-mule-common/Makefile
+++ b/editors/xemacs21-mule-common/Makefile
@@ -7,7 +7,7 @@
 
 # This is the COMMON port of XEmacs Mule slave
 # ports(editors/xemacs${XEMACS_MAJOR_VER}-mule, japanese/xemacs${XEMACS_MAJOR_VER}-*)
-# and provides `Architecture Independent' parts of xemacs binary. 
+# and provides `Architecture Independent' parts of xemacs binary.
 #
 # Caracteristic variables of XEmacs Mule ports family:
 #	MULE_PORT         : Mule port if defined(means COMMN or SLAVE)
diff --git a/editors/xemacs21-mule-sumo/Makefile b/editors/xemacs21-mule-sumo/Makefile
index 9a60d519f8ff..a424cfeacac6 100644
--- a/editors/xemacs21-mule-sumo/Makefile
+++ b/editors/xemacs21-mule-sumo/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${XEMACS_REL}
 CATEGORIES+=	editors
 MASTER_SITES=	# empty
 DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
@@ -17,7 +18,6 @@ RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${P
 		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-sumo-packages \
 		${RUN_DEP_LIST}
 
-EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
 
 XEMACS_MAJOR_VER=	21
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 16b5f4cde8f4..24d539277495 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -6,7 +6,7 @@
 #
 
 # This is the MASTER port of XEmacs Mule slave ports(japanese/xemacs${XEMACS_MAJOR_VER}-*)
-# and provides `Architecture Dependent' parts of xemacs binary. 
+# and provides `Architecture Dependent' parts of xemacs binary.
 #
 # Caracteristic variables of XEmacs Mule ports family:
 #	MULE_PORT         : Mule port if defined(means COMMN or SLAVE)
@@ -72,6 +72,8 @@ FILESDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/files
 PATCHDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/patches
 PLIST?=		${PKGLDIR}/PLIST
 
+SLAVEDIRS=	editors/xemacs21-mule-common editors/xemacs21-mule-sumo
+
 XEMACS_MAJOR_VER?=	21
 MULE_PORT=		yes
 PKGNAMESUFFIX?=		-mule
@@ -145,4 +147,6 @@ post-package:
 #	${MKDIR} ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults
 #.endif
 
-.include "${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/editors/xemacs21-sumo/Makefile b/editors/xemacs21-sumo/Makefile
index 9a60d519f8ff..a424cfeacac6 100644
--- a/editors/xemacs21-sumo/Makefile
+++ b/editors/xemacs21-sumo/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	${XEMACS_REL}
 CATEGORIES+=	editors
 MASTER_SITES=	# empty
 DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
@@ -17,7 +18,6 @@ RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${P
 		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-sumo-packages \
 		${RUN_DEP_LIST}
 
-EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
 
 XEMACS_MAJOR_VER=	21
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index f2751d543e70..9f9a9036c31a 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -17,7 +17,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}
 
 MAINTAINER?=	gj@FreeBSD.org
 
-RUN_DEPENDS+=    ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
+RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
@@ -27,6 +27,7 @@ XEMACS_REL=	21.1
 XEMACS_VER=	21.1.9
 DIST_SUBDIR=	xemacs
 
+SLAVEDIRS+=	editors/xemacs21-mule
 USE_XLIB=	yes
 USE_GMAKE=	yes
 STRIP=
diff --git a/editors/xemacs21/pkg-descr b/editors/xemacs21/pkg-descr
index 878196cc3b08..8902e19d257f 100644
--- a/editors/xemacs21/pkg-descr
+++ b/editors/xemacs21/pkg-descr
@@ -18,4 +18,4 @@ display model, including support for Motif menu and scroll bars and the
 ability to run as a widget inside other applications. Many people say
 it looks nicer than GNU Emacs.
 
-Web site: http://www.xemacs.org
+WWW: http://www.xemacs.org
diff --git a/editors/xemacs21/pkg-plist b/editors/xemacs21/pkg-plist
index 99cad805bf8e..bfa183b6a4c8 100644
--- a/editors/xemacs21/pkg-plist
+++ b/editors/xemacs21/pkg-plist
@@ -1143,4 +1143,3 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-9
 @dirrm lib/xemacs-%%XEMACS_VER%%/info
 @dirrm lib/xemacs-%%XEMACS_VER%%
 @unexec rmdir %D/lib/xemacs 2>/dev/null || true
-