7 files changed, 138 insertions, 97 deletions

diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 595b5239e4fd..978ec976705a 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,21 +7,28 @@
 
 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}|}
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
+.if defined(CANNA) && defined(FREEWNN)
+PKGNAMESUFFIX+=	-canna+freewnn
+.elif defined(CANNA) && defined(WNN6)
+PKGNAMESUFFIX+=	-canna+wnn6
+.elif defined(FREEWNN)
+PKGNAMESUFFIX+=	-freewnn
+.elif defined(WNN6)
+PKGNAMESUFFIX+= -wnn6
+.elif defined(CANNA)
+PKGNAMESUFFIX+=	-canna
+.endif
 DISTNAME=	xemacs-${XEMACS_VER:S/-b/./}
 DIST_SUBDIR=	xemacs
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	anrays@gmail.com
 COMMENT?=	XEmacs(beta version) text editor with mule(Only the executables)
 
-.include <bsd.port.pre.mk>
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
-RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages \
-		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
+BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base:${PORTSDIR}/editors/xemacs-mule-packages
+RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base:${PORTSDIR}/editors/xemacs-mule-packages
 .if defined(PKGNAMEPREFIX)
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-devel-mule
 .endif
@@ -30,16 +37,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces
+
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_XPM=	yes
 .endif
-LIB_DEPENDS+=	${LIB_INPUT_METHOD}
 
-XEMACS_MAJOR_VER?=	21
-XEMACS_REL=		${XEMACS_MAJOR_VER}.5
-XEMACS_VER=		${XEMACS_MAJOR_VER}.5-b16
-XEMACS_ARCH=		${CONFIGURE_TARGET}
+XEMACS_REL=	21.5
+XEMACS_VER=	${XEMACS_REL}-b19
+XEMACS_ARCH=	${CONFIGURE_TARGET}
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
@@ -59,11 +65,9 @@ CONFIGURE_ARGS=	--with-mule \
 		--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 \
 		--with-database=berkdb \
-		${WITH_XPM} ${WITH_XIM} \
-		${WITH_ATHENA} \
-		${WITH_MENUBARS} ${WITH_SCROLLBARS} ${WITH_DIALOGS} ${WITH_WIDGETS} \
-		${WITH_OFFIX} ${WITH_GTK} \
-		${WITH_INPUT_METHOD}
+		${WITH_XIM} \
+		${WITH_MENUBARS} ${WITH_SCROLLBARS} \
+		${WITH_DIALOGS} ${WITH_WIDGETS}
 MAKE_ARGS=	prefix=${PREFIX}
 ALL_TARGET=	all dist
 .if defined(PKGNAMEPREFIX)
@@ -76,13 +80,25 @@ DESCR=		${PKGDIR}/pkg-descr.ja
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
 .endif
+
+.if !defined(DEBUG)
+CONFIGURE_ARGS+=--debug=no --error-checking=none
+.endif
+
+.if defined(WITH_GTK)
+CONFIGURE_ARGS+=--with-gtk
+USE_GNOME+=	gtk12
+.endif
+
 PKGDIR=		${.CURDIR}/../../editors/xemacs-devel-mule
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
+.include <bsd.port.pre.mk>
+
 # Undump and malloc do not behave on amd64 at the moment
 .if ${ARCH} == "amd64"
-CONFIGURE_ARGS+= --with-system-malloc --pdump 
+CONFIGURE_ARGS+=--with-system-malloc --pdump
 .endif
 
 pre-fetch:
@@ -92,6 +108,9 @@ pre-fetch:
 	@${ECHO_MSG} "do not want to use X11."
 CONFIGURE_ARGS+=	--without-x11
 .else
+.if !defined(WITH_GTK)
+	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WITH_GTK and recompile."
+.endif
 .if !defined(WITHOUT_MOTIF)
 .if !defined(MOTIF_STATIC)
 	@${ECHO_MSG} ""
@@ -100,7 +119,7 @@ CONFIGURE_ARGS+=	--without-x11
 	@${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
+CONFIGURE_ARGS+=--with-jpeg=yes --with-png=yes --with-tiff=yes --with-xface=yes
 USE_MOTIF=	yes
 
 # hack to avoid shipping binaries linked with Motif
@@ -111,72 +130,86 @@ WITH_DIALOGS=	--with-dialogs=motif
 .endif
 
 .if defined(PACKAGE_BUILDING)
-WITH_OFFIX?=	--with-offix=no
+CONFIGURE_ARGS+=--with-offix=no
 .endif
-WITH_ATHENA?=	--with-athena=xaw
 WITH_MENUBARS?=	--with-menubars=lucid
 WITH_SCROLLBARS?=--with-scrollbars=motif
 WITH_WIDGETS?=	--with-widgets=motif
 .endif
-WITH_XPM?=	--with-xpm
 WITH_XIM?=	--with-xim=xlib
-WITH_ATHENA?=	--with-athena=xaw
 WITH_MENUBARS?=	--with-menubars=athena
 WITH_SCROLLBARS?=--with-scrollbars=athena
 WITH_DIALOGS?=	--with-dialogs=athena
 WITH_WIDGETS?=	--with-widgets=athena
+
+.if defined(WITH_XAW3D)
+CONFIGURE_ARGS+=--with-athena=3d
+.else
+CONFIGURE_ARGS+=--with-athena=xaw
+.endif
+
+.endif
+
+.if exists(${LOCALBASE}/include/libpq-fe.h)
+WITH_PGSQL=	yes
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+PLIST_SUB+=	WITH_PGSQL=""
+.else
+PLIST_SUB+=	WITH_PGSQL="@comment "
 .endif
 
 BINNAMEEXT=		-mule
 .if defined(CANNA) && defined(FREEWNN)
-PKGNAMESUFFIX=		-canna+freewnn
-WITH_INPUT_METHOD=	--with-canna --with-wnn --with-wnn6=no
-LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna \
+CONFIGURE_ARGS+=	--with-canna --with-wnn --with-wnn6=no
+LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna \
 			wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 .elif defined(CANNA) && defined(WNN6)
-PKGNAMESUFFIX=		-canna+wnn6
 SITE_INCLUDES=		${LOCALBASE}/include/wnn6
-WITH_INPUT_METHOD=	--with-canna --with-wnn6
-LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna \
+CONFIGURE_ARGS+=	--with-canna --with-wnn6
+LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna \
 			wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
 .elif defined(FREEWNN)
-PKGNAMESUFFIX=		-freewnn
-WITH_INPUT_METHOD=	--with-wnn --with-canna=no --with-wnn6=no
-LIB_INPUT_METHOD=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
+CONFIGURE_ARGS+=	--with-wnn --with-canna=no --with-wnn6=no
+LIB_DEPENDS+=		wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 .elif defined(WNN6)
-PKGNAMESUFFIX=		-wnn6
 SITE_INCLUDES=		${LOCALBASE}/include/wnn6
-WITH_INPUT_METHOD=	--with-wnn6 --with-canna=no
-LIB_INPUT_METHOD=	wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
+CONFIGURE_ARGS+=	--with-wnn6 --with-canna=no
+LIB_DEPENDS+=		wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
 .elif defined(CANNA)
-PKGNAMESUFFIX=		-canna
-WITH_INPUT_METHOD=	--with-canna --with-wnn=no --with-wnn6=no
-LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
+CONFIGURE_ARGS+=	--with-canna --with-wnn=no --with-wnn6=no
+LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna
+.else
+CONFIGURE_ARGS+=	--with-canna=no --with-wnn=no --with-wnn6=no
 .endif
 SITE_INCLUDES+=		${LOCALBASE}/include
 SITE_LIBRARIES+=	${LOCALBASE}/lib
-WITH_INPUT_METHOD?=	--with-canna=no --with-wnn=no --with-wnn6=no
 
 # fix .so references in a few man pages
-pre-configure::
+pre-configure:
 .for file in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1
 	@${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${file} > ${WRKDIR}/tmp_zot
 	@${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${file}
 .endfor
 
 pre-build:
-	@${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) \
-		-exec ${RM} -f \{} \;
+	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} -f \{} \;
 	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
 
-post-install::
-.for file in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
-	${STRIP_CMD} ${PREFIX}/bin/${file}
+post-install:
+.if !defined(DEBUG)
+.for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
+	${STRIP_CMD} ${PREFIX}/bin/${f}
 .endfor
+.endif
 # For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
 # Do what PLIST does for pkg_add.
 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
 	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
+	${FIND} ${PREFIX}/lib/xemacs-${XEMACS_VER} -name \*~ \
+		-exec ${RM} -f \{} \;
 	${RM} -f ${PREFIX}/bin/send-pr
 .if defined(PKGNAMEPREFIX)
 .if ${PKGNAMEPREFIX} == "ja-"
diff --git a/editors/xemacs-devel-mule/distinfo b/editors/xemacs-devel-mule/distinfo
index 37282adbee88..888c2e2a2475 100644
--- a/editors/xemacs-devel-mule/distinfo
+++ b/editors/xemacs-devel-mule/distinfo
@@ -1,2 +1,2 @@
-MD5 (xemacs/xemacs-21.5.16.tar.gz) = 09f532e91cda52d9a4e9239c8909e631
-SIZE (xemacs/xemacs-21.5.16.tar.gz) = 12915530
+MD5 (xemacs/xemacs-21.5.19.tar.gz) = 75ca89c49b4d99ae00113f8cd1b2a287
+SIZE (xemacs/xemacs-21.5.19.tar.gz) = 15564957
diff --git a/editors/xemacs-devel-mule/files/patch-alloc.c b/editors/xemacs-devel-mule/files/patch-alloc.c
new file mode 100644
index 000000000000..5041461ccc60
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-alloc.c
@@ -0,0 +1,16 @@
+Index: src/alloc.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
+retrieving revision 1.106
+diff -u -r1.106 alloc.c
+--- src/alloc.c	2005/02/03 16:14:04	1.106
++++ src/alloc.c	2005/02/23 00:01:18
+@@ -349,7 +349,7 @@
+ 
+ #else /* ERROR_CHECK_MALLOC */
+ 
+-#define MALLOC_BEGIN(block)
++#define MALLOC_BEGIN()
+ #define FREE_OR_REALLOC_BEGIN(block)
+ #define MALLOC_END()
+ 
diff --git a/editors/xemacs-devel-mule/files/patch-freebsd.h b/editors/xemacs-devel-mule/files/patch-freebsd.h
new file mode 100644
index 000000000000..7290249492fa
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-freebsd.h
@@ -0,0 +1,11 @@
+--- src/s/freebsd.h.old	Sun Dec 26 00:47:51 2004
++++ src/s/freebsd.h	Sun Dec 26 00:48:27 2004
+@@ -29,7 +29,7 @@
+ #ifndef __FreeBSD_version
+ #include <osreldate.h>
+ #endif
+-#if __FreeBSD_version >= 199701
++#if __FreeBSD_version >= 199701 && __FreeBSD_version < 600006
+ #define LIBS_SYSTEM "-lutil -lxpg4"
+ #else
+ #define LIBS_SYSTEM "-lutil"
diff --git a/editors/xemacs-devel-mule/files/patch-mem-limits.h b/editors/xemacs-devel-mule/files/patch-mem-limits.h
deleted file mode 100644
index a5ce6cb35839..000000000000
--- a/editors/xemacs-devel-mule/files/patch-mem-limits.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mem-limits.h.bak	Thu Mar 18 13:08:19 2004
-+++ src/mem-limits.h	Thu Mar 18 13:08:42 2004
-@@ -108,7 +108,7 @@
- static POINTER data_space_start;
- 
- /* Number of bytes of writable memory we can expect to be able to get */
--extern unsigned int lim_data;
-+extern rlim_t lim_data;
- 
- #if defined (HEAP_IN_DATA) && !defined(PDUMP)
- extern unsigned long static_heap_size;
diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist
index 46dd4fbdf706..e3f015b7f9c2 100644
--- a/editors/xemacs-devel-mule/pkg-plist
+++ b/editors/xemacs-devel-mule/pkg-plist
@@ -37,37 +37,16 @@ bin/ootags
 bin/rcs-checkin
 bin/xemacs
 bin/xemacs-%%XEMACS_VER%%
-lib/xemacs-%%XEMACS_VER%%/etc/BETA
-lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS
-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/ETAGS.EBNF
 lib/xemacs-%%XEMACS_VER%%/etc/Emacs.ad
-lib/xemacs-%%XEMACS_VER%%/etc/FTP
-lib/xemacs-%%XEMACS_VER%%/etc/GNU
 lib/xemacs-%%XEMACS_VER%%/etc/HELLO
 lib/xemacs-%%XEMACS_VER%%/etc/InstallGuide
-lib/xemacs-%%XEMACS_VER%%/etc/LPF
-lib/xemacs-%%XEMACS_VER%%/etc/MACHINES
-lib/xemacs-%%XEMACS_VER%%/etc/MAILINGLISTS
-lib/xemacs-%%XEMACS_VER%%/etc/MORE.STUFF
-lib/xemacs-%%XEMACS_VER%%/etc/MOTIVATION
 lib/xemacs-%%XEMACS_VER%%/etc/NEWS
 lib/xemacs-%%XEMACS_VER%%/etc/ONEWS
 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/PACKAGES
 lib/xemacs-%%XEMACS_VER%%/etc/README
-lib/xemacs-%%XEMACS_VER%%/etc/README.HYPERBOLE
-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
@@ -87,11 +66,7 @@ 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
-lib/xemacs-%%XEMACS_VER%%/etc/check_cygwin_setup.sh
-lib/xemacs-%%XEMACS_VER%%/etc/chr.png
-lib/xemacs-%%XEMACS_VER%%/etc/chrm.png
 lib/xemacs-%%XEMACS_VER%%/etc/ctags.1
 lib/xemacs-%%XEMACS_VER%%/etc/custom/check0.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/custom/check1.xpm
@@ -149,18 +124,15 @@ lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-stop.xbm
 lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-type.xbm
 lib/xemacs-%%XEMACS_VER%%/etc/eos/eos-up.xbm
 lib/xemacs-%%XEMACS_VER%%/etc/etags.1
-lib/xemacs-%%XEMACS_VER%%/etc/gnu.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/gnu.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/gnuattach.1
 lib/xemacs-%%XEMACS_VER%%/etc/gnuclient.1
 lib/xemacs-%%XEMACS_VER%%/etc/gnudoit.1
 lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.1
 lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.README
 lib/xemacs-%%XEMACS_VER%%/etc/gray1.xbm
+lib/xemacs-%%XEMACS_VER%%/etc/gtkrc
 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.gpg
 lib/xemacs-%%XEMACS_VER%%/etc/photos/adrian.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/adrianm.png
@@ -174,6 +146,8 @@ lib/xemacs-%%XEMACS_VER%%/etc/photos/bw.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/bwm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/cthomp.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/cthompm.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/chr.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/chrm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/dkindred.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/dkindredm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/dmoore.png
@@ -223,6 +197,8 @@ lib/xemacs-%%XEMACS_VER%%/etc/photos/pez.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/pezm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/piper.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/piperm.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/purvis.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/purvism.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/rickc.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/rickcm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/slb.png
@@ -241,8 +217,6 @@ lib/xemacs-%%XEMACS_VER%%/etc/photos/vladimir.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/vladimirm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/wmperry.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/wmperrym.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/youngs.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/youngsm.png
 lib/xemacs-%%XEMACS_VER%%/etc/recycle.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/recycle2.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/refcard.ps.gz
@@ -250,7 +224,6 @@ 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
 lib/xemacs-%%XEMACS_VER%%/etc/sparcworks/sunpro-mailcap
 lib/xemacs-%%XEMACS_VER%%/etc/tests/external-widget/Makefile
@@ -547,6 +520,7 @@ 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/compiler.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
@@ -567,6 +541,7 @@ 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/dump-data.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dumper.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/elhash.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/emodules.h
@@ -632,7 +607,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/dpx2.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/dual.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/elxsi.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ews4800r.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/gec63.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/gould-np1.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/gould.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/hp300bsd.h
@@ -713,7 +687,9 @@ 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/ndir.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nt.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-gmp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-mp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number.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
@@ -892,6 +868,7 @@ 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
+%%WITH_PGSQL%%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
@@ -899,6 +876,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
+lib/xemacs-%%XEMACS_VER%%/info/beta.info
 lib/xemacs-%%XEMACS_VER%%/info/cl.info
 lib/xemacs-%%XEMACS_VER%%/info/custom.info
 lib/xemacs-%%XEMACS_VER%%/info/dir
@@ -908,6 +886,9 @@ 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-2
+lib/xemacs-%%XEMACS_VER%%/info/internals.info-3
+lib/xemacs-%%XEMACS_VER%%/info/internals.info-4
+lib/xemacs-%%XEMACS_VER%%/info/internals.info-5
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2
@@ -918,6 +899,7 @@ lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9
+lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
 lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info
 lib/xemacs-%%XEMACS_VER%%/info/standards.info
 lib/xemacs-%%XEMACS_VER%%/info/term.info
@@ -927,6 +909,8 @@ lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2
 lib/xemacs-%%XEMACS_VER%%/info/widget.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info
+lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1
+lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2
@@ -1042,6 +1026,8 @@ lib/xemacs-%%XEMACS_VER%%/lisp/dump-paths.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/dumped-lisp.el
 lib/xemacs-%%XEMACS_VER%%/lisp/easymenu.el
 lib/xemacs-%%XEMACS_VER%%/lisp/easymenu.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/easy-mmode.el
+lib/xemacs-%%XEMACS_VER%%/lisp/easy-mmode.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/etags.el
 lib/xemacs-%%XEMACS_VER%%/lisp/etags.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/events.el
@@ -1331,6 +1317,8 @@ 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/regexp-opt.el
+lib/xemacs-%%XEMACS_VER%%/lisp/regexp-opt.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/register.el
 lib/xemacs-%%XEMACS_VER%%/lisp/register.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/replace.el
diff --git a/editors/xemacs-devel-mule/pkg-plist.arch-dep b/editors/xemacs-devel-mule/pkg-plist.arch-dep
index ee718e9f5d4b..bd27a7c7af4e 100644
--- a/editors/xemacs-devel-mule/pkg-plist.arch-dep
+++ b/editors/xemacs-devel-mule/pkg-plist.arch-dep
@@ -43,6 +43,7 @@ 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/compiler.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
@@ -63,6 +64,7 @@ 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/dump-data.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dumper.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/elhash.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/emodules.h
@@ -128,7 +130,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/dpx2.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/dual.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/elxsi.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/ews4800r.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/gec63.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/gould-np1.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/gould.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/hp300bsd.h
@@ -209,7 +210,9 @@ 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/ndir.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nt.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-gmp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-mp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number.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
@@ -388,6 +391,7 @@ 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
+%%WITH_PGSQL%%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