Update xemacs to 21.4.15. Approved by uebayasi@.

Changes in this version:
 	* etc/OXYMORONS: Inserted "Corporate Culture" for 21.4.15.
	* etc/package-index.LATEST.gpg: New, replaces
	`package-index.LATEST.pgp'.
	* etc/package-index.LATEST.pgp: Removed, replaced with
	`package-index.LATEST.gpg'.
	* configure.in: The icc compiler pretends to be gcc.  It isn't.
	* etc/PACKAGES (ERC): new.
	* configure.usage (--with-widgets): widgets now defaults to
	--with-widgets=no.  Patch inspired by Jim Schumacher.
	* etc/PACKAGES (riece): New package.
	* etc/PACKAGES (liece): Mark as deprecated.
	* configure.in: Add Intel C++ compiler detection to compiler
	version reporting.
	* configure.in: record additional info about compiler and libc
	versions, to assist in debugging.
	* configure.in (line 3573):
	(Mule input methods):
	Deprecate Motif for Linux.
	(Installation): Report when LessTif is used.
	* configure.in: installexe.sh is under srcdir, not blddir.
	* aclocal.m4: Add icc (Intel compiler) support.
	* configure.in: Ditto.
	* configure.in (OS_RELEASE): Add support for SunOS 5.10.
	On current OSes produced by Sun, `uname -r' prints "5.9".
	It seems likely that on future OSes, `uname -r' will print "5.10".
	We need to accept multi-digit release numbers.
	* PROBLEMS: Propose bash as an alternative to buggy Solaris
	/bin/sh.
	* configure.in: XEmacs failed to build on Solaris9.

2 files changed, 16 insertions, 16 deletions

diff --git a/editors/xemacs/patches/patch-aa b/editors/xemacs/patches/patch-aa
index aa45eb3ffd9..a1c69a195a1 100644
--- a/editors/xemacs/patches/patch-aa
+++ b/editors/xemacs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
+$NetBSD: patch-aa,v 1.5 2004/02/09 07:54:58 minskim Exp $
 
---- configure.orig	Thu Jan 16 01:45:58 2003
+--- configure.orig	2004-01-23 22:34:33.000000000 -0600
 +++ configure
-@@ -1128,6 +1128,7 @@
+@@ -1130,6 +1130,7 @@ echo "$ac_t""$configuration" 1>&6
  machine='' opsys=''
  
  case "$canonical" in
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
    sparc-*-*        ) machine=sparc ;;
    alpha*-*-*       ) machine=alpha ;;
    vax-*-*          ) machine=vax ;;
-@@ -1200,9 +1201,10 @@
+@@ -1202,9 +1203,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* )
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
      esac
    ;;
  
-@@ -3110,7 +3112,7 @@
+@@ -3134,7 +3136,7 @@ echo "configure:3132: checking "for runt
      decosf* | linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
          
  if test "$GCC" = "yes"; then
-@@ -13830,6 +13832,41 @@
+@@ -14057,6 +14059,41 @@ else   for feature in ncurses gpm; do
      eval "with_${feature}=no"
    done
  fi 
@@ -73,7 +73,7 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
  test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" && extra_objs="$extra_objs event-unixoid.o" &&  if test "$extra_verbose" = "yes"; then
     echo "    xemacs will be linked with \"event-unixoid.o\""
   fi
-@@ -16087,6 +16124,7 @@
+@@ -16477,6 +16514,7 @@ s%@libs_xauth@%$libs_xauth%g
  s%@dnd_objs@%$dnd_objs%g
  s%@lwlib_objs@%$lwlib_objs%g
  s%@ALLOCA@%$ALLOCA%g
diff --git a/editors/xemacs/patches/patch-af b/editors/xemacs/patches/patch-af
index b0b13ddcd16..8a8d0aa8c74 100644
--- a/editors/xemacs/patches/patch-af
+++ b/editors/xemacs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
+$NetBSD: patch-af,v 1.5 2004/02/09 07:54:58 minskim Exp $
 
---- configure.in.orig	Tue Jan  7 12:57:03 2003
+--- configure.in.orig	2004-01-23 22:37:54.000000000 -0600
 +++ configure.in
-@@ -1079,6 +1079,7 @@
+@@ -1082,6 +1082,7 @@ machine='' opsys=''
  
  dnl Straightforward machine determination
  case "$canonical" in
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
    sparc-*-*        ) machine=sparc ;;
    alpha*-*-*       ) machine=alpha ;;
    vax-*-*          ) machine=vax ;;
-@@ -1157,10 +1158,10 @@
+@@ -1160,10 +1161,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* )
@@ -23,7 +23,7 @@ $NetBSD: patch-af,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
      esac
    ;;
  
-@@ -2224,7 +2225,7 @@
+@@ -2244,7 +2245,7 @@ if test "$add_runtime_path" = "yes"; the
      decosf* | linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
@@ -32,13 +32,13 @@ $NetBSD: patch-af,v 1.4 2003/02/25 02:14:59 uebayasi Exp $
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
          XE_PROTECT_LINKER_FLAGS(xe_check_libs)
          AC_TRY_LINK(, , dash_r="$try_dash_r")
-@@ -4320,6 +4321,9 @@
-     eval "with_${feature}=no"
+@@ -4395,6 +4396,9 @@ else dnl "$with_tty" = "no"
    done
  fi dnl with_tty
-+
+ 
 +AC_CHECK_LIB(ossaudio, main, LIBOSSAUDIO=-lossaudio)
 +AC_SUBST(LIBOSSAUDIO)
- 
++
  dnl Do we need event-unixoid.o ?
  dnl This is needed for X, or for TTY, or for MSWIN w/Cygwin select()
+ dnl [but not Mingw MSWIN]