Update to patch release 21.4.24. From the ChangeLog:

2015-03-24 Vin Shelton <acs@xemacs.org>

        * XEmacs 21.4.24 is released

2015-02-23  Vin Shelton  <acs@xemacs.org>

        * configure.in: Add LIBOSSAUDIO as appropriate.  Patch from netbsd
        via Hauke Fath.
        * configure: Rebuild.

2015-02-15  Vin Shelton  <acs@xemacs.org>

        * configure.in: Additional netbsd platform definitions.
        * configure: Rebuild.

I have used the opportunity for a bit of spring cleaning:

o remove build restrictions for powerpc and mips (hacks.mk, Makefile)
o drop the inactive X11 toolkit options - they were never used, and
  upstream does not support them for 21.4, anyway (options.mk)
o add comments to patch files
o upstream converted the texinfo files to v5 format. Patch the offenders
  to be v4 compatible

26 files changed, 135 insertions, 681 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index a5894ba2a26..5337019f895 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.115 2016/03/05 11:28:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.116 2016/04/13 13:52:27 hauke Exp $
 
 PKGNAME?=	${DISTNAME}
 COMMENT?=	XEmacs text editor version 21
 
-DISTNAME=	xemacs-21.4.23
-PKGREVISION=	3
+DISTNAME=	xemacs-21.4.24
+#PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
@@ -16,8 +16,6 @@ CONFLICTS+=	gnuserv-[0-9]*
 CONFLICTS+=	xemacs-[0-9]*
 CONFLICTS+=	xemacs-nox11-[0-9]*
 
-BROKEN_ON_PLATFORM=	*-*-mips*	# fails purespace dumping
-
 USE_TOOLS+=	makeinfo
 
 HAS_CONFIGURE=		yes
@@ -37,8 +35,9 @@ PLIST_SUBST+=		ELSUFX=''
 .include "options.mk"
 
 CONFIGURE_ARGS+=	${MACHINE_GNU_PLATFORM}
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}/man1
+CONFIGURE_ARGS+=	--infopath=${PREFIX}/${PKGINFODIR}
 CONFIGURE_ARGS+=	--with-clash-detection
 CONFIGURE_ARGS+=	--with-mule=yes
 CONFIGURE_ARGS+=	--with-msw=no
@@ -52,13 +51,6 @@ CFLAGS+=		-Dunix
 CPPFLAGS+=	-DTERMINFO
 .endif
 
-.if ${X11_TYPE} != "modular"
-INFOPATH=		${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
-.else
-INFOPATH=		${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
-.endif
-CONFIGURE_ARGS+=	--infopath=${INFOPATH:Q}
-
 .if ${OPSYS} == "SunOS"
 .  if !exists(/usr/demo/SOUND/libaudio.a) && \
       !exists(/usr/demo/SOUND/lib/libaudio.a)
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index 36125af4c76..03d5fbafcef 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,25 +1,17 @@
-$NetBSD: distinfo,v 1.23 2016/03/29 19:32:53 hauke Exp $
+$NetBSD: distinfo,v 1.24 2016/04/13 13:52:27 hauke Exp $
 
-SHA1 (xemacs/xemacs-21.4.23.tar.gz) = b57bc569cf8d376c1e2443b6ea1f40d30271e9a6
-RMD160 (xemacs/xemacs-21.4.23.tar.gz) = 9df94c576b546a4df30c29ed3b5609ee816ad43c
-SHA512 (xemacs/xemacs-21.4.23.tar.gz) = 5f7b71c937ebcd7c16e42da8e0ac3d9619f8adc9e3b70707942285dd3a0b440d49c6f5ce929ec4a2b6f1093c7940354087221eac193233025b31b8b4b2ff2aee
-Size (xemacs/xemacs-21.4.23.tar.gz) = 8537366 bytes
-SHA1 (patch-Makefile.in.in) = ac8e41c0057a3c3aed0f02dc282423eb48158b7c
-SHA1 (patch-configure) = a48c1a92098c67d6f3e87c0c0e9917bc545d5155
-SHA1 (patch-configure.in) = 6ae72ac1746b42fc7f9a451579a5288f53a2b21c
-SHA1 (patch-lib-src_Makefile.in.in) = 865662811be6a92d5022f76e8325d0b194942791
-SHA1 (patch-lib-src_vcdiff) = bd42965219395cdae24d63972c23b3578229f375
-SHA1 (patch-lwlib_Makefile.in.in) = 2de9b7c45d7f5337d25138e518cd303b3c721fab
-SHA1 (patch-man_custom.texi) = 516baec86e2d04facd94ce07e8cdd7390b1fcd79
-SHA1 (patch-man_info.texi) = eb40eb9b6392c558db8d831e02b7693aaadb83b9
-SHA1 (patch-man_lispref_edebug-inc.texi) = 8e0cb2c29886ca7eb0c9d18d750e1455fc0c0fae
-SHA1 (patch-man_lispref_packaging.texi) = 8a778def392f5654122cc633177668b9c3d565fd
-SHA1 (patch-man_term.texi) = 47aff3a7678d315e5ec24ddce1e2418ccb988ad4
-SHA1 (patch-man_widget.texi) = 54076e3a3a14a2b26a9dc352a5359c6475d1f5c4
-SHA1 (patch-src_Makefile.in.in) = 28098f18870c34165b37fe11e84cbd6f5584bc63
-SHA1 (patch-src_config.h.in) = 9a031ace4ca6f89dacbf599484d9fcd410d7841f
-SHA1 (patch-src_dired.c) = 98f1c076c29385e3d5052cdb84d067f6cec8bc22
-SHA1 (patch-src_glyphs-eimage.c) = ea561758dd454003eb3274508087fd302d9d9fd4
-SHA1 (patch-src_lisp.h) = 60a0a77ffb67500e078e2cf53512350386741316
-SHA1 (patch-src_unexelf.c) = 738d09ea8a3d10b609e474b0efb8806d3e302bf9
-SHA1 (patch-src_unexfreebsd.c) = 89ce80b21fa5d6cf8be98762183c6a8b0d8f71dd
+SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
+RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
+SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
+Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes
+SHA1 (patch-Makefile.in.in) = b09f11e040eccf66eb29a32fb69a6acca26f3356
+SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd
+SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e
+SHA1 (patch-man_lispref_debugging.texi) = 4d6f99c17bc8e25e700a663f7eff147b72fd9a14
+SHA1 (patch-man_lispref_intro.texi) = 5837f8a0e8057649921cdbddd8e8329165ec1104
+SHA1 (patch-man_xemacs_custom.texi) = e564906bced48b0a7c788c217c02eafe167fee59
+SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775
+SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4
+SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966
+SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305
+SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448
diff --git a/editors/xemacs/hacks.mk b/editors/xemacs/hacks.mk
deleted file mode 100644
index 0d10d6678af..00000000000
--- a/editors/xemacs/hacks.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: hacks.mk,v 1.3 2014/12/15 11:46:34 jperkin Exp $
-
-.if !defined(XEMACS_HACKS_MK)
-XEMACS_HACKS_MK=	defined
-
-.include "../../mk/compiler.mk"
-
-### [Sun Dec 10 10:00:00 UTC 2011 : hauke]
-### On PowerPC, building with -O2 optimisation with GCC (on netbsd-5,
-### at least) results in 'xemacs -vanilla' dumping core.
-### Lower optimisation as a workaround, until GCC is fixed.
-###
-.if !empty(CC_VERSION:Mgcc*) && !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
-PKG_HACKS+=		powerpc-codegen
-BUILDLINK_TRANSFORM+=	opt:-O[0-9]*:-Os
-.endif
-
-.endif  # XEMACS_HACKS_MK
diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk
index 1ef91a23efd..d94f02f1c0e 100644
--- a/editors/xemacs/options.mk
+++ b/editors/xemacs/options.mk
@@ -1,65 +1,14 @@
-# $NetBSD: options.mk,v 1.11 2015/02/15 13:13:24 hauke Exp $
+# $NetBSD: options.mk,v 1.12 2016/04/13 13:52:27 hauke Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS=		ldap xface canna x11 debug
-PKG_OPTIONS_OPTIONAL_GROUPS=	toolkit
-PKG_OPTIONS_GROUP.toolkit=	lucid
-
-# GUI configuration is a mess... only support "lucid" for now.
-#PKG_OPTIONS_GROUP.toolkit+=	gtk motif xaw
-#PKG_OPTIONS_LEGACY_VARS+=	USE_ATHENA:xaw
-#PKG_OPTIONS_LEGACY_VARS+=	USE_GTK:gtk
-#PKG_OPTIONS_LEGACY_VARS+=	USE_MOTIF:motif
 
 PKG_SUGGESTED_OPTIONS=		x11
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Any of the "toolkit" options implies "x11".
-###
-.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mlucid) || \
-    !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw)
-.  if empty(PKG_OPTIONS:Mx11)
-PKG_OPTIONS+=		x11
-.  endif
-.endif
-
-###
-### Default to using the Lucid X11 toolkit if none is specified.
-###
-.if !empty(PKG_OPTIONS:Mx11)
-.  if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mlucid) && \
-      empty(PKG_OPTIONS:Mmotif) && empty(PKG_OPTIONS:Mxaw)
-PKG_OPTIONS+=		lucid
-.  endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+=	--with-ldap
-.  include "../../databases/openldap-client/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-
-.if !empty(PKG_OPTIONS:Mxface)
-CONFIGURE_ARGS+=	--with-xface
-.  include "../../mail/faces/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-xface
-.endif
-
-PLIST_VARS+=		canna
-.if !empty(PKG_OPTIONS:Mcanna)
-.  include "../../inputmethod/canna-lib/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-canna
-PLIST.canna=		yes
-.else
-CONFIGURE_ARGS+=	--without-canna
-.endif
-
-###
-### Support drawing pretty X11 widgets.
+### Support drawing pretty X11 Lucid widgets
 ###
 PLIST_VARS+=		x11
 .if !empty(PKG_OPTIONS:Mx11)
@@ -67,6 +16,7 @@ PLIST_VARS+=		x11
 .  include "../../graphics/png/buildlink3.mk"
 .  include "../../graphics/tiff/buildlink3.mk"
 .  include "../../x11/libXpm/buildlink3.mk"
+.  include "../../mk/xaw.buildlink3.mk"
 .  include "../../x11/xbitmaps/buildlink3.mk"
 PLIST.x11=		yes
 CONFIGURE_ARGS+=	--with-x
@@ -77,6 +27,14 @@ CONFIGURE_ARGS+=	--with-xpm
 CONFIGURE_ARGS+=	--site-includes=${PREFIX}/include:${X11BASE}/include
 CONFIGURE_ARGS+=	--site-libraries=${PREFIX}/lib:${X11BASE}/lib
 CONFIGURE_ARGS+=	--site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib
+# Lucid widgets
+CONFIGURE_ARGS+=	--with-toolbars=yes
+CONFIGURE_ARGS+=	--with-menubars=yes
+CONFIGURE_ARGS+=	--with-scrollbars=lucid
+CONFIGURE_ARGS+=	--with-dialogs=lucid
+CONFIGURE_ARGS+=	--with-widgets=lucid
+CONFIGURE_ARGS+=	--with-athena=xaw
+CONFIGURE_ARGS+=	--with-xim=xlib
 .else
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-jpeg
@@ -88,56 +46,27 @@ CONFIGURE_ARGS+=	--site-libraries=${PREFIX}/lib
 CONFIGURE_ARGS+=	--site-runtime-libraries=${PREFIX}/lib
 .endif
 
-###
-### Support using GTK X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mgtk)
-.  include "../../x11/gtk/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gtk
-CONFIGURE_ARGS+=	--with-menubars=yes
-CONFIGURE_ARGS+=	--with-scrollbars=yes
-CONFIGURE_ARGS+=	--with-dialogs=yes
-CONFIGURE_ARGS+=	--with-widgets=yes
-CONFIGURE_ARGS+=	--with-xim=yes
-.endif
-
-###
-### Support using Lucid X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mlucid)
-.  include "../../mk/xaw.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-toolbars=yes
-CONFIGURE_ARGS+=	--with-menubars=yes
-CONFIGURE_ARGS+=	--with-scrollbars=lucid
-CONFIGURE_ARGS+=	--with-dialogs=lucid
-CONFIGURE_ARGS+=	--with-widgets=lucid
-CONFIGURE_ARGS+=	--with-athena=xaw
-CONFIGURE_ARGS+=	--with-xim=xlib
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+=	--with-ldap
+.  include "../../databases/openldap-client/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-ldap
 .endif
 
-###
-### Support using Motif X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mmotif)
-.  include "../../mk/motif.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-menubars=motif
-CONFIGURE_ARGS+=	--with-scrollbars=motif
-CONFIGURE_ARGS+=	--with-dialogs=motif
-CONFIGURE_ARGS+=	--with-widgets=motif
-CONFIGURE_ARGS+=	--with-xim=motif
+.if !empty(PKG_OPTIONS:Mxface)
+CONFIGURE_ARGS+=	--with-xface
+.  include "../../mail/faces/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-xface
 .endif
 
-###
-### Support using Athena X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mxaw)
-.  include "../../mk/xaw.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-menubars=athena
-CONFIGURE_ARGS+=	--with-scrollbars=athena
-CONFIGURE_ARGS+=	--with-dialogs=athena
-CONFIGURE_ARGS+=	--with-widgets=athena
-CONFIGURE_ARGS+=	--with-athena=xaw
-CONFIGURE_ARGS+=	--with-xim=xlib
+PLIST_VARS+=		canna
+.if !empty(PKG_OPTIONS:Mcanna)
+.  include "../../inputmethod/canna-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-canna
+PLIST.canna=		yes
+.else
+CONFIGURE_ARGS+=	--without-canna
 .endif
 
 PLIST_VARS+=            debug
diff --git a/editors/xemacs/patches/patch-Makefile.in.in b/editors/xemacs/patches/patch-Makefile.in.in
index 4e437b5e62e..c6602ff7963 100644
--- a/editors/xemacs/patches/patch-Makefile.in.in
+++ b/editors/xemacs/patches/patch-Makefile.in.in
@@ -1,4 +1,8 @@
-$NetBSD: patch-Makefile.in.in,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-Makefile.in.in,v 1.2 2016/04/13 13:52:27 hauke Exp $
+
+Avoid picking up local config when checking features
+
+Install {c,e}tags man pages with xemada prefix
 
 --- Makefile.in.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ Makefile.in.in
diff --git a/editors/xemacs/patches/patch-configure b/editors/xemacs/patches/patch-configure
deleted file mode 100644
index a25a1d08eb9..00000000000
--- a/editors/xemacs/patches/patch-configure
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2015/02/04 09:19:20 hauke Exp $
-
---- configure.orig	2015-01-29 15:04:29.000000000 +0000
-+++ configure
-@@ -1130,6 +1130,7 @@ echo "$ac_t""$configuration" 1>&6
- machine='' opsys=''
- 
- case "$canonical" in
-+  arm-*-*          ) machine=sparc ;;
-   sparc-*-*        ) machine=sparc ;;
-   alpha*-*-*       ) machine=alpha ;;
-   vax-*-*          ) machine=vax ;;
-@@ -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* )
--                                            machine=hp9000s300 ;;
-+                                machine=m68k ;;
-       pc532-*-netbsd* | ns32k-*-netbsd* )  machine=ns32000 ;;
-       pmax-*-netbsd*  | mips-*-netbsd*  )  machine=pmax ;;
-+      alpha-*-netbsd )  machine=alpha ;;
-     esac
-   ;;
- 
-@@ -1508,6 +1510,7 @@ EOF
-       *-sysv5* )		opsys=sco7 ;;
-       *-386bsd* )	        opsys=386bsd ;;
-       *-freebsd* )		opsys=freebsd ;;
-+      *-dragonfly* )		opsys=dragonfly ;;
-       *-nextstep* )		opsys=nextstep ;;
-       *-pc-cygwin* )		opsys=cygwin32 ;;
-       *-pc-mingw* )		opsys=mingw32 ;
-@@ -3132,7 +3135,7 @@ echo "configure:3130: checking "for runt
-     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
-         xe_check_libs="${try_dash_r}/no/such/file-or-directory"
-         
- if test "$GCC" = "yes"; then
-@@ -14312,6 +14315,41 @@ else   for feature in ncurses gpm; do
-     eval "with_${feature}=no"
-   done
- 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
- 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
-@@ -16917,6 +16955,7 @@ s%@libs_xauth@%$libs_xauth%g
- s%@dnd_objs@%$dnd_objs%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
diff --git a/editors/xemacs/patches/patch-configure.in b/editors/xemacs/patches/patch-configure.in
deleted file mode 100644
index 150acfef029..00000000000
--- a/editors/xemacs/patches/patch-configure.in
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2015/02/04 09:19:20 hauke Exp $
-
---- configure.in.orig	2015-01-29 15:04:29.000000000 +0000
-+++ configure.in
-@@ -1082,6 +1082,7 @@ machine='' opsys=''
- 
- dnl Straightforward machine determination
- case "$canonical" in
-+  arm-*-*	   ) machine=arm ;;
-   sparc-*-*        ) machine=sparc ;;
-   alpha*-*-*       ) machine=alpha ;;
-   vax-*-*          ) machine=vax ;;
-@@ -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* )
--                      dnl Yes, this is somewhat bogus.
--                      machine=hp9000s300 ;;
-+                      machine=m68k ;;
-       pc532-*-netbsd* | ns32k-*-netbsd* )  machine=ns32000 ;;
-       pmax-*-netbsd*  | mips-*-netbsd*  )  machine=pmax ;;
-+      alpha-*-netbsd* ) machine=alpha ;;
-     esac
-   ;;
- 
-@@ -1545,6 +1546,7 @@ case "$canonical" in
-       *-sysv5* )		opsys=sco7 ;;
-       *-386bsd* )	        opsys=386bsd ;;
-       *-freebsd* )		opsys=freebsd ;;
-+      *-dragonfly* )		opsys=dragonfly ;;
-       *-nextstep* )		opsys=nextstep ;;
-       *-pc-cygwin* )		opsys=cygwin32 ;;
-       *-pc-mingw* )		opsys=mingw32 ;
-@@ -2245,7 +2247,7 @@ if test "$add_runtime_path" = "yes"; the
-     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
-         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")
-@@ -4522,6 +4524,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]
diff --git a/editors/xemacs/patches/patch-lib-src_Makefile.in.in b/editors/xemacs/patches/patch-lib-src_Makefile.in.in
index 401ab6b1f2a..0746eb54382 100644
--- a/editors/xemacs/patches/patch-lib-src_Makefile.in.in
+++ b/editors/xemacs/patches/patch-lib-src_Makefile.in.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-lib-src_Makefile.in.in,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-lib-src_Makefile.in.in,v 1.2 2016/04/13 13:52:27 hauke Exp $
+
+Install selected files, using bsd.pkg.mk functionality
 
 --- lib-src/Makefile.in.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ lib-src/Makefile.in.in
diff --git a/editors/xemacs/patches/patch-lib-src_vcdiff b/editors/xemacs/patches/patch-lib-src_vcdiff
deleted file mode 100644
index 0054aa90903..00000000000
--- a/editors/xemacs/patches/patch-lib-src_vcdiff
+++ /dev/null
@@ -1,111 +0,0 @@
-$NetBSD: patch-lib-src_vcdiff,v 1.1 2015/02/04 09:19:20 hauke Exp $
-
---- lib-src/vcdiff.orig	2015-01-29 15:04:29.000000000 +0000
-+++ lib-src/vcdiff
-@@ -1,23 +1,35 @@
--#!/bin/sh
-+#! /bin/sh
- #
- # Enhanced sccs diff utility for use with vc mode.
- # This version is more compatible with rcsdiff(1).
- #
--#	!Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp !
-+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
-+#               2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- #
--# Modified by: vladimir@Eng.Sun.COM on 95-06-07
--# * Made sure that file arguments are specifed as s.<filename>.
--# * Switched the assignments to $f inside the 3rd and 4th case statements of
--#   the first for-loop
--# * Removed the incorrect initialization of sid1 before the first for-loop.
-+# This file is part of GNU Emacs.
-+#
-+# GNU Emacs is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GNU Emacs is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Emacs; see the file COPYING.  If not, write to the
-+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
- #
- 
- DIFF="diff"
- usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
- 
--PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
-+PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
- 
--echo=
-+echo="echo"
- sid1= sid2=
- 
- for f
-@@ -31,14 +43,14 @@ do
- 			echo=:;;
- 		-r?*)
- 			case $sid1 in
--			-r*)
--				sid2=$f
-+			'')
-+				sid1=$f
- 				;;
--			*) 
-+			*)
- 				case $sid2 in
--				  ?*) echo "$usage" >&2; exit 2 ;;
-+				?*) echo "$usage" >&2; exit 2 ;;
- 				esac
--				sid1=$f
-+				sid2=$f
- 				;;
- 			esac
- 			;;
-@@ -67,31 +79,24 @@ trap 'rm -f $rev1 $rev2 || status=2; exi
- 
- for f
- do
--  s=2
--
--  # For files under SCCS control, fixup the file name to be the s. filename
--  if [ -d SCCS ]; then
--    if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
--      f="SCCS/s.$f"
--    fi
--  fi 
-+	s=2
- 
- 	case $f in
- 	s.* | */s.*)
- 		if
--			rev1=/tmp/geta$$
-+			rev1=`mktemp /tmp/geta.XXXXXXXX`
- 			get -s -p -k $sid1 "$f" > $rev1 &&
- 			case $sid2 in
- 			'')
- 				workfile=`expr " /$f" : '.*/s.\(.*\)'`
- 				;;
- 			*)
--				rev2=/tmp/getb$$
-+				rev2=`mktemp /tmp/getb.XXXXXXXX`
- 				get -s -p -k $sid2 "$f" > $rev2
- 				workfile=$rev2
- 			esac
- 		then
--			$echo $DIFF $options $sid1 $sid2 $workfile >&2
-+			$echo $DIFF $options $rev1 $workfile >&2
- 			$DIFF $options $rev1 $workfile
- 			s=$?
- 		fi
-@@ -104,3 +109,5 @@ do
- 	then status=$s
- 	fi
- done
-+
-+# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a
diff --git a/editors/xemacs/patches/patch-lwlib_Makefile.in.in b/editors/xemacs/patches/patch-lwlib_Makefile.in.in
index 90be6060d0c..8361fc7c13a 100644
--- a/editors/xemacs/patches/patch-lwlib_Makefile.in.in
+++ b/editors/xemacs/patches/patch-lwlib_Makefile.in.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-lwlib_Makefile.in.in,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-lwlib_Makefile.in.in,v 1.2 2016/04/13 13:52:27 hauke Exp $
+
+SunOS 5 bmake / gmake fixes
 
 --- lwlib/Makefile.in.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ lwlib/Makefile.in.in
diff --git a/editors/xemacs/patches/patch-man_custom.texi b/editors/xemacs/patches/patch-man_custom.texi
deleted file mode 100644
index 50bdbc59d79..00000000000
--- a/editors/xemacs/patches/patch-man_custom.texi
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-man_custom.texi,v 1.1 2016/01/17 07:51:34 richard Exp $
-http://tracker.xemacs.org/XEmacs/its/issue859
---- man/custom.texi.orig	2015-01-29 15:04:29.000000000 +0000
-+++ man/custom.texi
-@@ -60,7 +60,7 @@ automatically created from the options n
- 
- @node Declaring Groups, Declaring Variables, Top, Top
- @comment  node-name,  next,  previous,  up
--@section Declaring Groups
-+@chapter Declaring Groups
- 
- Use @code{defgroup} to declare new customization groups.
- 
-@@ -92,7 +92,7 @@ tag for that member.
- 
- @node Declaring Variables, Declaring Faces, Declaring Groups, Top
- @comment  node-name,  next,  previous,  up
--@section Declaring Variables
-+@chapter Declaring Variables
- 
- Use @code{defcustom} to declare user editable variables.
- 
-@@ -176,7 +176,7 @@ member.  For other types of variables, t
- 
- @node Declaring Faces, Usage for Package Authors, Declaring Variables, Top
- @comment  node-name,  next,  previous,  up
--@section Declaring Faces
-+@chapter Declaring Faces
- 
- Faces are declared with @code{defface}.
- 
-@@ -228,7 +228,7 @@ documentation string.@refill
- 
- @node Usage for Package Authors, Utilities, Declaring Faces, Top
- @comment  node-name,  next,  previous,  up
--@section Usage for Package Authors
-+@chapter Usage for Package Authors
- 
- The recommended usage for the author of a typical emacs lisp package is
- to create one group identifying the package, and make all user options
-@@ -244,7 +244,7 @@ keyword.
- 
- @node  Utilities, The Init File, Usage for Package Authors, Top
- @comment  node-name,  next,  previous,  up
--@section Utilities
-+@chapter Utilities
- 
- These utilities can come in handy when adding customization support.
- 
-@@ -276,7 +276,7 @@ The menu is in a format applicable to @c
- 
- @node The Init File, Wishlist, Utilities, Top
- @comment  node-name,  next,  previous,  up
--@section The Init File
-+@chapter The Init File
- 
- Customizations are saved to the file specified by @code{custom-file}, as
- calls to @code{custom-set-variables} and @code{custom-set-faces}.
-@@ -299,7 +299,7 @@ about enforcing its idea of the correct
- 
- @node Wishlist,  , The Init File, Top
- @comment  node-name,  next,  previous,  up
--@section Wishlist
-+@chapter Wishlist
- 
- @itemize @bullet
- @item
diff --git a/editors/xemacs/patches/patch-man_info.texi b/editors/xemacs/patches/patch-man_info.texi
deleted file mode 100644
index a76b0a946ee..00000000000
--- a/editors/xemacs/patches/patch-man_info.texi
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-man_info.texi,v 1.1 2016/01/17 07:51:34 richard Exp $
-http://tracker.xemacs.org/XEmacs/its/issue859
---- man/info.texi.orig	2015-01-29 15:04:29.000000000 +0000
-+++ man/info.texi
-@@ -542,6 +542,10 @@ to cancel the @samp{f}.
- 
- @c If a menu appears at the end of this node, remove it.
- @c It is an accident of the menu updating command.
-+@c Except now texinfo5 insists on one
-+@menu
-+* Help-Cross:: Cross reference section
-+@end menu
- 
- @node Help-Cross,  ,  , Help-Adv
- @subsection The node reached by the cross reference in Info
diff --git a/editors/xemacs/patches/patch-man_lispref_debugging.texi b/editors/xemacs/patches/patch-man_lispref_debugging.texi
new file mode 100644
index 00000000000..086ca1578e8
--- /dev/null
+++ b/editors/xemacs/patches/patch-man_lispref_debugging.texi
@@ -0,0 +1,15 @@
+$NetBSD: patch-man_lispref_debugging.texi,v 1.1 2016/04/13 13:52:27 hauke Exp $
+
+Fix makeinfo 4 build errors.
+
+--- man/lispref/debugging.texi.orig	2015-03-25 11:25:33.000000000 +0000
++++ man/lispref/debugging.texi
+@@ -725,7 +725,7 @@ the old indentation actually fit the int
+ and you have put back those parentheses, @kbd{C-M-q} should not change
+ anything.
+ 
+-@node Compilation Errors,  , Syntax Errors, Debugging
++@node Compilation Errors, Edebug , Syntax Errors, Debugging
+ @section Debugging Problems in Compilation
+ 
+   When an error happens during byte compilation, it is normally due to
diff --git a/editors/xemacs/patches/patch-man_lispref_edebug-inc.texi b/editors/xemacs/patches/patch-man_lispref_edebug-inc.texi
deleted file mode 100644
index 977cb70253c..00000000000
--- a/editors/xemacs/patches/patch-man_lispref_edebug-inc.texi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-man_lispref_edebug-inc.texi,v 1.1 2016/01/17 07:51:34 richard Exp $
-http://tracker.xemacs.org/XEmacs/its/issue859
---- man/lispref/edebug-inc.texi.orig	2015-01-29 15:04:29.000000000 +0000
-+++ man/lispref/edebug-inc.texi
-@@ -1103,7 +1103,7 @@ by an alternative, equivalent specificat
- Here is a table of the possibilities for @var{specification} and how each
- directs processing of arguments.
- 
--@table @bullet
-+@table @code
- 
- @item @code{t}
- All arguments are instrumented for evaluation.
diff --git a/editors/xemacs/patches/patch-man_lispref_intro.texi b/editors/xemacs/patches/patch-man_lispref_intro.texi
new file mode 100644
index 00000000000..3387688ee27
--- /dev/null
+++ b/editors/xemacs/patches/patch-man_lispref_intro.texi
@@ -0,0 +1,24 @@
+$NetBSD: patch-man_lispref_intro.texi,v 1.1 2016/04/13 13:52:27 hauke Exp $
+
+Fix makeinfo 4 build errors.
+
+--- man/lispref/intro.texi.orig	2015-03-25 11:25:33.000000000 +0000
++++ man/lispref/intro.texi
+@@ -4,7 +4,7 @@
+ @c See the file lispref.texi for copying conditions.
+ @setfilename ../../info/intro.info
+ 
+-@node Copying, Introduction
++@node Copying, Introduction, Top, Top
+ @unnumbered GNU GENERAL PUBLIC LICENSE
+ @center Version 2, June 1991
+ 
+@@ -400,7 +400,7 @@ consider it more useful to permit linkin
+ library.  If this is what you want to do, use the GNU Library General
+ Public License instead of this License.
+ 
+-@node Introduction,  , Copying
++@node Introduction, Packaging , Copying, Top
+ @chapter Introduction
+ 
+   Most of the XEmacs text editor is written in the programming
diff --git a/editors/xemacs/patches/patch-man_lispref_packaging.texi b/editors/xemacs/patches/patch-man_lispref_packaging.texi
deleted file mode 100644
index be415235bb5..00000000000
--- a/editors/xemacs/patches/patch-man_lispref_packaging.texi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-man_lispref_packaging.texi,v 1.1 2016/01/17 07:51:34 richard Exp $
-http://tracker.xemacs.org/XEmacs/its/issue859
---- man/lispref/packaging.texi.orig	2015-01-29 15:04:29.000000000 +0000
-+++ man/lispref/packaging.texi
-@@ -600,7 +600,7 @@ Builds the HTML versions of the document
- Does most of the work.  Builds the elcs, infos at a minimum.
- @end table
- 
--@subsection The targets that most people would be interested in would be:
-+@section The targets that most people would be interested in would be:
- 
- @itemize @bullet
- @item @code{all}
diff --git a/editors/xemacs/patches/patch-man_term.texi b/editors/xemacs/patches/patch-man_term.texi
deleted file mode 100644
index 7d631bdfb2d..00000000000
--- a/editors/xemacs/patches/patch-man_term.texi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-man_term.texi,v 1.1 2016/01/17 07:51:34 richard Exp $
-http://tracker.xemacs.org/XEmacs/its/issue859
---- man/term.texi.orig	2015-01-29 15:04:29.000000000 +0000
-+++ man/term.texi
-@@ -4,7 +4,7 @@ settitle Notes about emacs Term mode
- 
- @titlepage
- @sp 6
--@center @titlefont(Notes about Emacs TERM Mode)
-+@center @titlefont{Notes about Emacs TERM Mode}
- @end titlepage
- 
- @ifinfo
diff --git a/editors/xemacs/patches/patch-man_widget.texi b/editors/xemacs/patches/patch-man_widget.texi
deleted file mode 100644
index 580b0b6b8ab..00000000000
--- a/editors/xemacs/patches/patch-man_widget.texi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-man_widget.texi,v 1.1 2016/01/17 07:51:34 richard Exp $
-http://tracker.xemacs.org/XEmacs/its/issue859
---- man/widget.texi.orig	2015-01-29 15:04:29.000000000 +0000
-+++ man/widget.texi
-@@ -38,7 +38,7 @@
- 
- @node  Introduction, User Interface, Top, Top
- @comment  node-name,  next,  previous,  up
--@section Introduction
-+@chapter Introduction
- 
- Most graphical user interface toolkits, such as Motif and XView, provide
- a number of standard user interface controls (sometimes known as
diff --git a/editors/xemacs/patches/patch-man_xemacs_custom.texi b/editors/xemacs/patches/patch-man_xemacs_custom.texi
new file mode 100644
index 00000000000..0dac3af8435
--- /dev/null
+++ b/editors/xemacs/patches/patch-man_xemacs_custom.texi
@@ -0,0 +1,15 @@
+$NetBSD: patch-man_xemacs_custom.texi,v 1.1 2016/04/13 13:52:27 hauke Exp $
+
+Fix makeinfo 4 build errors.
+
+--- man/xemacs/custom.texi.orig	2015-03-25 11:25:33.000000000 +0000
++++ man/xemacs/custom.texi
+@@ -35,7 +35,7 @@ file to do the customization in each ses
+                      behavior of XEmacs.
+ @end menu
+ 
+-@node Minor Modes, , Customization, Customization
++@node Minor Modes, Variables, Customization, Customization
+ @section Minor Modes
+ @cindex minor modes
+ 
diff --git a/editors/xemacs/patches/patch-src_Makefile.in.in b/editors/xemacs/patches/patch-src_Makefile.in.in
index 782c1c35210..4d516e24938 100644
--- a/editors/xemacs/patches/patch-src_Makefile.in.in
+++ b/editors/xemacs/patches/patch-src_Makefile.in.in
@@ -1,4 +1,13 @@
-$NetBSD: patch-src_Makefile.in.in,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-src_Makefile.in.in,v 1.2 2016/04/13 13:52:27 hauke Exp $
+
+Directly substitute the local value of etcdir (``../etc/'')
+into src/Makefile.in.in.  This allows for overriding etcdir via
+INSTALL_MAKE_FLAGS at install-time so that destdir-style installation
+will work.
+
+liboss support
+
+SunOS 5 bmake / gmake fixes
 
 --- src/Makefile.in.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/Makefile.in.in
diff --git a/editors/xemacs/patches/patch-src_config.h.in b/editors/xemacs/patches/patch-src_config.h.in
index 2aa3891e8c3..f8d75470b6a 100644
--- a/editors/xemacs/patches/patch-src_config.h.in
+++ b/editors/xemacs/patches/patch-src_config.h.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_config.h.in,v 1.2 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-src_config.h.in,v 1.3 2016/04/13 13:52:27 hauke Exp $
+
+Always use static inline to fix build with C99 compilers.
 
 --- src/config.h.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/config.h.in
diff --git a/editors/xemacs/patches/patch-src_dired.c b/editors/xemacs/patches/patch-src_dired.c
deleted file mode 100644
index 2b7cea567b1..00000000000
--- a/editors/xemacs/patches/patch-src_dired.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_dired.c,v 1.1 2015/02/04 09:19:20 hauke Exp $
-
---- src/dired.c.orig	2015-01-29 15:04:29.000000000 +0000
-+++ src/dired.c
-@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA.  */
- /* Synched up with: FSF 19.30. */
- 
- #include <config.h>
-+#include <limits.h>
- #include "lisp.h"
- 
- #include "sysfile.h"
-@@ -97,7 +98,11 @@ If FILES-ONLY is the symbol t, then only
-   directory = Ffile_name_as_directory (directory);
-   directorylen = XSTRING_LENGTH (directory);
- 
-+#ifdef NAME_MAX
-+  statbuf = (char *)alloca (directorylen + NAME_MAX + 1);
-+#else
-   statbuf = (char *)alloca (directorylen + MAXNAMLEN + 1);
-+#endif
-   memcpy (statbuf, XSTRING_DATA (directory), directorylen);
-   statbuf_tail = statbuf + directorylen;
- 
diff --git a/editors/xemacs/patches/patch-src_glyphs-eimage.c b/editors/xemacs/patches/patch-src_glyphs-eimage.c
deleted file mode 100644
index c59154ddfbc..00000000000
--- a/editors/xemacs/patches/patch-src_glyphs-eimage.c
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-src_glyphs-eimage.c,v 1.2 2015/02/04 09:19:20 hauke Exp $
-
-Fix CVE-2009-2688, via <https://bugzilla.redhat.com/show_bug.cgi?id=511994>
-
---- src/glyphs-eimage.c.orig	2015-01-29 15:04:29.000000000 +0000
-+++ src/glyphs-eimage.c
-@@ -407,6 +407,7 @@ jpeg_instantiate (Lisp_Object image_inst
-    */
- 
-   {
-+    UINT_64_BIT pixels_sq;
-     int jpeg_gray = 0;		/* if we're dealing with a grayscale */
-     /* Step 4: set parameters for decompression.   */
- 
-@@ -429,7 +430,10 @@ jpeg_instantiate (Lisp_Object image_inst
-     jpeg_start_decompress (&cinfo);
- 
-     /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/
--
-+    pixels_sq =
-+      (UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height;
-+    if (pixels_sq > ((size_t) -1) / 3)
-+      signal_image_error ("JPEG image too large to instantiate", instantiator);
-     unwind.eimage = (unsigned char*) xmalloc (cinfo.output_width * cinfo.output_height * 3);
-     if (!unwind.eimage)
-       signal_image_error("Unable to allocate enough memory for image", instantiator);
-@@ -671,6 +675,7 @@ gif_instantiate (Lisp_Object image_insta
-   {
-     ColorMapObject *cmo = unwind.giffile->SColorMap;
-     int i, j, row, pass, interlace, slice;
-+    UINT_64_BIT pixels_sq;
-     unsigned char *eip;
-     /* interlaced gifs have rows in this order:
-        0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ...  */
-@@ -679,6 +684,9 @@ gif_instantiate (Lisp_Object image_insta
- 
-     height = unwind.giffile->SHeight;
-     width = unwind.giffile->SWidth;
-+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-+    if (pixels_sq > ((size_t) -1) / (3 * unwind.giffile->ImageCount))
-+      signal_image_error ("GIF image too large to instantiate", instantiator);
-     unwind.eimage = (unsigned char*)
-       xmalloc (width * height * 3 * unwind.giffile->ImageCount);
-     if (!unwind.eimage)
-@@ -939,7 +947,14 @@ png_instantiate (Lisp_Object image_insta
-     unsigned char **row_pointers;
-     height = png_get_image_height(png_ptr, info_ptr);
-     width = png_get_image_width(png_ptr, info_ptr);
-+    UINT_64_BIT pixels_sq;
- 
-+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-+    if (pixels_sq > ((size_t) -1) / 3) {
-+	    signal_image_error ("PNG image too large to instantiate",
-+		instantiator);
-+    }
-+    
-     /* Wow, allocate all the memory.  Truly, exciting.
-        Well, yes, there's excitement to be had.  It turns out that libpng
-        strips in place, so the last row overruns the buffer if depth is 16
-@@ -949,7 +964,7 @@ png_instantiate (Lisp_Object image_insta
- 
-     padding = 5 * width;
-     unwind.eimage = xnew_array_and_zero (unsigned char,
--					 width * height * 3 + padding);
-+					 pixels_sq * 3 + padding);
- 
-     /* libpng expects that the image buffer passed in contains a
-        picture to draw on top of if the png has any transparencies.
-@@ -1286,6 +1301,7 @@ tiff_instantiate (Lisp_Object image_inst
- 
-     uint32 *raster;
-     unsigned char *ep;
-+    UINT_64_BIT pixels_sq;
- 
-     assert (!NILP (data));
- 
-@@ -1308,12 +1324,16 @@ tiff_instantiate (Lisp_Object image_inst
- 
-     TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width);
-     TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height);
--    unwind.eimage = (unsigned char *) xmalloc (width * height * 3);
-+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-+    if (pixels_sq >= 1 << 29)
-+      signal_image_error ("TIFF image too large to instantiate", instantiator);
-+    unwind.eimage = (unsigned char *) xmalloc (pixels_sq * 3);
-+
- 
-     /* #### This is little more than proof-of-concept/function testing.
-        It needs to be reimplemented via scanline reads for both memory
-        compactness. */
--    raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32));
-+    raster = (uint32*) _TIFFmalloc ((tsize_t) (pixels_sq * sizeof (uint32)));
-     if (raster != NULL)
-       {
- 	int i,j;
diff --git a/editors/xemacs/patches/patch-src_lisp.h b/editors/xemacs/patches/patch-src_lisp.h
index 60073eff462..fe5e6af1c14 100644
--- a/editors/xemacs/patches/patch-src_lisp.h
+++ b/editors/xemacs/patches/patch-src_lisp.h
@@ -1,9 +1,7 @@
-$NetBSD: patch-src_lisp.h,v 1.4 2016/03/29 19:32:53 hauke Exp $
+$NetBSD: patch-src_lisp.h,v 1.5 2016/04/13 13:52:27 hauke Exp $
 
 Don't try to define max_align_t in C11 or C++11 mode.
 
-Fix CVE-2009-2688, via <https://bugzilla.redhat.com/show_bug.cgi?id=511994>
-
 --- src/lisp.h.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/lisp.h
 @@ -195,6 +195,7 @@ void xfree (void *);
@@ -22,12 +20,3 @@ Fix CVE-2009-2688, via <https://bugzilla.redhat.com/show_bug.cgi?id=511994>
  
  #ifndef ALIGNOF
  # if defined (__GNUC__) && (__GNUC__ >= 2)
-@@ -265,6 +267,8 @@ void assert_failed (const char *, int, c
- /*#define REGISTER register*/
- /*#endif*/
- 
-+/* Mitigating CVE-2009-2688, see glyphs-eimage.c */
-+#define UINT_64_BIT uint64_t
- 
- /* EMACS_INT is the underlying integral type into which a Lisp_Object must fit.
-    In particular, it must be large enough to contain a pointer.
diff --git a/editors/xemacs/patches/patch-src_unexelf.c b/editors/xemacs/patches/patch-src_unexelf.c
index 2a2849e135b..bc0fcd07a84 100644
--- a/editors/xemacs/patches/patch-src_unexelf.c
+++ b/editors/xemacs/patches/patch-src_unexelf.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_unexelf.c,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-src_unexelf.c,v 1.2 2016/04/13 13:52:27 hauke Exp $
+
+Build on NetBSD/alpha
 
 --- src/unexelf.c.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/unexelf.c
diff --git a/editors/xemacs/patches/patch-src_unexfreebsd.c b/editors/xemacs/patches/patch-src_unexfreebsd.c
index 60ad8d402c7..cb85ffd1832 100644
--- a/editors/xemacs/patches/patch-src_unexfreebsd.c
+++ b/editors/xemacs/patches/patch-src_unexfreebsd.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_unexfreebsd.c,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-src_unexfreebsd.c,v 1.2 2016/04/13 13:52:27 hauke Exp $
+
+Build on NetBSD/arm*
 
 --- src/unexfreebsd.c.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/unexfreebsd.c