Update to 21.5-b13(Beta version).

8 files changed, 306 insertions, 116 deletions

diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 00661b4c8578..ca6170ff1187 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -6,19 +6,15 @@
 #
 
 PORTNAME=	xemacs-devel-mule
-PORTVERSION=	${XEMACS_VER}
-.if defined(WNN6)
-.endif
+PORTVERSION=	${XEMACS_VER:S/-/./}
 CATEGORIES+=	editors
-MASTER_SITES=	${MASTER_SITE_XEMACS}
-MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
-DISTNAME=	xemacs-${XEMACS_VER}
-DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
-		${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/xemacs|} \
+		${MASTER_SITE_XEMACS:S|%SUBDIR%|xemacs-${XEMACS_REL}|}
+DISTNAME=	xemacs-${XEMACS_VER:S/-b/./}
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
-COMMENT?=	XEmacs(gamma version) text editor with mule(Only the executables)
+COMMENT?=	XEmacs(beta version) text editor with mule(Only the executables)
 
 .include <bsd.port.pre.mk>
 
@@ -28,37 +24,36 @@ RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR
 .if defined(PKGNAMEPREFIX)
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-devel-mule
 .endif
+.if !defined(WITHOUT_X11)
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		compface.1:${PORTSDIR}/mail/faces \
-		intl.4:${PORTSDIR}/devel/gettext \
+		compface.1:${PORTSDIR}/mail/faces
+USE_XLIB=	yes
+USE_XPM=	yes
+.endif
+LIB_DEPENDS+=	intl.4:${PORTSDIR}/devel/gettext \
 		${LIB_INPUT_METHOD}
 
 XEMACS_MAJOR_VER?=	21
-XEMACS_REL=		${XEMACS_MAJOR_VER}.4
-XEMACS_VER=		${XEMACS_MAJOR_VER}.4.12
+XEMACS_REL=		${XEMACS_MAJOR_VER}.5
+XEMACS_VER=		${XEMACS_MAJOR_VER}.5-b13
 XEMACS_ARCH=		${CONFIGURE_TARGET}
 
-USE_XLIB=	yes
+WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=213
 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
 
-CONFIGURE_ARGS=	--with-x11 \
-		--with-mule \
+CONFIGURE_ARGS=	--with-mule \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib \
 		--site-libraries='${SITE_LIBRARIES}' \
 		--site-includes='${SITE_INCLUDES}' \
-		--with-xface \
 		--with-sound=native \
 		--with-site-lisp \
 		--with-pop \
 		--with-xfs \
-		--with-jpeg \
-		--with-png \
-		--with-tiff \
 		--with-ldap=no \
 		--infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
 		--with-clash-detection \
@@ -75,8 +70,6 @@ INSTALL_TARGET=	install-arch-dep
 PLIST=		${PKGDIR}/pkg-plist.arch-dep
 .if ${PKGNAMEPREFIX} == "ja-"
 DESCR=		${PKGDIR}/pkg-descr.ja
-MANLANG=	ja
-MAN1=		xemacs.1
 .endif
 .else
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
@@ -87,9 +80,12 @@ PKGDIR=		${.CURDIR}/../../editors/xemacs-devel-mule
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
 pre-fetch:
-.if !defined(WANT_GTK)
-	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK and recompile."
-.endif
+.if defined(WITHOUT_X11)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
+	@${ECHO_MSG} "do not want to use X11."
+CONFIGURE_ARGS+=	--without-x11
+.else
 .if !defined(WITHOUT_MOTIF)
 .if !defined(MOTIF_STATIC)
 	@${ECHO_MSG} ""
@@ -98,6 +94,7 @@ pre-fetch:
 	@${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, "
 	@${ECHO_MSG} "which will force the use of athena widgets for dialogs."
 .endif
+CONFIG_ARGS+=	--with-jpeg=yes --with-png=yes --with-tiff=yes --with-xface=yes
 USE_MOTIF=	yes
 
 # hack to avoid shipping binaries linked with Motif
@@ -107,13 +104,6 @@ WITH_DIALOGS=	--with-dialogs=athena
 WITH_DIALOGS=	--with-dialogs=motif
 .endif
 
-.if defined(WANT_GTK)
-WITH_GTK=	--with-gtk=yes
-WITH_XPM=	--with-xpm=no
-USE_GNOME=	gtk12
-USE_XPM=	no
-.endif
-
 .if defined(PACKAGE_BUILDING)
 WITH_OFFIX?=	--with-offix=no
 .endif
@@ -122,7 +112,6 @@ WITH_MENUBARS?=	--with-menubars=lucid
 WITH_SCROLLBARS?=--with-scrollbars=motif
 WITH_WIDGETS?=	--with-widgets=motif
 .endif
-USE_XPM?=	yes
 WITH_XPM?=	--with-xpm
 WITH_XIM?=	--with-xim=xlib
 WITH_ATHENA?=	--with-athena=xaw
@@ -130,6 +119,7 @@ WITH_MENUBARS?=	--with-menubars=athena
 WITH_SCROLLBARS?=--with-scrollbars=athena
 WITH_DIALOGS?=	--with-dialogs=athena
 WITH_WIDGETS?=	--with-widgets=athena
+.endif
 
 BINNAMEEXT=		-mule
 .if defined(CANNA) && defined(FREEWNN)
@@ -181,16 +171,8 @@ post-install::
 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
 	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
 	${RM} -f ${PREFIX}/bin/send-pr
-.if defined(WANT_GTK)
-	@${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to"
-	@${ECHO_MSG} "the maintainer."
-	@${ECHO_MSG} "Please also be aware that the package's name was automagically changed"
-	@${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
-.endif
 .if defined(PKGNAMEPREFIX)
 .if ${PKGNAMEPREFIX} == "ja-"
-	@${MKDIR} ${PREFIX}/man/ja/man1
-	@${INSTALL_MAN} ${WRKSRC}/etc/xemacs-ja.1 ${PREFIX}/man/ja/man1/xemacs.1
 	@${LN} -sf ja ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP
 .endif
 .endif
diff --git a/editors/xemacs-devel-mule/distinfo b/editors/xemacs-devel-mule/distinfo
index 656334adab9c..b77ee8af55c2 100644
--- a/editors/xemacs-devel-mule/distinfo
+++ b/editors/xemacs-devel-mule/distinfo
@@ -1,3 +1 @@
-MD5 (xemacs/xemacs-21.4.12-src.tar.gz) = 2e2c1502b1eb76af094108988c626a0e
-MD5 (xemacs/xemacs-21.4.12-elc.tar.gz) = 6e0931158967f433e46546595bf72904
-MD5 (xemacs/xemacs-21.4.12-info.tar.gz) = d31805fc1cff0337d40b77422ba86923
+MD5 (xemacs/xemacs-21.5.13.tar.gz) = 71953e7d012b122806f0b8b2dbd6852b
diff --git a/editors/xemacs-devel-mule/files/patch-af b/editors/xemacs-devel-mule/files/patch-af
index c0c55cbf0aef..814548dd9365 100644
--- a/editors/xemacs-devel-mule/files/patch-af
+++ b/editors/xemacs-devel-mule/files/patch-af
@@ -1,14 +1,14 @@
---- configure.in.orig	Wed Jul 25 09:39:21 2001
-+++ configure.in	Sun Oct  7 23:20:24 2001
-@@ -1098,6 +1098,7 @@
+--- configure.in.orig	Fri Feb 14 14:31:16 2003
++++ configure.in	Tue Apr 29 21:52:41 2003
+@@ -1133,6 +1133,7 @@
  dnl Straightforward OS determination
  case "$canonical" in
    *-*-linux*    ) opsys=linux ;;
-+  *-*-freebsd* ) opsys=freebsd ;;
++  *-*-freebsd*   ) opsys=freebsd ;;
    *-*-netbsd*   ) opsys=netbsd ;;
    *-*-openbsd*	) opsys=openbsd ;;
    *-*-nextstep* ) opsys=nextstep ;;
-@@ -3661,21 +3662,24 @@
+@@ -3920,20 +3921,24 @@
      test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) }
    fi
    dnl Back to our regularly scheduled wnn hunting
@@ -17,32 +17,32 @@
 -      AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
 -	AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
 -	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
-+  if test "$with_wnn6" = "yes"; then
-+    AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
-+      AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
-+	AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
-+  else
-+    if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
-+      AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
-+	AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
-+	  AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
-+	    AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
-+    fi
++ if test "$with_wnn6" = "yes"; then
++   AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
++     AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
++AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
++ else
++   if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
++     AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
++AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
++  AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
++    AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
++   fi
    fi
    test -z "$with_wnn" && with_wnn=yes
    if test "$with_wnn" = "yes"; then
      AC_DEFINE(HAVE_WNN)
      XE_PREPEND(-l$libwnn, libs_x)
-     XE_ADD_OBJS(mule-wnnfns.o)
 -    if test "$with_wnn6" != "no"; then
 -      AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes)
 -      test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
 -    fi
++    dnl XE_ADD_OBJS(mule-wnnfns.o) missing here
 +    test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
    fi
  
    dnl Autodetect canna
-@@ -4257,7 +4261,7 @@
+@@ -4526,7 +4531,7 @@
  dnl Check for Berkeley DB.
  if test "$with_database_berkdb" != "no"; then
    AC_MSG_CHECKING(for Berkeley db.h)
diff --git a/editors/xemacs-devel-mule/files/patch-al b/editors/xemacs-devel-mule/files/patch-al
new file mode 100644
index 000000000000..ef0ae35060df
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-al
@@ -0,0 +1,11 @@
+--- src/lstream.c.orig	Tue Apr 29 21:31:17 2003
++++ src/lstream.c	Tue Apr 29 21:31:22 2003
+@@ -101,7 +101,7 @@
+     }
+ }
+ 
+-inline static Bytecount
++/*inline*/ static Bytecount
+ aligned_sizeof_lstream (Bytecount lstream_type_specific_size)
+ {
+   return MAX_ALIGN_SIZE (offsetof (Lstream, data) +
diff --git a/editors/xemacs-devel-mule/files/patch-am b/editors/xemacs-devel-mule/files/patch-am
new file mode 100644
index 000000000000..22285c9b8f0a
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-am
@@ -0,0 +1,17 @@
+--- modules/common/Makefile.common.orig	Tue Feb  4 08:33:04 2003
++++ modules/common/Makefile.common	Tue May 20 17:07:22 2003
+@@ -62,7 +62,7 @@
+ 	$(MODCC) $(MODCFLAGS) -c $<
+ 
+ $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o
+-	$(MODCC) --mode=link --mode=verbose --mod-output=$@ $^ $(LDFLAGS)
++	$(MODCC) --mode=link --mode=verbose --mod-output=$@ ${.ALLSRC} $(LDFLAGS)
+ 
+ $(MODNAME)_i.c: $(SRCS)
+ 	ELLMAKEDOC=$(MAKE_DOCFILE) $(MODCC) --mode=init --mod-output=$@ \
+@@ -78,4 +78,4 @@
+ extraclean: distclean
+ 
+ install: $(OBJECT_TO_BUILD)
+-	$(INSTALL_PROGRAM) $< $(INSTALLPATH)
++	$(INSTALL_PROGRAM) ${.ALLSRC} $(INSTALLPATH)
diff --git a/editors/xemacs-devel-mule/pkg-descr b/editors/xemacs-devel-mule/pkg-descr
index 2d8d16342879..a90b789a40ee 100644
--- a/editors/xemacs-devel-mule/pkg-descr
+++ b/editors/xemacs-devel-mule/pkg-descr
@@ -1,6 +1,5 @@
 This is a package containing only the executables for development
-version(gamma) of XEmacs with Mule(version 21.4.12), the next
-generation of Emacs.
+version(beta) of XEmacs with Mule, the next generation of Emacs.
 
 This package is not built with any particular language support except for
 already built-in Imput Method - SKK and SJ3.  If you want other built-in
diff --git a/editors/xemacs-devel-mule/pkg-descr.ja b/editors/xemacs-devel-mule/pkg-descr.ja
index 398a41a1fb66..fb2b94412c95 100644
--- a/editors/xemacs-devel-mule/pkg-descr.ja
+++ b/editors/xemacs-devel-mule/pkg-descr.ja
@@ -1,10 +1,9 @@
 This is a package containing only the executables for development
-version(gamma) of XEmacs with Mule(version 21.4.12), the next
-generation of Emacs.
+version(beta) of XEmacs with Mule, the next generation of Emacs.
 
-You need to install a full package, xemacs-devel-mule-21.4.12, containing emacs
-executables, lisp files, info pages, and so on for XEmacs with Mule
-(version 21.4.12).
+You need to install a full package for editors/xemacs-devel-mule
+containing emacs executables, lisp files, info pages, and so on for
+XEmacs with Mule. 
 
 This package is built with Japanese support by using SKK, SJ3, Canna,
 FreeWnn or Wnn6 as an external input engine. Each input method would be
@@ -19,14 +18,3 @@ supported in following ports respectively:
 If you use with SJ3 or SKK, you should be installed sj3serv or skkserv
 in advance. SKK is supported as already builtin. Also it will
 support several input methods under leim. 
-
-This package and the package xemacs-devel-mule-21.4.12, might clobber any
-existing emacs installation.  In particular, the executables and man
-pages of etags/ctags are installed, and the info pages that come with
-the original emacs will be overwritten too.
-
-Although this shouldn't cause any problems to run both mule and emacs,
-it may cause some confusion when one of them is pkg_delete'd.  If
-someone has a solution to this, please tell me.
-Or to avoid this problem, you could select prefix for top install
-directory. By default it is pointed to the usual place, /usr/local.
diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist
index 5ec6a9047461..bb595ec8f996 100644
--- a/editors/xemacs-devel-mule/pkg-plist
+++ b/editors/xemacs-devel-mule/pkg-plist
@@ -43,6 +43,7 @@ lib/xemacs-%%XEMACS_VER%%/etc/CODING-STANDARDS
 lib/xemacs-%%XEMACS_VER%%/etc/CODINGS
 lib/xemacs-%%XEMACS_VER%%/etc/COPYING
 lib/xemacs-%%XEMACS_VER%%/etc/COPYING.LIB
+lib/xemacs-%%XEMACS_VER%%/etc/ChangeLog
 lib/xemacs-%%XEMACS_VER%%/etc/DEBUG
 lib/xemacs-%%XEMACS_VER%%/etc/DISTRIB
 lib/xemacs-%%XEMACS_VER%%/etc/Emacs.ad
@@ -61,7 +62,6 @@ lib/xemacs-%%XEMACS_VER%%/etc/OONEWS
 lib/xemacs-%%XEMACS_VER%%/etc/ORDERS
 lib/xemacs-%%XEMACS_VER%%/etc/ORDERS.EUROPE
 lib/xemacs-%%XEMACS_VER%%/etc/ORDERS.JAPAN
-lib/xemacs-%%XEMACS_VER%%/etc/OXYMORONS
 lib/xemacs-%%XEMACS_VER%%/etc/PACKAGES
 lib/xemacs-%%XEMACS_VER%%/etc/README
 lib/xemacs-%%XEMACS_VER%%/etc/README.HYPERBOLE
@@ -69,17 +69,23 @@ lib/xemacs-%%XEMACS_VER%%/etc/README.OO-BROWSER
 lib/xemacs-%%XEMACS_VER%%/etc/SERVICE
 lib/xemacs-%%XEMACS_VER%%/etc/TERMS
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL
+lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.cs
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.de
+lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.es
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.fr
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.hr
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.ja
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.ko
+lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.nl
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.no
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.pl
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.ro
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.ru
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.se
+lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.sk
+lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.sl
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.th
+lib/xemacs-%%XEMACS_VER%%/etc/VEGETABLES
 lib/xemacs-%%XEMACS_VER%%/etc/XKeysymDB
 lib/xemacs-%%XEMACS_VER%%/etc/aliases.ksh
 lib/xemacs-%%XEMACS_VER%%/etc/cbx.png
@@ -155,7 +161,7 @@ lib/xemacs-%%XEMACS_VER%%/etc/idd/drop
 lib/xemacs-%%XEMACS_VER%%/etc/idd/dropmsk
 lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit
 lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit-7bit
-lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.pgp
+lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.gpg
 lib/xemacs-%%XEMACS_VER%%/etc/photos/adrian.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/adrianm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/ajc.png
@@ -180,9 +186,13 @@ lib/xemacs-%%XEMACS_VER%%/etc/photos/golubev.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/golubevm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/hniksic.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/hniksicm.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/james.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/jamesm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/jan.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/jareth.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/jarethm.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/jason.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/jasonm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/jens.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/jensm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/jmiller.png
@@ -207,6 +217,8 @@ lib/xemacs-%%XEMACS_VER%%/etc/photos/morioka.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/moriokam.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/ograf.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/ografm.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/oscar.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/oscarm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/pez.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/pezm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/piper.png
@@ -403,6 +415,93 @@ lib/xemacs-%%XEMACS_VER%%/etc/toolbar/workshop-cap-xx.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/toolbar/workshop-up.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/toolbar/workshop-xx.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/trash.xpm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/README
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-BIG5-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-EUC_CN-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-EUC_JP-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-EUC_KR-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-EUC_TW-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_1-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_10-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_11-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_13-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_14-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_15-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_2-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_3-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_4-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_5-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_6-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_7-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_8-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-ISO_8859_9-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-JOHAB-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-KOI8_R-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-KOI8_U-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-KOI_8-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-SJIS-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm/glibc-TIS_620-2.1.2.ucm
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/README
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/chinese-cns11643-1.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/chinese-cns11643-2.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/chinese-cns11643-3.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/chinese-cns11643-4.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/chinese-cns11643-5.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/chinese-cns11643-6.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/chinese-cns11643-7.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/chinese-sisheng.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/ethiopic.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/indian-is13194.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/ipa.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/japanese-jisx0213-1.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/japanese-jisx0213-2.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/thai-tis620.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/tibetan.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/vietnamese-viscii-lower.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs/vietnamese-viscii-upper.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/other/lao.txt
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-1.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-10.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-13.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-14.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-15.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-16.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-2.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-3.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-4.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-5.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-6.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-7.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-8.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/8859-9.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/BIG5.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CNS11643.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP1250.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP1251.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP1252.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP1253.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP1254.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP1255.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP1256.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP1257.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP1258.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP874.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP932.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP936.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP949.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/CP950.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/GB12345.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/GB2312.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/HANGUL.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/JIS0201.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/JIS0208.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/JIS0212.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/JOHAB.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/KOI8-R.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/KSC5601.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/KSX1001.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/OLD5601.TXT
+lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium/SHIFTJIS.TXT
 lib/xemacs-%%XEMACS_VER%%/etc/xemacs-beta.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/xemacs-enhanced.png
 lib/xemacs-%%XEMACS_VER%%/etc/xemacs-fe.sh
@@ -410,7 +509,6 @@ lib/xemacs-%%XEMACS_VER%%/etc/xemacs-icon.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/xemacs-icon2.xbm
 lib/xemacs-%%XEMACS_VER%%/etc/xemacs-icon2.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/xemacs-icon3.xpm
-lib/xemacs-%%XEMACS_VER%%/etc/xemacs-ja.1
 lib/xemacs-%%XEMACS_VER%%/etc/xemacs.1
 lib/xemacs-%%XEMACS_VER%%/etc/xemacs.xbm
 lib/xemacs-%%XEMACS_VER%%/etc/xemacs.xpm
@@ -443,32 +541,43 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/buffer.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/bufslots.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/bytecode.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/casetab.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/charset.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/chartab.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/cm.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/coding-system-slots.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/commands.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/config.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/conslots.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-gtk-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-gtk.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-impl.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-msw-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-msw.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-stream-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-stream.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-tty-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-tty.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-x-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-x.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/database.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/debug.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/device-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/device.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/devslots.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dragdrop.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dumper.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/eldap.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/elhash.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/emodules.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/events-mod.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/event-gtk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/events.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extents-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extents.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xlib.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xt.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/faces.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/file-coding.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frameslots.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gccache-gtk.h
@@ -481,15 +590,14 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/glyphs-x.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/glyphs.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gpmevent.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gtk-xemacs.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gui-gtk.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gui-x.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gui.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gutter.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/hash.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/imgproc.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/insdel.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/iso-wide.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/intl-auto-encap-win32.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/keymap.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/libinterface.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/libsst.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/libst.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/line-number.h
@@ -600,18 +708,19 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/windowsnt.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/xps100.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/macros.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mem-limits.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/menubar-msw.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/menubar.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/miscplay.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mule-ccl.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mule-charset.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nativesound.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ndir.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nt.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ntheap.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-impl.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-msw-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-msw.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-tty-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-tty.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-x-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-x.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/offix-cursors.h
@@ -619,9 +728,10 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/offix-types.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/offix.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/opaque.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/paths.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/postgresql.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/process-slots.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/process.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/procimpl.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/profile.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/rangetab.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/redisplay.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/regex.h
@@ -733,19 +843,22 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-2.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-3.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-4-2.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/usg5-4.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/win32-common.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/win32-native.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/windowsnt.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/xenix.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/scrollbar-gtk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/scrollbar-msw.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/scrollbar-x.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/scrollbar.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/select-common.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/select.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sheap-adjust.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sound.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/specifier.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/symeval.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/symsinit.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syntax.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syscommctrl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sysdep.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sysdir.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/sysdll.h
@@ -758,20 +871,27 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/systime.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/systty.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syswait.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/syswindows.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/text.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/toolbar-common.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/toolbar.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/tooltalk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ui-gtk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/universe.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/winslots.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xgccache.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsic.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsicp.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xmmanagerp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xmotif.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xmprimitivep.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xmu.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/make-docfile
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/mmencode
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/auto-autoloads.el
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/auto-autoloads.elc
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/postgresql.ell
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/movemail
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/profile
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/rcs2log
@@ -793,6 +913,7 @@ lib/xemacs-%%XEMACS_VER%%/info/external-widget.info
 lib/xemacs-%%XEMACS_VER%%/info/info.info
 lib/xemacs-%%XEMACS_VER%%/info/internals.info
 lib/xemacs-%%XEMACS_VER%%/info/internals.info-1
+lib/xemacs-%%XEMACS_VER%%/info/internals.info-10
 lib/xemacs-%%XEMACS_VER%%/info/internals.info-2
 lib/xemacs-%%XEMACS_VER%%/info/internals.info-3
 lib/xemacs-%%XEMACS_VER%%/info/internals.info-4
@@ -848,6 +969,7 @@ lib/xemacs-%%XEMACS_VER%%/info/lispref.info-48
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-49
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-50
+lib/xemacs-%%XEMACS_VER%%/info/lispref.info-51
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
@@ -904,6 +1026,7 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-20
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-21
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-22
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-23
+lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-24
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-5
@@ -912,7 +1035,6 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-7
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-8
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-9
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog
-lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
 lib/xemacs-%%XEMACS_VER%%/lisp/README
 lib/xemacs-%%XEMACS_VER%%/lisp/abbrev.el
@@ -933,6 +1055,10 @@ lib/xemacs-%%XEMACS_VER%%/lisp/autoload.el
 lib/xemacs-%%XEMACS_VER%%/lisp/autoload.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/backquote.el
 lib/xemacs-%%XEMACS_VER%%/lisp/backquote.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/behavior-defs.el
+lib/xemacs-%%XEMACS_VER%%/lisp/behavior-defs.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/behavior.el
+lib/xemacs-%%XEMACS_VER%%/lisp/behavior.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/blessmail.el
 lib/xemacs-%%XEMACS_VER%%/lisp/blessmail.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/buff-menu.el
@@ -967,6 +1093,8 @@ lib/xemacs-%%XEMACS_VER%%/lisp/code-cmds.el
 lib/xemacs-%%XEMACS_VER%%/lisp/code-cmds.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/code-files.el
 lib/xemacs-%%XEMACS_VER%%/lisp/code-files.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/code-init.el
+lib/xemacs-%%XEMACS_VER%%/lisp/code-init.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/code-process.el
 lib/xemacs-%%XEMACS_VER%%/lisp/code-process.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/coding.el
@@ -997,6 +1125,8 @@ lib/xemacs-%%XEMACS_VER%%/lisp/derived.el
 lib/xemacs-%%XEMACS_VER%%/lisp/derived.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/device.el
 lib/xemacs-%%XEMACS_VER%%/lisp/device.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/diagnose.el
+lib/xemacs-%%XEMACS_VER%%/lisp/diagnose.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/dialog-gtk.el
 lib/xemacs-%%XEMACS_VER%%/lisp/dialog-gtk.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/dialog-items.el
@@ -1022,8 +1152,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/extents.el
 lib/xemacs-%%XEMACS_VER%%/lisp/extents.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/faces.el
 lib/xemacs-%%XEMACS_VER%%/lisp/faces.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/files-nomule.el
-lib/xemacs-%%XEMACS_VER%%/lisp/files-nomule.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/files.el
 lib/xemacs-%%XEMACS_VER%%/lisp/files.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/fill.el
@@ -1104,10 +1232,10 @@ lib/xemacs-%%XEMACS_VER%%/lisp/gutter-items.el
 lib/xemacs-%%XEMACS_VER%%/lisp/gutter-items.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/gutter.el
 lib/xemacs-%%XEMACS_VER%%/lisp/gutter.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/hash-table.el
+lib/xemacs-%%XEMACS_VER%%/lisp/hash-table.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/help-macro.el
 lib/xemacs-%%XEMACS_VER%%/lisp/help-macro.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/help-nomule.el
-lib/xemacs-%%XEMACS_VER%%/lisp/help-nomule.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/help.el
 lib/xemacs-%%XEMACS_VER%%/lisp/help.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/hyper-apropos.el
@@ -1183,13 +1311,24 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/auto-autoloads.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/auto-autoloads.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/china-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/china-util.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyril-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyril-util.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/devan-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/devan-util.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/devanagari.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/devanagari.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/english.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/english.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/ethio-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/ethio-util.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/ethiopic.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/ethiopic.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/european.el
@@ -1198,12 +1337,22 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/greek.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/greek.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/hebrew.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/hebrew.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/indian.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/indian.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/japan-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/japan-util.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/japanese.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/japanese.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/kinsoku.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/kinsoku.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/korea-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/korea-util.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/korean.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/korean.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/lao-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/lao-util.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/lao.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/lao.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/latin.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/latin.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/misc-lang.el
@@ -1218,28 +1367,39 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-cmds.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-cmds.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-coding.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-coding.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-help.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-help.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-init.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-init.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-misc.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-misc.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-composite-stub.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-composite-stub.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-composite.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-composite.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-locale.txt
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-msw-init-late.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-msw-init-late.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-tty-init.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-tty-init.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-win32-init.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-win32-init.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-x-init.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-x-init.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis-chars.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis-chars.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-util.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/viet-chars.el
-lib/xemacs-%%XEMACS_VER%%/lisp/mule/viet-chars.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/tibet-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/tibet-util.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/tibetan.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/tibetan.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/viet-util.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/viet-util.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/vietnamese.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/vietnamese.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/multicast.el
 lib/xemacs-%%XEMACS_VER%%/lisp/multicast.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mwheel.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mwheel.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/newcomment.el
+lib/xemacs-%%XEMACS_VER%%/lisp/newcomment.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/objects.el
 lib/xemacs-%%XEMACS_VER%%/lisp/objects.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/obsolete.el
@@ -1263,16 +1423,22 @@ lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/paths.el
 lib/xemacs-%%XEMACS_VER%%/lisp/picture.el
 lib/xemacs-%%XEMACS_VER%%/lisp/picture.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/post-gc.el
+lib/xemacs-%%XEMACS_VER%%/lisp/post-gc.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/printer.el
 lib/xemacs-%%XEMACS_VER%%/lisp/printer.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/process.el
 lib/xemacs-%%XEMACS_VER%%/lisp/process.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/raw-process.el
+lib/xemacs-%%XEMACS_VER%%/lisp/raw-process.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/rect.el
 lib/xemacs-%%XEMACS_VER%%/lisp/rect.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/register.el
 lib/xemacs-%%XEMACS_VER%%/lisp/register.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/replace.el
 lib/xemacs-%%XEMACS_VER%%/lisp/replace.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/resize-minibuffer.el
+lib/xemacs-%%XEMACS_VER%%/lisp/resize-minibuffer.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/scrollbar.el
 lib/xemacs-%%XEMACS_VER%%/lisp/scrollbar.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/select.el
@@ -1299,37 +1465,60 @@ lib/xemacs-%%XEMACS_VER%%/lisp/symbols.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/syntax.el
 lib/xemacs-%%XEMACS_VER%%/lisp/syntax.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/AT386.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/AT386.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/README
 lib/xemacs-%%XEMACS_VER%%/lisp/term/apollo.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/apollo.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/bg-mouse.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/bg-mouse.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/bobcat.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/internal.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/bobcat.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/term/cygwin.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/cygwin.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/keyswap.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/keyswap.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/linux.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/linux.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/lk201.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/lk201.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/news.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/pc-win.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/news.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/scoansi.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/sun-mouse.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/sun.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/scoansi.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/sup-mouse.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/sup-mouse.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/tvi970.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/tvi970.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt-control.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt-control.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt100-led.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt100-led.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt100.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt100.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt102.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt102.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt125.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt125.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt200.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt200.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt201.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt201.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt220.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt220.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt240.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt240.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt300.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt300.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt320.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt320.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt400.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt400.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/vt420.el
-lib/xemacs-%%XEMACS_VER%%/lisp/term/win32-win.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/vt420.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/wyse50.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/wyse50.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/xterm.el
+lib/xemacs-%%XEMACS_VER%%/lisp/term/xterm.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/text-mode.el
 lib/xemacs-%%XEMACS_VER%%/lisp/text-mode.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/text-props.el
@@ -1342,12 +1531,13 @@ lib/xemacs-%%XEMACS_VER%%/lisp/tty-init.el
 lib/xemacs-%%XEMACS_VER%%/lisp/tty-init.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/undo-stack.el
 lib/xemacs-%%XEMACS_VER%%/lisp/undo-stack.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/unicode.el
+lib/xemacs-%%XEMACS_VER%%/lisp/unicode.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/update-elc-2.el
 lib/xemacs-%%XEMACS_VER%%/lisp/update-elc.el
 lib/xemacs-%%XEMACS_VER%%/lisp/userlock.el
 lib/xemacs-%%XEMACS_VER%%/lisp/userlock.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/version.el
-lib/xemacs-%%XEMACS_VER%%/lisp/very-early-lisp.el
 lib/xemacs-%%XEMACS_VER%%/lisp/view-less.el
 lib/xemacs-%%XEMACS_VER%%/lisp/view-less.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/wid-browse.el
@@ -1395,6 +1585,11 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include
 @unexec rmdir %D/lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules 2>/dev/null || true
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/unicode/other
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/unicode/mule-ucs
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/unicode/ibm
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/unicode
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/toolbar
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/tests/external-widget
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/tests