Update according to XEmacs21.1.11 update.

PR:		ports/20242
Submitted by:	KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

15 files changed, 94 insertions, 39 deletions

diff --git a/editors/xemacs-comm-packages/Makefile b/editors/xemacs-comm-packages/Makefile
index ad6a84bf3d35..e9b7183b5fb1 100644
--- a/editors/xemacs-comm-packages/Makefile
+++ b/editors/xemacs-comm-packages/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xemacs-comm-packages
-PORTVERSION=	1.0
-CATEGORIES=	editors
+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/ \
@@ -25,7 +25,7 @@ DISTFILES=	\
 		mh-e-1.12-pkg.tar.gz \
 		rmail-1.11-pkg.tar.gz \
 		supercite-1.14-pkg.tar.gz \
-		tm-1.22-pkg.tar.gz \
+		tm-1.23-pkg.tar.gz \
 		vm-1.22-pkg.tar.gz \
 		zenirc-1.07-pkg.tar.gz
 
diff --git a/editors/xemacs-comm-packages/distinfo b/editors/xemacs-comm-packages/distinfo
index e5c9f8d519e1..6e5b0212e37c 100644
--- a/editors/xemacs-comm-packages/distinfo
+++ b/editors/xemacs-comm-packages/distinfo
@@ -7,6 +7,6 @@ MD5 (xemacs/mew-1.10-pkg.tar.gz) = 6cce3bc4210aa87f0c647f297957b806
 MD5 (xemacs/mh-e-1.12-pkg.tar.gz) = d932211ff7e57e0ed4d9e3feeb07fe4a
 MD5 (xemacs/rmail-1.11-pkg.tar.gz) = e58f62afe0b6b1261a1e2ff97323f75c
 MD5 (xemacs/supercite-1.14-pkg.tar.gz) = 6a8c339c16d3c76f6b930c46eaa37317
-MD5 (xemacs/tm-1.22-pkg.tar.gz) = 509fd058273694d95dcde6cc5f8b9cfd
+MD5 (xemacs/tm-1.23-pkg.tar.gz) = 9a7dc98133c7ee4b710140506a9d05f7
 MD5 (xemacs/vm-1.22-pkg.tar.gz) = d3eb427a3b7bedbac2e1d5e6ee228d1f
 MD5 (xemacs/zenirc-1.07-pkg.tar.gz) = c382629d9ba07f365a0dfe3e0224a630
diff --git a/editors/xemacs-comm-packages/pkg-plist b/editors/xemacs-comm-packages/pkg-plist
index 4f8564b47064..a916cb677e16 100644
--- a/editors/xemacs-comm-packages/pkg-plist
+++ b/editors/xemacs-comm-packages/pkg-plist
@@ -1057,7 +1057,6 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc
 @dirrm lib/xemacs/xemacs-packages/lisp/bbdb
 @dirrm lib/xemacs/xemacs-packages/etc/zenirc
 @dirrm lib/xemacs/xemacs-packages/etc/vm
-@dirrm lib/xemacs/xemacs-packages/etc/sounds
 @dirrm lib/xemacs/xemacs-packages/etc/smilies
 @dirrm lib/xemacs/xemacs-packages/etc/mew
 @dirrm lib/xemacs/xemacs-packages/etc/message
@@ -1066,3 +1065,4 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc
 @dirrm lib/xemacs/xemacs-packages/etc/gnats
 @dirrm lib/xemacs/xemacs-packages/etc/bbdb/tex
 @dirrm lib/xemacs/xemacs-packages/etc/bbdb
+@unexec rmdir %D/lib/xemacs/xemacs-packages/etc/sounds 2>/dev/null || true
diff --git a/editors/xemacs-games-packages/Makefile b/editors/xemacs-games-packages/Makefile
index ce16f47c1dbd..df7c4f69370a 100644
--- a/editors/xemacs-games-packages/Makefile
+++ b/editors/xemacs-games-packages/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-games-packages
 PORTVERSION=	1.0
-CATEGORIES=	editors
+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/ \
diff --git a/editors/xemacs-libs-packages/Makefile b/editors/xemacs-libs-packages/Makefile
index 6c9843d39d25..f5c47b8d9790 100644
--- a/editors/xemacs-libs-packages/Makefile
+++ b/editors/xemacs-libs-packages/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xemacs-libs-packages
-PORTVERSION=	1.0
-CATEGORIES=	editors
+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/ \
@@ -17,7 +17,7 @@ MASTER_SITES=	\
 
 DISTFILES=	\
 		Sun-1.12-pkg.tar.gz \
-		edebug-1.09-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
diff --git a/editors/xemacs-libs-packages/distinfo b/editors/xemacs-libs-packages/distinfo
index 2a10bbb06bf4..595ad255504a 100644
--- a/editors/xemacs-libs-packages/distinfo
+++ b/editors/xemacs-libs-packages/distinfo
@@ -1,5 +1,5 @@
 MD5 (xemacs/Sun-1.12-pkg.tar.gz) = 02e94feebe595088b2d9154d7db5dc17
-MD5 (xemacs/edebug-1.09-pkg.tar.gz) = 98d7b0b016927f6484dfac493146a024
+MD5 (xemacs/edebug-1.10-pkg.tar.gz) = bc6c005476a28fea9e6044097ae26309
 MD5 (xemacs/sounds-au-1.09-pkg.tar.gz) = 8f451d7b9aa22bae0e5a04da42a656dc
 MD5 (xemacs/sounds-wav-1.09-pkg.tar.gz) = 0f2aa67f7005f449f6c6f2611e3e1da0
 MD5 (xemacs/tooltalk-1.11-pkg.tar.gz) = 5c69af8102109ac3ab6144853dc7f735
diff --git a/editors/xemacs-libs-packages/pkg-plist b/editors/xemacs-libs-packages/pkg-plist
index 3049d9630d35..27a719c8b357 100644
--- a/editors/xemacs-libs-packages/pkg-plist
+++ b/editors/xemacs-libs-packages/pkg-plist
@@ -136,4 +136,4 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.tooltalk
 @dirrm lib/xemacs/xemacs-packages/lisp/sounds-au
 @dirrm lib/xemacs/xemacs-packages/lisp/edebug
 @dirrm lib/xemacs/xemacs-packages/lisp/Sun
-@dirrm lib/xemacs/xemacs-packages/etc/sounds
+@unexec rmdir %D/lib/xemacs/xemacs-packages/etc/sounds 2>/dev/null || true
diff --git a/editors/xemacs-oa-packages/Makefile b/editors/xemacs-oa-packages/Makefile
index e7e7ac235464..215bfb394fec 100644
--- a/editors/xemacs-oa-packages/Makefile
+++ b/editors/xemacs-oa-packages/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-oa-packages
 PORTVERSION=	1.0
-CATEGORIES=	editors
+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/ \
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index f28ced222250..006bea689150 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xemacs-packages
-PORTVERSION=	1.4
+PORTVERSION=	1.5
 CATEGORIES=	editors elisp
 MASTER_SITES=	\
 		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
@@ -16,34 +16,34 @@ MASTER_SITES=	\
 		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
 
 DISTFILES=	\
-		apel-1.16-pkg.tar.gz \
+		apel-1.18-pkg.tar.gz \
 		auctex-1.19-pkg.tar.gz \
 		c-support-1.14-pkg.tar.gz \
 		cc-mode-1.17-pkg.tar.gz \
 		debug-1.11-pkg.tar.gz \
 		dired-1.07-pkg.tar.gz \
-		edit-utils-1.47-pkg.tar.gz \
+		edit-utils-1.50-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.29-pkg.tar.gz \
+		mail-lib-1.30-pkg.tar.gz \
 		mailcrypt-2.04-pkg.tar.gz \
 		net-utils-1.13-pkg.tar.gz \
 		os-utils-1.20-pkg.tar.gz \
-		pcl-cvs-1.46-pkg.tar.gz \
-		prog-modes-1.25-pkg.tar.gz \
+		pcl-cvs-1.47-pkg.tar.gz \
+		prog-modes-1.28-pkg.tar.gz \
 		ps-print-nomule-1.03-pkg.tar.gz \
-		psgml-1.16-pkg.tar.gz \
+		psgml-1.18-pkg.tar.gz \
 		sgml-1.06-pkg.tar.gz \
 		sh-script-1.11-pkg.tar.gz \
 		texinfo-1.19-pkg.tar.gz \
 		text-modes-1.25-pkg.tar.gz \
 		time-1.09-pkg.tar.gz \
 		vc-1.23-pkg.tar.gz \
-		viper-1.20-pkg.tar.gz \
+		viper-1.21-pkg.tar.gz \
 		w3-1.15-pkg.tar.gz \
-		xemacs-base-1.39-pkg.tar.gz \
+		xemacs-base-1.42-pkg.tar.gz \
 		xemacs-devel-1.26-pkg.tar.gz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
diff --git a/editors/xemacs-packages/distinfo b/editors/xemacs-packages/distinfo
index 842bcaadc82c..6d19608c7c1d 100644
--- a/editors/xemacs-packages/distinfo
+++ b/editors/xemacs-packages/distinfo
@@ -1,29 +1,29 @@
-MD5 (xemacs/apel-1.16-pkg.tar.gz) = fa6690bff9b0fdbaa0fa1cff5787db88
+MD5 (xemacs/apel-1.18-pkg.tar.gz) = da0f6d52e76a39bcfa8b83654a61a641
 MD5 (xemacs/auctex-1.19-pkg.tar.gz) = 278f92451968e75df51d70cbe0f9a3bc
 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.47-pkg.tar.gz) = db5985c901721eac65e6ff9126df20f5
+MD5 (xemacs/edit-utils-1.50-pkg.tar.gz) = 10c69a4641d48ab5ed24ffe8df29487f
 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.29-pkg.tar.gz) = 38798e07bb63350135477fcb046e97f0
+MD5 (xemacs/mail-lib-1.30-pkg.tar.gz) = ddf636d24947daa7a1b8870155802923
 MD5 (xemacs/mailcrypt-2.04-pkg.tar.gz) = 69807743b44a35a99eb03054642d8a25
 MD5 (xemacs/net-utils-1.13-pkg.tar.gz) = 9ee77d48ee7e97cb148dc4f9a04c3bf4
 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/pcl-cvs-1.47-pkg.tar.gz) = 5b998b880b04935a415fffeb1991d64e
+MD5 (xemacs/prog-modes-1.28-pkg.tar.gz) = 81b0bf8a0e8b7882f08cbd13df33d362
 MD5 (xemacs/ps-print-nomule-1.03-pkg.tar.gz) = 4656fbaccd48ab097d791b03e9f40f76
-MD5 (xemacs/psgml-1.16-pkg.tar.gz) = eaa4104c2d688962519b72976252283f
+MD5 (xemacs/psgml-1.18-pkg.tar.gz) = 96839abd1a73c4ea9a65f71efce41316
 MD5 (xemacs/sgml-1.06-pkg.tar.gz) = 4761323697a995beb53896f350c3f3d6
 MD5 (xemacs/sh-script-1.11-pkg.tar.gz) = 49f389b0bf5107848a4b342e70bb9472
 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.23-pkg.tar.gz) = 238c499b5cdd6ad6a19b682a4a3d7fb2
-MD5 (xemacs/viper-1.20-pkg.tar.gz) = 87306b858388bb7f36b17c41b049b1d4
+MD5 (xemacs/viper-1.21-pkg.tar.gz) = b0f4c8b61843c2837280477fd6bcb8fe
 MD5 (xemacs/w3-1.15-pkg.tar.gz) = a160290f8b3df941f3f0985522bc271b
-MD5 (xemacs/xemacs-base-1.39-pkg.tar.gz) = 8c0a2ab3855712e4c3771c83b63a9aa3
+MD5 (xemacs/xemacs-base-1.42-pkg.tar.gz) = 6b9c567c91532bf718b440d6f6b2f4ab
 MD5 (xemacs/xemacs-devel-1.26-pkg.tar.gz) = 91c111d1997128ddb323530383750eb3
diff --git a/editors/xemacs-packages/pkg-plist b/editors/xemacs-packages/pkg-plist
index 097dad44f57f..c0e796612f22 100644
--- a/editors/xemacs-packages/pkg-plist
+++ b/editors/xemacs-packages/pkg-plist
@@ -111,7 +111,28 @@ 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/ISO_8879-1986/entities/isoamsa.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isoamsb.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isoamsc.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isoamsn.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isoamso.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isoamsr.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isobox.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isocyr1.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isocyr2.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isodia.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isogrk3.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isolat1.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isolat2.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isomfrk.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isomopf.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isomscr.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isonum.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isopub.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/isotech.ent
+lib/xemacs/xemacs-packages/etc/psgml/ISOlat1.ent
 lib/xemacs/xemacs-packages/etc/psgml/README.cdtd
+lib/xemacs/xemacs-packages/etc/psgml/cals-tbl.dtd
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3-r
@@ -121,6 +142,14 @@ 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/datatypes.dtd
+lib/xemacs/xemacs-packages/etc/psgml/dbcent.mod
+lib/xemacs/xemacs-packages/etc/psgml/dbgenent.mod
+lib/xemacs/xemacs-packages/etc/psgml/dbhier.mod
+lib/xemacs/xemacs-packages/etc/psgml/dbnotn.mod
+lib/xemacs/xemacs-packages/etc/psgml/dbpool.mod
+lib/xemacs/xemacs-packages/etc/psgml/docbook.dcl
+lib/xemacs/xemacs-packages/etc/psgml/docbook.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-3.2.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-3.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-3s.dtd
@@ -137,7 +166,19 @@ 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/iso88591.map
+lib/xemacs/xemacs-packages/etc/psgml/mathml.dtd
+lib/xemacs/xemacs-packages/etc/psgml/mmlalias.ent
+lib/xemacs/xemacs-packages/etc/psgml/mmlextra.ent
 lib/xemacs/xemacs-packages/etc/psgml/structures.dtd
+lib/xemacs/xemacs-packages/etc/psgml/versionInfo.ent
+lib/xemacs/xemacs-packages/etc/psgml/xhtml-lat1.ent
+lib/xemacs/xemacs-packages/etc/psgml/xhtml-special.ent
+lib/xemacs/xemacs-packages/etc/psgml/xhtml-symbol.ent
+lib/xemacs/xemacs-packages/etc/psgml/xhtml1-frameset.dtd
+lib/xemacs/xemacs-packages/etc/psgml/xhtml1-strict.dtd
+lib/xemacs/xemacs-packages/etc/psgml/xhtml1-transitional-mathml.dtd
+lib/xemacs/xemacs-packages/etc/psgml/xhtml1-transitional.dtd
+lib/xemacs/xemacs-packages/etc/psgml/xhtml1.dcl
 lib/xemacs/xemacs-packages/etc/time/0.xpm
 lib/xemacs/xemacs-packages/etc/time/1.xpm
 lib/xemacs/xemacs-packages/etc/time/2.xpm
@@ -353,6 +394,8 @@ lib/xemacs/xemacs-packages/lisp/apel/ChangeLog
 lib/xemacs/xemacs-packages/lisp/apel/README.en
 lib/xemacs/xemacs-packages/lisp/apel/README.ja
 lib/xemacs/xemacs-packages/lisp/apel/_pkg.el
+lib/xemacs/xemacs-packages/lisp/apel/apel-ver.el
+lib/xemacs/xemacs-packages/lisp/apel/apel-ver.elc
 lib/xemacs/xemacs-packages/lisp/apel/atype.el
 lib/xemacs/xemacs-packages/lisp/apel/atype.elc
 lib/xemacs/xemacs-packages/lisp/apel/auto-autoloads.el
@@ -383,6 +426,8 @@ lib/xemacs/xemacs-packages/lisp/apel/mcs-ltn1.el
 lib/xemacs/xemacs-packages/lisp/apel/mcs-ltn1.elc
 lib/xemacs/xemacs-packages/lisp/apel/mcs-xm.el
 lib/xemacs/xemacs-packages/lisp/apel/mcs-xm.elc
+lib/xemacs/xemacs-packages/lisp/apel/mcs-xmu.el
+lib/xemacs/xemacs-packages/lisp/apel/mcs-xmu.elc
 lib/xemacs/xemacs-packages/lisp/apel/mule-caesar.el
 lib/xemacs/xemacs-packages/lisp/apel/mule-caesar.elc
 lib/xemacs/xemacs-packages/lisp/apel/path-util.el
@@ -413,6 +458,10 @@ lib/xemacs/xemacs-packages/lisp/apel/poem-xm.el
 lib/xemacs/xemacs-packages/lisp/apel/poem-xm.elc
 lib/xemacs/xemacs-packages/lisp/apel/poem.el
 lib/xemacs/xemacs-packages/lisp/apel/poem.elc
+lib/xemacs/xemacs-packages/lisp/apel/product.el
+lib/xemacs/xemacs-packages/lisp/apel/product.elc
+lib/xemacs/xemacs-packages/lisp/apel/pym.el
+lib/xemacs/xemacs-packages/lisp/apel/pym.elc
 lib/xemacs/xemacs-packages/lisp/apel/richtext.el
 lib/xemacs/xemacs-packages/lisp/apel/richtext.elc
 lib/xemacs/xemacs-packages/lisp/apel/static.el
@@ -1484,6 +1533,7 @@ 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
+@dirrm lib/xemacs/xemacs-packages/pkginfo
 @dirrm lib/xemacs/xemacs-packages/man/w3
 @dirrm lib/xemacs/xemacs-packages/man/viper
 @dirrm lib/xemacs/xemacs-packages/man/psgml
@@ -1494,6 +1544,7 @@ 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 %%PREFIX%%/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
@@ -1523,6 +1574,8 @@ 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 %%PREFIX%%/lib/xemacs/xemacs-packages/lisp 2>/dev/null || true
+@unexec rmdir %%PREFIX%%/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
@@ -1534,3 +1587,5 @@ 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 %%PREFIX%%/lib/xemacs/xemacs-packages/etc 2>/dev/null || true
+@unexec rmdir %%PREFIX%%/lib/xemacs/xemacs-packages 2>/dev/null || true
diff --git a/editors/xemacs-prog-packages/Makefile b/editors/xemacs-prog-packages/Makefile
index c289233df269..f71aab60686e 100644
--- a/editors/xemacs-prog-packages/Makefile
+++ b/editors/xemacs-prog-packages/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xemacs-prog-packages
-PORTVERSION=	1.0
-CATEGORIES=	editors
+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/ \
@@ -17,12 +17,12 @@ MASTER_SITES=	\
 
 DISTFILES=	\
 		ada-1.08-pkg.tar.gz \
-		ediff-1.25-pkg.tar.gz \
+		ediff-1.26-pkg.tar.gz \
 		emerge-1.07-pkg.tar.gz \
 		idlwave-1.2-pkg.tar.gz \
 		jde-1.17-pkg.tar.gz \
 		scheme-1.10-pkg.tar.gz \
-		vc-cc-1.13-pkg.tar.gz \
+		vc-cc-1.14-pkg.tar.gz \
 		vhdl-1.10-pkg.tar.gz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
diff --git a/editors/xemacs-prog-packages/distinfo b/editors/xemacs-prog-packages/distinfo
index 1f77bf428bae..a382739f83ee 100644
--- a/editors/xemacs-prog-packages/distinfo
+++ b/editors/xemacs-prog-packages/distinfo
@@ -1,8 +1,8 @@
 MD5 (xemacs/ada-1.08-pkg.tar.gz) = 51341e069406ddf88b64805909c46cec
-MD5 (xemacs/ediff-1.25-pkg.tar.gz) = 12744ed012de55196d1a53e563ecf1a1
+MD5 (xemacs/ediff-1.26-pkg.tar.gz) = 3a8d5c77d0ae59b1c5bdb09ca0e49c3b
 MD5 (xemacs/emerge-1.07-pkg.tar.gz) = 8ac1df0b264708389f9136b981c88ce4
 MD5 (xemacs/idlwave-1.2-pkg.tar.gz) = 0a914c85a2fe6d2e089302f8523916b3
 MD5 (xemacs/jde-1.17-pkg.tar.gz) = 3ca073383f4db92faaa2411c26ee8962
 MD5 (xemacs/scheme-1.10-pkg.tar.gz) = bececd89dbf28da7e3666d8bab8b2aa4
-MD5 (xemacs/vc-cc-1.13-pkg.tar.gz) = 6f06894049442dabe04e2163015064f3
+MD5 (xemacs/vc-cc-1.14-pkg.tar.gz) = 6ab4ec8c1c4919b08cddeb79fbf88f84
 MD5 (xemacs/vhdl-1.10-pkg.tar.gz) = e922ed42f67b47d85621b9f3e5469618
diff --git a/editors/xemacs-wp-packages/Makefile b/editors/xemacs-wp-packages/Makefile
index a7335f8e976d..ee5c780da6d6 100644
--- a/editors/xemacs-wp-packages/Makefile
+++ b/editors/xemacs-wp-packages/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xemacs-wp-packages
-PORTVERSION=	1.0
-CATEGORIES=	editors
+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/ \
@@ -18,7 +18,7 @@ MASTER_SITES=	\
 DISTFILES=	\
 		crisp-1.11-pkg.tar.gz \
 		edt-1.09-pkg.tar.gz \
-		reftex-1.18-pkg.tar.gz \
+		reftex-1.20-pkg.tar.gz \
 		textools-1.10-pkg.tar.gz \
 		tpu-1.10-pkg.tar.gz
 
diff --git a/editors/xemacs-wp-packages/distinfo b/editors/xemacs-wp-packages/distinfo
index 284644d019c8..cf55834bcedc 100644
--- a/editors/xemacs-wp-packages/distinfo
+++ b/editors/xemacs-wp-packages/distinfo
@@ -1,5 +1,5 @@
 MD5 (xemacs/crisp-1.11-pkg.tar.gz) = eccf7d46bce826b980d128d6520d6065
 MD5 (xemacs/edt-1.09-pkg.tar.gz) = f83ba89f9ce92df260bcf61ef50f8bf8
-MD5 (xemacs/reftex-1.18-pkg.tar.gz) = d794b02cc2d6a3841098f50770452733
+MD5 (xemacs/reftex-1.20-pkg.tar.gz) = 1c3cf5c4e7a243ba84572e594cc343b1
 MD5 (xemacs/textools-1.10-pkg.tar.gz) = eb519e2ab8c792f162b1604950c2d3e6
 MD5 (xemacs/tpu-1.10-pkg.tar.gz) = 345af1744a9bd9a55a11476bc96f7103