3 files changed, 51 insertions, 60 deletions

diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 006bea689150..bdf4eda3f4d4 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xemacs-packages
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	editors elisp
 MASTER_SITES=	\
 		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
@@ -17,34 +17,34 @@ MASTER_SITES=	\
 
 DISTFILES=	\
 		apel-1.18-pkg.tar.gz \
-		auctex-1.19-pkg.tar.gz \
+		auctex-1.21-pkg.tar.gz \
 		c-support-1.14-pkg.tar.gz \
-		cc-mode-1.17-pkg.tar.gz \
+		cc-mode-1.20-pkg.tar.gz \
 		debug-1.11-pkg.tar.gz \
 		dired-1.07-pkg.tar.gz \
-		edit-utils-1.50-pkg.tar.gz \
-		efs-1.19-pkg.tar.gz \
+		edit-utils-1.52-pkg.tar.gz \
+		efs-1.20-pkg.tar.gz \
 		fsf-compat-1.07-pkg.tar.gz \
 		hm--html-menus-1.14-pkg.tar.gz \
-		ispell-1.18-pkg.tar.gz \
+		ispell-1.19-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.47-pkg.tar.gz \
-		prog-modes-1.28-pkg.tar.gz \
+		os-utils-1.23-pkg.tar.gz \
+		pcl-cvs-1.49-pkg.tar.gz \
+		prog-modes-1.29-pkg.tar.gz \
 		ps-print-nomule-1.03-pkg.tar.gz \
-		psgml-1.18-pkg.tar.gz \
+		psgml-1.19-pkg.tar.gz \
 		sgml-1.06-pkg.tar.gz \
-		sh-script-1.11-pkg.tar.gz \
+		sh-script-1.12-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.21-pkg.tar.gz \
 		w3-1.15-pkg.tar.gz \
-		xemacs-base-1.42-pkg.tar.gz \
-		xemacs-devel-1.26-pkg.tar.gz
+		xemacs-base-1.43-pkg.tar.gz \
+		xemacs-devel-1.28-pkg.tar.gz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
diff --git a/editors/xemacs-packages/distinfo b/editors/xemacs-packages/distinfo
index 6d19608c7c1d..c7bcb6263d31 100644
--- a/editors/xemacs-packages/distinfo
+++ b/editors/xemacs-packages/distinfo
@@ -1,29 +1,29 @@
-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.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.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.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.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.21-pkg.tar.gz) = b0f4c8b61843c2837280477fd6bcb8fe
-MD5 (xemacs/w3-1.15-pkg.tar.gz) = a160290f8b3df941f3f0985522bc271b
-MD5 (xemacs/xemacs-base-1.42-pkg.tar.gz) = 6b9c567c91532bf718b440d6f6b2f4ab
-MD5 (xemacs/xemacs-devel-1.26-pkg.tar.gz) = 91c111d1997128ddb323530383750eb3
+MD5 (xemacs/apel-1.18-pkg.tar.gz) = aa6e7a6a30f3484cbd04d27642204238
+MD5 (xemacs/auctex-1.21-pkg.tar.gz) = b8d14855617e3f8c0619532b0d90dc66
+MD5 (xemacs/c-support-1.14-pkg.tar.gz) = 81579546b8f16ba2cea4d1ac02e970cd
+MD5 (xemacs/cc-mode-1.20-pkg.tar.gz) = 21eb285fee19bf64ee7fd06118739c06
+MD5 (xemacs/debug-1.11-pkg.tar.gz) = c74e3d49d4eed6f7f675840ca129129d
+MD5 (xemacs/dired-1.07-pkg.tar.gz) = f4f283226fa13f34a225e8bc9b95b06c
+MD5 (xemacs/edit-utils-1.52-pkg.tar.gz) = c4c4623e518731171bcb2730c28bf8e6
+MD5 (xemacs/efs-1.20-pkg.tar.gz) = 9eb6fa653414b02caae6419d7ffa60be
+MD5 (xemacs/fsf-compat-1.07-pkg.tar.gz) = 6adc8e4b0aba74d979c7a457f879e707
+MD5 (xemacs/hm--html-menus-1.14-pkg.tar.gz) = bbf5918e7452c8b8e00cfce36b7d79dd
+MD5 (xemacs/ispell-1.19-pkg.tar.gz) = 5de7d01a4e93bb068c53bde76605c16a
+MD5 (xemacs/mail-lib-1.30-pkg.tar.gz) = e3ad38b57e0c18b32b26225c6b686941
+MD5 (xemacs/mailcrypt-2.04-pkg.tar.gz) = 9fb17fc5cc088bd1eac322f421559339
+MD5 (xemacs/net-utils-1.13-pkg.tar.gz) = 12f2cc5271d841a04620e8e3af7dfa08
+MD5 (xemacs/os-utils-1.23-pkg.tar.gz) = 036fc45942dacd01d9c01e5ee5840c79
+MD5 (xemacs/pcl-cvs-1.49-pkg.tar.gz) = f3520232748f47bd958eb896c296d7d9
+MD5 (xemacs/prog-modes-1.29-pkg.tar.gz) = 5a4fe02ed34c7e85ba219c1c3eff06ce
+MD5 (xemacs/ps-print-nomule-1.03-pkg.tar.gz) = d424c96727977c8cb9e27f287ebbccea
+MD5 (xemacs/psgml-1.19-pkg.tar.gz) = c674bb3160f540da8260f90923ae127d
+MD5 (xemacs/sgml-1.06-pkg.tar.gz) = 78ca82ea49c0d385805af870fbc12b76
+MD5 (xemacs/sh-script-1.12-pkg.tar.gz) = 87adf4c99303febf5f8b35d5453ee5d1
+MD5 (xemacs/texinfo-1.19-pkg.tar.gz) = 209b3f985c6a1af8be9bd7485c6b611d
+MD5 (xemacs/text-modes-1.25-pkg.tar.gz) = 1149df3bfa2f8ed744e3e8ed7ef3789f
+MD5 (xemacs/time-1.09-pkg.tar.gz) = 76936d620056b7841e546d8a7768aefc
+MD5 (xemacs/vc-1.23-pkg.tar.gz) = be8ff04c8b25b947b1b2aa1397cd1727
+MD5 (xemacs/viper-1.21-pkg.tar.gz) = 1cf37ef9c0c0b5b9f9f37dcb9e8b3c18
+MD5 (xemacs/w3-1.15-pkg.tar.gz) = d976d752eca92a5fb177f2370ac41d40
+MD5 (xemacs/xemacs-base-1.43-pkg.tar.gz) = afcc076bc96f1c3ef1ea6eb2d7d67ad0
+MD5 (xemacs/xemacs-devel-1.28-pkg.tar.gz) = a69ab0f89cd267067d3b5e4906faaa2d
diff --git a/editors/xemacs-packages/pkg-plist b/editors/xemacs-packages/pkg-plist
index e600634a1bec..4265713ada23 100644
--- a/editors/xemacs-packages/pkg-plist
+++ b/editors/xemacs-packages/pkg-plist
@@ -133,15 +133,6 @@ 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
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3.2
-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/datatypes.dtd
 lib/xemacs/xemacs-packages/etc/psgml/dbcent.mod
 lib/xemacs/xemacs-packages/etc/psgml/dbgenent.mod
@@ -389,7 +380,6 @@ lib/xemacs/xemacs-packages/info/w3.info-1
 lib/xemacs/xemacs-packages/info/w3.info-2
 lib/xemacs/xemacs-packages/info/w3.info-3
 lib/xemacs/xemacs-packages/info/w3.info-4
-lib/xemacs/xemacs-packages/info/w3.info-5
 lib/xemacs/xemacs-packages/lisp/apel/ChangeLog
 lib/xemacs/xemacs-packages/lisp/apel/README.en
 lib/xemacs/xemacs-packages/lisp/apel/README.ja
@@ -726,6 +716,8 @@ lib/xemacs/xemacs-packages/lisp/edit-utils/tree-menu.el
 lib/xemacs/xemacs-packages/lisp/edit-utils/tree-menu.elc
 lib/xemacs/xemacs-packages/lisp/edit-utils/uniquify.el
 lib/xemacs/xemacs-packages/lisp/edit-utils/uniquify.elc
+lib/xemacs/xemacs-packages/lisp/edit-utils/vertical-mode.el
+lib/xemacs/xemacs-packages/lisp/edit-utils/vertical-mode.elc
 lib/xemacs/xemacs-packages/lisp/edit-utils/where-was-i-db.el
 lib/xemacs/xemacs-packages/lisp/edit-utils/where-was-i-db.elc
 lib/xemacs/xemacs-packages/lisp/edit-utils/winring.el
@@ -968,6 +960,8 @@ lib/xemacs/xemacs-packages/lisp/os-utils/ledit.el
 lib/xemacs/xemacs-packages/lisp/os-utils/ledit.elc
 lib/xemacs/xemacs-packages/lisp/os-utils/lpr.el
 lib/xemacs/xemacs-packages/lisp/os-utils/lpr.elc
+lib/xemacs/xemacs-packages/lisp/os-utils/mchat.el
+lib/xemacs/xemacs-packages/lisp/os-utils/mchat.elc
 lib/xemacs/xemacs-packages/lisp/os-utils/rlogin.el
 lib/xemacs/xemacs-packages/lisp/os-utils/rlogin.elc
 lib/xemacs/xemacs-packages/lisp/os-utils/spell.el
@@ -1041,6 +1035,8 @@ lib/xemacs/xemacs-packages/lisp/prog-modes/m4-mode.el
 lib/xemacs/xemacs-packages/lisp/prog-modes/m4-mode.elc
 lib/xemacs/xemacs-packages/lisp/prog-modes/make-mode.el
 lib/xemacs/xemacs-packages/lisp/prog-modes/make-mode.elc
+lib/xemacs/xemacs-packages/lisp/prog-modes/mode-compile.el
+lib/xemacs/xemacs-packages/lisp/prog-modes/mode-compile.elc
 lib/xemacs/xemacs-packages/lisp/prog-modes/modula2.el
 lib/xemacs/xemacs-packages/lisp/prog-modes/modula2.elc
 lib/xemacs/xemacs-packages/lisp/prog-modes/pascal.el
@@ -1533,7 +1529,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
-@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
@@ -1544,7 +1539,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 %%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
@@ -1574,11 +1568,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
 @dirrm lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities
 @dirrm lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986
 @dirrm lib/xemacs/xemacs-packages/etc/psgml
@@ -1587,6 +1578,6 @@ 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
-@unexec rmdir %%PREFIX%%/lib/xemacs 2>/dev/null || true
+@unexec rmdir %D/lib/xemacs/xemacs-packages/* 2>/dev/null || true
+@unexec rmdir %D/lib/xemacs/xemacs-packages 2>/dev/null || true
+@unexec rmdir %D/lib/xemacs 2>/dev/null || true