4 files changed, 51 insertions, 2 deletions
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index ab50fe4dd92..49b4bde87a2 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2007/05/20 17:20:25 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2007/06/30 17:59:03 joerg Exp $
 
 DISTNAME=	xemacs-21.5.27
 
@@ -38,6 +38,7 @@ WITH_WIDGETS=	--with-widgets=lucid
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
 
 INFOPATH=	${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
 
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index 9e148a1d7ab..129253412ac 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2006/10/14 02:24:46 rillig Exp $
+$NetBSD: distinfo,v 1.19 2007/06/30 17:59:03 joerg Exp $
 
 SHA1 (xemacs-21.5.27.tar.gz) = 55fc3e9c8fe3cac92791ffe1a0870aeae1baf0b8
 RMD160 (xemacs-21.5.27.tar.gz) = ee0caff8730c999d37aa3a19b19f23d5756837ad
@@ -12,3 +12,5 @@ SHA1 (patch-af) = e71e89be5ce6070bca4b4ab8456f92cf52c50c6e
 SHA1 (patch-ag) = f859010a113a9765819f92c79ce905cf4fd801dd
 SHA1 (patch-ah) = 53d806344f2429d26ee8a10005d1087d84fb0321
 SHA1 (patch-ai) = ed24c7c0cc802386c0293c34842882d5ec770426
+SHA1 (patch-aj) = aeebaec687a1ea2974d909404938fc060d5df75f
+SHA1 (patch-ak) = c8a3369efdd4af32b1a65cdb3d798724d63b3ed5
diff --git a/editors/xemacs-current/patches/patch-aj b/editors/xemacs-current/patches/patch-aj
new file mode 100644
index 00000000000..3861df16d47
--- /dev/null
+++ b/editors/xemacs-current/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2007/06/30 17:59:03 joerg Exp $
+
+--- lib-src/fakemail.c.orig	2007-06-30 17:23:25.000000000 +0000
++++ lib-src/fakemail.c
+@@ -149,15 +149,13 @@ extern int fclose (), pclose ();
+ extern char *malloc (), *realloc ();
+ #endif
+ 
+-#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 || defined(__DragonFly__)
+ #define CURRENT_USER 
+ #endif 
+ 
+ #ifdef CURRENT_USER
+ extern struct passwd *getpwuid ();
+-#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 
+-extern uid_t geteuid (); 
+-#else 
++#if defined(__FreeBSD_version) && __FreeBSD_version < 400000
+ extern unsigned short geteuid (); 
+ #endif 
+ static struct passwd *my_entry;
diff --git a/editors/xemacs-current/patches/patch-ak b/editors/xemacs-current/patches/patch-ak
new file mode 100644
index 00000000000..fb859c27e99
--- /dev/null
+++ b/editors/xemacs-current/patches/patch-ak
@@ -0,0 +1,24 @@
+$NetBSD: patch-ak,v 1.1 2007/06/30 17:59:03 joerg Exp $
+
+--- src/dired.c.orig	2004-11-04 23:06:21.000000000 +0000
++++ src/dired.c
+@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
+ /* Synched up with: FSF 19.30. */
+ 
+ #include <config.h>
++#include <limits.h>
+ #include "lisp.h"
+ 
+ #include "buffer.h"
+@@ -104,7 +105,11 @@ If FILES-ONLY is the symbol t, then only
+   directory = Ffile_name_as_directory (directory);
+   directorylen = XSTRING_LENGTH (directory);
+ 
++#ifdef NAME_MAX
++  statbuf = alloca_ibytes (directorylen + NAME_MAX + 1);
++#else
+   statbuf = alloca_ibytes (directorylen + MAXNAMLEN + 1);
++#endif
+   memcpy (statbuf, XSTRING_DATA (directory), directorylen);
+   statbuf_tail = statbuf + directorylen;
+