6 files changed, 80 insertions, 127 deletions

diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 4c63775a7992..1fc1b9c1cb31 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	xemacs-mule
 PORTVERSION=	${XEMACS_VER}
-PORTREVISION=	1
 .if defined(WNN6)
 .endif
 CATEGORIES+=	editors
@@ -18,7 +17,7 @@ DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
 		${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX}
 DIST_SUBDIR=	xemacs
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	anray@inet.ua
 COMMENT?=	XEmacs(stable version) text editor with mule(Only the executables)
 
 USE_GNOME=	#
@@ -39,7 +38,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 XEMACS_MAJOR_VER?=	21
 XEMACS_REL=		${XEMACS_MAJOR_VER}.4
-XEMACS_VER=		${XEMACS_MAJOR_VER}.4.14
+XEMACS_VER=		${XEMACS_MAJOR_VER}.4.16
 XEMACS_ARCH=		${CONFIGURE_TARGET}
 
 USE_GETTEXT=	yes
@@ -91,7 +90,7 @@ PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
 # 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:
@@ -171,9 +170,9 @@ WITH_INPUT_METHOD?=	--with-canna=no --with-wnn=no --with-wnn6=no
 
 # fix .so references in a few man pages
 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}
+.for f in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1
+	@${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${f} > ${WRKDIR}/tmp_zot
+	@${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${f}
 .endfor
 
 pre-build:
@@ -182,8 +181,8 @@ pre-build:
 	@${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}
+.for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
+	${STRIP_CMD} ${PREFIX}/bin/${f}
 .endfor
 # For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
 # Do what PLIST does for pkg_add.
diff --git a/editors/xemacs21-mule/distinfo b/editors/xemacs21-mule/distinfo
index 46ecac3f0101..43ec1a6e9f33 100644
--- a/editors/xemacs21-mule/distinfo
+++ b/editors/xemacs21-mule/distinfo
@@ -1,6 +1,6 @@
-MD5 (xemacs/xemacs-21.4.14-src.tar.gz) = 6034fbaf3934361b4d1c5ff9ee1979da
-SIZE (xemacs/xemacs-21.4.14-src.tar.gz) = 8092804
-MD5 (xemacs/xemacs-21.4.14-elc.tar.gz) = 05408e9bb2c0a199528fa463c766a890
-SIZE (xemacs/xemacs-21.4.14-elc.tar.gz) = 925908
-MD5 (xemacs/xemacs-21.4.14-info.tar.gz) = 421d51e90577c71c453c42a201afe64f
-SIZE (xemacs/xemacs-21.4.14-info.tar.gz) = 1663979
+MD5 (xemacs/xemacs-21.4.16-src.tar.gz) = 547f0dacceacfe013a1cee21bc0e859e
+SIZE (xemacs/xemacs-21.4.16-src.tar.gz) = 8315419
+MD5 (xemacs/xemacs-21.4.16-elc.tar.gz) = daa608da30d3b75dbcb59befe8c1a3c6
+SIZE (xemacs/xemacs-21.4.16-elc.tar.gz) = 931295
+MD5 (xemacs/xemacs-21.4.16-info.tar.gz) = 2af10831789ab70ba866f2660263ff08
+SIZE (xemacs/xemacs-21.4.16-info.tar.gz) = 1632145
diff --git a/editors/xemacs21-mule/files/patch-etags.c b/editors/xemacs21-mule/files/patch-etags.c
new file mode 100644
index 000000000000..468f3e4a4b4c
--- /dev/null
+++ b/editors/xemacs21-mule/files/patch-etags.c
@@ -0,0 +1,29 @@
+Index: lib-src/etags.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
+retrieving revision 1.24.2.2
+retrieving revision 1.24.2.3
+diff -u -r1.24.2.2 -r1.24.2.3
+--- lib-src/etags.c	2004/06/24 04:02:29	1.24.2.2
++++ lib-src/etags.c	2004/12/17 23:03:25	1.24.2.3
+@@ -5146,6 +5146,7 @@
+      bool ignore_case;
+      language *lang;
+ {
++  static struct re_pattern_buffer zeropattern;
+   char *name;
+   const char *err;
+   struct re_pattern_buffer *patbuf;
+@@ -5166,11 +5167,9 @@
+   (void) scan_separators (name);
+ 
+   patbuf = xnew (1, struct re_pattern_buffer);
++  *patbuf = zeropattern;
+   /* Translation table to fold case if appropriate. */
+   patbuf->translate = (ignore_case) ? lc_trans : NULL;
+-  patbuf->fastmap = NULL;
+-  patbuf->buffer = NULL;
+-  patbuf->allocated = 0;
+ 
+   err = re_compile_pattern (regexp_pattern, strlen (regexp_pattern), patbuf);
+   if (err != NULL)
diff --git a/editors/xemacs21-mule/files/patch-mem-limits.h b/editors/xemacs21-mule/files/patch-mem-limits.h
deleted file mode 100644
index a5ce6cb35839..000000000000
--- a/editors/xemacs21-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/xemacs21-mule/files/patch-regex.c b/editors/xemacs21-mule/files/patch-regex.c
new file mode 100644
index 000000000000..6a4e854c5955
--- /dev/null
+++ b/editors/xemacs21-mule/files/patch-regex.c
@@ -0,0 +1,33 @@
+Index: regex.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
+retrieving revision 1.25.2.10
+retrieving revision 1.25.2.9
+diff -u -r1.25.2.10 -r1.25.2.9
+--- src/regex.c	2004/10/08 00:40:33	1.25.2.10
++++ src/regex.c	2004/09/23 03:03:43	1.25.2.9
+@@ -4766,20 +4766,16 @@
+ 
+ 		/* Go through the first `min (num_regs, regs->num_regs)'
+ 		   registers, since that is all we initialized.  */
+-		for (mcnt = 1;
+-		     mcnt < MIN (num_nonshy_regs, regs->num_regs);
+-		     mcnt++)
++		for (mcnt = 1; mcnt < MIN (num_regs, regs->num_regs); mcnt++)
+ 		  {
+-		    int ireg = bufp->external_to_internal_register[mcnt];
+-
+-		    if (REG_UNSET (regstart[ireg]) || REG_UNSET (regend[ireg]))
++		    if (REG_UNSET (regstart[mcnt]) || REG_UNSET (regend[mcnt]))
+ 		      regs->start[mcnt] = regs->end[mcnt] = -1;
+ 		    else
+ 		      {
+ 			regs->start[mcnt]
+-			  = (regoff_t) POINTER_TO_OFFSET (regstart[ireg]);
++			  = (regoff_t) POINTER_TO_OFFSET (regstart[mcnt]);
+ 			regs->end[mcnt]
+-			  = (regoff_t) POINTER_TO_OFFSET (regend[ireg]);
++			  = (regoff_t) POINTER_TO_OFFSET (regend[mcnt]);
+ 		      }
+ 		  }
+ 	      } /* regs && !bufp->no_sub */
diff --git a/editors/xemacs21-mule/pkg-plist b/editors/xemacs21-mule/pkg-plist
index 5ec6a9047461..46d8523d7965 100644
--- a/editors/xemacs21-mule/pkg-plist
+++ b/editors/xemacs21-mule/pkg-plist
@@ -151,11 +151,12 @@ 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.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
@@ -780,12 +781,6 @@ 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/cl.info
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-1
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-2
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-3
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-4
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-5
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-6
 lib/xemacs-%%XEMACS_VER%%/info/custom.info
 lib/xemacs-%%XEMACS_VER%%/info/dir
 lib/xemacs-%%XEMACS_VER%%/info/emodules.info
@@ -794,123 +789,30 @@ 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/internals.info-6
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-7
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-8
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-9
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-11
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-12
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-13
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-14
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-15
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-16
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-17
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-18
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-19
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-20
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-21
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-22
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-23
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-24
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-25
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-26
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-27
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-28
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-29
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-30
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-31
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-32
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-33
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-34
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-35
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-36
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-37
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-38
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-39
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-40
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-41
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-42
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-43
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-44
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-45
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-46
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-47
-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-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/new-users-guide.info
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-1
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-2
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-3
 lib/xemacs-%%XEMACS_VER%%/info/standards.info
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-1
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-2
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-3
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-4
 lib/xemacs-%%XEMACS_VER%%/info/term.info
 lib/xemacs-%%XEMACS_VER%%/info/termcap.info
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-1
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-2
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-3
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-10
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-11
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-12
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-3
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-4
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-5
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-6
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-7
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-8
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-9
 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-faq.info-3
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-11
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-12
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-13
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-14
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-15
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-16
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-17
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-18
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-19
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2
-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-3
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-5
-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/ChangeLog
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
@@ -1182,7 +1084,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/arabic.elc
 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/chinese.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.el
@@ -1261,6 +1162,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/page.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.el
 lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/paths.el
+lib/xemacs-%%XEMACS_VER%%/lisp/paths.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/picture.el
 lib/xemacs-%%XEMACS_VER%%/lisp/picture.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/printer.el
@@ -1347,6 +1249,7 @@ 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/version.elc
 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