Update to XEmacs 21.5.10, "burdock".

Changes excerpted from ${WRKSRC}/CHANGES-beta.

---

Lots of updates from Ben Wing (as always), also from Andy Piper, Mike
Sperber, and Stephen Turnbull with lots of documentation updates and
fixes.  One new exciting addition in this release is that the LDAP and
PostgreSQL code has been extracted out of the core C code and moved to
DSO's.  We have Jerry James to thank/blame/worship for that.

Build

-- Reset sheap-adjustment to zero - Piper.
-- Make --pdump default to yes on Linux - Turnbull.
-- Only use -Wpacked in GCC v3 - Wing.
-- Remove LISP_FLOAT_TYPE definition. - James.
-- Temporarily disable DSO's under Cygwin - Wing.
-- Updates to DSO building code (Makefile.in, configure.in etc) - Wing, James.
-- Separate compiler warning flags from CFLAGS - Wing.
-- Delete auto-autoloads.e* & custom-load.e* on 'make clean' - Turnbull.
-- Disable detection of 'getaddrinfo' for HP-UX 11.XX - Turnbull.
-- Include modules directories in 'make tags' - Youngs.
-- Fix shadowing warnings in make-docfile.c - Wing.
-- Move the common stuff from postgresql/ldap Makefile.in.in &
     configure.ac's into a "common" Makefile and configure script -
     Wing.
-- Major cleanup of ellcc - Wing, James.
-- Add Makefile var to pick up '--site-libraries' in DSO's - Youngs.
-- Avoid unnecessary deviations from UNIX 'describe-installation' in
     xemacs.mak - Aichner.
-- Don't confirm overwriting files in xemacs.mak - Aichner.
-- Support 'xemacs_extra_name' in xemacs.mak - Aichner.
-- Some gcc/g++ 3 fixes - Wing.
-- Warning fixes - Wing.
-- Fix some C++ errors - Wing.
-- Allow for C needing volatile and C++ that can't have volatile,
     remove previous volatile hacks - Wing.
-- Try for a working Cygwin build with old unexec - Wing.
-- Warning suppression - Turnbull.
-- New Mule character class regexp tests - Turnbull, Ueno.
-- Better handling of known bugs in tests - Turnbull.
-- Add test for stale subexpr match-data - Turnbull.
-- Update syntax-table tests - Turnbull.
-- Add word-boundary regexp tests - Turnbull.

Documentation

-- Updates to PROBLEMS file
	Running/Linux - Lesstif 0.93.36 - Turnbull
	Running/IRIX - Irix 6.5 coredumps - Turnbull
	Running/Cygwin - "No cygXpm-noX" fatal error - Turnbull
	Missing charsets - Remove ambiguity - Turnbull
	Running, General - FontSet warnings - Turnbull
	MacOS/X - Stack limitation - Turnbull
	Digital Unix - Generalise - Turnbull
	AIX - USE_KKCC lossage - Turnbull.
-- Update instructions in info/dir - Wallington.
-- Recommend TeXinfo 4.2 in INSTALL - Turnbull.
-- Add example in sample.Xdefaults - Boffi.
-- Typo fixes - Yamaoka, Youngs, Turnbull, Wing.
-- Docstring fixes - Turnbull, Piper, Skyttä, Wing.
-- Update description of XEmacs Patches and Design ML's - Turnbull.
-- Incorportate ChangeLog.X into ChangeLog - Wing.
-- FAQ additions/amendments:
	Debugging FAQ improvements - Wing.
	Mention union type bugs - Turnbull.
	Debugging HOWTO improvements - Turnbull.
	Decoding Lisp objects in the debugger - Turnbull.
	Fix location of FAQ on website - Skyttä.
	Add missing menu entry for Q3.2.7 - Verna.
	Displaying non-ASCII - Turnbull.
	Mention bug report commands - Turnbull.
	Revise Q1.3.[1-6] - Turnbull.
	New FAQ for "no cygXpm-noX" fatal error - Turnbull.
-- New TeXinfo nodes:
	"Widget Internals" - Turnbull.
	"Simple Specifier Usage" - Turnbull.
	"Compilation Options" - Turnbull.
-- Document charset Unification and Tables - Turnbull.
-- Better short description of Mule in Mule submenu - Turnbull.
-- Regression Testing XEmacs design hints & rewrite - Turnbull.
-- Document 'face-frob-from-locale-first' - Golubev.
-- Document 'set-face-background-pixmap-file' - Verna.
-- Add urefs to Doug Lea's * Wolfram Gloger's home pages in "Low-Level
     Modules" - Turnbull.
-- Update "Available Packages" - Skyttä.
-- Document 'append' arg of 'add-to-list' - Skyttä.
-- Add optimisation hints in "Techniques for XEmacs Developers" - Turnbull.

Internals

-- Add *menubar*FontSet and *popup*FontSet entries - Turnbull, Skyttä.
-- Extract ldap and postgresql code from core and put them into DSO's - James.
-- 'Fset_window_point' Correct to GNU/Emacs behaviour (fixes some bugs
     in Gnus) - Wing.
-- Inhibit GC in critical sections - Wing.
-- Fix calculation in 'report_sheap_usage' - Piper.
-- Implement and use new var 'garbage_collection_messages' - Wallington.
-- Fix 'open_database' for Berkeley DB 4.1.x - Allen.
-- Updates to frame code - Sperber.
-- Change C debugger entrance: error message, then stack trace, then
     exiting message, then force debugger - Wing.
-- Use EQ not EQUAL in 'mswindows_init_frame_1' - Wing.
-- Better redisplay-related asserts - Wing.
-- Don't generate large warning strings when they'll be discarded - Wing.
-- Implement 'debug-on-error' as documented - Wing.
-- Fix docs relating to QUIT which can't GC under any circumstances - Wing.
-- More robust package compilation and debugging - Wing.
-- Overhaul profile code - Wing.
-- Fix crashes due to incorrectly ported GNU/Emacs code - Wing.
-- Clean up realpath.c - Wing.
-- DdeCreateStringHandle needs to be manual due to new Cygwin bug - Wing.
-- Fix some Cygwin complaints - Wing.
-- Unconditionally use LISP_FLOAT_TYPE code - James.
-- Improve crash message in 'shut_down_emacs' - Turnbull.
-- Update NAS code for NAS 1.6 and later - Toy.
-- Fix "unused variable" warnings in mule-canna.c - Turnbull.
-- Prototype 'enqueue_focus_event' - Turnbull.
-- Use BORDER_FIDDLE_FACTOR instead of 10 in 'layout_layout' - Piper.
-- Add optional 'noerror' arg to 'Frequire' - Wallington.
-- Only resize 'layout_query_geometry' dynamically if static sizes
     haven't been set - Piper.
-- Fix infloop upon a gdm logout - Sigelman.
-- Fix scope of 'num_nonshy_regs' - Turnbull.
-- Fix "stale match data" bug - Turnbull.
-- Don't call 'XtDisplay' on a destroyed widget - Golubev.
-- Update specifier code - Sperber.
-- Update process code - Sperber.
-- Move ldap/postgresql code out to DSO's - James.
-- Normalise Ffile_truename and drive spec on cygwing to win32 format
     - Piper.
-- Use 'closesocket' instead of 'CloseHandle' in 'winsock_closer' - Alexander.
-- Coding system updates - Ikiuo.

Lisp API

-- Update window-xemacs.el to fix 'goto-line' - Wing.
-- Add garbage collection messages - Wallington.
-- Re-implement window configurations in Emacs Lisp - Sperber.
-- Enhance background-pixmap-file code - Verna.
-- New macro 'save-window-excursion' to eventually replace bytecode
     instruction - Sperber.
-- Move window.el et al up the order in dumped-lisp.el - Sperber.
-- Don't use 'save-window-excursion' in
     'shrink-window-if-larger-than-buffer' - Sperber.
-- Updates to pixel-size code in dialog.el - Sperber.
-- Remove nonworking 'breakpoint-on-error' - Wing.
-- Extract out 'with-displaying-help-buffer' into a more general mechanism
     - Wing.
-- Don't catch errors when noninteractive in startup.el - Wing.
-- Fix warnings in code-files.el, loadhist.el, & package-get.el - Wing.
-- Simplify code in '*-reset-device-font-menus' - James.
-- Synch font-menu.el to the 21.4 version - Turnbull.
-- Preserve return value from 'call-process' - Sperber.
-- New functions in replace.el that operate on regions - Evans.
-- Run 'delete-frame-hook' in general dialogs only - Piper.
-- Add a margin parameter in autoload.el for DSO autoloads - James.
-- Conditionalise autoloads for DSO's on the existence of the DSO - James.
-- Always set module directories/paths in dump-paths.el - James.
-- Bring list of package sites up to date - Skyttä.
-- Add "Find Variable" menu entry for 'hyper-apropos-find-variable' -
     Wallington
-- Fix 'view-lossage' interactive spec - Wallington.
-- Synch 'with-output-to-string' with GNU/Emacs 21 - Wallington.
-- Bind C-xrd to 'delete-rectangle' - Yamaoka.
-- Move entries in 'auto-mode-alist' out to packages for the modes
     that are in packages - Skyttä
-- New compatible alias for 'lookup-syntax-properties'
     ('parse-sexp-lookup-properties') - Turnbull.
-- Enable C autoloads for DSO's - James.
-- Update revert-buffer code - Piper.
-- Add new coding system 'utf-8-bom' - Ikiuo.

6 files changed, 56 insertions, 55 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 36238652823..23c2188019b 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2002/11/01 16:34:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/18 05:45:42 uebayasi Exp $
 
-DISTNAME=	xemacs-21.5.9
-PKGREVISION=	1
+DISTNAME=	xemacs-21.5.10
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.5/ \
 		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-21.5/ \
@@ -14,8 +13,8 @@ COMMENT=	*BETA* XEmacs text editor version 21.5.9
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
-PLIST_SUBST+=	EMACSVER=xemacs-21.5-b9
-MESSAGE_SUBST+=	EMACSVER=xemacs-21.5-b9
+PLIST_SUBST+=	EMACSVER=xemacs-21.5-b10
+MESSAGE_SUBST+=	EMACSVER=xemacs-21.5-b10
 
 .if (${MACHINE_ARCH} == "arm32")
 .  include "../../lang/gcc/buildlink2.mk"
diff --git a/editors/xemacs-current/PLIST b/editors/xemacs-current/PLIST
index 9856967d1c3..2540d315daf 100644
--- a/editors/xemacs-current/PLIST
+++ b/editors/xemacs-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/10/06 11:40:07 magick Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/01/18 05:45:42 uebayasi Exp $
 bin/${EMACSVER}
 bin/ellcc
 bin/gnuattach
@@ -10,6 +10,9 @@ bin/xemacs-b2m
 bin/xemacs-ctags
 bin/xemacs-etags
 bin/xemacs-rcs-checkin
+@exec ${MKDIR} %D/lib/xemacs
+@exec ${MKDIR} %D/lib/xemacs/site-lisp
+@exec ${MKDIR} %D/lib/xemacs/site-modules
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/DOC
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/add-big-package.sh
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/config.values
@@ -64,7 +67,6 @@ 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/eldap.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/elhash.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/emodules.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/event-gtk.h
@@ -229,7 +231,6 @@ lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/offix-types.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/offix.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/opaque.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/paths.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/postgresql.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/process.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/procimpl.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/rangetab.h
@@ -387,6 +388,8 @@ lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/xmprimitivep.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/xmu.h
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/make-docfile
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/mmencode
+lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.el
+lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.elc
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/movemail
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/profile
 lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/rcs2log
@@ -935,6 +938,8 @@ lib/${EMACSVER}/info/lispref.info-47
 lib/${EMACSVER}/info/lispref.info-48
 lib/${EMACSVER}/info/lispref.info-49
 lib/${EMACSVER}/info/lispref.info-5
+lib/${EMACSVER}/info/lispref.info-50
+lib/${EMACSVER}/info/lispref.info-51
 lib/${EMACSVER}/info/lispref.info-6
 lib/${EMACSVER}/info/lispref.info-7
 lib/${EMACSVER}/info/lispref.info-8
@@ -991,6 +996,7 @@ lib/${EMACSVER}/info/xemacs.info-20
 lib/${EMACSVER}/info/xemacs.info-21
 lib/${EMACSVER}/info/xemacs.info-22
 lib/${EMACSVER}/info/xemacs.info-23
+lib/${EMACSVER}/info/xemacs.info-24
 lib/${EMACSVER}/info/xemacs.info-3
 lib/${EMACSVER}/info/xemacs.info-4
 lib/${EMACSVER}/info/xemacs.info-5
@@ -999,7 +1005,6 @@ lib/${EMACSVER}/info/xemacs.info-7
 lib/${EMACSVER}/info/xemacs.info-8
 lib/${EMACSVER}/info/xemacs.info-9
 lib/${EMACSVER}/lisp/ChangeLog
-lib/${EMACSVER}/lisp/ChangeLog.1
 lib/${EMACSVER}/lisp/ChangeLog.GTK
 lib/${EMACSVER}/lisp/README
 lib/${EMACSVER}/lisp/abbrev.el
@@ -1545,35 +1550,32 @@ man/man1/gnuserv.1
 man/man1/xemacs-ctags.1
 man/man1/xemacs-etags.1
 man/man1/xemacs.1
-@dirrm lib/${EMACSVER}/etc/custom/example-themes
-@dirrm lib/${EMACSVER}/etc/custom
-@dirrm lib/${EMACSVER}/etc/eos
-@dirrm lib/${EMACSVER}/etc/idd
-@dirrm lib/${EMACSVER}/etc/photos
-@dirrm lib/${EMACSVER}/etc/sparcworks
-@dirrm lib/${EMACSVER}/etc/tests/external-widget
-@dirrm lib/${EMACSVER}/etc/tests
-@dirrm lib/${EMACSVER}/etc/toolbar
-@dirrm lib/${EMACSVER}/etc/unicode/ibm
-@dirrm lib/${EMACSVER}/etc/unicode/mule-ucs
-@dirrm lib/${EMACSVER}/etc/unicode/other
+@exec ${MKDIR} /var/tmp/xemacs.lock && chmod 1777 /var/tmp/xemacs.lock
+@unexec ${RM} -rf /var/tmp/xemacs.lock
+@dirrm lib/${EMACSVER}/lisp/term
+@dirrm lib/${EMACSVER}/lisp/mule
+@dirrm lib/${EMACSVER}/lisp
+@dirrm lib/${EMACSVER}/info
 @dirrm lib/${EMACSVER}/etc/unicode/unicode-consortium
+@dirrm lib/${EMACSVER}/etc/unicode/other
+@dirrm lib/${EMACSVER}/etc/unicode/mule-ucs
+@dirrm lib/${EMACSVER}/etc/unicode/ibm
 @dirrm lib/${EMACSVER}/etc/unicode
+@dirrm lib/${EMACSVER}/etc/toolbar
+@dirrm lib/${EMACSVER}/etc/tests/external-widget
+@dirrm lib/${EMACSVER}/etc/tests
+@dirrm lib/${EMACSVER}/etc/sparcworks
+@dirrm lib/${EMACSVER}/etc/photos
+@dirrm lib/${EMACSVER}/etc/idd
+@dirrm lib/${EMACSVER}/etc/eos
+@dirrm lib/${EMACSVER}/etc/custom/example-themes
+@dirrm lib/${EMACSVER}/etc/custom
 @dirrm lib/${EMACSVER}/etc
-@dirrm lib/${EMACSVER}/lisp/mule
-@dirrm lib/${EMACSVER}/lisp/term
-@dirrm lib/${EMACSVER}/lisp
 @dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/modules
-@dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m
 @dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/s
+@dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m
 @dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include
 @dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}
-@dirrm lib/${EMACSVER}/info
-@dirrm lib/${EMACSVER}
-@exec ${MKDIR} /var/tmp/xemacs.lock && chmod 1777 /var/tmp/xemacs.lock
-@unexec rm -rf /var/tmp/xemacs.lock
-@exec ${MKDIR} %D/lib/xemacs/site-lisp
-@exec ${MKDIR} %D/lib/xemacs/site-modules
-@dirrm lib/xemacs/site-lisp
 @dirrm lib/xemacs/site-modules
+@dirrm lib/xemacs/site-lisp
 @dirrm lib/xemacs
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index 265c9f9b707..a160a14ee9a 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2002/10/06 11:40:07 magick Exp $
+$NetBSD: distinfo,v 1.3 2003/01/18 05:45:42 uebayasi Exp $
 
-SHA1 (xemacs-21.5.9.tar.gz) = b1e04ea87e9eea1e0e0806faef3fb211712dcfc2
-Size (xemacs-21.5.9.tar.gz) = 12618231 bytes
-SHA1 (patch-aa) = fd7d092348048db6b47a399a1b651c5d578d37bb
-SHA1 (patch-ab) = 451b3eaa6ba2d33e654daf53442c90d969478dde
-SHA1 (patch-ac) = 0272b0547f25872f7605f846d082817bfcdceead
+SHA1 (xemacs-21.5.10.tar.gz) = 429818840413950366af1552e687db565cb4bb30
+Size (xemacs-21.5.10.tar.gz) = 12748210 bytes
+SHA1 (patch-aa) = 4966a5bda4456976cdc1b05eb5c6bb5cf4f41250
+SHA1 (patch-ab) = 62a968f19d1b2b9efc5f8c3cf3e612f6a1dc7df2
+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 16d6566bf35..b3101332688 100644
--- a/editors/xemacs-current/patches/patch-aa
+++ b/editors/xemacs-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/24 19:40:33 magick Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/18 05:45:43 uebayasi Exp $
 
---- Makefile.in.in.orig	Thu Dec 20 07:08:09 2001
+--- Makefile.in.in.orig	Sat Jan 18 12:23:29 2003
 +++ Makefile.in.in
-@@ -470,8 +470,12 @@
+@@ -477,8 +477,12 @@
  	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 6f1bcfd24b7..19e18970270 100644
--- a/editors/xemacs-current/patches/patch-ab
+++ b/editors/xemacs-current/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
+$NetBSD: patch-ab,v 1.3 2003/01/18 05:45:43 uebayasi Exp $
 
---- configure.orig	Fri Aug 16 06:11:45 2002
+--- configure.orig	Mon Dec 16 11:33:04 2002
 +++ configure
-@@ -1157,6 +1157,7 @@
+@@ -1159,6 +1159,7 @@
  machine='' opsys=''
  
  case "$canonical" in
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
    sparc-*-*        ) machine=sparc ;;
    alpha*-*-*       ) machine=alpha ;;
    vax-*-*          ) machine=vax ;;
-@@ -1229,9 +1230,10 @@
+@@ -1231,9 +1232,10 @@
      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-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
      esac
    ;;
  
-@@ -3145,7 +3147,7 @@
+@@ -3207,7 +3209,7 @@
      decosf* | linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
          
  if test "$GCC" = "yes"; then
-@@ -13283,6 +13285,43 @@
+@@ -14233,6 +14235,43 @@
    fi
  fi
  
@@ -75,11 +75,11 @@ $NetBSD: patch-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
  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
-@@ -15926,6 +15965,7 @@
- s%@dnd_objs@%$dnd_objs%g
+@@ -16072,6 +16111,7 @@
+ 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%@dll_ld@%$dll_ld%g
- s%@dll_cflags@%$dll_cflags%g
+ s%@SRC_SUBDIR_DEPS@%$SRC_SUBDIR_DEPS%g
+ s%@INSTALL_ARCH_DEP_SUBDIR@%$INSTALL_ARCH_DEP_SUBDIR%g
diff --git a/editors/xemacs-current/patches/patch-ac b/editors/xemacs-current/patches/patch-ac
index f1de7ef5ffa..b1f0134faf4 100644
--- a/editors/xemacs-current/patches/patch-ac
+++ b/editors/xemacs-current/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/03/24 19:40:33 magick Exp $
+$NetBSD: patch-ac,v 1.2 2003/01/18 05:45:44 uebayasi Exp $
 
---- lib-src/Makefile.in.in.orig	Thu Dec 20 08:58:19 2001
+--- lib-src/Makefile.in.in.orig	Fri Apr 26 03:03:23 2002
 +++ lib-src/Makefile.in.in
 @@ -66,7 +66,7 @@
  INSTALL = @install_pp@ @INSTALL@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/03/24 19:40:33 magick Exp $
  ## ========================== Lists of Files ===========================
  
  #define NO_SHORTNAMES
-@@ -234,7 +234,7 @@
+@@ -237,7 +237,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.1.1.1 2002/03/24 19:40:33 magick Exp $
  	@echo; echo "Installing utilities run internally by XEmacs."
  	./make-path ${archlibdir}
  	if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
-@@ -245,17 +245,27 @@
+@@ -248,17 +248,27 @@
  	if test "`(cd ${archlibdir} && $(pwd))`" \
  	     != "`(cd ${srcdir}     && $(pwd))`"; then \
  	  for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \