9 files changed, 54 insertions, 4 deletions

diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index b7568eae1094..9f4485c96a7c 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -80,6 +80,11 @@ PKGDIR=		${.CURDIR}/../../editors/xemacs-devel-mule
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
+# Undump and malloc do not behave on amd64 at the moment
+.if ${ARCH} == "amd64"
+CONFIGURE_ARGS+= --with-system-malloc --pdump 
+.endif
+
 pre-fetch:
 .if defined(WITHOUT_X11)
 	@${ECHO_MSG} ""
diff --git a/editors/xemacs-devel-mule/files/patch-ak b/editors/xemacs-devel-mule/files/patch-ak
index a45db5e1084d..1284f826cc7e 100644
--- a/editors/xemacs-devel-mule/files/patch-ak
+++ b/editors/xemacs-devel-mule/files/patch-ak
@@ -4,7 +4,7 @@
  # include <sys/exec_elf.h>
  #endif
  
-+#if defined(__FreeBSD__) && defined(__alpha__)
++#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__))
 +# ifdef __STDC__
 +#  define ElfW(type)   Elf64_##type
 +# else
diff --git a/editors/xemacs-devel-mule/files/patch-mem-limits.h b/editors/xemacs-devel-mule/files/patch-mem-limits.h
new file mode 100644
index 000000000000..a5ce6cb35839
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-mem-limits.h
@@ -0,0 +1,11 @@
+--- src/mem-limits.h.bak	Thu Mar 18 13:08:19 2004
++++ src/mem-limits.h	Thu Mar 18 13:08:42 2004
+@@ -108,7 +108,7 @@
+ static POINTER data_space_start;
+ 
+ /* Number of bytes of writable memory we can expect to be able to get */
+-extern unsigned int lim_data;
++extern rlim_t lim_data;
+ 
+ #if defined (HEAP_IN_DATA) && !defined(PDUMP)
+ extern unsigned long static_heap_size;
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 68a26e9cab3a..318b04d7a075 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -55,6 +55,13 @@ ALL_TARGET=	all dist
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
+.include <bsd.port.pre.mk>
+
+# Undump and malloc do not behave on amd64 at the moment
+.if ${ARCH} == "amd64"
+CONFIGURE_ARGS+= --with-system-malloc --pdump 
+.endif
+
 pre-fetch:
 #.if !defined(WANT_GTK)
 #	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK "
@@ -122,4 +129,4 @@ post-install::
 #	@${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
 #.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/xemacs-devel/files/patch-ak b/editors/xemacs-devel/files/patch-ak
index a45db5e1084d..1284f826cc7e 100644
--- a/editors/xemacs-devel/files/patch-ak
+++ b/editors/xemacs-devel/files/patch-ak
@@ -4,7 +4,7 @@
  # include <sys/exec_elf.h>
  #endif
  
-+#if defined(__FreeBSD__) && defined(__alpha__)
++#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__))
 +# ifdef __STDC__
 +#  define ElfW(type)   Elf64_##type
 +# else
diff --git a/editors/xemacs-devel/files/patch-mem-limits.h b/editors/xemacs-devel/files/patch-mem-limits.h
new file mode 100644
index 000000000000..a5ce6cb35839
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-mem-limits.h
@@ -0,0 +1,11 @@
+--- src/mem-limits.h.bak	Thu Mar 18 13:08:19 2004
++++ src/mem-limits.h	Thu Mar 18 13:08:42 2004
+@@ -108,7 +108,7 @@
+ static POINTER data_space_start;
+ 
+ /* Number of bytes of writable memory we can expect to be able to get */
+-extern unsigned int lim_data;
++extern rlim_t lim_data;
+ 
+ #if defined (HEAP_IN_DATA) && !defined(PDUMP)
+ extern unsigned long static_heap_size;
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index ece32c189874..02470b920ce1 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -87,6 +87,11 @@ PKGDIR=		${.CURDIR}/../../editors/xemacs21-mule
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
+# Undump and malloc do not behave on amd64 at the moment
+.if ${ARCH} == "amd64"
+CONFIGURE_ARGS+= --with-system-malloc --pdump 
+.endif
+
 pre-fetch:
 .if !defined(WANT_GTK)
 	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK and recompile."
diff --git a/editors/xemacs21-mule/files/patch-ak b/editors/xemacs21-mule/files/patch-ak
index a45db5e1084d..1284f826cc7e 100644
--- a/editors/xemacs21-mule/files/patch-ak
+++ b/editors/xemacs21-mule/files/patch-ak
@@ -4,7 +4,7 @@
  # include <sys/exec_elf.h>
  #endif
  
-+#if defined(__FreeBSD__) && defined(__alpha__)
++#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__))
 +# ifdef __STDC__
 +#  define ElfW(type)   Elf64_##type
 +# else
diff --git a/editors/xemacs21-mule/files/patch-mem-limits.h b/editors/xemacs21-mule/files/patch-mem-limits.h
new file mode 100644
index 000000000000..a5ce6cb35839
--- /dev/null
+++ b/editors/xemacs21-mule/files/patch-mem-limits.h
@@ -0,0 +1,11 @@
+--- src/mem-limits.h.bak	Thu Mar 18 13:08:19 2004
++++ src/mem-limits.h	Thu Mar 18 13:08:42 2004
+@@ -108,7 +108,7 @@
+ static POINTER data_space_start;
+ 
+ /* Number of bytes of writable memory we can expect to be able to get */
+-extern unsigned int lim_data;
++extern rlim_t lim_data;
+ 
+ #if defined (HEAP_IN_DATA) && !defined(PDUMP)
+ extern unsigned long static_heap_size;