reinit the tree, so we can have metadata

17 files changed, 1056 insertions, 0 deletions

diff --git a/app-editors/xemacs/files/README.Gentoo b/app-editors/xemacs/files/README.Gentoo
new file mode 100644
index 000000000000..abb71cc90988
--- /dev/null
+++ b/app-editors/xemacs/files/README.Gentoo
@@ -0,0 +1,45 @@
+README.Gentoo
+-------------
+
+This is a quick tutorial on how to configure the XEmacs package user
+interface (package-ui). After you configure package-ui, you will be
+able to download and install XEmacs packages and dependencies while in
+XEmacs. For the complete documentation, see
+/usr/share/doc/xemacs-21.4.*/README.packages.gz
+
+Once XEmacs is emerged onto a Gentoo Linux system, you will only have
+the following elisp modules installed: xemacs-base, efs and
+(optionally if you had mule in USE) mule-base. This guide will show
+how to use package-ui to download and install your own preference in
+elisp modules to ~/.xemacs/xemacs-packages.
+
+First, start XEmacs and load the package-ui elisp module.
+
+  M-x load-library RET package-ui RET
+
+The first thing to set is the download site (package-ui installs via
+network).
+
+  M-x customize-variable RET package-get-remote RET
+
+Insert a new value, then:
+
+  Choice: Remote
+  Host: ibiblio.org
+  Directory: /pub/packages/editors/xemacs/packages/
+
+Make sure you set and save the change. Note, other host/directories
+are possible. The the documentation for package-ui for more
+information. Hint: ibiblio.org is *fast*.
+
+Then set the location package-ui should install to:
+
+  M-x customize-variable RET pui-package-install-dest-dir RET
+
+  Directory: ~/.xemacs/xemacs-packages
+
+Make sure you set and save the change.
+
+At this point you can install your modules:
+
+  M-x pui-list-packages
diff --git a/app-editors/xemacs/files/xemacs-21.4.19-db.patch b/app-editors/xemacs/files/xemacs-21.4.19-db.patch
new file mode 100644
index 000000000000..cf87d60e628a
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.19-db.patch
@@ -0,0 +1,84 @@
+This patch fixes several database-related problems.
+
+dbm_open has been moved into gdbm_compat, so we check for that and include it.
+
+ndbm.h is located in /usr/include/gdbm on Gentoo, so we only check
+there, given that we don't support normal dbm installations, and we
+patch database.c as well. Not portable beyond Gentoo, but will work
+for us.
+
+The checks for Berkeley DB only took into account up to version
+3. Added checks to deal with several versions 4 as well.
+
+--- xemacs-21.4.19/configure.in	2005-12-24 01:48:14.000000000 +0100
++++ xemacs-21.4.19-db/configure.in	2006-06-11 22:43:52.000000000 +0200
+@@ -4502,7 +4502,7 @@
+ 
+ dnl Check for ndbm.h, required for either kind of DBM support.
+ if test "$with_database_gdbm $with_database_dbm" != "no no"; then
+-  AC_CHECK_HEADER(ndbm.h, [:], [
++  AC_CHECK_HEADER(gdbm/ndbm.h, [:], [
+     test "$with_database_gdbm" = "yes" -o \
+          "$with_database_dbm"  = "yes" && \
+       XE_DIE("Required DBM support cannot be provided.")
+@@ -4513,10 +4513,13 @@
+ if test "$with_database_gdbm" != "no"; then
+   AC_CHECK_LIB(gdbm, dbm_open, [
+    with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
++	AC_CHECK_LIB(gdbm_compat, dbm_open, [
++	with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
+    if test "$with_database_gdbm" = "yes"; then
+      XE_DIE("Required GNU DBM support cannot be provided.")
+    fi
+-   with_database_gdbm=no])
++   with_database_gdbm=no], -lgdbm)
++  ])
+ fi
+ 
+ dnl Check for DBM support in libc and libdbm.
+@@ -4614,11 +4617,30 @@
+ #if DB_VERSION_MAJOR > 2
+ yes
+ #endif
+-], [AC_MSG_RESULT(3); dbfunc=db_create],[
+-    AC_MSG_RESULT(2); dbfunc=db_open])],[
+-    AC_MSG_RESULT(1); dbfunc=dbopen])
++], [AC_EGREP_CPP(yes,
++[#include <$db_h_file>
++#if DB_VERSION_MAJOR > 3
++yes
++#endif
++], [AC_MSG_RESULT(4); dbfunc=db_create; dbver=4],[
++    AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[
++    AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[
++    AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1])
+     AC_CHECK_FUNC($dbfunc,     with_database_berkdb=yes need_libdb=no, [
+-    AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)])
++    AC_CHECK_LIB(db, db_create_4002,  with_database_berkdb=yes need_libdb=yes)])
++  fi
++
++  dnl Berk db 4.1 decorates public functions with version information
++  if test "$have_database_berkdb" != "yes" -a "$dbver" = "4"; then
++    rm -f $tempcname
++    echo "#include <$db_h_file>" > $tempcname
++    echo "configure___ dbfunc=db_create" >> $tempcname
++    define(TAB, [       ])dnl
++    eval `$CPP -Isrc $tempcname \
++        | sed -n -e "s/[[ TAB]]*=[[ TAB\"]]*/='/" -e "s/[[ TAB\"]]*\$/'/" -e "s/^configure___//p"`
++    rm -f $tempcname
++    AC_MSG_WARN("db_create is really $dbfunc")
++    AC_CHECK_LIB(db, $dbfunc,  have_database_berkdb=yes need_libdb=yes)
+   fi
+ 
+   if test "$with_database_berkdb" = "yes"; then
+--- xemacs-21.4.19/src/database.c	2005-12-24 01:52:35.000000000 +0100
++++ xemacs-21.4.19-db/src/database.c	2006-06-13 21:00:01.000000000 +0200
+@@ -82,7 +82,7 @@
+ #endif /* HAVE_BERKELEY_DB */
+ 
+ #ifdef HAVE_DBM
+-#include <ndbm.h>
++#include <gdbm/ndbm.h>
+ Lisp_Object Qdbm;
+ #endif /* HAVE_DBM */
+ 
diff --git a/app-editors/xemacs/files/xemacs-21.4.19-texi.patch b/app-editors/xemacs/files/xemacs-21.4.19-texi.patch
new file mode 100644
index 000000000000..f53eb3dafd31
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.19-texi.patch
@@ -0,0 +1,33 @@
+Index: emodules.texi
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/man/emodules.texi,v
+retrieving revision 1.2.2.2
+diff -u -B -r1.2.2.2 emodules.texi
+--- man/emodules.texi	2002/08/20 11:35:22	1.2.2.2
++++ man/emodules.texi	2006/12/09 14:21:22
+@@ -3,6 +3,9 @@
+ @c %**start of header
+ @setfilename ../info/emodules.info
+ @settitle Extending Emacs using C Modules
++@direntry
++* Emodules: (emodules).      XEmacs dynamically loadable module support.
++@end direntry
+ @c %**end of header
+ 
+ @c
+Index: external-widget.texi
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/man/external-widget.texi,v
+retrieving revision 1.3.2.1
+diff -u -B -r1.3.2.1 external-widget.texi
+--- man/external-widget.texi	2002/04/30 16:06:06	1.3.2.1
++++ man/external-widget.texi	2006/12/09 14:21:22
+@@ -4,7 +4,7 @@
+ @ifinfo
+ @dircategory XEmacs Editor
+ @direntry
+-* External Widget: (external-widget) External Client Widget.
++* External Widget: (external-widget). External Client Widget.
+ @end direntry
+ @end ifinfo
+ 
diff --git a/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch b/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch
new file mode 100644
index 000000000000..105eb549eb6d
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch
@@ -0,0 +1,19 @@
+--- lib-src/vcdiff.~1~	1996-12-18 23:42:33.000000000 +0100
++++ lib-src/vcdiff	2008-04-09 08:20:36.000000000 +0200
+@@ -79,14 +79,14 @@
+ 	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
diff --git a/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch b/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch
new file mode 100644
index 000000000000..aceae530bcb0
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch
@@ -0,0 +1,18 @@
+Patch to include depracated LDAP symbols, specifically
+ldap_open. Without the proper prototype the call will almost surely
+lead to crashes on 64-bit arches otherwise. Thanks to hwoareng for the
+initial bug report.
+
+Not reported upstream since bug tracker is down.
+
+--- src/eldap.h.~1~	2001-04-12 20:23:36.000000000 +0200
++++ src/eldap.h	2010-09-28 19:53:34.148472315 +0200
+@@ -21,6 +21,8 @@
+ #ifndef INCLUDED_eldap_h_
+ #define INCLUDED_eldap_h_
+ 
++#define LDAP_DEPRECATED 1
++
+ #include <lber.h>
+ #include <ldap.h>
+ 
diff --git a/app-editors/xemacs/files/xemacs-21.4.22-large-images.patch b/app-editors/xemacs/files/xemacs-21.4.22-large-images.patch
new file mode 100644
index 000000000000..a03af3ccfa38
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.22-large-images.patch
@@ -0,0 +1,122 @@
+PATCH 21.4
+
+Here is the 21.4 version of the previous patch.  The lisp.h hunk is a
+little ugly.  Recommendations on how to deal with the absence of
+UINT_64_T in 21.4 are welcome.
+
+Index: src/glyphs-eimage.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-eimage.c,v
+retrieving revision 1.9.2.5
+diff -d -u -r1.9.2.5 glyphs-eimage.c
+--- src/glyphs-eimage.c	2007/08/20 19:52:28	1.9.2.5
++++ src/glyphs-eimage.c	2009/07/01 22:36:04
+@@ -407,6 +407,7 @@
+    */
+
+   {
++    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_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 @@
+   {
+     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 @@
+
+     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)
+@@ -937,11 +945,15 @@
+   {
+     int y;
+     unsigned char **row_pointers;
++    UINT_64_BIT pixels_sq;
+     height = info_ptr->height;
+     width = info_ptr->width;
++    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. */
+-    unwind.eimage = xnew_array_and_zero (unsigned char, width * height * 3);
++    unwind.eimage = xnew_array_and_zero (unsigned char, pixels_sq * 3);
+     /* libpng expects that the image buffer passed in contains a
+        picture to draw on top of if the png has any transparencies.
+        This could be a good place to pass that in... */
+@@ -994,7 +1006,7 @@
+       png_set_expand (png_ptr);
+     /* send grayscale images to RGB too */
+     if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+-        info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++	info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+       png_set_gray_to_rgb (png_ptr);
+     /* we can't handle alpha values */
+     if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+@@ -1268,6 +1280,7 @@
+
+     uint32 *raster;
+     unsigned char *ep;
++    UINT_64_BIT pixels_sq;
+
+     assert (!NILP (data));
+
+@@ -1290,12 +1303,15 @@
+
+     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;
+Index: src/lisp.h
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
+retrieving revision 1.45.2.10
+diff -d -u -r1.45.2.10 lisp.h
+--- src/lisp.h	2005/02/01 03:55:02	1.45.2.10
++++ src/lisp.h	2009/07/01 22:36:05
+@@ -265,6 +265,11 @@
+ /*#define REGISTER register*/
+ /*#endif*/
+
++#if SIZEOF_LONG == 8
++#define UINT_64_BIT unsigned long
++#elif SIZEOF_LONG_LONG == 8
++#define UINT_64_BIT unsigned long long
++#endif
+
+ /* 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/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch b/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch
new file mode 100644
index 000000000000..0143e375d749
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch
@@ -0,0 +1,66 @@
+diff -ur xemacs-21.4.22.orig/src/glyphs-eimage.c xemacs-21.4.22/src/glyphs-eimage.c
+--- xemacs-21.4.22.orig/src/glyphs-eimage.c	2011-09-26 19:44:57.889720996 +0300
++++ xemacs-21.4.22/src/glyphs-eimage.c	2011-09-26 19:48:07.026226254 +0300
+@@ -946,8 +946,8 @@
+     int y;
+     unsigned char **row_pointers;
+     UINT_64_BIT pixels_sq;
+-    height = info_ptr->height;
+-    width = info_ptr->width;
++    height = png_get_image_height(png_ptr, info_ptr);
++    width = png_get_image_width(png_ptr, info_ptr);
+     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);
+@@ -1002,22 +1002,22 @@
+     /* Now that we're using EImage, ask for 8bit RGB triples for any type
+        of image*/
+     /* convert palette images to full RGB */
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
++    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
+       png_set_expand (png_ptr);
+     /* send grayscale images to RGB too */
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+-	info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY ||
++	png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
+       png_set_gray_to_rgb (png_ptr);
+     /* we can't handle alpha values */
+-    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
++    if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
+       png_set_strip_alpha (png_ptr);
+     /* tell libpng to strip 16 bit depth files down to 8 bits */
+-    if (info_ptr->bit_depth == 16)
++    if (png_get_bit_depth(png_ptr, info_ptr) == 16)
+       png_set_strip_16 (png_ptr);
+     /* if the image is < 8 bits, pad it out */
+-    if (info_ptr->bit_depth < 8)
++    if (png_get_bit_depth(png_ptr, info_ptr) < 8)
+       {
+-	if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
++	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
+ 	  png_set_expand (png_ptr);
+ 	else
+ 	  png_set_packing (png_ptr);
+@@ -1036,16 +1036,18 @@
+      */
+     {
+       int i;
++      png_textp text;
++      int num_text;
+ 
+-      for (i = 0 ; i < info_ptr->num_text ; i++)
++      for (i = 0 ; i < num_text ; i++)
+ 	{
+ 	  /* How paranoid do I have to be about no trailing NULLs, and
+ 	     using (int)info_ptr->text[i].text_length, and strncpy and a temp
+ 	     string somewhere? */
+ 
+ 	  warn_when_safe (Qpng, Qinfo, "%s - %s",
+-			  info_ptr->text[i].key,
+-			  info_ptr->text[i].text);
++			  text[i].key,
++			  text[i].text);
+ 	}
+     }
+ #endif
diff --git a/app-editors/xemacs/files/xemacs-21.4.22-texinfo-5.patch b/app-editors/xemacs/files/xemacs-21.4.22-texinfo-5.patch
new file mode 100644
index 000000000000..05dda3974a65
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.22-texinfo-5.patch
@@ -0,0 +1,437 @@
+--- xemacs-21.4.22-orig/man/custom.texi
++++ xemacs-21.4.22/man/custom.texi
+@@ -60,7 +60,7 @@
+ 
+ @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 @@
+ 
+ @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 @@
+ 
+ @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 @@
+ 
+ @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 @@
+ 
+ @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 @@
+ 
+ @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 @@
+ 
+ @node Wishlist,  , The Init File, Top
+ @comment  node-name,  next,  previous,  up
+-@section Wishlist
++@chapter Wishlist
+ 
+ @itemize @bullet
+ @item
+--- xemacs-21.4.22-orig/man/info.texi
++++ xemacs-21.4.22/man/info.texi
+@@ -543,6 +543,10 @@
+ @c If a menu appears at the end of this node, remove it.
+ @c It is an accident of the menu updating command.
+ 
++@menu
++* Help-Cross::
++@end menu
++
+ @node Help-Cross,  ,  , Help-Adv
+ @subsection The node reached by the cross reference in Info
+ 
+--- xemacs-21.4.22-orig/man/lispref/edebug-inc.texi
++++ xemacs-21.4.22/man/lispref/edebug-inc.texi
+@@ -1103,7 +1103,7 @@
+ Here is a table of the possibilities for @var{specification} and how each
+ directs processing of arguments.
+ 
+-@table @bullet
++@table @asis
+ 
+ @item @code{t}
+ All arguments are instrumented for evaluation.
+--- xemacs-21.4.22-orig/man/lispref/packaging.texi
++++ xemacs-21.4.22/man/lispref/packaging.texi
+@@ -600,7 +600,7 @@
+ 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}
+--- xemacs-21.4.22-orig/man/term.texi
++++ xemacs-21.4.22/man/term.texi
+@@ -4,7 +4,7 @@
+ 
+ @titlepage
+ @sp 6
+-@center @titlefont(Notes about Emacs TERM Mode)
++@center @titlefont{Notes about Emacs TERM Mode}
+ @end titlepage
+ 
+ @ifinfo
+--- xemacs-21.4.22-orig/man/widget.texi
++++ xemacs-21.4.22/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
+@@ -129,7 +129,7 @@
+ 
+ @node User Interface, Programming Example, Introduction, Top
+ @comment  node-name,  next,  previous,  up
+-@section User Interface
++@chapter User Interface
+ 
+ A form consists of read only text for documentation and some fields,
+ where each of the fields contains two parts, a tag and a value.  The
+@@ -175,7 +175,7 @@
+ a form, namely editing the editable text fields and activating the
+ buttons.
+ 
+-@subsection Editable Text Fields
++@section Editable Text Fields
+ 
+ In the example, the value for the @samp{Name} is most likely displayed
+ in an editable text field, and so are values for each of the members of
+@@ -194,7 +194,7 @@
+ Face used for other editing fields.
+ @end deffn
+ 
+-@subsection Buttons
++@section Buttons
+ 
+ Some portions of the buffer have an associated @dfn{action}, which can
+ be @dfn{invoked} by a standard key or mouse command.  These portions
+@@ -259,7 +259,7 @@
+ Face used for buttons when the mouse pointer is above it.
+ @end defopt
+ 
+-@subsection Navigation
++@section Navigation
+ 
+ You can use all the normal Emacs commands to move around in a form
+ buffer, plus you will have these additional commands:
+@@ -277,7 +277,7 @@
+ 
+ @node Programming Example, Setting Up the Buffer, User Interface, Top
+ @comment  node-name,  next,  previous,  up
+-@section Programming Example
++@chapter Programming Example
+ 
+ Here is the code to implement the user interface example (see @ref{User
+ Interface}).
+@@ -369,7 +369,7 @@
+ 
+ @node Setting Up the Buffer, Basic Types, Programming Example, Top
+ @comment  node-name,  next,  previous,  up
+-@section Setting Up the Buffer
++@chapter Setting Up the Buffer
+ 
+ Widgets are created with @code{widget-create}, which returns a
+ @dfn{widget} object.  This object can be queried and manipulated by
+@@ -422,7 +422,7 @@
+ 
+ @node Basic Types, Sexp Types, Setting Up the Buffer, Top
+ @comment  node-name,  next,  previous,  up
+-@section Basic Types
++@chapter Basic Types
+ 
+ The syntax of a type specification is given below:
+ 
+@@ -635,7 +635,7 @@
+ 
+ @node link, url-link, Basic Types, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{link} Widget
++@section The @code{link} Widget
+ 
+ Syntax:
+ 
+@@ -659,7 +659,7 @@
+ 
+ @node url-link, info-link, link, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{url-link} Widget
++@section The @code{url-link} Widget
+ 
+ Syntax:
+ 
+@@ -672,7 +672,7 @@
+ 
+ @node info-link, push-button, url-link, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{info-link} Widget
++@section The @code{info-link} Widget
+ 
+ Syntax:
+ 
+@@ -685,7 +685,7 @@
+ 
+ @node  push-button, editable-field, info-link, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{push-button} Widget
++@section The @code{push-button} Widget
+ 
+ Syntax:
+ 
+@@ -709,7 +709,7 @@
+ 
+ @node editable-field, text, push-button, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{editable-field} Widget
++@section The @code{editable-field} Widget
+ 
+ Syntax:
+ 
+@@ -753,7 +753,7 @@
+ 
+ @node text, menu-choice, editable-field, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{text} Widget
++@section The @code{text} Widget
+ 
+ This is just like @code{editable-field}, but intended for multiline text
+ fields.  The default @code{:keymap} is @code{widget-text-keymap}, which
+@@ -761,7 +761,7 @@
+ 
+ @node menu-choice, radio-button-choice, text, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{menu-choice} Widget
++@section The @code{menu-choice} Widget
+ 
+ Syntax:
+ 
+@@ -796,7 +796,7 @@
+ 
+ @node radio-button-choice, item, menu-choice, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{radio-button-choice} Widget
++@section The @code{radio-button-choice} Widget
+ 
+ Syntax:
+ 
+@@ -856,7 +856,7 @@
+ 
+ @node item, choice-item, radio-button-choice, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{item} Widget
++@section The @code{item} Widget
+ 
+ Syntax:
+ 
+@@ -870,7 +870,7 @@
+ 
+ @node choice-item, toggle, item, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{choice-item} Widget
++@section The @code{choice-item} Widget
+ 
+ Syntax:
+ 
+@@ -886,7 +886,7 @@
+ 
+ @node toggle, checkbox, choice-item, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{toggle} Widget
++@section The @code{toggle} Widget
+ 
+ Syntax:
+ 
+@@ -914,7 +914,7 @@
+ 
+ @node checkbox, checklist, toggle, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{checkbox} Widget
++@section The @code{checkbox} Widget
+ 
+ The widget has two possible states, `selected' and `unselected', which
+ corresponds to a @code{t} or @code{nil} value.
+@@ -927,7 +927,7 @@
+ 
+ @node checklist, editable-list, checkbox, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{checklist} Widget
++@section The @code{checklist} Widget
+ 
+ Syntax:
+ 
+@@ -978,7 +978,7 @@
+ 
+ @node editable-list, group, checklist, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{editable-list} Widget
++@section The @code{editable-list} Widget
+ 
+ Syntax:
+ 
+@@ -1030,7 +1030,7 @@
+ 
+ @node group,  , editable-list, Basic Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The @code{group} Widget
++@section The @code{group} Widget
+ 
+ This widget simply groups other widgets together.
+ 
+@@ -1044,7 +1044,7 @@
+ 
+ @node Sexp Types, Widget Properties, Basic Types, Top
+ @comment
+-@section Sexp Types
++@chapter Sexp Types
+ 
+ A number of widgets for editing s-expressions (lisp types) are also
+ available.  These basically fall in the following categories.
+@@ -1058,7 +1058,7 @@
+ 
+ @node constants, generic, Sexp Types, Sexp Types
+ @comment  node-name,  next,  previous,  up
+-@subsection The Constant Widgets.
++@section The Constant Widgets.
+ 
+ The @code{const} widget can contain any lisp expression, but the user is
+ prohibited from editing it, which is mainly useful as a component of one
+@@ -1094,7 +1094,7 @@
+ 
+ @node generic, atoms, constants, Sexp Types
+ @comment  node-name,  next,  previous,  up
+-@subsection Generic Sexp Widget.
++@section Generic Sexp Widget.
+ 
+ The @code{sexp} widget can contain any lisp expression, and allows the
+ user to edit it inline in the buffer.
+@@ -1115,7 +1115,7 @@
+ 
+ @node atoms, composite, generic, Sexp Types
+ @comment  node-name,  next,  previous,  up
+-@subsection Atomic Sexp Widgets.
++@section Atomic Sexp Widgets.
+ 
+ The atoms are s-expressions that does not consist of other
+ s-expressions.  A string is an atom, while a list is a composite type.
+@@ -1192,7 +1192,7 @@
+ 
+ @node composite,  , atoms, Sexp Types
+ @comment  node-name,  next,  previous,  up
+-@subsection Composite Sexp Widgets.
++@section Composite Sexp Widgets.
+ 
+ The syntax for the composite are
+ 
+@@ -1265,7 +1265,7 @@
+ 
+ @node Widget Properties, Defining New Widgets, Sexp Types, Top
+ @comment  node-name,  next,  previous,  up
+-@section Properties
++@chapter Properties
+ 
+ You can examine or set the value of a widget by using the widget object
+ that was returned by @code{widget-create}.
+@@ -1353,7 +1353,7 @@
+ 
+ @node Defining New Widgets, Widget Browser, Widget Properties, Top
+ @comment  node-name,  next,  previous,  up
+-@section Defining New Widgets
++@chapter Defining New Widgets
+ 
+ You can define specialized widgets with @code{define-widget}.  It allows
+ you to create a shorthand for more complex widgets.  This includes
+@@ -1565,7 +1565,7 @@
+ 
+ @node Widget Browser, Widget Minor Mode, Defining New Widgets, Top
+ @comment  node-name,  next,  previous,  up
+-@section Widget Browser
++@chapter Widget Browser
+ 
+ There is a separate package to browse widgets.  This is intended to help
+ programmers who want to examine the content of a widget.  The browser
+@@ -1589,7 +1589,7 @@
+ 
+ @node  Widget Minor Mode, Utilities, Widget Browser, Top
+ @comment  node-name,  next,  previous,  up
+-@section Widget Minor Mode
++@chapter Widget Minor Mode
+ 
+ There is a minor mode for manipulating widgets in major modes that
+ doesn't provide any support for widgets themselves.  This is mostly
+@@ -1606,7 +1606,7 @@
+ 
+ @node  Utilities, Widget Wishlist, Widget Minor Mode, Top
+ @comment  node-name,  next,  previous,  up
+-@section Utilities.
++@chapter Utilities.
+ 
+ @defun widget-prompt-value widget prompt [ value unbound ]
+ Prompt for a value matching @var{widget}, using @var{prompt}.@*
+@@ -1621,7 +1621,7 @@
+ 
+ @node Widget Wishlist, Widget Internals, Utilities, Top
+ @comment  node-name,  next,  previous,  up
+-@section Wishlist
++@chapter Wishlist
+ 
+ @itemize @bullet
+ @item 
+@@ -1693,7 +1693,7 @@
+ @end itemize
+ 
+ @node Widget Internals, , Widget Wishlist, Top
+-@section Internals
++@chapter Internals
+ 
+ This (very brief!) section provides a few notes on the internal
+ structure and implementation of Emacs widgets.  Avoid relying on this
+@@ -1701,7 +1701,7 @@
+ To the extent that it actually describes APIs, the information will be
+ moved to appropriate sections of the manual in due course.
+ 
+-@subsection The @dfn{Widget} and @dfn{Type} Structures
++@section The @dfn{Widget} and @dfn{Type} Structures
+ 
+ Widgets and types are currently both implemented as lists.
+ 
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
new file mode 100644
index 000000000000..494fc51c3b88
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
@@ -0,0 +1,32 @@
+diff -r e2da872593c0 configure.in
+--- a/configure.in	Tue Mar 24 22:15:53 2015 -0400
++++ b/configure.in	Sun Mar 13 13:48:24 2016 +0100
+@@ -1939,6 +1939,8 @@
+     CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes"
+     dnl Yuck, bad compares have been worth at least 3 crashes!
+     CFLAGS="$CFLAGS -Wsign-compare"
++    dnl Use old gnu inline semantics until we fix the source
++    CFLAGS="$CFLAGS -fgnu89-inline"
+     dnl XEmacs is known not to be strict-aliasing-safe.
+     case "`gcc -v --help 2>&1`" in
+       *-fstrict-aliasing* ) CFLAGS="$CFLAGS -fno-strict-aliasing" ;;
+diff -r e2da872593c0 src/lisp.h
+--- a/src/lisp.h	Tue Mar 24 22:15:53 2015 -0400
++++ b/src/lisp.h	Sun Mar 13 13:48:24 2016 +0100
+@@ -193,6 +193,8 @@
+ # endif /* GNUC */
+ #endif
+ 
++#ifndef _GCC_MAX_ALIGN_T
++#define _GCC_MAX_ALIGN_T
+ /* No type has a greater alignment requirement than max_align_t.
+    (except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -202,6 +204,7 @@
+   struct { void (*f)(void); } f;
+   struct { double d; } d;
+ } max_align_t;
++#endif
+ 
+ #ifndef ALIGNOF
+ # if defined (__GNUC__) && (__GNUC__ >= 2)
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
new file mode 100644
index 000000000000..62d26ccc053c
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
@@ -0,0 +1,28 @@
+Don't define deprecated glibc symbol
+
+Avoid defining the deprecated symbols _BSD_SOURCE and _SVID_SOURCE
+that xmkmf thinks are needed to compile X programs.
+
+diff -r 09d56098ea2c -r 32a8151f8af7 configure.in
+--- a/configure.in	Sat Feb 11 01:24:06 2017 +0100
++++ b/configure.in	Sat Feb 11 01:59:40 2017 +0100
+@@ -2868,10 +2868,15 @@
+ 	  *     ) val=1 ;;
+ 	esac
+ dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
+-	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
+-	  if test "$val" = "1"
+-	    then AC_DEFINE_UNQUOTED($sym)
+-	    else AC_DEFINE_UNQUOTED($sym,$val)
++dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
++dnl likes us to define; ignore them if appropriate.
++	if grep "^#define $sym " confdefs.h >/dev/null          || \
++           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++        then :; else
++ 	  if test "$val" = "1"
++ 	    then AC_DEFINE_UNQUOTED($sym)
++ 	    else AC_DEFINE_UNQUOTED($sym,$val)
+ 	  fi
+ 	fi  ;;
+       esac
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
new file mode 100644
index 000000000000..19b8984db2d0
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
@@ -0,0 +1,12 @@
+diff -r e2da872593c0 configure.in
+--- a/configure.in	Tue Mar 24 22:15:53 2015 -0400
++++ b/configure.in	Mon Apr 17 10:13:05 2017 +0200
+@@ -4449,7 +4449,7 @@
+     AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
+     AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
+     XE_ADD_OBJS(terminfo.o)
+-    XE_PREPEND(-lncurses, LIBS)
++    XE_PREPEND($(pkg-config ncurses --libs), LIBS)
+ 
+     if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
+       dnl Try again, and check for the bogus ncurses/ include bug.
diff --git a/app-editors/xemacs/files/xemacs-21.5.29-optimization-bug.patch b/app-editors/xemacs/files/xemacs-21.5.29-optimization-bug.patch
new file mode 100644
index 000000000000..32a1a02c2abe
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.29-optimization-bug.patch
@@ -0,0 +1,14 @@
+Work around a GCC optimization bug as described in
+http://tracker.xemacs.org/XEmacs/its/issue354
+
+--- src/dumper.c.~1~	2008-01-26 09:54:11.000000000 +0100
++++ src/dumper.c	2008-05-03 10:17:03.000000000 +0200
+@@ -2584,7 +2584,7 @@
+ #endif /* !WIN32_NATIVE */
+ 
+ 
+-static int
++int
+ pdump_file_try (Wexttext *exe_path)
+ {
+   Wexttext *w = exe_path + wext_strlen (exe_path);
diff --git a/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch b/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch
new file mode 100644
index 000000000000..17e572044fac
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch
@@ -0,0 +1,33 @@
+diff -r a2912073be85 lisp/paragraphs.el
+--- a/lisp/paragraphs.el	Wed Jun 19 09:30:30 2013 -0600
++++ b/lisp/paragraphs.el	Sat Jun 22 13:27:48 2013 +0200
+@@ -180,7 +180,10 @@
+   :type '(choice regexp (const :tag "Use default value" nil)))
+ (put 'sentence-end 'safe-local-variable 'string-or-null-p)
+ 
+-(defcustom sentence-end-base "[.?!][]\"'”)}]*"
++(defcustom sentence-end-base
++  (concat "[.?!][]\"'"
++	  (if (featurep 'mule) (string (unicode-to-char #x201D)) "")
++	  ")}]*")
+   "Regexp matching the basic end of a sentence, not including following space."
+   :group 'paragraphs
+   :type 'string
+@@ -201,14 +204,14 @@
+ in between.  See Info node `(elisp)Standard Regexps'."
+   (or sentence-end
+       ;; We accept non-break space along with space.
+-      (concat (if sentence-end-without-period "\\w[ \u00a0][ \u00a0]\\|")
++      (concat (if sentence-end-without-period "\\w[ \240][ \240]\\|")
+ 	      "\\("
+ 	      sentence-end-base
+               (if sentence-end-double-space
+-                  "\\($\\|[ \u00a0]$\\|\t\\|[ \u00a0][ \u00a0]\\)" "\\($\\|[\t \u00a0]\\)")
++                  "\\($\\|[ \240]$\\|\t\\|[ \240][ \240]\\)" "\\($\\|[\t \240]\\)")
+               "\\|[" sentence-end-without-space "]+"
+ 	      "\\)"
+-              "[ \u00a0\t\n]*")))
++              "[ \240\t\n]*")))
+ 
+ (defcustom page-delimiter "^\014"
+   "*Regexp describing line-beginnings that separate pages."
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
new file mode 100644
index 000000000000..025a390f3335
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
@@ -0,0 +1,35 @@
+diff --git a/src/lisp.h b/src/lisp.h
+--- a/src/lisp.h
++++ b/src/lisp.h
+@@ -1154,6 +1154,8 @@
+ 
+ /* ------------------------ alignment definitions ------------------- */
+ 
++#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \
++    (!defined (__cplusplus) || __cplusplus < 201103L)
+ /* No type has a greater alignment requirement than max_align_t.
+    (except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -1163,6 +1165,7 @@
+   struct { void (*f)(void); } f;
+   struct { double d; } d;
+ } max_align_t;
++#endif
+ 
+ /* ALIGNOF returns the required alignment of a type -- i.e. a value such
+    that data of this type must begin at a memory address which is a
+@@ -1170,7 +1173,11 @@
+    as the type itself. */
+ 
+ #ifndef ALIGNOF
+-# if defined (__GNUC__) && (__GNUC__ >= 2)
++# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
++#  define ALIGNOF(type) _Alignof(type)
++# elif defined (__cplusplus) && __cplusplus >= 201103L
++#  define ALIGNOF(type) alignof(type)
++# elif defined (__GNUC__) && (__GNUC__ >= 2)
+ /* gcc has an extension that gives us exactly what we want. */
+ #  define ALIGNOF(type) __alignof__ (type)
+ # elif ! defined (__cplusplus)
+
+
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
new file mode 100644
index 000000000000..b611b15fd8b1
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
@@ -0,0 +1,32 @@
+diff -r f412e9f093d4 configure
+--- a/configure	Wed Jan 25 00:47:06 2017 +0000
++++ b/configure	Sun Jan 29 19:32:47 2017 +0100
+@@ -13507,7 +13507,10 @@
+ 	  -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
+ 	  *     ) val=1 ;;
+ 	esac
+-	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++	if grep "^#define $sym " confdefs.h >/dev/null          || \
++           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++        then :; else
+ 	  if test "$val" = "1"
+ 	    then cat >>confdefs.h <<_ACEOF
+ #define $sym 1
+diff -r f412e9f093d4 configure.ac
+--- a/configure.ac	Wed Jan 25 00:47:06 2017 +0000
++++ b/configure.ac	Sun Jan 29 19:32:47 2017 +0100
+@@ -3136,7 +3136,12 @@
+ 	  *     ) val=1 ;;
+ 	esac
+ dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
+-	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
++dnl likes us to define; ignore them if appropriate.
++	if grep "^#define $sym " confdefs.h >/dev/null          || \
++           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++        then :; else
+ 	  if test "$val" = "1"
+ 	    then AC_DEFINE_UNQUOTED($sym)
+ 	    else AC_DEFINE_UNQUOTED($sym,$val)
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch
new file mode 100644
index 000000000000..a08eda3c8a83
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch
@@ -0,0 +1,13 @@
+diff -r 6355de501637 configure
+--- a/configure	Thu Jan 23 15:03:16 2014 +0000
++++ b/configure	Fri Jan 31 23:55:12 2014 +0100
+@@ -19699,7 +19699,8 @@
+     extra_objs="$extra_objs terminfo.o" &&  if test "$verbose" = "yes"; then
+    echo "    xemacs will be linked with \"terminfo.o\""
+  fi
+-    LIBS="-lncurses $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lncurses\" to \$LIBS"; fi
++    ncurses_libs=$(pkg-config ncurses --libs)
++    LIBS="$ncurses_libs $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"$ncurses_libs\" to \$LIBS"; fi
+ 
+     if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
+                         save_c_switch_site="$c_switch_site"
diff --git a/app-editors/xemacs/files/xemacs.desktop b/app-editors/xemacs/files/xemacs.desktop
new file mode 100644
index 000000000000..93f14a731f2b
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs.desktop
@@ -0,0 +1,33 @@
+[Desktop Entry]
+Name=XEmacs Text Editor
+Name[bg]=редактор XEmacs
+Name[ca]=Editor XEmacs
+Name[cs]=Editor XEmacs
+Name[da]=XEmacs tekstredigerer
+Name[de]=XEmacs Texteditor
+Name[eo]=La redaktilo XEmakso
+Name[es]=Emacs para X
+Name[et]=Emacs X'i kasutajaliidesega
+Name[fi]=XEmacs editori
+Name[fr]=Éditeur XEmacs
+Name[hu]=XEmacs szövegszerkesztő
+Name[is]=XEmacs-ritill
+Name[it]=Emacs per X
+Name[ja]=XEmacs テキスト・エディター
+Name[mk]=Софистицираниот XEmacs уредувач
+Name[no]=XEmacs-tekstredigerer
+Name[pt]=Editor XEmacs
+Name[ro]=Editorul XEmacs
+Name[ru]=Редактор XEmacs
+Name[sk]=Editor XEmacs
+Name[sl]=Urejevalnik XEmacs
+Name[uk]=Редактор XEmacs
+GenericName=Text Editor
+Comment=Edit text
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=xemacs %f
+Icon=xemacs
+Type=Application
+Terminal=false
+Categories=Utility;TextEditor;
+StartupWMClass=Emacs