Add DragonFly and modular Xorg support.

9 files changed, 115 insertions, 19 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index cbce82d0b4e..06706897df3 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.83 2007/02/15 14:27:48 joerg Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
@@ -15,4 +15,5 @@ PLIST_SUBST+=	X11ONLY=""
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
index 3aeb256c172..ae7077dcce0 100644
--- a/editors/xemacs/Makefile.common
+++ b/editors/xemacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2006/11/03 07:01:42 wiz Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/02/15 14:27:48 joerg Exp $
 
 DISTNAME=	xemacs-21.4.17
 CATEGORIES=	editors
@@ -103,6 +103,7 @@ post-extract:
 	@for f in ${EXTRA_FILES}; do \
 		${GTAR} xzCf ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/$$f; \
 	done
+	${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
 
 post-patch:
 	@${RM} -f ${WRKSRC}/etc/ctags.1.orig
diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST
index adae6696963..3fb3763c492 100644
--- a/editors/xemacs/PLIST
+++ b/editors/xemacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/03/20 18:21:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/02/15 14:27:48 joerg Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -258,6 +258,7 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/dgux5-4r2.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/dgux5-4r3.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/dgux5-4r4.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/domain.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/dragonfly.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/esix.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/esix5r4.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/ewsux5r4.h
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index 19eb9589832..0e633c95ee6 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/02/28 16:20:10 uebayasi Exp $
+$NetBSD: distinfo,v 1.11 2007/02/15 14:27:48 joerg Exp $
 
 SHA1 (xemacs/xemacs-21.4.17.tar.gz) = 274812bee5f8010ca3d56b517026270d94415f33
 RMD160 (xemacs/xemacs-21.4.17.tar.gz) = d42ca370ba916f0147b368bd7db2cc6c523646ae
@@ -9,13 +9,14 @@ Size (xemacs/xemacs-21.4.17-elc.tar.gz) = 931709 bytes
 SHA1 (xemacs/xemacs-21.4.17-info.tar.gz) = 6a0319d8a5e29c6725d3973ee5f39360503ef681
 RMD160 (xemacs/xemacs-21.4.17-info.tar.gz) = 5894750e99d225e53e79bf2c6fa786b3fd13d7a5
 Size (xemacs/xemacs-21.4.17-info.tar.gz) = 1634004 bytes
-SHA1 (patch-aa) = f625428b9fb782d452a01e82a9d5d716fba4c4ed
+SHA1 (patch-aa) = 933c2522fce7877d73c57cf0e153afcce78bdf7e
 SHA1 (patch-ab) = 1487edf8addea7971f4fcbcf57818090f32edef5
 SHA1 (patch-ac) = effbc40595b0c3b6e443588528113d907a6056c1
 SHA1 (patch-ad) = e2a70a64f0659ffda6dd27b37512e4dc5bd4ecf4
-SHA1 (patch-af) = 3e69cbd226c6f6b0f6480d78ffd06b7da8cef2b9
+SHA1 (patch-ae) = c3ad7249bb7eb51c509546fc88fe3efc5b70a6d7
+SHA1 (patch-af) = 97cd3d340f349a645a7be9a683879528d9f4c5f2
 SHA1 (patch-ah) = 9a02b989a6d45cdfead22ea703acceca722cf313
 SHA1 (patch-ai) = ea752473a56d20907201763966ecdeaaeffac84a
 SHA1 (patch-ak) = 240daa4996d51fe754e6fe46f2577f9112febe3c
 SHA1 (patch-al) = 247826009110453a868525e711e084b7dee49664
-SHA1 (patch-am) = 498784ac7532a5e24319c0c236e44e2f9beb14ea
+SHA1 (patch-am) = b7dc4c12b7d40ba12c6b82f9fc211a70877f85e7
diff --git a/editors/xemacs/files/dragonfly.h b/editors/xemacs/files/dragonfly.h
new file mode 100644
index 00000000000..742fce1e649
--- /dev/null
+++ b/editors/xemacs/files/dragonfly.h
@@ -0,0 +1,52 @@
+/* Synched up with: FSF 19.31. */
+
+/* s/ file for DragonFly system.  */
+
+/* Get most of the stuff from bsd4.3 */
+#include "bsd4-3.h"
+
+/* For mem-limits.h. */
+#define BSD4_2
+
+/* These aren't needed, since we have getloadavg.  */
+#undef KERNEL_FILE
+#undef LDAV_SYMBOL
+
+#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
+
+#define INTERRUPTIBLE_OPEN
+
+#define LIBS_DEBUG
+#define LIBS_SYSTEM "-lutil"
+
+#ifndef NOT_C_CODE
+#ifdef BSD /* fixing BSD define */
+#undef BSD
+#endif
+#include <sys/param.h>
+/* Kludge to work around setlocale(LC_ALL,...) not working after 01/1997 */
+#endif /* C code */
+
+#define LIBS_TERMCAP "-ltermcap"
+
+#ifndef NOT_C_CODE
+#include <stddef.h>
+#endif
+#define LD_SWITCH_SYSTEM
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
+#define UNEXEC "unexelf.o"
+#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
+#define LINKER "$(CC) -nostdlib"
+#undef LIB_GCC
+#define LIB_GCC
+
+/* #define NO_TERMIO */ /* detected in configure */
+#define DECLARE_GETPWUID_WITH_UID_T
+
+/* freebsd uses OXTABS instead of the expected TAB3. */
+#define TABDLY OXTABS
+#define TAB3 OXTABS
+
+/* Needed to avoid hanging when child process writes an error message
+   and exits -- enami tsugutomo <enami@ba2.so-net.or.jp>.  */
+#define vfork fork
diff --git a/editors/xemacs/patches/patch-aa b/editors/xemacs/patches/patch-aa
index a1c69a195a1..aa0f1650b39 100644
--- a/editors/xemacs/patches/patch-aa
+++ b/editors/xemacs/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2004/02/09 07:54:58 minskim Exp $
+$NetBSD: patch-aa,v 1.6 2007/02/15 14:27:48 joerg Exp $
 
---- configure.orig	2004-01-23 22:34:33.000000000 -0600
+--- configure.orig	2005-01-31 03:06:14.000000000 +0000
 +++ configure
 @@ -1130,6 +1130,7 @@ echo "$ac_t""$configuration" 1>&6
  machine='' opsys=''
@@ -22,7 +22,15 @@ $NetBSD: patch-aa,v 1.5 2004/02/09 07:54:58 minskim Exp $
      esac
    ;;
  
-@@ -3134,7 +3136,7 @@ echo "configure:3132: checking "for runt
+@@ -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 ;
+@@ -3133,7 +3136,7 @@ echo "configure:3131: checking "for runt
      decosf* | linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
@@ -31,7 +39,7 @@ $NetBSD: patch-aa,v 1.5 2004/02/09 07:54:58 minskim Exp $
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
          
  if test "$GCC" = "yes"; then
-@@ -14057,6 +14059,41 @@ else   for feature in ncurses gpm; do
+@@ -14091,6 +14094,41 @@ else   for feature in ncurses gpm; do
      eval "with_${feature}=no"
    done
  fi 
@@ -73,7 +81,7 @@ $NetBSD: patch-aa,v 1.5 2004/02/09 07:54:58 minskim Exp $
  test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" && extra_objs="$extra_objs event-unixoid.o" &&  if test "$extra_verbose" = "yes"; then
     echo "    xemacs will be linked with \"event-unixoid.o\""
   fi
-@@ -16477,6 +16514,7 @@ s%@libs_xauth@%$libs_xauth%g
+@@ -16511,6 +16549,7 @@ s%@libs_xauth@%$libs_xauth%g
  s%@dnd_objs@%$dnd_objs%g
  s%@lwlib_objs@%$lwlib_objs%g
  s%@ALLOCA@%$ALLOCA%g
diff --git a/editors/xemacs/patches/patch-ae b/editors/xemacs/patches/patch-ae
new file mode 100644
index 00000000000..9f492e9cf00
--- /dev/null
+++ b/editors/xemacs/patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.3 2007/02/15 14:27:48 joerg Exp $
+
+--- src/dired.c.orig	2007-02-13 18:38:12.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-af b/editors/xemacs/patches/patch-af
index 8a8d0aa8c74..a5a112843bd 100644
--- a/editors/xemacs/patches/patch-af
+++ b/editors/xemacs/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.5 2004/02/09 07:54:58 minskim Exp $
+$NetBSD: patch-af,v 1.6 2007/02/15 14:27:48 joerg Exp $
 
---- configure.in.orig	2004-01-23 22:37:54.000000000 -0600
+--- configure.in.orig	2005-01-31 02:54:47.000000000 +0000
 +++ configure.in
 @@ -1082,6 +1082,7 @@ machine='' opsys=''
  
@@ -23,7 +23,15 @@ $NetBSD: patch-af,v 1.5 2004/02/09 07:54:58 minskim Exp $
      esac
    ;;
  
-@@ -2244,7 +2245,7 @@ if test "$add_runtime_path" = "yes"; the
+@@ -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 ;
+@@ -2247,7 +2249,7 @@ if test "$add_runtime_path" = "yes"; the
      decosf* | linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
@@ -32,7 +40,7 @@ $NetBSD: patch-af,v 1.5 2004/02/09 07:54:58 minskim Exp $
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
          XE_PROTECT_LINKER_FLAGS(xe_check_libs)
          AC_TRY_LINK(, , dash_r="$try_dash_r")
-@@ -4395,6 +4396,9 @@ else dnl "$with_tty" = "no"
+@@ -4409,6 +4411,9 @@ else dnl "$with_tty" = "no"
    done
  fi dnl with_tty
  
diff --git a/editors/xemacs/patches/patch-am b/editors/xemacs/patches/patch-am
index 69291a86845..7302234e889 100644
--- a/editors/xemacs/patches/patch-am
+++ b/editors/xemacs/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2003/12/22 07:08:30 uebayasi Exp $
+$NetBSD: patch-am,v 1.3 2007/02/15 14:27:48 joerg Exp $
 
 --- src/database.c.orig	Thu Jun 19 12:34:42 2003
 +++ src/database.c
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.2 2003/12/22 07:08:30 uebayasi Exp $
  #define __BIT_TYPES_DEFINED__
  #include <inttypes.h>
 -#ifndef __FreeBSD__
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
  typedef uint8_t  u_int8_t;
  typedef uint16_t u_int16_t;
  typedef uint32_t u_int32_t;
@@ -15,7 +15,7 @@ $NetBSD: patch-am,v 1.2 2003/12/22 07:08:30 uebayasi Exp $
  typedef uint64_t u_int64_t;
 -#endif
  #endif /* WE_DONT_NEED_QUADS */
-+#endif /* !(__FreeBSD__ || __NetBSD__ || __OpenBSD__) */
++#endif /* !(__FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__) */
  #endif /* HAVE_INTTYPES_H */
  #endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */
  /* Berkeley DB wants __STDC__ to be defined; else if does `#define const' */