5 files changed, 98 insertions, 7 deletions

diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index b129e4ef5992..5a3e9df27811 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 October 1998
 # Whom:			shige
 #
-# $Id: Makefile,v 1.2 1998/12/17 09:08:09 asami Exp $
+# $Id: Makefile,v 1.3 1999/01/16 22:58:59 asami Exp $
 #
 
 DISTNAME=	emacs-20.3
@@ -22,10 +22,11 @@ RUN_DEPENDS=	emacs-20.3:${PORTSDIR}/editors/emacs20
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit --with-pop
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 EMACS_VER=	20.3
-PLIST_SUB=	EMACS_VER=${EMACS_VER}
+EMACS_ARCH=	${MACHINE_ARCH}--freebsd
+CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --with-pop
+PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${EMACS_ARCH}
 
 .if defined(USE_XPGLIB)
 .if (${USE_XPGLIB} == "YES")
diff --git a/editors/emacs20-dl/files/patch-ai b/editors/emacs20-dl/files/patch-ai
new file mode 100644
index 000000000000..1ae2376d3fed
--- /dev/null
+++ b/editors/emacs20-dl/files/patch-ai
@@ -0,0 +1,17 @@
+--- src/unexelf.c.orig	Mon Aug 10 11:33:12 1998
++++ src/unexelf.c	Sun Jan  3 20:54:08 1999
+@@ -512,6 +512,14 @@
+ # include <link.h>	/* get ElfW etc */
+ #endif
+ 
++#ifdef __FreeBSD__
++# ifdef __STDC__
++#  define ElfW(type)	Elf_##type
++# else
++#  define ElfW(type)	Elf_/**/type
++# endif
++#endif
++
+ #ifndef ElfW
+ # ifdef __STDC__
+ #  define ElfW(type)	Elf32_##type
diff --git a/editors/emacs20-dl/files/patch-aj b/editors/emacs20-dl/files/patch-aj
new file mode 100644
index 000000000000..b11a244c6e41
--- /dev/null
+++ b/editors/emacs20-dl/files/patch-aj
@@ -0,0 +1,31 @@
+--- src/m/alpha.h.orig	Wed Oct 29 16:47:37 1997
++++ src/m/alpha.h	Sun Jan  3 20:05:49 1999
+@@ -239,7 +239,7 @@
+ 
+ #ifndef NOT_C_CODE
+ /* We need these because pointers are larger than the default ints.  */
+-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #include <alloca.h>
+ #else
+ #include <stdlib.h>
+@@ -308,7 +308,8 @@
+    termio and struct termios are mutually incompatible.  */
+ #define NO_TERMIO
+ 
+-#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
++#if defined (LINUX) || \
++	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+ # define TEXT_END ({ extern int _etext; &_etext; })
+ # ifndef __ELF__
+ #  define COFF
+@@ -316,7 +317,8 @@
+ # endif /* notdef __ELF__ */
+ #endif
+ 
+-#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
++#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
++	&& defined (__ELF__)
+ #define HAVE_TEXT_START
+ #endif
+ 
diff --git a/editors/emacs20-dl/files/patch-cb b/editors/emacs20-dl/files/patch-cb
index fe5f9671b66a..d1877ed654df 100644
--- a/editors/emacs20-dl/files/patch-cb
+++ b/editors/emacs20-dl/files/patch-cb
@@ -1,5 +1,5 @@
---- src/s/freebsd.h.orig	Wed Nov 11 21:22:03 1998
-+++ src/s/freebsd.h	Wed Nov 11 21:52:19 1998
+--- src/s/freebsd.h.orig	Wed Aug 19 16:25:36 1998
++++ src/s/freebsd.h	Sun Jan  3 20:56:02 1999
 @@ -45,6 +45,13 @@
  #define LIBS_SYSTEM -lutil
  #define LIBS_TERMCAP -ltermcap
@@ -14,3 +14,21 @@
  #define SYSV_SYSTEM_DIR
  
  /* freebsd has POSIX-style pgrp behavior. */
+@@ -54,9 +61,16 @@
+ #ifdef __ELF__
+ 
+ #define LD_SWITCH_SYSTEM
++
++#ifdef __alpha__
++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
++#else
+ #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 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
++#endif
++
++#define UNEXEC unexelf.o
+ #undef LIB_GCC
+ #define LIB_GCC
+ 
diff --git a/editors/emacs20-dl/files/patch-cc b/editors/emacs20-dl/files/patch-cc
index ec35177dedca..acc21ccdc46f 100644
--- a/editors/emacs20-dl/files/patch-cc
+++ b/editors/emacs20-dl/files/patch-cc
@@ -1,5 +1,5 @@
---- configure.in.orig	Sat Nov 21 08:59:52 1998
-+++ configure.in	Sat Nov 21 08:58:16 1998
+--- configure.in.orig	Wed Jul  1 07:15:05 1998
++++ configure.in	Sun Jan  3 21:44:02 1999
 @@ -57,6 +57,9 @@
  AC_ARG_WITH(gssapi,
  [  --with-gssapi           support GSSAPI-authenticated POP],
@@ -10,3 +10,27 @@
  dnl This should be the last --with option, because --with-x is
  dnl added later on when we find the path of X, and it's best to
  dnl keep them together visually.
+@@ -162,6 +165,15 @@
+ machine='' opsys='' unported=no
+ case "${canonical}" in
+ 
++  ## FreeBSD ports
++  *-*-freebsd* )
++    opsys=freebsd
++    case "${canonical}" in
++      alpha*-*-freebsd*)	machine=alpha ;;
++      i[3456]86-*-freebsd*)	machine=intel386 ;;
++    esac
++  ;;
++
+   ## NetBSD ports
+   *-*-netbsd* )
+     opsys=netbsd
+@@ -939,7 +951,6 @@
+ 				;;
+       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
+       *-386bsd* )	        opsys=386bsd ;;
+-      *-freebsd* )	        opsys=freebsd ;;
+       *-nextstep* )             opsys=nextstep ;;
+       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
+     esac