Update 21.5-b13 to 21.5-b15 and relevant corrections as follows:

* remove patch for module build section of Makefile according to
  change $^ to macro itself.

5 files changed, 42 insertions, 30 deletions

diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 3870a77fbcba..1cdbe24b54a0 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/xemacs|} \
 		${MASTER_SITE_XEMACS:S|%SUBDIR%|xemacs-${XEMACS_REL}|}
@@ -38,7 +37,7 @@ LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext \
 
 XEMACS_MAJOR_VER?=	21
 XEMACS_REL=		${XEMACS_MAJOR_VER}.5
-XEMACS_VER=		${XEMACS_MAJOR_VER}.5-b13
+XEMACS_VER=		${XEMACS_MAJOR_VER}.5-b15
 XEMACS_ARCH=		${CONFIGURE_TARGET}
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
diff --git a/editors/xemacs-devel-mule/distinfo b/editors/xemacs-devel-mule/distinfo
index b77ee8af55c2..f0f713d55c96 100644
--- a/editors/xemacs-devel-mule/distinfo
+++ b/editors/xemacs-devel-mule/distinfo
@@ -1 +1 @@
-MD5 (xemacs/xemacs-21.5.13.tar.gz) = 71953e7d012b122806f0b8b2dbd6852b
+MD5 (xemacs/xemacs-21.5.15.tar.gz) = c2db973c6c19defe46ebbdf2f372523f
diff --git a/editors/xemacs-devel-mule/files/patch-am b/editors/xemacs-devel-mule/files/patch-am
index 22285c9b8f0a..3bd0174e15c0 100644
--- a/editors/xemacs-devel-mule/files/patch-am
+++ b/editors/xemacs-devel-mule/files/patch-am
@@ -1,15 +1,6 @@
---- 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 @@
+--- modules/common/Makefile.common~	Mon Sep  1 10:40:23 2003
++++ modules/common/Makefile.common	Tue Sep  9 15:33:12 2003
+@@ -86,4 +86,4 @@
  extraclean: distclean
  
  install: $(OBJECT_TO_BUILD)
diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist
index bb595ec8f996..4e3aa57fb2c6 100644
--- a/editors/xemacs-devel-mule/pkg-plist
+++ b/editors/xemacs-devel-mule/pkg-plist
@@ -248,6 +248,7 @@ lib/xemacs-%%XEMACS_VER%%/etc/recycle2.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/refcard.ps.gz
 lib/xemacs-%%XEMACS_VER%%/etc/refcard.tex
 lib/xemacs-%%XEMACS_VER%%/etc/sample.Xdefaults
+lib/xemacs-%%XEMACS_VER%%/etc/sample.Xresources
 lib/xemacs-%%XEMACS_VER%%/etc/sample.init.el
 lib/xemacs-%%XEMACS_VER%%/etc/sink.xbm
 lib/xemacs-%%XEMACS_VER%%/etc/sparcworks/SW.Editor.xpm
@@ -891,7 +892,6 @@ 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
@@ -1026,7 +1026,6 @@ 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
@@ -1034,6 +1033,7 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-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/.cvsignore
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
 lib/xemacs-%%XEMACS_VER%%/lisp/README
@@ -1305,6 +1305,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/msw-mouse.el
 lib/xemacs-%%XEMACS_VER%%/lisp/msw-mouse.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/msw-select.el
 lib/xemacs-%%XEMACS_VER%%/lisp/msw-select.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/.cvsignore
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/arabic.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/arabic.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/auto-autoloads.el
@@ -1583,7 +1584,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m
 @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%%/modules
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/unicode/unicode-consortium
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/unicode/other
diff --git a/editors/xemacs-devel-mule/pkg-plist.arch-dep b/editors/xemacs-devel-mule/pkg-plist.arch-dep
index 93b59c405145..ee718e9f5d4b 100644
--- a/editors/xemacs-devel-mule/pkg-plist.arch-dep
+++ b/editors/xemacs-devel-mule/pkg-plist.arch-dep
@@ -38,32 +38,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
@@ -76,15 +87,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
@@ -195,18 +205,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
@@ -214,9 +225,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
@@ -328,19 +340,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
@@ -353,20 +368,26 @@ 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%%/movemail
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/profile
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/rcs2log
@@ -382,5 +403,5 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m
 @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%%/modules
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%