Update xemacs-current to 21.5.18

From the Releasenotes:
Relative to XEmacs 21.5.17 "chayote", "chestnut" has Jerry James's new
bignum support.  You can now keep track of the U.S. national debt to
the penny, or count to Avogadro's number by ones!  Speaking of really
big numbers, Malcolm Purvis has one in mind: "two".  To GTK+ fans,
that's an awfully big number.  It's not here yet, but Malcolm has put
in a lot of patches, and a port to GTK+ v2 could start soon.  Jerry
James has started using the Uno code checker to clean up unused
variables and other ugliness.  Completion of the portable dumper
project is in sight, as Olivier Galibert has contributed code to
attach the dumpfile to the executable.

A large number of contributors have provided the usual assortment of
bug fixes and feature additions, small and large.

5 files changed, 40 insertions, 32 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index e560f53937d..e9f84ef5147 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.40 2004/10/03 00:14:39 tv Exp $
+# $NetBSD: Makefile,v 1.41 2004/11/25 18:09:06 magick Exp $
 
-DISTNAME=	xemacs-21.5.17
-PKGREVISION=	1
+DISTNAME=	xemacs-21.5.18
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=xemacs-21.5/}
 
 MAINTAINER=	magick@NetBSD.org
 HOMEPAGE=	http://www.xemacs.org/
-COMMENT=	*BETA* XEmacs text editor version 21.5.17
+COMMENT=	*BETA* XEmacs text editor version 21.5.18
 
 USE_BUILDLINK3=	YES
 USE_X11=	YES
 
 BUILD_DEFS+=	XEMACS_WIDGETS XEMACS_ESD USE_OPENLDAP USE_XFACE XEMACS_USE_CANNA
-PLIST_SUBST+=	EMACSVER=xemacs-21.5-b17
-MESSAGE_SUBST+=	EMACSVER=xemacs-21.5-b17
+PLIST_SUBST+=	EMACSVER=xemacs-21.5-b18
+MESSAGE_SUBST+=	EMACSVER=xemacs-21.5-b18
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=		2.95.3
diff --git a/editors/xemacs-current/PLIST b/editors/xemacs-current/PLIST
index a15a0f894b7..7227f56a147 100644
--- a/editors/xemacs-current/PLIST
+++ b/editors/xemacs-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/04/04 16:12:01 magick Exp $
+@comment $NetBSD: PLIST,v 1.15 2004/11/25 18:09:06 magick Exp $
 bin/${EMACSVER}
 bin/ellcc
 bin/gnuattach
@@ -67,8 +67,9 @@ lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/device-impl.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/device.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/devslots.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/dragdrop.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/dumper.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/elhash.h
+lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/dump-data.h
+lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/dumper.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/emodules.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/event-gtk.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/events.h
@@ -169,6 +170,9 @@ lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m/nh4000.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m/ns16000.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m/ns32000.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m/nu.h
+lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/number-gmp.h
+lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/number-mp.h
+lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/number.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m/orion.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m/orion105.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m/paragon.h
@@ -408,8 +412,9 @@ lib/${EMACSVER}/etc/COPYING.LIB
 lib/${EMACSVER}/etc/ChangeLog
 lib/${EMACSVER}/etc/DEBUG
 lib/${EMACSVER}/etc/DISTRIB
-lib/${EMACSVER}/etc/Emacs.ad
 lib/${EMACSVER}/etc/FTP
+lib/${EMACSVER}/etc/ETAGS.EBNF
+lib/${EMACSVER}/etc/Emacs.ad
 lib/${EMACSVER}/etc/GNU
 lib/${EMACSVER}/etc/HELLO
 lib/${EMACSVER}/etc/InstallGuide
@@ -511,6 +516,7 @@ lib/${EMACSVER}/etc/eos/eos-stop.xbm
 lib/${EMACSVER}/etc/eos/eos-type.xbm
 lib/${EMACSVER}/etc/eos/eos-up.xbm
 lib/${EMACSVER}/etc/etags.1
+lib/${EMACSVER}/etc/gtkrc
 lib/${EMACSVER}/etc/gnu.xbm
 lib/${EMACSVER}/etc/gnu.xpm
 lib/${EMACSVER}/etc/gnuattach.1
@@ -892,6 +898,7 @@ lib/${EMACSVER}/info/lispref.info-6
 lib/${EMACSVER}/info/lispref.info-7
 lib/${EMACSVER}/info/lispref.info-8
 lib/${EMACSVER}/info/lispref.info-9
+lib/${EMACSVER}/info/lispref.info-10
 lib/${EMACSVER}/info/new-users-guide.info
 lib/${EMACSVER}/info/standards.info
 lib/${EMACSVER}/info/term.info
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index 465b4bd7d08..3b3e8751f0d 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2004/04/04 16:12:01 magick Exp $
+$NetBSD: distinfo,v 1.13 2004/11/25 18:09:06 magick Exp $
 
-SHA1 (xemacs-21.5.17.tar.gz) = 0952c508636276f4b08a43019c9a034913a8784f
-Size (xemacs-21.5.17.tar.gz) = 13818839 bytes
-SHA1 (patch-aa) = 48f0b47ff872338587b3118075e10413febf2639
-SHA1 (patch-ab) = 62a968f19d1b2b9efc5f8c3cf3e612f6a1dc7df2
+SHA1 (xemacs-21.5.18.tar.gz) = b149d1854d71fe1a04a40a9734689876d0140f22
+Size (xemacs-21.5.18.tar.gz) = 14985234 bytes
+SHA1 (patch-aa) = e344bd0283c0cd30e99e8573ad2d6b8a22a519cc
+SHA1 (patch-ab) = a307cc77bf7136c28d374b50bd0524a1b0ca329e
 SHA1 (patch-ac) = 1ffaa2c5c425de6abd8f76d262762d21d8c7d0af
 SHA1 (patch-ad) = 14c5e0f31801648fbdb7f96e5d26cb505a59b741
 SHA1 (patch-ae) = 902a375f974e06eb5d67b69deadead98c625d97a
diff --git a/editors/xemacs-current/patches/patch-aa b/editors/xemacs-current/patches/patch-aa
index 09cb1aefaf1..db7c415f66c 100644
--- a/editors/xemacs-current/patches/patch-aa
+++ b/editors/xemacs-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/01/19 06:52:56 salo Exp $
+$NetBSD: patch-aa,v 1.4 2004/11/25 18:09:07 magick Exp $
 
---- Makefile.in.in.orig	Sat Jan 18 12:23:29 2003
+--- Makefile.in.in.orig	2004-09-10 13:58:08.000000000 +0200
 +++ Makefile.in.in
-@@ -477,8 +477,12 @@
+@@ -456,8 +456,13 @@ install-arch-indep: mkdir info
  	fi
  	cd ${srcdir}/etc && \
  	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
@@ -14,6 +14,7 @@ $NetBSD: patch-aa,v 1.3 2003/01/19 06:52:56 salo Exp $
 +           else \
 +             ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
 +           fi \
++
  	  done
- 	@echo "If you would like to save approximately 2M of disk space, do"
+ 	@echo "If you would like to save approximately 4M of disk space, do"
  	@echo "make gzip-el"
diff --git a/editors/xemacs-current/patches/patch-ab b/editors/xemacs-current/patches/patch-ab
index 19e18970270..c5572e0be30 100644
--- a/editors/xemacs-current/patches/patch-ab
+++ b/editors/xemacs-current/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2003/01/18 05:45:43 uebayasi Exp $
+$NetBSD: patch-ab,v 1.4 2004/11/25 18:09:07 magick Exp $
 
---- configure.orig	Mon Dec 16 11:33:04 2002
+--- configure.orig	2004-10-22 07:16:35.000000000 +0200
 +++ configure
-@@ -1159,6 +1159,7 @@
+@@ -1149,6 +1149,7 @@ echo "$ac_t""$configuration" 1>&6
  machine='' opsys=''
  
  case "$canonical" in
@@ -10,19 +10,19 @@ $NetBSD: patch-ab,v 1.3 2003/01/18 05:45:43 uebayasi Exp $
    sparc-*-*        ) machine=sparc ;;
    alpha*-*-*       ) machine=alpha ;;
    vax-*-*          ) machine=vax ;;
-@@ -1231,9 +1232,10 @@
+@@ -1221,9 +1222,10 @@ case "$canonical" in
      case "$canonical" in
        i[3-9]86-*-netbsd*) machine=intel386 ;;
        hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
 -                                            machine=hp9000s300 ;;
-+	machine=m68k ;;
++      machine=m68k ;;
        pc532-*-netbsd* | ns32k-*-netbsd* )  machine=ns32000 ;;
        pmax-*-netbsd*  | mips-*-netbsd*  )  machine=pmax ;;
 +      alpha-*-netbsd* ) machine=alpha ;;
      esac
    ;;
  
-@@ -3207,7 +3209,7 @@
+@@ -3367,7 +3369,7 @@ echo "configure:3365: checking "for runt
      decosf* | linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
@@ -31,14 +31,14 @@ $NetBSD: patch-ab,v 1.3 2003/01/18 05:45:43 uebayasi Exp $
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
          
  if test "$GCC" = "yes"; then
-@@ -14233,6 +14235,43 @@
+@@ -14799,6 +14801,44 @@ EOF
+     with_esd_sound=no
    fi
  fi
- 
 + echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
 + echo "configure:10915: checking for main in -lossaudio" >&5
 + ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
-+ 
++
 + xe_check_libs=" -lossaudio "
 + cat > conftest.$ac_ext <<EOF
 + #line 10920 "configure"
@@ -46,7 +46,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/18 05:45:43 uebayasi Exp $
 + /* Override any gcc2 internal prototype to avoid an error.  */
 + /* We use char because int might match the return type of a gcc2
 +     builtin and then its argument prototype would still apply.  */
-+ 
++
 + int main() {
 + main()
 + ; return 0; }
@@ -62,20 +62,21 @@ $NetBSD: patch-ab,v 1.3 2003/01/18 05:45:43 uebayasi Exp $
 + fi
 + rm -f conftest*
 + xe_check_libs=""
-+ 
++
 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 +   echo "$ac_t""yes" 1>&6
 +   LIBOSSAUDIO=-lossaudio
 + else
 +   echo "$ac_t""no" 1>&6
 + fi
-+ 
++
 +
 +EOF
++
+ 
  test "$need_miscplay" = "yes" && extra_objs="$extra_objs miscplay.o" &&  if test "$extra_verbose" = "yes"; then
     echo "    xemacs will be linked with \"miscplay.o\""
-  fi
-@@ -16072,6 +16111,7 @@
+@@ -17085,6 +17125,7 @@ s%@ldap_libs@%$ldap_libs%g
  s%@postgresql_libs@%$postgresql_libs%g
  s%@lwlib_objs@%$lwlib_objs%g
  s%@ALLOCA@%$ALLOCA%g