Update the vc package to version 1.22.

Fix PLIST to delete the psgml and sgml packages. The error was hidden
by the way @unexec rmdir is done.

Bump PORTVERSION to 1.2.

3 files changed, 136 insertions, 3 deletions

diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 5975f68419fb..1e5af523cdc7 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xemacs-packages
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	editors
 MASTER_SITES=	\
 		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
@@ -24,7 +24,7 @@ DISTFILES=	\
 		efs-1.16-pkg.tar.gz         time-1.09-pkg.tar.gz \
 		fsf-compat-1.07-pkg.tar.gz  viper-1.18-pkg.tar.gz \
 		mail-lib-1.28-pkg.tar.gz    net-utils-1.13-pkg.tar.gz \
-		mailcrypt-2.04-pkg.tar.gz   vc-1.21-pkg.tar.gz \
+		mailcrypt-2.04-pkg.tar.gz   vc-1.22-pkg.tar.gz \
 		sh-script-1.11-pkg.tar.gz   auctex-1.19-pkg.tar.gz \
 		ispell-1.18-pkg.tar.gz      pcl-cvs-1.41-pkg.tar.gz \
 		w3-1.15-pkg.tar.gz          texinfo-1.18-pkg.tar.gz \
diff --git a/editors/xemacs-packages/distinfo b/editors/xemacs-packages/distinfo
index bbfadb7b6958..a0a7107bfe28 100644
--- a/editors/xemacs-packages/distinfo
+++ b/editors/xemacs-packages/distinfo
@@ -17,7 +17,7 @@ MD5 (xemacs/viper-1.18-pkg.tar.gz) = 66c988d8f43927d2998ba4bad4ce36b1
 MD5 (xemacs/mail-lib-1.28-pkg.tar.gz) = bef2f5542871e820f0f0bcd918fd3676
 MD5 (xemacs/net-utils-1.13-pkg.tar.gz) = 9ee77d48ee7e97cb148dc4f9a04c3bf4
 MD5 (xemacs/mailcrypt-2.04-pkg.tar.gz) = 69807743b44a35a99eb03054642d8a25
-MD5 (xemacs/vc-1.21-pkg.tar.gz) = 69e2d423e84d6d60b02219c4011b04d0
+MD5 (xemacs/vc-1.22-pkg.tar.gz) = 203309aa4378cc3fce8eff5f7b8ac622
 MD5 (xemacs/sh-script-1.11-pkg.tar.gz) = 49f389b0bf5107848a4b342e70bb9472
 MD5 (xemacs/auctex-1.19-pkg.tar.gz) = 278f92451968e75df51d70cbe0f9a3bc
 MD5 (xemacs/ispell-1.18-pkg.tar.gz) = 11ae38e4e89498a44502fe596a9cd563
diff --git a/editors/xemacs-packages/pkg-plist b/editors/xemacs-packages/pkg-plist
index 8c1bf581b950..e602b2c0b0a3 100644
--- a/editors/xemacs-packages/pkg-plist
+++ b/editors/xemacs-packages/pkg-plist
@@ -75,6 +75,86 @@ lib/xemacs/xemacs-packages/etc/hm--html-menus/idd/drop
 lib/xemacs/xemacs-packages/etc/hm--html-menus/idd/dropmsk
 lib/xemacs/xemacs-packages/etc/hm--html-menus/templates/command-description.html.tmpl
 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/HTMLlat1.ent
+lib/xemacs/xemacs-packages/etc/psgml/HTMLspecial.ent
+lib/xemacs/xemacs-packages/etc/psgml/HTMLsymbol.ent
+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/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-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/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.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-r
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/iehtml
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/Added_Latin_1
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/Added_Latin_1_for_HTML
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/Added_Math_Symbols-_Delimiters
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/Added_Math_Symbols-_Ordinary
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/Added_Math_Symbols-_Relations
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/Diacritical_Marks
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/General_Technical
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/Greek_Symbols
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOamsa
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOamsb
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOamsc
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOamsn
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOamso
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOamsr
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISObox
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOcyr1
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOcyr2
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOdia
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOgrk1
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOgrk2
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOgrk3
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOgrk4
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOlat1
+lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOlat2
+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/time/0.xpm
 lib/xemacs/xemacs-packages/etc/time/1.xpm
 lib/xemacs/xemacs-packages/etc/time/2.xpm
@@ -271,6 +351,8 @@ lib/xemacs/xemacs-packages/info/mailcrypt.info-2
 lib/xemacs/xemacs-packages/info/pcl-cvs.info
 lib/xemacs/xemacs-packages/info/pcl-cvs.info-1
 lib/xemacs/xemacs-packages/info/pcl-cvs.info-2
+lib/xemacs/xemacs-packages/info/psgml-api.info
+lib/xemacs/xemacs-packages/info/psgml.info
 lib/xemacs/xemacs-packages/info/viper.info
 lib/xemacs/xemacs-packages/info/viper.info-1
 lib/xemacs/xemacs-packages/info/viper.info-2
@@ -876,6 +958,46 @@ lib/xemacs/xemacs-packages/lisp/prog-modes/verilog-mode.el
 lib/xemacs/xemacs-packages/lisp/prog-modes/verilog-mode.elc
 lib/xemacs/xemacs-packages/lisp/prog-modes/vrml-mode.el
 lib/xemacs/xemacs-packages/lisp/prog-modes/vrml-mode.elc
+lib/xemacs/xemacs-packages/lisp/psgml/ChangeLog
+lib/xemacs/xemacs-packages/lisp/psgml/_pkg.el
+lib/xemacs/xemacs-packages/lisp/psgml/auto-autoloads.el
+lib/xemacs/xemacs-packages/lisp/psgml/auto-autoloads.elc
+lib/xemacs/xemacs-packages/lisp/psgml/custom-load.el
+lib/xemacs/xemacs-packages/lisp/psgml/custom-load.elc
+lib/xemacs/xemacs-packages/lisp/psgml/iso-sgml.el
+lib/xemacs/xemacs-packages/lisp/psgml/iso-sgml.elc
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-api.el
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-api.elc
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-charent.el
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-charent.elc
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-debug.el
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-debug.elc
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-dtd.el
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-dtd.elc
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-edit.el
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-edit.elc
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-fs.el
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-fs.elc
+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
+lib/xemacs/xemacs-packages/lisp/psgml/psgml-xemacs.elc
+lib/xemacs/xemacs-packages/lisp/psgml/psgml.el
+lib/xemacs/xemacs-packages/lisp/psgml/psgml.elc
+lib/xemacs/xemacs-packages/lisp/sgml/ChangeLog
+lib/xemacs/xemacs-packages/lisp/sgml/_pkg.el
+lib/xemacs/xemacs-packages/lisp/sgml/auto-autoloads.el
+lib/xemacs/xemacs-packages/lisp/sgml/auto-autoloads.elc
+lib/xemacs/xemacs-packages/lisp/sgml/linuxdoc-sgml.el
+lib/xemacs/xemacs-packages/lisp/sgml/linuxdoc-sgml.elc
+lib/xemacs/xemacs-packages/lisp/sgml/sgml-mode.el
+lib/xemacs/xemacs-packages/lisp/sgml/sgml-mode.elc
 lib/xemacs/xemacs-packages/lisp/sh-script/ChangeLog
 lib/xemacs/xemacs-packages/lisp/sh-script/_pkg.el
 lib/xemacs/xemacs-packages/lisp/sh-script/auto-autoloads.el
@@ -1260,6 +1382,8 @@ lib/xemacs/xemacs-packages/man/hm--html-menus/umlaute.texi
 lib/xemacs/xemacs-packages/man/ispell/ispell.texi
 lib/xemacs/xemacs-packages/man/mailcrypt/mailcrypt.texi
 lib/xemacs/xemacs-packages/man/pcl-cvs/pcl-cvs.texi
+lib/xemacs/xemacs-packages/man/psgml/psgml-api.texi
+lib/xemacs/xemacs-packages/man/psgml/psgml.texi
 lib/xemacs/xemacs-packages/man/viper/viper.texi
 lib/xemacs/xemacs-packages/man/w3/w3-faq.txi
 lib/xemacs/xemacs-packages/man/w3/w3.txi
@@ -1279,6 +1403,8 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.net-utils
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.os-utils
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.pcl-cvs
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.prog-modes
+lib/xemacs/xemacs-packages/pkginfo/MANIFEST.psgml
+lib/xemacs/xemacs-packages/pkginfo/MANIFEST.sgml
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.sh-script
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.texinfo
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.text-modes
@@ -1291,6 +1417,7 @@ 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
 @dirrm lib/xemacs/xemacs-packages/man/pcl-cvs
 @dirrm lib/xemacs/xemacs-packages/man/mailcrypt
 @dirrm lib/xemacs/xemacs-packages/man/ispell
@@ -1308,6 +1435,8 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/lisp/text-modes
 @dirrm lib/xemacs/xemacs-packages/lisp/texinfo
 @dirrm lib/xemacs/xemacs-packages/lisp/sh-script
+@dirrm lib/xemacs/xemacs-packages/lisp/sgml
+@dirrm lib/xemacs/xemacs-packages/lisp/psgml
 @dirrm lib/xemacs/xemacs-packages/lisp/prog-modes
 @dirrm lib/xemacs/xemacs-packages/lisp/pcl-cvs
 @dirrm lib/xemacs/xemacs-packages/lisp/os-utils
@@ -1328,6 +1457,10 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @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/ISO_8879-1986/entities
+@dirrm lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986
+@dirrm lib/xemacs/xemacs-packages/etc/psgml/cdtd
+@dirrm lib/xemacs/xemacs-packages/etc/psgml
 @dirrm lib/xemacs/xemacs-packages/etc/hm--html-menus/templates
 @dirrm lib/xemacs/xemacs-packages/etc/hm--html-menus/idd
 @dirrm lib/xemacs/xemacs-packages/etc/hm--html-menus