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, 74 insertions, 89 deletions

diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 1811a1e09fc5..f28ced222250 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	\
 		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/
+
 DISTFILES=	\
 		apel-1.16-pkg.tar.gz \
 		auctex-1.19-pkg.tar.gz \
@@ -21,33 +22,34 @@ DISTFILES=	\
 		cc-mode-1.17-pkg.tar.gz \
 		debug-1.11-pkg.tar.gz \
 		dired-1.07-pkg.tar.gz \
-		edit-utils-1.45-pkg.tar.gz \
-		efs-1.16-pkg.tar.gz \
+		edit-utils-1.47-pkg.tar.gz \
+		efs-1.19-pkg.tar.gz \
 		fsf-compat-1.07-pkg.tar.gz \
 		hm--html-menus-1.14-pkg.tar.gz \
 		ispell-1.18-pkg.tar.gz \
-		mail-lib-1.28-pkg.tar.gz \
+		mail-lib-1.29-pkg.tar.gz \
 		mailcrypt-2.04-pkg.tar.gz \
 		net-utils-1.13-pkg.tar.gz \
-		os-utils-1.19-pkg.tar.gz \
-		pcl-cvs-1.41-pkg.tar.gz \
-		prog-modes-1.23-pkg.tar.gz \
+		os-utils-1.20-pkg.tar.gz \
+		pcl-cvs-1.46-pkg.tar.gz \
+		prog-modes-1.25-pkg.tar.gz \
 		ps-print-nomule-1.03-pkg.tar.gz \
-		psgml-1.15-pkg.tar.gz \
+		psgml-1.16-pkg.tar.gz \
 		sgml-1.06-pkg.tar.gz \
 		sh-script-1.11-pkg.tar.gz \
-		texinfo-1.18-pkg.tar.gz \
-		text-modes-1.22-pkg.tar.gz \
+		texinfo-1.19-pkg.tar.gz \
+		text-modes-1.25-pkg.tar.gz \
 		time-1.09-pkg.tar.gz \
-		vc-1.22-pkg.tar.gz \
-		viper-1.18-pkg.tar.gz \
+		vc-1.23-pkg.tar.gz \
+		viper-1.20-pkg.tar.gz \
 		w3-1.15-pkg.tar.gz \
-		xemacs-base-1.37-pkg.tar.gz \
-		xemacs-devel-1.25-pkg.tar.gz
+		xemacs-base-1.39-pkg.tar.gz \
+		xemacs-devel-1.26-pkg.tar.gz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
 DIST_SUBDIR=	xemacs
+MASTER_SITE_SUBDIR=${DIST_SUBDIR}
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xemacs-packages
@@ -63,15 +65,18 @@ do-extract:
 
 do-install:
 	${MKDIR} ${XEMACSDIR}
-	${CP} -Rp ${WRKSRC} ${XEMACSDIR}
+	${CP} -Rp ${WRKDIR}/xemacs-packages ${XEMACSDIR}
 
 post-install:
-	@${ECHO_MSG} "This is only a subset of the available packages for xemacs."
-	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
-	@${ECHO_MSG} "running it as root and using the 'Manage Packages' 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-sumo-packages or"
-	@${ECHO_MSG} "xemacs-mule-sumo-packages port."
+	@${ECHO_MSG} "    This is the basic package for XEmacs(version over 21). You might be enough"
+	@${ECHO_MSG} "only with this package for working at XEmacs but if you think it"
+	@${ECHO_MSG} "insufficient,you can install other packages provided by XEmacs.org with"
+	@${ECHO_MSG} "editors/xemacs-*-packages ports. These ports are prepared for corresponding"
+	@${ECHO_MSG} "XEmacs packages except for xemacs-packages, xemacs-mule-basic-packages and"
+	@${ECHO_MSG} "xemacs-additional-packages. Where xemacs-additional-packages is a meta ports for"
+	@${ECHO_MSG} "packages out of xemacs, xemacs 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-packages/distinfo b/editors/xemacs-packages/distinfo
index 310d697cb360..842bcaadc82c 100644
--- a/editors/xemacs-packages/distinfo
+++ b/editors/xemacs-packages/distinfo
@@ -4,26 +4,26 @@ MD5 (xemacs/c-support-1.14-pkg.tar.gz) = c804b3eb5a395bbe39020a5115c3d5e5
 MD5 (xemacs/cc-mode-1.17-pkg.tar.gz) = ac9ed86d107513eb22173e8893e8ae78
 MD5 (xemacs/debug-1.11-pkg.tar.gz) = 034e56577b306bb9f4cb822c2adc89b0
 MD5 (xemacs/dired-1.07-pkg.tar.gz) = f7ecf6faf11794e18299c2aa139e6b1e
-MD5 (xemacs/edit-utils-1.45-pkg.tar.gz) = b541b5c1f63f69a32864d609fbb4ead9
-MD5 (xemacs/efs-1.16-pkg.tar.gz) = c04ecaf45f6e090b8f0bdcb6ce7a04ab
+MD5 (xemacs/edit-utils-1.47-pkg.tar.gz) = db5985c901721eac65e6ff9126df20f5
+MD5 (xemacs/efs-1.19-pkg.tar.gz) = db531e86ba8ac4c48d9dadbd868e245a
 MD5 (xemacs/fsf-compat-1.07-pkg.tar.gz) = c6c353c516ce02153e93348768589b47
 MD5 (xemacs/hm--html-menus-1.14-pkg.tar.gz) = 92bcfc9112da3c16f3b922576c79facc
 MD5 (xemacs/ispell-1.18-pkg.tar.gz) = 11ae38e4e89498a44502fe596a9cd563
-MD5 (xemacs/mail-lib-1.28-pkg.tar.gz) = bef2f5542871e820f0f0bcd918fd3676
+MD5 (xemacs/mail-lib-1.29-pkg.tar.gz) = 38798e07bb63350135477fcb046e97f0
 MD5 (xemacs/mailcrypt-2.04-pkg.tar.gz) = 69807743b44a35a99eb03054642d8a25
 MD5 (xemacs/net-utils-1.13-pkg.tar.gz) = 9ee77d48ee7e97cb148dc4f9a04c3bf4
-MD5 (xemacs/os-utils-1.19-pkg.tar.gz) = 9202c67fdd110d546c2d6ae96a16ee4e
-MD5 (xemacs/pcl-cvs-1.41-pkg.tar.gz) = 86e3b1e6bbb60931c31ba0d98162da26
-MD5 (xemacs/prog-modes-1.23-pkg.tar.gz) = 108b0bdbecc0b648e27a5760572e283e
+MD5 (xemacs/os-utils-1.20-pkg.tar.gz) = ae25336b47085f86f3ff73542d848a0e
+MD5 (xemacs/pcl-cvs-1.46-pkg.tar.gz) = 41bb10c9a91773fe5a3971ea6e1e635b
+MD5 (xemacs/prog-modes-1.25-pkg.tar.gz) = ebd814c93af479a3dc0fdf6f86d89b74
 MD5 (xemacs/ps-print-nomule-1.03-pkg.tar.gz) = 4656fbaccd48ab097d791b03e9f40f76
-MD5 (xemacs/psgml-1.15-pkg.tar.gz) = 3f7835cf7f2e891a731179a698473a16
+MD5 (xemacs/psgml-1.16-pkg.tar.gz) = eaa4104c2d688962519b72976252283f
 MD5 (xemacs/sgml-1.06-pkg.tar.gz) = 4761323697a995beb53896f350c3f3d6
 MD5 (xemacs/sh-script-1.11-pkg.tar.gz) = 49f389b0bf5107848a4b342e70bb9472
-MD5 (xemacs/texinfo-1.18-pkg.tar.gz) = ddfced14a51de83ce4db4d5036538124
-MD5 (xemacs/text-modes-1.22-pkg.tar.gz) = 969a6a4b259153b17365c68dda516ce0
+MD5 (xemacs/texinfo-1.19-pkg.tar.gz) = 1b0835a00f1d3d5772e251a23368e98e
+MD5 (xemacs/text-modes-1.25-pkg.tar.gz) = 3db7095b4b378f222e6d21f6f9483f98
 MD5 (xemacs/time-1.09-pkg.tar.gz) = fe670ec58c71b6720e97af24f2fb9893
-MD5 (xemacs/vc-1.22-pkg.tar.gz) = 203309aa4378cc3fce8eff5f7b8ac622
-MD5 (xemacs/viper-1.18-pkg.tar.gz) = 66c988d8f43927d2998ba4bad4ce36b1
+MD5 (xemacs/vc-1.23-pkg.tar.gz) = 238c499b5cdd6ad6a19b682a4a3d7fb2
+MD5 (xemacs/viper-1.20-pkg.tar.gz) = 87306b858388bb7f36b17c41b049b1d4
 MD5 (xemacs/w3-1.15-pkg.tar.gz) = a160290f8b3df941f3f0985522bc271b
-MD5 (xemacs/xemacs-base-1.37-pkg.tar.gz) = 08ae3bd521b19cfa59cd80a9892f2656
-MD5 (xemacs/xemacs-devel-1.25-pkg.tar.gz) = 521f5b549326278261ec1d2dd293dd65
+MD5 (xemacs/xemacs-base-1.39-pkg.tar.gz) = 8c0a2ab3855712e4c3771c83b63a9aa3
+MD5 (xemacs/xemacs-devel-1.26-pkg.tar.gz) = 91c111d1997128ddb323530383750eb3
diff --git a/editors/xemacs-packages/pkg-comment b/editors/xemacs-packages/pkg-comment
index 890d7e97d0bb..b9b465ef359a 100644
--- a/editors/xemacs-packages/pkg-comment
+++ b/editors/xemacs-packages/pkg-comment
@@ -1 +1 @@
-Common elisp packages for xemacs 21
+Basic XEmacs elisp packages(basic)
diff --git a/editors/xemacs-packages/pkg-descr b/editors/xemacs-packages/pkg-descr
index 5059f576405a..212291496213 100644
--- a/editors/xemacs-packages/pkg-descr
+++ b/editors/xemacs-packages/pkg-descr
@@ -2,8 +2,9 @@ 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 for XEmacs(version over 21). which
+contains basically needed packages in usual working at XEmacs provided by
+xemacs.org(www.xemacs.org).
 
-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-packages/pkg-plist b/editors/xemacs-packages/pkg-plist
index 4a6579c82edf..097dad44f57f 100644
--- a/editors/xemacs-packages/pkg-plist
+++ b/editors/xemacs-packages/pkg-plist
@@ -77,6 +77,9 @@ lib/xemacs/xemacs-packages/etc/hm--html-menus/templates/command-description.html
 lib/xemacs/xemacs-packages/etc/hm--html-menus/templates/frame.html.tmpl
 lib/xemacs/xemacs-packages/etc/psgml/CATALOG
 lib/xemacs/xemacs-packages/etc/psgml/ECAT
+lib/xemacs/xemacs-packages/etc/psgml/HTML3.2.decl
+lib/xemacs/xemacs-packages/etc/psgml/HTML4.01.decl
+lib/xemacs/xemacs-packages/etc/psgml/HTML4.decl
 lib/xemacs/xemacs-packages/etc/psgml/HTMLlat1.ent
 lib/xemacs/xemacs-packages/etc/psgml/HTMLspecial.ent
 lib/xemacs/xemacs-packages/etc/psgml/HTMLsymbol.ent
@@ -108,53 +111,33 @@ lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOnum
 lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOpub
 lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOtech
 lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/Numeric_and_Special_Graphic
-lib/xemacs/xemacs-packages/etc/psgml/ISOlat1.sgml
 lib/xemacs/xemacs-packages/etc/psgml/README.cdtd
-lib/xemacs/xemacs-packages/etc/psgml/README.htmlpro
-lib/xemacs/xemacs-packages/etc/psgml/Wing.ISOlat1.sgml
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-2
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3-r
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3.2
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3.2f
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4l
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-hj
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-mcom
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4.01frame
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4.01s
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4frame
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4s
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-r
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/iehtml
-lib/xemacs/xemacs-packages/etc/psgml/html-0.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-0s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-1.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-1s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-2.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-3.2.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-3.2f.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-3.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-3s.dtd
+lib/xemacs/xemacs-packages/etc/psgml/html-4.01frame.dtd
+lib/xemacs/xemacs-packages/etc/psgml/html-4.01l.dtd
+lib/xemacs/xemacs-packages/etc/psgml/html-4.01s.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-4frame.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-4l.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-4s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-cougar.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-hj.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-hjs.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-icons.sgml
 lib/xemacs/xemacs-packages/etc/psgml/html-latin.sgml
 lib/xemacs/xemacs-packages/etc/psgml/html-math.sgml
-lib/xemacs/xemacs-packages/etc/psgml/html-mcom.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-mcoms.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-s.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html.decl
 lib/xemacs/xemacs-packages/etc/psgml/html.dtd
-lib/xemacs/xemacs-packages/etc/psgml/htmlpro.dtd
-lib/xemacs/xemacs-packages/etc/psgml/ie30-s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/ie30.dtd
-lib/xemacs/xemacs-packages/etc/psgml/ie3tables.dtd
-lib/xemacs/xemacs-packages/etc/psgml/iehtml-s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/iehtml.dtd
-lib/xemacs/xemacs-packages/etc/psgml/ietables.dtd
 lib/xemacs/xemacs-packages/etc/psgml/iso88591.map
-lib/xemacs/xemacs-packages/etc/psgml/sinfo.dtd
-lib/xemacs/xemacs-packages/etc/psgml/webtechs.catalog
+lib/xemacs/xemacs-packages/etc/psgml/structures.dtd
 lib/xemacs/xemacs-packages/etc/time/0.xpm
 lib/xemacs/xemacs-packages/etc/time/1.xpm
 lib/xemacs/xemacs-packages/etc/time/2.xpm
@@ -768,8 +751,6 @@ lib/xemacs/xemacs-packages/lisp/efs/efs-ti-twenex.el
 lib/xemacs/xemacs-packages/lisp/efs/efs-ti-twenex.elc
 lib/xemacs/xemacs-packages/lisp/efs/efs-tops-20.el
 lib/xemacs/xemacs-packages/lisp/efs/efs-tops-20.elc
-lib/xemacs/xemacs-packages/lisp/efs/efs-vm.el
-lib/xemacs/xemacs-packages/lisp/efs/efs-vm.elc
 lib/xemacs/xemacs-packages/lisp/efs/efs-vms.el
 lib/xemacs/xemacs-packages/lisp/efs/efs-vms.elc
 lib/xemacs/xemacs-packages/lisp/efs/efs-vos.el
@@ -958,16 +939,23 @@ lib/xemacs/xemacs-packages/lisp/pcl-cvs/auto-autoloads.el
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/auto-autoloads.elc
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/custom-load.el
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/custom-load.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/dired-cvs.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/dired-cvs.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/generic-sc.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/generic-sc.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-bindings.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-bindings.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-buffer.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-buffer.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-xemacs.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-xemacs.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-compat.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-compat.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-edit.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-edit.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-log.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-log.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-status.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-status.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/easy-mmode.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-defs.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-defs.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-info.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-info.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-parse.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-parse.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-util.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-util.elc
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs.el
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs.elc
 lib/xemacs/xemacs-packages/lisp/prog-modes/ChangeLog
@@ -1064,8 +1052,6 @@ lib/xemacs/xemacs-packages/lisp/psgml/psgml-html.el
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-html.elc
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-info.el
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-info.elc
-lib/xemacs/xemacs-packages/lisp/psgml/psgml-other.el
-lib/xemacs/xemacs-packages/lisp/psgml/psgml-other.elc
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-parse.el
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-parse.elc
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-xemacs.el
@@ -1498,7 +1484,6 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.viper
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.w3
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-base
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
-@unexec rmdir %D/lib/xemacs/xemacs-packages/pkginfo 2>/dev/null || true
 @dirrm lib/xemacs/xemacs-packages/man/w3
 @dirrm lib/xemacs/xemacs-packages/man/viper
 @dirrm lib/xemacs/xemacs-packages/man/psgml
@@ -1509,7 +1494,6 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/man/efs
 @dirrm lib/xemacs/xemacs-packages/man/cc-mode
 @dirrm lib/xemacs/xemacs-packages/man/auctex
-@unexec rmdir %D/lib/xemacs/xemacs-packages/man 2>/dev/null || true
 @dirrm lib/xemacs/xemacs-packages/lisp/xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/lisp/xemacs-base
 @dirrm lib/xemacs/xemacs-packages/lisp/w3
@@ -1539,8 +1523,6 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/lisp/c-support
 @dirrm lib/xemacs/xemacs-packages/lisp/auctex
 @dirrm lib/xemacs/xemacs-packages/lisp/apel
-@unexec rmdir %D/lib/xemacs/xemacs-packages/lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages/info 2>/dev/null || true
 @dirrm lib/xemacs/xemacs-packages/etc/w3
 @dirrm lib/xemacs/xemacs-packages/etc/time
 @dirrm lib/xemacs/xemacs-packages/etc/psgml/cdtd
@@ -1552,6 +1534,3 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/etc/hm--html-menus
 @dirrm lib/xemacs/xemacs-packages/etc/auctex/style
 @dirrm lib/xemacs/xemacs-packages/etc/auctex
-@unexec rmdir %D/lib/xemacs/xemacs-packages/etc 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true