Update to version 21.1.10

Rearrange xemacs mule packages

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

5 files changed, 34 insertions, 50 deletions

diff --git a/editors/xemacs-basic-mule-packages/Makefile b/editors/xemacs-basic-mule-packages/Makefile
index 77d19ea..062dd29 100644
--- a/editors/xemacs-basic-mule-packages/Makefile
+++ b/editors/xemacs-basic-mule-packages/Makefile
@@ -1,29 +1,28 @@
-# New ports collection makefile for:	X-Emacs Packages with Mule
-# Date created:		24 Oct 1999
-# Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
+# New ports collection makefile for:	Basic XEmacs elisp packages with Mule
+# Date created:		03 June 2000
+# Whom:			KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
 #
-# $FreeBSD$
+# $FreeBSD$$
 #
 
-PORTNAME=	xemacs-mule-packages
-PORTVERSION=	1.1
+PORTNAME=	xemacs-basic-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_SITE_PORTS_JP}
+		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
 
-# These are not smallest set of packages but mostly usage of packages for
-# many `Mule' users.
 DISTFILES=	\
-		mule-base-1.34-pkg.tar.gz	locale-1.15-pkg.tar.gz \
-		skk-1.15-pkg.tar.gz		elib-1.06-pkg.tar.gz \
-		egg-its-1.22-pkg.tar.gz		ps-print-ja-1.01-pkg.tar.gz
+		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.15-pkg.tar.gz
 
-MAINTAINER=	kiri@pis.toba-cmt.ac.jp
+MAINTAINER=	KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
 
 DIST_SUBDIR=	xemacs
 MASTER_SITE_SUBDIR=${DIST_SUBDIR}
@@ -45,18 +44,16 @@ do-install:
 	${CP} -Rp ${WRKDIR}/mule-packages ${XEMACSDIR}
 
 post-install:
-	@${ECHO_MSG} "This is only a subset of the available packages for xemacs"
-	@${ECHO_MSG} "with mule."
-	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
-	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
-	@${ECHO_MSG} "the 'Options' menu of the menubar."
-	@${ECHO_MSG} "To install all packages besides basic packages(xemacs-packages or"
-	@${ECHO_MSG} "xemacs-mule-packages), consider using the xemacs-other-packages or"
-	@${ECHO_MSG} "xemacs-mule-other-packages port."
-
-## for make PLIST (only maintainer use)
-#arrange:
-#	${MAKE} -DPLIST_OVERRIDE DIRRM2RMDIRS="lib/xemacs/mule-packages/pkginfo lib/xemacs/mule-packages/man lib/xemacs/mule-packages/lisp lib/xemacs/mule-packages/info lib/xemacs/mule-packages/etc lib/xemacs/mule-packages" \
-#		DIRRMDEPTH=2 plist
+	@${ECHO_MSG} "    This is the basic mule package for XEmacs(version over 21). You might be"
+	@${ECHO_MSG} "enough with this package installing basic package(editors/xemacs-packages)"
+	@${ECHO_MSG} "altogether for working at XEmacs but if you think it insufficient,you can"
+	@${ECHO_MSG} "install other packages provided by XEmacs.org with editors/xemacs-*-packages"
+	@${ECHO_MSG} "ports. These ports are prepared for corresponding XEmacs packages except for"
+	@${ECHO_MSG} "xemacs-packages, xemacs-basic-packages and xemacs-additional-packages. Where"
+	@${ECHO_MSG} "xemacs-additional-packages is a meta ports for packages out of xemacs, xemacs"
+	@${ECHO_MSG} "mule-basic and xemacs mule category packages."
+	@${ECHO_MSG} "    You can also install with running it as root and using the 'Manage Packes'"
+	@${ECHO_MSG} "menu within the 'Options' menu of the menubar. But using this xemacs package"
+	@${ECHO_MSG} "managing, you could not control under ports managing ;-)"
 
 .include <bsd.port.mk>
diff --git a/editors/xemacs-basic-mule-packages/distinfo b/editors/xemacs-basic-mule-packages/distinfo
index 616e9a3..cd272a4 100644
--- a/editors/xemacs-basic-mule-packages/distinfo
+++ b/editors/xemacs-basic-mule-packages/distinfo
@@ -1,6 +1,5 @@
+MD5 (xemacs/egg-its-1.22-pkg.tar.gz) = e6c2684467a316c1c282901d26c02d48
+MD5 (xemacs/elib-1.06-pkg.tar.gz) = 339069723620631e005817292403b19e
+MD5 (xemacs/locale-1.16-pkg.tar.gz) = f8d07dfb54d440329167669689a1f210
 MD5 (xemacs/mule-base-1.34-pkg.tar.gz) = f4f068f34b9200ae63567d3045b6dcaf
-MD5 (xemacs/locale-1.15-pkg.tar.gz) = f36714b847d89db6f2be4197bf3004ca
 MD5 (xemacs/skk-1.15-pkg.tar.gz) = 0a96626408534afa1f47f2db15f0a28b
-MD5 (xemacs/elib-1.06-pkg.tar.gz) = 339069723620631e005817292403b19e
-MD5 (xemacs/egg-its-1.22-pkg.tar.gz) = e6c2684467a316c1c282901d26c02d48
-MD5 (xemacs/ps-print-ja-1.01-pkg.tar.gz) = 6d42af1790d11c1ecde0157d9b0526ca
diff --git a/editors/xemacs-basic-mule-packages/pkg-comment b/editors/xemacs-basic-mule-packages/pkg-comment
index 890d7e9..31f0c4e 100644
--- a/editors/xemacs-basic-mule-packages/pkg-comment
+++ b/editors/xemacs-basic-mule-packages/pkg-comment
@@ -1 +1 @@
-Common elisp packages for xemacs 21
+Basic XEmacs elisp packages with Mule(basic-mule)
diff --git a/editors/xemacs-basic-mule-packages/pkg-descr b/editors/xemacs-basic-mule-packages/pkg-descr
index 5059f57..cd4a2a1 100644
--- a/editors/xemacs-basic-mule-packages/pkg-descr
+++ b/editors/xemacs-basic-mule-packages/pkg-descr
@@ -2,8 +2,10 @@ Starting with release 21, xemacs does not come with lisp packages
 any more. Instead, they are distributed separately from the main
 sources.
 
-This port attempts to provide a subset of the available packages that
-should be useful for most users.
+    This port provides a basic package with mule for XEmacs(version over 21).
+which contains basically needed packages provided by xemacs.org(www.xemacs.org)
+in addition to the basic package(editors/xemacs-packages) for usual working at
+XEmacs.
 
-To install additional packages, use the "Manage Packages" menu
-in the "Options" menu of your xemacs' menubar.
+To install other categories' packages, use editors/xemacs-*-packages
+ports/packages.
diff --git a/editors/xemacs-basic-mule-packages/pkg-plist b/editors/xemacs-basic-mule-packages/pkg-plist
index 83bb891..2167473 100644
--- a/editors/xemacs-basic-mule-packages/pkg-plist
+++ b/editors/xemacs-basic-mule-packages/pkg-plist
@@ -182,12 +182,6 @@ lib/xemacs/mule-packages/lisp/mule-base/thai-xtis-util.el
 lib/xemacs/mule-packages/lisp/mule-base/thai-xtis-util.elc
 lib/xemacs/mule-packages/lisp/mule-base/viet-util.el
 lib/xemacs/mule-packages/lisp/mule-base/viet-util.elc
-lib/xemacs/mule-packages/lisp/ps-print-ja/ChangeLog
-lib/xemacs/mule-packages/lisp/ps-print-ja/_pkg.el
-lib/xemacs/mule-packages/lisp/ps-print-ja/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/ps-print-ja/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/ps-print-ja/ps-print.el
-lib/xemacs/mule-packages/lisp/ps-print-ja/ps-print.elc
 lib/xemacs/mule-packages/lisp/skk/ChangeLog
 lib/xemacs/mule-packages/lisp/skk/_pkg.el
 lib/xemacs/mule-packages/lisp/skk/auto-autoloads.el
@@ -236,20 +230,14 @@ lib/xemacs/mule-packages/pkginfo/MANIFEST.egg-its
 lib/xemacs/mule-packages/pkginfo/MANIFEST.elib
 lib/xemacs/mule-packages/pkginfo/MANIFEST.locale
 lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base
-lib/xemacs/mule-packages/pkginfo/MANIFEST.ps-print-ja
 lib/xemacs/mule-packages/pkginfo/MANIFEST.skk
-@unexec rmdir %D/lib/xemacs/mule-packages/pkginfo 2>/dev/null || true
 @dirrm lib/xemacs/mule-packages/man/skk
 @dirrm lib/xemacs/mule-packages/man/elib
-@unexec rmdir %D/lib/xemacs/mule-packages/man 2>/dev/null || true
 @dirrm lib/xemacs/mule-packages/lisp/skk
-@dirrm lib/xemacs/mule-packages/lisp/ps-print-ja
 @dirrm lib/xemacs/mule-packages/lisp/mule-base
 @dirrm lib/xemacs/mule-packages/lisp/locale
 @dirrm lib/xemacs/mule-packages/lisp/elib
 @dirrm lib/xemacs/mule-packages/lisp/egg-its
-@unexec rmdir %D/lib/xemacs/mule-packages/lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages/info 2>/dev/null || true
 @dirrm lib/xemacs/mule-packages/etc/start-files/ro
 @dirrm lib/xemacs/mule-packages/etc/start-files/ja
 @dirrm lib/xemacs/mule-packages/etc/start-files/fr
@@ -264,5 +252,3 @@ lib/xemacs/mule-packages/pkginfo/MANIFEST.skk
 @dirrm lib/xemacs/mule-packages/etc/app-defaults/fr
 @dirrm lib/xemacs/mule-packages/etc/app-defaults/de
 @dirrm lib/xemacs/mule-packages/etc/app-defaults
-@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true