Update 1.7 to 1.8:

                apel-1.19              -> apel-1.20
                auctex-1.22            -> auctex-1.24
                c-support-1.15         -> c-support-1.16
                cc-mode-1.21           -> cc-mode-1.23
                debug-1.12             -> debug-1.14
                dired-1.08             -> dired-1.09
                edit-utils-1.53        -> edit-utils-1.55
                efs-1.21               -> efs-1.22
                fsf-compat-1.07        -> fsf-compat-1.08
                hm--html-menus-1.15    -> hm--html-menus-1.16
                ispell-1.21            -> ispell-1.22
                mail-lib-1.33          -> mail-lib-1.35
                mailcrypt-2.06         -> mailcrypt-2.07
                net-utils-1.14         -> net-utils-1.15
                os-utils-1.24          -> os-utils-1.25
                pcl-cvs-1.50           -> pcl-cvs-1.51
                prog-modes-1.30        -> prog-modes-1.32
                ps-print-nomule-1.04   -> ps-print-nomule-1.05
                psgml-1.20             -> psgml-1.22
                sgml-1.07              -> sgml-1.08
                sh-script-1.12         -> sh-script-1.13
                texinfo-1.19           -> texinfo-1.20
                text-modes-1.28        -> text-modes-1.29
                time-1.10              -> time-1.11
                vc-1.24                -> vc-1.26
                viper-1.22             -> viper-1.24
                w3-1.16                -> w3-1.18
                xemacs-base-1.46       -> xemacs-base-1.49
                xemacs-devel-1.30      -> xemacs-devel-1.31

3 files changed, 82 insertions, 63 deletions

diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 77521f9fa84b..9beb6632769f 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -6,41 +6,41 @@
 #
 
 PORTNAME=	xemacs-packages
-PORTVERSION=	1.7
+PORTVERSION=	1.8
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_XEMACS} \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	packages kiri
 DISTFILES=	\
-		apel-1.19-pkg.tar.gz \
-		auctex-1.22-pkg.tar.gz \
-		c-support-1.15-pkg.tar.gz \
-		cc-mode-1.21-pkg.tar.gz \
-		debug-1.12-pkg.tar.gz \
-		dired-1.08-pkg.tar.gz \
-		edit-utils-1.53-pkg.tar.gz \
-		efs-1.21-pkg.tar.gz \
-		fsf-compat-1.07-pkg.tar.gz \
-		hm--html-menus-1.15-pkg.tar.gz \
-		ispell-1.21-pkg.tar.gz \
-		mail-lib-1.33-pkg.tar.gz \
-		mailcrypt-2.06-pkg.tar.gz \
-		net-utils-1.14-pkg.tar.gz \
-		os-utils-1.24-pkg.tar.gz \
-		pcl-cvs-1.50-pkg.tar.gz \
-		prog-modes-1.30-pkg.tar.gz \
-		ps-print-nomule-1.04-pkg.tar.gz \
-		psgml-1.20-pkg.tar.gz \
-		sgml-1.07-pkg.tar.gz \
-		sh-script-1.12-pkg.tar.gz \
-		texinfo-1.19-pkg.tar.gz \
-		text-modes-1.28-pkg.tar.gz \
-		time-1.10-pkg.tar.gz \
-		vc-1.24-pkg.tar.gz \
-		viper-1.22-pkg.tar.gz \
-		w3-1.16-pkg.tar.gz \
-		xemacs-base-1.46-pkg.tar.gz \
-		xemacs-devel-1.30-pkg.tar.gz
+		apel-1.20-pkg.tar.gz \
+		auctex-1.24-pkg.tar.gz \
+		c-support-1.16-pkg.tar.gz \
+		cc-mode-1.23-pkg.tar.gz \
+		debug-1.14-pkg.tar.gz \
+		dired-1.09-pkg.tar.gz \
+		edit-utils-1.55-pkg.tar.gz \
+		efs-1.22-pkg.tar.gz \
+		fsf-compat-1.08-pkg.tar.gz \
+		hm--html-menus-1.16-pkg.tar.gz \
+		ispell-1.22-pkg.tar.gz \
+		mail-lib-1.35-pkg.tar.gz \
+		mailcrypt-2.07-pkg.tar.gz \
+		net-utils-1.15-pkg.tar.gz \
+		os-utils-1.25-pkg.tar.gz \
+		pcl-cvs-1.51-pkg.tar.gz \
+		prog-modes-1.32-pkg.tar.gz \
+		ps-print-nomule-1.05-pkg.tar.gz \
+		psgml-1.22-pkg.tar.gz \
+		sgml-1.08-pkg.tar.gz \
+		sh-script-1.13-pkg.tar.gz \
+		texinfo-1.20-pkg.tar.gz \
+		text-modes-1.29-pkg.tar.gz \
+		time-1.11-pkg.tar.gz \
+		vc-1.26-pkg.tar.gz \
+		viper-1.24-pkg.tar.gz \
+		w3-1.18-pkg.tar.gz \
+		xemacs-base-1.49-pkg.tar.gz \
+		xemacs-devel-1.31-pkg.tar.gz
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
diff --git a/editors/xemacs-packages/distinfo b/editors/xemacs-packages/distinfo
index 3d12ee8306c8..c1b48652d3ed 100644
--- a/editors/xemacs-packages/distinfo
+++ b/editors/xemacs-packages/distinfo
@@ -1,29 +1,29 @@
-MD5 (xemacs/apel-1.19-pkg.tar.gz) = 81ab147115a88f5ea62901898ee29897
-MD5 (xemacs/auctex-1.22-pkg.tar.gz) = c4f99bfa9b2b6aa3f08d0b25e9a8fcbf
-MD5 (xemacs/c-support-1.15-pkg.tar.gz) = 9acb70d0ee0d1d4804abf461e94915fa
-MD5 (xemacs/cc-mode-1.21-pkg.tar.gz) = 588594447ca22a7fdbe580e53ce7fe69
-MD5 (xemacs/debug-1.12-pkg.tar.gz) = 0a90aa36cdffd13e8fc2413cd78449dc
-MD5 (xemacs/dired-1.08-pkg.tar.gz) = 42f7e3e82d281da0246d696a9059d047
-MD5 (xemacs/edit-utils-1.53-pkg.tar.gz) = c38383534157176dee793184543e2422
-MD5 (xemacs/efs-1.21-pkg.tar.gz) = a933c742941ff4f0d73acbd392cb6ab5
-MD5 (xemacs/fsf-compat-1.07-pkg.tar.gz) = 6adc8e4b0aba74d979c7a457f879e707
-MD5 (xemacs/hm--html-menus-1.15-pkg.tar.gz) = 69aecc277ac8754318bfdd5f8613ec7f
-MD5 (xemacs/ispell-1.21-pkg.tar.gz) = a036811e426eb3a390ccc36e35efc3f5
-MD5 (xemacs/mail-lib-1.33-pkg.tar.gz) = 06fb329e488d8e3b8ff28155687f21b2
-MD5 (xemacs/mailcrypt-2.06-pkg.tar.gz) = a91b84af146d8a36619f545ae12fbe31
-MD5 (xemacs/net-utils-1.14-pkg.tar.gz) = 17d7330c573535ab02c3e2582ae880d7
-MD5 (xemacs/os-utils-1.24-pkg.tar.gz) = 2aaf6d347b58ade3a32d5eecd059e04a
-MD5 (xemacs/pcl-cvs-1.50-pkg.tar.gz) = 844efc1a7cd25c9f8d7c9d4af2b1d3c4
-MD5 (xemacs/prog-modes-1.30-pkg.tar.gz) = 9e3573c49de15a3525ebcca6f8e715b8
-MD5 (xemacs/ps-print-nomule-1.04-pkg.tar.gz) = 2532858db76dff62fc6e7b62c42c01ee
-MD5 (xemacs/psgml-1.20-pkg.tar.gz) = 0cb458f0bb5b0033cd8289569a627a59
-MD5 (xemacs/sgml-1.07-pkg.tar.gz) = a1b1f84fa1ab4ced2f53a7ac333521bb
-MD5 (xemacs/sh-script-1.12-pkg.tar.gz) = 87adf4c99303febf5f8b35d5453ee5d1
-MD5 (xemacs/texinfo-1.19-pkg.tar.gz) = 209b3f985c6a1af8be9bd7485c6b611d
-MD5 (xemacs/text-modes-1.28-pkg.tar.gz) = af1a7a1b3f8403b0e431574bc72caf9f
-MD5 (xemacs/time-1.10-pkg.tar.gz) = 4d393ce1373550cc78f450aac980a928
-MD5 (xemacs/vc-1.24-pkg.tar.gz) = 53540948e4e07c38c89a5208fc4bc6fd
-MD5 (xemacs/viper-1.22-pkg.tar.gz) = c49bf9ba3326647363ee34e1a619d0ee
-MD5 (xemacs/w3-1.16-pkg.tar.gz) = ad9f1d8ed60dfdf75b6354d93c1c0a46
-MD5 (xemacs/xemacs-base-1.46-pkg.tar.gz) = 3cf54cdd4c564736f0a4cc9d2f7f31ce
-MD5 (xemacs/xemacs-devel-1.30-pkg.tar.gz) = dac6a1d249a6a49f9f152d5d1e57848d
+MD5 (xemacs/apel-1.20-pkg.tar.gz) = 0d3ac6c109783e1cc48cc4608843d6c3
+MD5 (xemacs/auctex-1.24-pkg.tar.gz) = b159994dd51a73f5973e1920740c9b8c
+MD5 (xemacs/c-support-1.16-pkg.tar.gz) = 047accf51457a041bf920c9563de1bf6
+MD5 (xemacs/cc-mode-1.23-pkg.tar.gz) = 1d614d7f592fe30fb1dbf5c1ccdccfee
+MD5 (xemacs/debug-1.14-pkg.tar.gz) = 20312f80900f1c99f3eeecddf75026ca
+MD5 (xemacs/dired-1.09-pkg.tar.gz) = 762c91be888f57cc048b48017006bd56
+MD5 (xemacs/edit-utils-1.55-pkg.tar.gz) = 234dbef5cb64dfa89c204b9af82becb0
+MD5 (xemacs/efs-1.22-pkg.tar.gz) = bde42cd7cd02fd4f385baa66adfa0128
+MD5 (xemacs/fsf-compat-1.08-pkg.tar.gz) = d9ac18b3c7801c5fb8ea3da8d09f22d9
+MD5 (xemacs/hm--html-menus-1.16-pkg.tar.gz) = defc795c8c783b13599927399df7bf18
+MD5 (xemacs/ispell-1.22-pkg.tar.gz) = f688004228ae7f4484a9bb77d8109490
+MD5 (xemacs/mail-lib-1.35-pkg.tar.gz) = 0ab5467ea9cb1959b6ca19fb3eae9d9e
+MD5 (xemacs/mailcrypt-2.07-pkg.tar.gz) = b6c7121db866bc4ad99b3a3138d81390
+MD5 (xemacs/net-utils-1.15-pkg.tar.gz) = 9937053eaff439f202748499f69a91cc
+MD5 (xemacs/os-utils-1.25-pkg.tar.gz) = e71b109e0fb81032fa664768c98b6bcc
+MD5 (xemacs/pcl-cvs-1.51-pkg.tar.gz) = db6ac5334fe6422aa7a830dbd46a86f2
+MD5 (xemacs/prog-modes-1.32-pkg.tar.gz) = 1d29e6874e8ac1ce7ad06a0317d0ee4e
+MD5 (xemacs/ps-print-nomule-1.05-pkg.tar.gz) = c071d71ac89d9a540c0799fb33f40c3a
+MD5 (xemacs/psgml-1.22-pkg.tar.gz) = 09116005362d29583dd18e00ca912d11
+MD5 (xemacs/sgml-1.08-pkg.tar.gz) = bdadf462489fa1540cc56d1c561aaa54
+MD5 (xemacs/sh-script-1.13-pkg.tar.gz) = d9fa57da5e44091bf31282886de25687
+MD5 (xemacs/texinfo-1.20-pkg.tar.gz) = 25a3261b1700f4b83d229dc1dcf633ae
+MD5 (xemacs/text-modes-1.29-pkg.tar.gz) = 12c0d8e6a661f70afe50536f66d5deb4
+MD5 (xemacs/time-1.11-pkg.tar.gz) = 93ca34fe3275dc3ef5b8fd4c6824551d
+MD5 (xemacs/vc-1.26-pkg.tar.gz) = 53757fdff5aede0d4bd9dc4153af2d33
+MD5 (xemacs/viper-1.24-pkg.tar.gz) = 024c342ce95814b77a5a7b05920ed0b0
+MD5 (xemacs/w3-1.18-pkg.tar.gz) = 0a44fd650b1cc1d4731db721eb337e5a
+MD5 (xemacs/xemacs-base-1.49-pkg.tar.gz) = 4df2b16db1df1a7cb7b249a4c722ca43
+MD5 (xemacs/xemacs-devel-1.31-pkg.tar.gz) = 3c15f7db1c1ec6634f06e21655a86801
diff --git a/editors/xemacs-packages/pkg-plist b/editors/xemacs-packages/pkg-plist
index 49785fd95fab..ccc794ba9cb9 100644
--- a/editors/xemacs-packages/pkg-plist
+++ b/editors/xemacs-packages/pkg-plist
@@ -133,6 +133,20 @@ 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/docbook
+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/cdtd/mathml
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/xhtml1-frameset
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/xhtml1-strict
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/xhtml1-transitional
 lib/xemacs/xemacs-packages/etc/psgml/datatypes.dtd
 lib/xemacs/xemacs-packages/etc/psgml/dbcent.mod
 lib/xemacs/xemacs-packages/etc/psgml/dbgenent.mod
@@ -394,8 +408,6 @@ lib/xemacs/xemacs-packages/lisp/apel/broken.el
 lib/xemacs/xemacs-packages/lisp/apel/broken.elc
 lib/xemacs/xemacs-packages/lisp/apel/calist.el
 lib/xemacs/xemacs-packages/lisp/apel/calist.elc
-lib/xemacs/xemacs-packages/lisp/apel/emu-mule.el
-lib/xemacs/xemacs-packages/lisp/apel/emu-mule.elc
 lib/xemacs/xemacs-packages/lisp/apel/emu.el
 lib/xemacs/xemacs-packages/lisp/apel/emu.elc
 lib/xemacs/xemacs-packages/lisp/apel/file-detect.el
@@ -859,6 +871,8 @@ lib/xemacs/xemacs-packages/lisp/mail-lib/ChangeLog
 lib/xemacs/xemacs-packages/lisp/mail-lib/_pkg.el
 lib/xemacs/xemacs-packages/lisp/mail-lib/auto-autoloads.el
 lib/xemacs/xemacs-packages/lisp/mail-lib/auto-autoloads.elc
+lib/xemacs/xemacs-packages/lisp/mail-lib/base64.el
+lib/xemacs/xemacs-packages/lisp/mail-lib/base64.elc
 lib/xemacs/xemacs-packages/lisp/mail-lib/browse-url.el
 lib/xemacs/xemacs-packages/lisp/mail-lib/browse-url.elc
 lib/xemacs/xemacs-packages/lisp/mail-lib/custom-load.el
@@ -877,6 +891,8 @@ lib/xemacs/xemacs-packages/lisp/mail-lib/pop3.el
 lib/xemacs/xemacs-packages/lisp/mail-lib/pop3.elc
 lib/xemacs/xemacs-packages/lisp/mail-lib/reporter.el
 lib/xemacs/xemacs-packages/lisp/mail-lib/reporter.elc
+lib/xemacs/xemacs-packages/lisp/mail-lib/rfc2104.el
+lib/xemacs/xemacs-packages/lisp/mail-lib/rfc2104.elc
 lib/xemacs/xemacs-packages/lisp/mail-lib/rfc822.el
 lib/xemacs/xemacs-packages/lisp/mail-lib/rfc822.elc
 lib/xemacs/xemacs-packages/lisp/mail-lib/rmail-mini.el
@@ -887,6 +903,8 @@ lib/xemacs/xemacs-packages/lisp/mail-lib/sendmail.el
 lib/xemacs/xemacs-packages/lisp/mail-lib/sendmail.elc
 lib/xemacs/xemacs-packages/lisp/mail-lib/smtpmail.el
 lib/xemacs/xemacs-packages/lisp/mail-lib/smtpmail.elc
+lib/xemacs/xemacs-packages/lisp/mail-lib/starttls.el
+lib/xemacs/xemacs-packages/lisp/mail-lib/starttls.elc
 lib/xemacs/xemacs-packages/lisp/mailcrypt/ANNOUNCE
 lib/xemacs/xemacs-packages/lisp/mailcrypt/ChangeLog
 lib/xemacs/xemacs-packages/lisp/mailcrypt/INSTALL
@@ -1147,6 +1165,8 @@ lib/xemacs/xemacs-packages/lisp/texinfo/texnfo-upd.el
 lib/xemacs/xemacs-packages/lisp/texinfo/texnfo-upd.elc
 lib/xemacs/xemacs-packages/lisp/text-modes/ChangeLog
 lib/xemacs/xemacs-packages/lisp/text-modes/_pkg.el
+lib/xemacs/xemacs-packages/lisp/text-modes/ansi-color.el
+lib/xemacs/xemacs-packages/lisp/text-modes/ansi-color.elc
 lib/xemacs/xemacs-packages/lisp/text-modes/auto-autoloads.el
 lib/xemacs/xemacs-packages/lisp/text-modes/auto-autoloads.elc
 lib/xemacs/xemacs-packages/lisp/text-modes/autoinsert.el
@@ -1247,8 +1267,6 @@ lib/xemacs/xemacs-packages/lisp/w3/TODO
 lib/xemacs/xemacs-packages/lisp/w3/_pkg.el
 lib/xemacs/xemacs-packages/lisp/w3/auto-autoloads.el
 lib/xemacs/xemacs-packages/lisp/w3/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/w3/base64.el
-lib/xemacs/xemacs-packages/lisp/w3/base64.elc
 lib/xemacs/xemacs-packages/lisp/w3/css.el
 lib/xemacs/xemacs-packages/lisp/w3/css.elc
 lib/xemacs/xemacs-packages/lisp/w3/custom-load.el
@@ -1574,6 +1592,7 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/lisp/apel
 @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