Update to 21.5.27.

This fixes PR 34197.

9 files changed, 57 insertions, 116 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 36028f238d0..ca224cab1bd 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2006/04/17 13:46:22 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2006/09/04 09:20:51 martin Exp $
 
-DISTNAME=	xemacs-21.5.19
-PKGREVISION=	4
+DISTNAME=	xemacs-21.5.27
 
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=xemacs-21.5/}
@@ -48,16 +47,19 @@ HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--with-clash-detection
-CONFIGURE_ARGS+=	--error-checking=none
 CONFIGURE_ARGS+=	--with-mule=yes
 CONFIGURE_ARGS+=	--without-ncurses
 CONFIGURE_ARGS+=	--without-msw
 CONFIGURE_ARGS+=	${WITH_WIDGETS}
-CONFIGURE_ARGS+=	--infopath=${INFOPATH:Q}
-CONFIGURE_ARGS+=	--site-includes=${PREFIX}/include:${WRKDIR}
-CONFIGURE_ARGS+=	--site-libraries=${PREFIX}/lib
+CONFIGURE_ARGS+=	--with-infopath=${INFOPATH:Q}
+CONFIGURE_ARGS+=	--with-site-includes=${PREFIX}/include:${WRKDIR}
+CONFIGURE_ARGS+=	--with-site-libraries=${PREFIX}/lib
 
 CFLAGS+=		-Dunix
+# newer gcc has big trouble with aliasing otherwise - this should be fixed
+# in the source, but untill then, use the big hammer here:
+CFLAGS+=		-fno-strict-aliasing
+
 INFO_FILES=		# PLIST
 
 post-patch:
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index 27780d88765..fef0627df9c 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.16 2005/03/02 22:05:19 magick Exp $
+$NetBSD: distinfo,v 1.17 2006/09/04 09:20:51 martin Exp $
 
-SHA1 (xemacs-21.5.19.tar.gz) = d9ad416b2b4aa2d0363b8d561e79d86b4197941d
-RMD160 (xemacs-21.5.19.tar.gz) = 1f0edb959baaefa41985eee4957c20c94529c84d
-Size (xemacs-21.5.19.tar.gz) = 15564957 bytes
-SHA1 (patch-aa) = e344bd0283c0cd30e99e8573ad2d6b8a22a519cc
-SHA1 (patch-ab) = a307cc77bf7136c28d374b50bd0524a1b0ca329e
-SHA1 (patch-ac) = 1ffaa2c5c425de6abd8f76d262762d21d8c7d0af
-SHA1 (patch-ad) = 14c5e0f31801648fbdb7f96e5d26cb505a59b741
+SHA1 (xemacs-21.5.27.tar.gz) = 55fc3e9c8fe3cac92791ffe1a0870aeae1baf0b8
+RMD160 (xemacs-21.5.27.tar.gz) = ee0caff8730c999d37aa3a19b19f23d5756837ad
+Size (xemacs-21.5.27.tar.gz) = 15042023 bytes
+SHA1 (patch-aa) = 5e099de33676099916771080c606046ca9acdac6
+SHA1 (patch-ab) = a9e74f1271150845eb858582e8f65a47c64c8c6b
+SHA1 (patch-ac) = 9a480bf587e1b7e3fb15724433ca706f1848182e
+SHA1 (patch-ad) = 244ddfebb25ccca7b34b308cced61f256b50d0a7
 SHA1 (patch-ae) = 902a375f974e06eb5d67b69deadead98c625d97a
 SHA1 (patch-af) = e71e89be5ce6070bca4b4ab8456f92cf52c50c6e
-SHA1 (patch-ag) = cd4e13ebaa9ff13c3987eddc427998a3765da259
-SHA1 (patch-ah) = ff4490952e304d075a24d89b685f46702044d8e1
+SHA1 (patch-ag) = f859010a113a9765819f92c79ce905cf4fd801dd
+SHA1 (patch-ah) = 53d806344f2429d26ee8a10005d1087d84fb0321
diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk
index 4226bab335d..8e63b89637f 100644
--- a/editors/xemacs-current/options.mk
+++ b/editors/xemacs-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2006/08/14 14:22:23 martin Exp $
+# $NetBSD: options.mk,v 1.8 2006/09/04 09:20:51 martin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS=	esound ldap xface canna debug
@@ -33,6 +33,6 @@ CONFIGURE_ARGS+=	--with-sound=none
 #.endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=	--debug
+CONFIGURE_ARGS+=	--enable-debug=yes --with-debug
 .endif
 
diff --git a/editors/xemacs-current/patches/patch-aa b/editors/xemacs-current/patches/patch-aa
index db7c415f66c..2c8878b89d0 100644
--- a/editors/xemacs-current/patches/patch-aa
+++ b/editors/xemacs-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/11/25 18:09:07 magick Exp $
+$NetBSD: patch-aa,v 1.5 2006/09/04 09:20:51 martin Exp $
 
---- Makefile.in.in.orig	2004-09-10 13:58:08.000000000 +0200
-+++ Makefile.in.in
-@@ -456,8 +456,13 @@ install-arch-indep: mkdir info
+--- Makefile.in.in.orig	2005-12-31 13:41:23.000000000 +0100
++++ Makefile.in.in	2006-08-30 17:24:05.000000000 +0200
+@@ -462,8 +462,13 @@
  	fi
  	cd ${srcdir}/etc && \
  	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
diff --git a/editors/xemacs-current/patches/patch-ab b/editors/xemacs-current/patches/patch-ab
index c5572e0be30..7d91c357c90 100644
--- a/editors/xemacs-current/patches/patch-ab
+++ b/editors/xemacs-current/patches/patch-ab
@@ -1,86 +1,22 @@
-$NetBSD: patch-ab,v 1.4 2004/11/25 18:09:07 magick Exp $
+$NetBSD: patch-ab,v 1.5 2006/09/04 09:20:51 martin Exp $
 
---- configure.orig	2004-10-22 07:16:35.000000000 +0200
-+++ configure
-@@ -1149,6 +1149,7 @@ echo "$ac_t""$configuration" 1>&6
- machine='' opsys=''
- 
- case "$canonical" in
-+  arm-*-*         ) machine=arm ;;
-   sparc-*-*        ) machine=sparc ;;
-   alpha*-*-*       ) machine=alpha ;;
-   vax-*-*          ) machine=vax ;;
-@@ -1221,9 +1222,10 @@ case "$canonical" in
-     case "$canonical" in
+--- configure.orig	2006-05-16 06:16:04.000000000 +0200
++++ configure	2006-08-30 17:46:21.000000000 +0200
+@@ -4415,7 +4415,7 @@
+     case "${ac_cv_build}" 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
-   ;;
- 
-@@ -3367,7 +3369,7 @@ echo "configure:3365: checking "for runt
+@@ -9735,7 +9735,7 @@
      decosf* | linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
 -      for try_dash_r in "-R" "-R " "-rpath "; do
-+      for try_dash_r in "-Wl,R" "-R " "-R " "-rpath "; do
++      for try_dash_r in "-Wl,R" "-R" "-R " "-rpath "; do
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
-         
- if test "$GCC" = "yes"; then
-@@ -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"
-+ #include "confdefs.h"
-+ /* 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; }
-+ EOF
-+ if { (eval echo configure:10931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+   echo "configure: failed program was:" >&5
-+   cat conftest.$ac_ext >&5
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=no"
-+ 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\""
-@@ -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
-+s%@LIBOSSAUDIO@%$LIBOSSAUDIO%g
- s%@have_esd_config@%$have_esd_config%g
- s%@SRC_SUBDIR_DEPS@%$SRC_SUBDIR_DEPS%g
- s%@INSTALL_ARCH_DEP_SUBDIR@%$INSTALL_ARCH_DEP_SUBDIR%g
+ if test "$GCC" = "yes"; then
diff --git a/editors/xemacs-current/patches/patch-ac b/editors/xemacs-current/patches/patch-ac
index b1f0134faf4..2e986434d04 100644
--- a/editors/xemacs-current/patches/patch-ac
+++ b/editors/xemacs-current/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2003/01/18 05:45:44 uebayasi Exp $
+$NetBSD: patch-ac,v 1.3 2006/09/04 09:20:51 martin Exp $
 
---- lib-src/Makefile.in.in.orig	Fri Apr 26 03:03:23 2002
-+++ lib-src/Makefile.in.in
-@@ -66,7 +66,7 @@
+--- lib-src/Makefile.in.in.orig	2005-11-22 08:14:42.000000000 +0100
++++ lib-src/Makefile.in.in	2006-08-30 17:49:52.000000000 +0200
+@@ -67,7 +67,7 @@
  INSTALL = @install_pp@ @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.2 2003/01/18 05:45:44 uebayasi Exp $
  ## ========================== Lists of Files ===========================
  
  #define NO_SHORTNAMES
-@@ -237,7 +237,7 @@
+@@ -242,7 +242,7 @@
  
  ## Install the internal utilities.  Until they are installed, we can
  ## just run them directly from lib-src.
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.2 2003/01/18 05:45:44 uebayasi Exp $
  	@echo; echo "Installing utilities run internally by XEmacs."
  	./make-path ${archlibdir}
  	if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
-@@ -248,17 +248,27 @@
+@@ -253,17 +253,27 @@
  	if test "`(cd ${archlibdir} && $(pwd))`" \
  	     != "`(cd ${srcdir}     && $(pwd))`"; then \
  	  for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \
diff --git a/editors/xemacs-current/patches/patch-ad b/editors/xemacs-current/patches/patch-ad
index 099e3a0fe04..9f2b887eba2 100644
--- a/editors/xemacs-current/patches/patch-ad
+++ b/editors/xemacs-current/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/03/24 19:40:33 magick Exp $
+$NetBSD: patch-ad,v 1.2 2006/09/04 09:20:51 martin Exp $
 
---- src/unexelf.c.orig	Thu Apr 12 20:24:27 2001
-+++ src/unexelf.c
-@@ -481,10 +481,19 @@
+--- src/unexelf.c.orig	2005-10-29 09:18:21.000000000 +0200
++++ src/unexelf.c	2006-08-30 17:51:08.000000000 +0200
+@@ -492,10 +492,19 @@
  
  #ifndef ElfW
  # ifdef __STDC__
@@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/03/24 19:40:33 magick Exp $
  #endif
  
  #ifndef ELF_BSS_SECTION_NAME
-@@ -952,7 +961,7 @@
+@@ -961,7 +970,7 @@
        memcpy (NEW_SECTION_H (nn).sh_offset + new_base, src,
  	      NEW_SECTION_H (nn).sh_size);
  
diff --git a/editors/xemacs-current/patches/patch-ag b/editors/xemacs-current/patches/patch-ag
index e6fcbf7ce5f..cd68a6c164c 100644
--- a/editors/xemacs-current/patches/patch-ag
+++ b/editors/xemacs-current/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2003/04/23 22:54:43 martin Exp $
+$NetBSD: patch-ag,v 1.2 2006/09/04 09:20:51 martin Exp $
 
---- src/event-xlike-inc.c.orig	2003-04-23 23:17:05.000000000 +0200
-+++ src/event-xlike-inc.c	2003-04-23 23:39:47.000000000 +0200
-@@ -22,12 +22,63 @@
+--- src/event-xlike-inc.c.orig	2005-06-26 20:05:04.000000000 +0200
++++ src/event-xlike-inc.c	2006-08-30 17:59:31.000000000 +0200
+@@ -22,6 +22,58 @@
  
  /* Synched up with: Not in FSF. */
  
@@ -57,10 +57,13 @@ $NetBSD: patch-ag,v 1.1 2003/04/23 22:54:43 martin Exp $
 +
 +static int last_quit_check_signal_tick_count;
 +
++
  /* For some code it's reasonable to have only one copy and conditionalize
     at run-time.  For other code it isn't. #### Perhaps all code should be
     included here, not in event-xlike.c.  However, event-xlike.c is always
-    X-specific, whereas the following code isn't, in the GTK case. */
+@@ -29,7 +81,7 @@
+ 
+ EXFUN (Funicode_to_char, 2);  /* In unicode.c.  */
  
 -static int
 +int
diff --git a/editors/xemacs-current/patches/patch-ah b/editors/xemacs-current/patches/patch-ah
index 9db91c7b63b..2e9219a2469 100644
--- a/editors/xemacs-current/patches/patch-ah
+++ b/editors/xemacs-current/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2005/01/22 13:03:06 magick Exp $
+$NetBSD: patch-ah,v 1.2 2006/09/04 09:20:51 martin Exp $
 
---- src/mule-canna.c.orig	2004-09-20 21:19:52.000000000 +0200
-+++ src/mule-canna.c
-@@ -438,7 +438,9 @@ If nil is specified for each arg, the de
+--- modules/canna/canna_api.c.orig	2005-11-16 08:14:16.000000000 +0100
++++ modules/canna/canna_api.c	2006-08-30 18:05:00.000000000 +0200
+@@ -437,7 +437,9 @@
      }
    else
      {