Update to version 21.1.10

Rearrange xemacs mule packages

PR:	19021
PR:	19023
Submitted by: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

3 files changed, 27 insertions, 16 deletions

diff --git a/editors/xemacs21-sumo/Makefile b/editors/xemacs21-sumo/Makefile
index e89cc034c481..62a45deb15dc 100644
--- a/editors/xemacs21-sumo/Makefile
+++ b/editors/xemacs21-sumo/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   Meta port of XEmacs mule with sumo package
+# New ports collection makefile for:   Meta port of XEmacs with sumo package
 # Date created:        19 August 1999
 # Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
@@ -6,17 +6,23 @@
 #
 
 PORTNAME=	xemacs-${NAMEPREFIX}sumo
-PORTVERSION=	${XEMACS_REL}
-CATEGORIES+=	editors elisp
+PORTVERSION=	${XEMACS_VER}
+CATEGORIES=	editors
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-sumo-packages \
-		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-sumo-packages \
+.if defined(NAMEPREFIX) && ${NAMEPREFIX} == "mule-" || \
+	defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} != ""
+RUN_DEPENDS=	${LOCALBASE}/share/doc/xemacs-additional-packages:${PORTSDIR}/editors/xemacs-additional-packages \
+		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.leim:${PORTSDIR}/editors/xemacs-mule-packages \
 		${RUN_DEP_LIST}
+.else
+RUN_DEPENDS=	${LOCALBASE}/share/doc/xemacs-additional-packages:${PORTSDIR}/editors/xemacs-additional-packages \
+		${RUN_DEP_LIST}
+.endif
 
 NO_BUILD=	yes
 
@@ -25,15 +31,17 @@ XEMACS_REL=		21.1
 XEMACS_VER=		21.1.10
 XEMACS_ARCH=		${MACHINE_ARCH}--freebsd
 
+do-install:		# empty
+
 .include <bsd.port.pre.mk>
 
-.if defined(PKGNAMEPREFIX) && (${PKGNAMEPREFIX} == "ja-")
+.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == "ja-"
 RUN_DEP_LIST=		${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/japanese/xemacs${XEMACS_MAJOR_VER}${PKGNAMESUFFIX}
-.else
+.elif defined(NAMEPREFIX) && ${NAMEPREFIX} == "mule-"
 RUN_DEP_LIST=		${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule
 NAMEPREFIX=		mule-
+.else
+RUN_DEP_LIST=		${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}
 .endif
 
-do-install:		# empty
-
 .include <bsd.port.post.mk>
diff --git a/editors/xemacs21-sumo/pkg-comment b/editors/xemacs21-sumo/pkg-comment
index b3108fb03250..7e0724b12229 100644
--- a/editors/xemacs21-sumo/pkg-comment
+++ b/editors/xemacs21-sumo/pkg-comment
@@ -1 +1 @@
-The "meta-port" for XEmacs Mule with SUMO packages
+The "meta-port" for XEmacs with SUMO packages
diff --git a/editors/xemacs21-sumo/pkg-descr b/editors/xemacs21-sumo/pkg-descr
index 48ca1e9e8f17..fad3a4ce8939 100644
--- a/editors/xemacs21-sumo/pkg-descr
+++ b/editors/xemacs21-sumo/pkg-descr
@@ -1,11 +1,14 @@
-This port is for XEmacs environment using XEmacs mule ports and 
-Mule SUMO packages. 
+This port is for XEmacs environment using XEmacs ports and Mule SUMO
+packages. `SUMO package would be made by installing xemacs-packages and
+xemacs-additonal-packages(for Mule SUMO xemacs-basic-mule-packages and
+xemacs-mule-packages in addition).
 
-This package is built with Multilingual Imput Methods. Especially, Japanese
-input is supported by using SKK, SJ3, Canna, Wnn4 or Wnn6 as an external
-input engine . Each input method would be supported in following ports
-respectively:
+Each package except for xemacs21-sumo is built with Multilingual Imput
+Methods. Especially, Japanese input is supported by using SKK, SJ3, Canna,
+Wnn4 or Wnn6 as an external input engine . Each input method would be
+supported in following ports respectively:
 
+	editors/xemacs21-sumo ............... No input method supports
 	editors/xemacs21-mule-sumo .......... SKK, SJ3
 	japanese/xemacs21-sumo-canna ........ SKK, SJ3, Canna
 	japanese/xemacs21-sumo-canna+wnn4 ... SKK, SJ3, Canna, Wnn4