Add fix for Alpha.

 - patch for configure, unexelf.c, alpha.h, PLIST and etc.

43 files changed, 867 insertions, 137 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 7a7615570457..1f18eab2dca6 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.33 1999/01/02 12:26:10 kuriyama Exp $
+# $Id: Makefile,v 1.34 1999/01/16 22:58:57 asami Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -13,14 +13,15 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	ports@FreeBSD.ORG
 
 EMACS_VERSION=	19.34
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION}
+EMACS_ARCH=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${EMACS_ARCH}
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/emacs-19.34
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
-		--sharedstatedir=/var/run
+CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --sharedstatedir=/var/run
+
 STRIP=
 MAN1=		emacs.1 etags.1 ctags.1
 
diff --git a/editors/emacs/files/patch-ac b/editors/emacs/files/patch-ac
index 32937f709d3f..264e517b385f 100644
--- a/editors/emacs/files/patch-ac
+++ b/editors/emacs/files/patch-ac
@@ -1,5 +1,5 @@
---- orig/s/freebsd.h	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Tue Sep 29 11:35:32 1998
+--- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
++++ src/s/freebsd.h	Sat Jan 16 22:17:58 1999
 @@ -1,5 +1,15 @@
  /* s/ file for freebsd system.  */
  
@@ -24,16 +24,21 @@
  
  #define SYSV_SYSTEM_DIR
  
-@@ -42,12 +51,28 @@
+@@ -42,12 +51,33 @@
  #undef BSD_PGRPS
  #define GETPGRP_NO_ARG
  
 +#ifdef __ELF__
 +
 +#define LD_SWITCH_SYSTEM
++#ifdef i386
 +#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
++#else
++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
++#endif
++#define UNEXEC unexelf.o
 +#undef LIB_GCC
 +#define LIB_GCC
 +
@@ -54,7 +59,7 @@
  
  #ifndef N_TRELOFF
  #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +88,8 @@
+@@ -63,6 +93,8 @@
  #endif /* __FreeBSD__ */
  #endif /* NO_SHARED_LIBS */
  
@@ -63,7 +68,7 @@
  #define HAVE_WAIT_HEADER
  #define HAVE_GETLOADAVG
  /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +107,8 @@
+@@ -80,6 +112,8 @@
  #define BSD 199103
  #elif __FreeBSD__ == 2
  #define BSD 199306
diff --git a/editors/emacs/files/patch-af b/editors/emacs/files/patch-af
new file mode 100644
index 000000000000..23092a4a8ca0
--- /dev/null
+++ b/editors/emacs/files/patch-af
@@ -0,0 +1,13 @@
+--- configure.orig	Tue Aug 20 13:11:26 1996
++++ configure	Sat Jan 16 23:18:54 1999
+@@ -756,6 +756,10 @@
+     machine=alpha opsys=gnu-linux
+   ;;
+ 
++  alpha-*-freebsd* )
++    machine=alpha opsys=freebsd
++  ;;
++
+   ## Altos 3068
+   m68*-altos-sysv* )
+     machine=altos opsys=usg5-2
diff --git a/editors/emacs/files/patch-ag b/editors/emacs/files/patch-ag
new file mode 100644
index 000000000000..a556bd24f5eb
--- /dev/null
+++ b/editors/emacs/files/patch-ag
@@ -0,0 +1,34 @@
+--- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
++++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
+@@ -234,7 +234,11 @@
+ 
+ #ifndef NOT_C_CODE
+ /* We need these because pointers are larger than the default ints.  */
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #include <alloca.h>
++#else
++#include <stdlib.h>
++#endif
+ 
+ /* Hack alert!  For reasons unknown to mankind the string.h file insists
+    on defining bcopy etc. as taking char pointers as arguments.  With
+@@ -299,10 +303,18 @@
+    termio and struct termios are mutually incompatible.  */
+ #define NO_TERMIO
+ 
+-#ifdef LINUX
++#if defined(LINUX) || \
++	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+ # define TEXT_END ({ extern int _etext; &_etext; })
+ # ifndef __ELF__
+ #  define COFF
+ #  define DATA_END ({ extern int _EDATA; &_EDATA; })
+ # endif /* notdef __ELF__ */
+ #endif
++
++#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
++	&& defined (__ELF__)
++#define HAVE_TEXT_START
++#endif
++
++
diff --git a/editors/emacs/files/patch-ah b/editors/emacs/files/patch-ah
new file mode 100644
index 000000000000..3f990e4b5970
--- /dev/null
+++ b/editors/emacs/files/patch-ah
@@ -0,0 +1,54 @@
+--- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
++++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
+@@ -423,12 +423,50 @@
+ #include <elf.h>
+ #include <sys/mman.h>
+ 
+-#ifdef __alpha__
++#if defined(__alpha__) && defined(__osf__)
+ # include <sym.h>	/* get COFF debugging symbol table declaration */
++#else if defined(__alpha__)
++typedef struct {
++	short magic;
++	short vstamp;
++	int ilineMax;
++	int idnMax;
++	int ipdMax;
++	int isymMax;
++	int ioptMax;
++	int iauxMax;
++	int issMax;
++	int issExtMax;
++	int ifdMax;
++	int crfd;
++	int iextMax;
++	long cbLine;
++	long cbLineOffset;
++	long cbDnOffset;
++	long cbPdOffset;
++	long cbSymOffset;
++	long cbOptOffset;
++	long cbAuxOffset;
++	long cbSsOffset;
++	long cbSsExtOffset;
++	long cbFdOffset;
++	long cbRfdOffset;
++	long cbExtOffset;
++} HDRR, *pHDRR; 
++#define cbHDRR sizeof(HDRR)
++#define hdrNil ((pHDRR)0)
+ #endif
+ 
+ #if __GNU_LIBRARY__ - 0 >= 6
+ # 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
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 64141be5d27d..2284811017d7 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -113,18 +113,18 @@ info/viper-4
 @exec install-info %D/info/ediff %D/info/dir
 @exec install-info %D/info/ccmode %D/info/dir
 @exec install-info %D/info/message %D/info/dir
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/cvtmail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/digest-doc
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/emacsserver
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/fakemail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/hexl
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/movemail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/profile
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/rcs2log
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/sorted-doc
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/vcdiff
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/yow
-@dirrm libexec/emacs/%%EMACS_VERSION%%/i386--freebsd
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/fakemail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/hexl
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/movemail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/profile
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/rcs2log
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/sorted-doc
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/vcdiff
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/yow
+@dirrm libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%
 @dirrm libexec/emacs/%%EMACS_VERSION%%
 @unexec rmdir %D/libexec/emacs 2>/dev/null || true
 share/emacs/%%EMACS_VERSION%%/etc/3B-MAXMEM
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index 7a7615570457..1f18eab2dca6 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.33 1999/01/02 12:26:10 kuriyama Exp $
+# $Id: Makefile,v 1.34 1999/01/16 22:58:57 asami Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -13,14 +13,15 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	ports@FreeBSD.ORG
 
 EMACS_VERSION=	19.34
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION}
+EMACS_ARCH=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${EMACS_ARCH}
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/emacs-19.34
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
-		--sharedstatedir=/var/run
+CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --sharedstatedir=/var/run
+
 STRIP=
 MAN1=		emacs.1 etags.1 ctags.1
 
diff --git a/editors/emacs19/files/patch-ac b/editors/emacs19/files/patch-ac
index 32937f709d3f..264e517b385f 100644
--- a/editors/emacs19/files/patch-ac
+++ b/editors/emacs19/files/patch-ac
@@ -1,5 +1,5 @@
---- orig/s/freebsd.h	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Tue Sep 29 11:35:32 1998
+--- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
++++ src/s/freebsd.h	Sat Jan 16 22:17:58 1999
 @@ -1,5 +1,15 @@
  /* s/ file for freebsd system.  */
  
@@ -24,16 +24,21 @@
  
  #define SYSV_SYSTEM_DIR
  
-@@ -42,12 +51,28 @@
+@@ -42,12 +51,33 @@
  #undef BSD_PGRPS
  #define GETPGRP_NO_ARG
  
 +#ifdef __ELF__
 +
 +#define LD_SWITCH_SYSTEM
++#ifdef i386
 +#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
++#else
++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
++#endif
++#define UNEXEC unexelf.o
 +#undef LIB_GCC
 +#define LIB_GCC
 +
@@ -54,7 +59,7 @@
  
  #ifndef N_TRELOFF
  #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +88,8 @@
+@@ -63,6 +93,8 @@
  #endif /* __FreeBSD__ */
  #endif /* NO_SHARED_LIBS */
  
@@ -63,7 +68,7 @@
  #define HAVE_WAIT_HEADER
  #define HAVE_GETLOADAVG
  /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +107,8 @@
+@@ -80,6 +112,8 @@
  #define BSD 199103
  #elif __FreeBSD__ == 2
  #define BSD 199306
diff --git a/editors/emacs19/files/patch-af b/editors/emacs19/files/patch-af
new file mode 100644
index 000000000000..23092a4a8ca0
--- /dev/null
+++ b/editors/emacs19/files/patch-af
@@ -0,0 +1,13 @@
+--- configure.orig	Tue Aug 20 13:11:26 1996
++++ configure	Sat Jan 16 23:18:54 1999
+@@ -756,6 +756,10 @@
+     machine=alpha opsys=gnu-linux
+   ;;
+ 
++  alpha-*-freebsd* )
++    machine=alpha opsys=freebsd
++  ;;
++
+   ## Altos 3068
+   m68*-altos-sysv* )
+     machine=altos opsys=usg5-2
diff --git a/editors/emacs19/files/patch-ag b/editors/emacs19/files/patch-ag
new file mode 100644
index 000000000000..a556bd24f5eb
--- /dev/null
+++ b/editors/emacs19/files/patch-ag
@@ -0,0 +1,34 @@
+--- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
++++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
+@@ -234,7 +234,11 @@
+ 
+ #ifndef NOT_C_CODE
+ /* We need these because pointers are larger than the default ints.  */
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #include <alloca.h>
++#else
++#include <stdlib.h>
++#endif
+ 
+ /* Hack alert!  For reasons unknown to mankind the string.h file insists
+    on defining bcopy etc. as taking char pointers as arguments.  With
+@@ -299,10 +303,18 @@
+    termio and struct termios are mutually incompatible.  */
+ #define NO_TERMIO
+ 
+-#ifdef LINUX
++#if defined(LINUX) || \
++	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+ # define TEXT_END ({ extern int _etext; &_etext; })
+ # ifndef __ELF__
+ #  define COFF
+ #  define DATA_END ({ extern int _EDATA; &_EDATA; })
+ # endif /* notdef __ELF__ */
+ #endif
++
++#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
++	&& defined (__ELF__)
++#define HAVE_TEXT_START
++#endif
++
++
diff --git a/editors/emacs19/files/patch-ah b/editors/emacs19/files/patch-ah
new file mode 100644
index 000000000000..3f990e4b5970
--- /dev/null
+++ b/editors/emacs19/files/patch-ah
@@ -0,0 +1,54 @@
+--- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
++++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
+@@ -423,12 +423,50 @@
+ #include <elf.h>
+ #include <sys/mman.h>
+ 
+-#ifdef __alpha__
++#if defined(__alpha__) && defined(__osf__)
+ # include <sym.h>	/* get COFF debugging symbol table declaration */
++#else if defined(__alpha__)
++typedef struct {
++	short magic;
++	short vstamp;
++	int ilineMax;
++	int idnMax;
++	int ipdMax;
++	int isymMax;
++	int ioptMax;
++	int iauxMax;
++	int issMax;
++	int issExtMax;
++	int ifdMax;
++	int crfd;
++	int iextMax;
++	long cbLine;
++	long cbLineOffset;
++	long cbDnOffset;
++	long cbPdOffset;
++	long cbSymOffset;
++	long cbOptOffset;
++	long cbAuxOffset;
++	long cbSsOffset;
++	long cbSsExtOffset;
++	long cbFdOffset;
++	long cbRfdOffset;
++	long cbExtOffset;
++} HDRR, *pHDRR; 
++#define cbHDRR sizeof(HDRR)
++#define hdrNil ((pHDRR)0)
+ #endif
+ 
+ #if __GNU_LIBRARY__ - 0 >= 6
+ # 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
diff --git a/editors/emacs19/pkg-plist b/editors/emacs19/pkg-plist
index 64141be5d27d..2284811017d7 100644
--- a/editors/emacs19/pkg-plist
+++ b/editors/emacs19/pkg-plist
@@ -113,18 +113,18 @@ info/viper-4
 @exec install-info %D/info/ediff %D/info/dir
 @exec install-info %D/info/ccmode %D/info/dir
 @exec install-info %D/info/message %D/info/dir
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/cvtmail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/digest-doc
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/emacsserver
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/fakemail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/hexl
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/movemail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/profile
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/rcs2log
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/sorted-doc
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/vcdiff
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/yow
-@dirrm libexec/emacs/%%EMACS_VERSION%%/i386--freebsd
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/fakemail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/hexl
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/movemail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/profile
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/rcs2log
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/sorted-doc
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/vcdiff
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/yow
+@dirrm libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%
 @dirrm libexec/emacs/%%EMACS_VERSION%%
 @unexec rmdir %D/libexec/emacs 2>/dev/null || true
 share/emacs/%%EMACS_VERSION%%/etc/3B-MAXMEM
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
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index c5a2f4b96091..181f6ef87d6b 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.34 1998/12/13 11:54:49 kuriyama Exp $
+# $Id: Makefile,v 1.35 1999/01/16 22:58:59 asami Exp $
 #
 
 DISTNAME=	emacs-20.3
@@ -15,10 +15,12 @@ MAINTAINER=	jseger@FreeBSD.org
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit --with-pop
+EMACS_ARCH=	${MACHINE_ARCH}--freebsd
+CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --with-pop
+
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAN1=		emacs.1 etags.1 ctags.1
-PLIST_SUB=	EMACS_VER=20.3
+PLIST_SUB=	EMACS_VER=20.3 EMACS_ARCH=${EMACS_ARCH}
 
 .if defined(USE_XPGLIB)
 .if (${USE_XPGLIB} == "YES")
diff --git a/editors/emacs20/files/patch-ai b/editors/emacs20/files/patch-ai
new file mode 100644
index 000000000000..1ae2376d3fed
--- /dev/null
+++ b/editors/emacs20/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/files/patch-aj b/editors/emacs20/files/patch-aj
new file mode 100644
index 000000000000..b11a244c6e41
--- /dev/null
+++ b/editors/emacs20/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/files/patch-cb b/editors/emacs20/files/patch-cb
index fe5f9671b66a..d1877ed654df 100644
--- a/editors/emacs20/files/patch-cb
+++ b/editors/emacs20/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/files/patch-cc b/editors/emacs20/files/patch-cc
index ec35177dedca..acc21ccdc46f 100644
--- a/editors/emacs20/files/patch-cc
+++ b/editors/emacs20/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
diff --git a/editors/emacs20/pkg-plist b/editors/emacs20/pkg-plist
index 9c3edfe40b3a..3d30edd452e4 100644
--- a/editors/emacs20/pkg-plist
+++ b/editors/emacs20/pkg-plist
@@ -51,17 +51,17 @@ info/widget
 @exec install-info %D/info/vip %D/info/dir
 @exec install-info %D/info/viper %D/info/dir
 @exec install-info %D/info/widget %D/info/dir
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/cvtmail
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/digest-doc
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/emacsserver
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/fakemail
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/hexl
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/movemail
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/profile
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/rcs2log
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/sorted-doc
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/vcdiff
-libexec/emacs/%%EMACS_VER%%/i386--freebsd/yow
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/cvtmail
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/digest-doc
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/emacsserver
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fakemail
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/hexl
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/movemail
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/profile
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/rcs2log
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/sorted-doc
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 share/emacs/%%EMACS_VER%%/etc/3B-MAXMEM
 share/emacs/%%EMACS_VER%%/etc/AIX.DUMP
 share/emacs/%%EMACS_VER%%/etc/BABYL
@@ -1287,7 +1287,7 @@ share/emacs/%%EMACS_VER%%/lisp/zone-mode.el
 share/emacs/%%EMACS_VER%%/lisp/zone-mode.elc
 share/emacs/%%EMACS_VER%%/site-lisp/subdirs.el
 share/emacs/site-lisp/subdirs.el
-@dirrm libexec/emacs/%%EMACS_VER%%/i386--freebsd
+@dirrm libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%
 @dirrm libexec/emacs/%%EMACS_VER%%
 @dirrm libexec/emacs
 @dirrm share/emacs/%%EMACS_VER%%/etc/e
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 7a7615570457..1f18eab2dca6 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.33 1999/01/02 12:26:10 kuriyama Exp $
+# $Id: Makefile,v 1.34 1999/01/16 22:58:57 asami Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -13,14 +13,15 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	ports@FreeBSD.ORG
 
 EMACS_VERSION=	19.34
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION}
+EMACS_ARCH=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${EMACS_ARCH}
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/emacs-19.34
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
-		--sharedstatedir=/var/run
+CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --sharedstatedir=/var/run
+
 STRIP=
 MAN1=		emacs.1 etags.1 ctags.1
 
diff --git a/editors/emacs22/files/patch-ac b/editors/emacs22/files/patch-ac
index 32937f709d3f..264e517b385f 100644
--- a/editors/emacs22/files/patch-ac
+++ b/editors/emacs22/files/patch-ac
@@ -1,5 +1,5 @@
---- orig/s/freebsd.h	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Tue Sep 29 11:35:32 1998
+--- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
++++ src/s/freebsd.h	Sat Jan 16 22:17:58 1999
 @@ -1,5 +1,15 @@
  /* s/ file for freebsd system.  */
  
@@ -24,16 +24,21 @@
  
  #define SYSV_SYSTEM_DIR
  
-@@ -42,12 +51,28 @@
+@@ -42,12 +51,33 @@
  #undef BSD_PGRPS
  #define GETPGRP_NO_ARG
  
 +#ifdef __ELF__
 +
 +#define LD_SWITCH_SYSTEM
++#ifdef i386
 +#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
++#else
++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
++#endif
++#define UNEXEC unexelf.o
 +#undef LIB_GCC
 +#define LIB_GCC
 +
@@ -54,7 +59,7 @@
  
  #ifndef N_TRELOFF
  #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +88,8 @@
+@@ -63,6 +93,8 @@
  #endif /* __FreeBSD__ */
  #endif /* NO_SHARED_LIBS */
  
@@ -63,7 +68,7 @@
  #define HAVE_WAIT_HEADER
  #define HAVE_GETLOADAVG
  /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +107,8 @@
+@@ -80,6 +112,8 @@
  #define BSD 199103
  #elif __FreeBSD__ == 2
  #define BSD 199306
diff --git a/editors/emacs22/files/patch-af b/editors/emacs22/files/patch-af
new file mode 100644
index 000000000000..23092a4a8ca0
--- /dev/null
+++ b/editors/emacs22/files/patch-af
@@ -0,0 +1,13 @@
+--- configure.orig	Tue Aug 20 13:11:26 1996
++++ configure	Sat Jan 16 23:18:54 1999
+@@ -756,6 +756,10 @@
+     machine=alpha opsys=gnu-linux
+   ;;
+ 
++  alpha-*-freebsd* )
++    machine=alpha opsys=freebsd
++  ;;
++
+   ## Altos 3068
+   m68*-altos-sysv* )
+     machine=altos opsys=usg5-2
diff --git a/editors/emacs22/files/patch-ag b/editors/emacs22/files/patch-ag
new file mode 100644
index 000000000000..a556bd24f5eb
--- /dev/null
+++ b/editors/emacs22/files/patch-ag
@@ -0,0 +1,34 @@
+--- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
++++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
+@@ -234,7 +234,11 @@
+ 
+ #ifndef NOT_C_CODE
+ /* We need these because pointers are larger than the default ints.  */
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #include <alloca.h>
++#else
++#include <stdlib.h>
++#endif
+ 
+ /* Hack alert!  For reasons unknown to mankind the string.h file insists
+    on defining bcopy etc. as taking char pointers as arguments.  With
+@@ -299,10 +303,18 @@
+    termio and struct termios are mutually incompatible.  */
+ #define NO_TERMIO
+ 
+-#ifdef LINUX
++#if defined(LINUX) || \
++	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+ # define TEXT_END ({ extern int _etext; &_etext; })
+ # ifndef __ELF__
+ #  define COFF
+ #  define DATA_END ({ extern int _EDATA; &_EDATA; })
+ # endif /* notdef __ELF__ */
+ #endif
++
++#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
++	&& defined (__ELF__)
++#define HAVE_TEXT_START
++#endif
++
++
diff --git a/editors/emacs22/files/patch-ah b/editors/emacs22/files/patch-ah
new file mode 100644
index 000000000000..3f990e4b5970
--- /dev/null
+++ b/editors/emacs22/files/patch-ah
@@ -0,0 +1,54 @@
+--- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
++++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
+@@ -423,12 +423,50 @@
+ #include <elf.h>
+ #include <sys/mman.h>
+ 
+-#ifdef __alpha__
++#if defined(__alpha__) && defined(__osf__)
+ # include <sym.h>	/* get COFF debugging symbol table declaration */
++#else if defined(__alpha__)
++typedef struct {
++	short magic;
++	short vstamp;
++	int ilineMax;
++	int idnMax;
++	int ipdMax;
++	int isymMax;
++	int ioptMax;
++	int iauxMax;
++	int issMax;
++	int issExtMax;
++	int ifdMax;
++	int crfd;
++	int iextMax;
++	long cbLine;
++	long cbLineOffset;
++	long cbDnOffset;
++	long cbPdOffset;
++	long cbSymOffset;
++	long cbOptOffset;
++	long cbAuxOffset;
++	long cbSsOffset;
++	long cbSsExtOffset;
++	long cbFdOffset;
++	long cbRfdOffset;
++	long cbExtOffset;
++} HDRR, *pHDRR; 
++#define cbHDRR sizeof(HDRR)
++#define hdrNil ((pHDRR)0)
+ #endif
+ 
+ #if __GNU_LIBRARY__ - 0 >= 6
+ # 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
diff --git a/editors/emacs22/pkg-plist b/editors/emacs22/pkg-plist
index 64141be5d27d..2284811017d7 100644
--- a/editors/emacs22/pkg-plist
+++ b/editors/emacs22/pkg-plist
@@ -113,18 +113,18 @@ info/viper-4
 @exec install-info %D/info/ediff %D/info/dir
 @exec install-info %D/info/ccmode %D/info/dir
 @exec install-info %D/info/message %D/info/dir
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/cvtmail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/digest-doc
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/emacsserver
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/fakemail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/hexl
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/movemail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/profile
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/rcs2log
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/sorted-doc
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/vcdiff
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/yow
-@dirrm libexec/emacs/%%EMACS_VERSION%%/i386--freebsd
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/fakemail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/hexl
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/movemail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/profile
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/rcs2log
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/sorted-doc
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/vcdiff
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/yow
+@dirrm libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%
 @dirrm libexec/emacs/%%EMACS_VERSION%%
 @unexec rmdir %D/libexec/emacs 2>/dev/null || true
 share/emacs/%%EMACS_VERSION%%/etc/3B-MAXMEM
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 7a7615570457..1f18eab2dca6 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.33 1999/01/02 12:26:10 kuriyama Exp $
+# $Id: Makefile,v 1.34 1999/01/16 22:58:57 asami Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -13,14 +13,15 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	ports@FreeBSD.ORG
 
 EMACS_VERSION=	19.34
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION}
+EMACS_ARCH=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${EMACS_ARCH}
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/emacs-19.34
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
-		--sharedstatedir=/var/run
+CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --sharedstatedir=/var/run
+
 STRIP=
 MAN1=		emacs.1 etags.1 ctags.1
 
diff --git a/editors/emacs23/files/patch-ac b/editors/emacs23/files/patch-ac
index 32937f709d3f..264e517b385f 100644
--- a/editors/emacs23/files/patch-ac
+++ b/editors/emacs23/files/patch-ac
@@ -1,5 +1,5 @@
---- orig/s/freebsd.h	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Tue Sep 29 11:35:32 1998
+--- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
++++ src/s/freebsd.h	Sat Jan 16 22:17:58 1999
 @@ -1,5 +1,15 @@
  /* s/ file for freebsd system.  */
  
@@ -24,16 +24,21 @@
  
  #define SYSV_SYSTEM_DIR
  
-@@ -42,12 +51,28 @@
+@@ -42,12 +51,33 @@
  #undef BSD_PGRPS
  #define GETPGRP_NO_ARG
  
 +#ifdef __ELF__
 +
 +#define LD_SWITCH_SYSTEM
++#ifdef i386
 +#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
++#else
++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
++#endif
++#define UNEXEC unexelf.o
 +#undef LIB_GCC
 +#define LIB_GCC
 +
@@ -54,7 +59,7 @@
  
  #ifndef N_TRELOFF
  #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +88,8 @@
+@@ -63,6 +93,8 @@
  #endif /* __FreeBSD__ */
  #endif /* NO_SHARED_LIBS */
  
@@ -63,7 +68,7 @@
  #define HAVE_WAIT_HEADER
  #define HAVE_GETLOADAVG
  /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +107,8 @@
+@@ -80,6 +112,8 @@
  #define BSD 199103
  #elif __FreeBSD__ == 2
  #define BSD 199306
diff --git a/editors/emacs23/files/patch-af b/editors/emacs23/files/patch-af
new file mode 100644
index 000000000000..23092a4a8ca0
--- /dev/null
+++ b/editors/emacs23/files/patch-af
@@ -0,0 +1,13 @@
+--- configure.orig	Tue Aug 20 13:11:26 1996
++++ configure	Sat Jan 16 23:18:54 1999
+@@ -756,6 +756,10 @@
+     machine=alpha opsys=gnu-linux
+   ;;
+ 
++  alpha-*-freebsd* )
++    machine=alpha opsys=freebsd
++  ;;
++
+   ## Altos 3068
+   m68*-altos-sysv* )
+     machine=altos opsys=usg5-2
diff --git a/editors/emacs23/files/patch-ag b/editors/emacs23/files/patch-ag
new file mode 100644
index 000000000000..a556bd24f5eb
--- /dev/null
+++ b/editors/emacs23/files/patch-ag
@@ -0,0 +1,34 @@
+--- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
++++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
+@@ -234,7 +234,11 @@
+ 
+ #ifndef NOT_C_CODE
+ /* We need these because pointers are larger than the default ints.  */
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #include <alloca.h>
++#else
++#include <stdlib.h>
++#endif
+ 
+ /* Hack alert!  For reasons unknown to mankind the string.h file insists
+    on defining bcopy etc. as taking char pointers as arguments.  With
+@@ -299,10 +303,18 @@
+    termio and struct termios are mutually incompatible.  */
+ #define NO_TERMIO
+ 
+-#ifdef LINUX
++#if defined(LINUX) || \
++	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+ # define TEXT_END ({ extern int _etext; &_etext; })
+ # ifndef __ELF__
+ #  define COFF
+ #  define DATA_END ({ extern int _EDATA; &_EDATA; })
+ # endif /* notdef __ELF__ */
+ #endif
++
++#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
++	&& defined (__ELF__)
++#define HAVE_TEXT_START
++#endif
++
++
diff --git a/editors/emacs23/files/patch-ah b/editors/emacs23/files/patch-ah
new file mode 100644
index 000000000000..3f990e4b5970
--- /dev/null
+++ b/editors/emacs23/files/patch-ah
@@ -0,0 +1,54 @@
+--- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
++++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
+@@ -423,12 +423,50 @@
+ #include <elf.h>
+ #include <sys/mman.h>
+ 
+-#ifdef __alpha__
++#if defined(__alpha__) && defined(__osf__)
+ # include <sym.h>	/* get COFF debugging symbol table declaration */
++#else if defined(__alpha__)
++typedef struct {
++	short magic;
++	short vstamp;
++	int ilineMax;
++	int idnMax;
++	int ipdMax;
++	int isymMax;
++	int ioptMax;
++	int iauxMax;
++	int issMax;
++	int issExtMax;
++	int ifdMax;
++	int crfd;
++	int iextMax;
++	long cbLine;
++	long cbLineOffset;
++	long cbDnOffset;
++	long cbPdOffset;
++	long cbSymOffset;
++	long cbOptOffset;
++	long cbAuxOffset;
++	long cbSsOffset;
++	long cbSsExtOffset;
++	long cbFdOffset;
++	long cbRfdOffset;
++	long cbExtOffset;
++} HDRR, *pHDRR; 
++#define cbHDRR sizeof(HDRR)
++#define hdrNil ((pHDRR)0)
+ #endif
+ 
+ #if __GNU_LIBRARY__ - 0 >= 6
+ # 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
diff --git a/editors/emacs23/pkg-plist b/editors/emacs23/pkg-plist
index 64141be5d27d..2284811017d7 100644
--- a/editors/emacs23/pkg-plist
+++ b/editors/emacs23/pkg-plist
@@ -113,18 +113,18 @@ info/viper-4
 @exec install-info %D/info/ediff %D/info/dir
 @exec install-info %D/info/ccmode %D/info/dir
 @exec install-info %D/info/message %D/info/dir
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/cvtmail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/digest-doc
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/emacsserver
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/fakemail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/hexl
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/movemail
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/profile
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/rcs2log
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/sorted-doc
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/vcdiff
-libexec/emacs/%%EMACS_VERSION%%/i386--freebsd/yow
-@dirrm libexec/emacs/%%EMACS_VERSION%%/i386--freebsd
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/fakemail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/hexl
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/movemail
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/profile
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/rcs2log
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/sorted-doc
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/vcdiff
+libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/yow
+@dirrm libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%
 @dirrm libexec/emacs/%%EMACS_VERSION%%
 @unexec rmdir %D/libexec/emacs 2>/dev/null || true
 share/emacs/%%EMACS_VERSION%%/etc/3B-MAXMEM
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index ce146b0e586e..51d07146a87f 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.34 1998/10/21 09:58:29 asami Exp $
+# $Id: Makefile,v 1.35 1998/12/02 07:57:11 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -58,14 +58,15 @@ BROKEN=		You should build install one of the other mule ports first
 INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 TMPPLIST=	${WRKDIR}/.PLIST.mktmp-${PKGNAME}
-PLIST_SUB=	EMACS_VERSION=19.34
+EMACS_ARCH=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=19.34 EMACS_ARCH=${EMACS_ARCH}
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 EMACS_PREFIX=	mule
 EMACS_EXECUTABLE =	mule
-CONFIGURE_ARGS=	i386--freebsd --with-executable=${EMACS_EXECUTABLE} \
+CONFIGURE_ARGS=	${EMACS_ARCH} --with-executable=${EMACS_EXECUTABLE} \
 		--with-emacs-prefix=${EMACS_PREFIX} \
 		--with-terminal-face \
 		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
diff --git a/editors/mule-common/files/patch-ac b/editors/mule-common/files/patch-ac
index 32937f709d3f..264e517b385f 100644
--- a/editors/mule-common/files/patch-ac
+++ b/editors/mule-common/files/patch-ac
@@ -1,5 +1,5 @@
---- orig/s/freebsd.h	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Tue Sep 29 11:35:32 1998
+--- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
++++ src/s/freebsd.h	Sat Jan 16 22:17:58 1999
 @@ -1,5 +1,15 @@
  /* s/ file for freebsd system.  */
  
@@ -24,16 +24,21 @@
  
  #define SYSV_SYSTEM_DIR
  
-@@ -42,12 +51,28 @@
+@@ -42,12 +51,33 @@
  #undef BSD_PGRPS
  #define GETPGRP_NO_ARG
  
 +#ifdef __ELF__
 +
 +#define LD_SWITCH_SYSTEM
++#ifdef i386
 +#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
++#else
++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
++#endif
++#define UNEXEC unexelf.o
 +#undef LIB_GCC
 +#define LIB_GCC
 +
@@ -54,7 +59,7 @@
  
  #ifndef N_TRELOFF
  #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +88,8 @@
+@@ -63,6 +93,8 @@
  #endif /* __FreeBSD__ */
  #endif /* NO_SHARED_LIBS */
  
@@ -63,7 +68,7 @@
  #define HAVE_WAIT_HEADER
  #define HAVE_GETLOADAVG
  /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +107,8 @@
+@@ -80,6 +112,8 @@
  #define BSD 199103
  #elif __FreeBSD__ == 2
  #define BSD 199306
diff --git a/editors/mule-common/files/patch-af b/editors/mule-common/files/patch-af
new file mode 100644
index 000000000000..23092a4a8ca0
--- /dev/null
+++ b/editors/mule-common/files/patch-af
@@ -0,0 +1,13 @@
+--- configure.orig	Tue Aug 20 13:11:26 1996
++++ configure	Sat Jan 16 23:18:54 1999
+@@ -756,6 +756,10 @@
+     machine=alpha opsys=gnu-linux
+   ;;
+ 
++  alpha-*-freebsd* )
++    machine=alpha opsys=freebsd
++  ;;
++
+   ## Altos 3068
+   m68*-altos-sysv* )
+     machine=altos opsys=usg5-2
diff --git a/editors/mule-common/files/patch-ag b/editors/mule-common/files/patch-ag
new file mode 100644
index 000000000000..a556bd24f5eb
--- /dev/null
+++ b/editors/mule-common/files/patch-ag
@@ -0,0 +1,34 @@
+--- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
++++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
+@@ -234,7 +234,11 @@
+ 
+ #ifndef NOT_C_CODE
+ /* We need these because pointers are larger than the default ints.  */
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #include <alloca.h>
++#else
++#include <stdlib.h>
++#endif
+ 
+ /* Hack alert!  For reasons unknown to mankind the string.h file insists
+    on defining bcopy etc. as taking char pointers as arguments.  With
+@@ -299,10 +303,18 @@
+    termio and struct termios are mutually incompatible.  */
+ #define NO_TERMIO
+ 
+-#ifdef LINUX
++#if defined(LINUX) || \
++	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+ # define TEXT_END ({ extern int _etext; &_etext; })
+ # ifndef __ELF__
+ #  define COFF
+ #  define DATA_END ({ extern int _EDATA; &_EDATA; })
+ # endif /* notdef __ELF__ */
+ #endif
++
++#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
++	&& defined (__ELF__)
++#define HAVE_TEXT_START
++#endif
++
++
diff --git a/editors/mule-common/files/patch-ah b/editors/mule-common/files/patch-ah
new file mode 100644
index 000000000000..3f990e4b5970
--- /dev/null
+++ b/editors/mule-common/files/patch-ah
@@ -0,0 +1,54 @@
+--- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
++++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
+@@ -423,12 +423,50 @@
+ #include <elf.h>
+ #include <sys/mman.h>
+ 
+-#ifdef __alpha__
++#if defined(__alpha__) && defined(__osf__)
+ # include <sym.h>	/* get COFF debugging symbol table declaration */
++#else if defined(__alpha__)
++typedef struct {
++	short magic;
++	short vstamp;
++	int ilineMax;
++	int idnMax;
++	int ipdMax;
++	int isymMax;
++	int ioptMax;
++	int iauxMax;
++	int issMax;
++	int issExtMax;
++	int ifdMax;
++	int crfd;
++	int iextMax;
++	long cbLine;
++	long cbLineOffset;
++	long cbDnOffset;
++	long cbPdOffset;
++	long cbSymOffset;
++	long cbOptOffset;
++	long cbAuxOffset;
++	long cbSsOffset;
++	long cbSsExtOffset;
++	long cbFdOffset;
++	long cbRfdOffset;
++	long cbExtOffset;
++} HDRR, *pHDRR; 
++#define cbHDRR sizeof(HDRR)
++#define hdrNil ((pHDRR)0)
+ #endif
+ 
+ #if __GNU_LIBRARY__ - 0 >= 6
+ # 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
diff --git a/editors/mule-common/files/patch-mn b/editors/mule-common/files/patch-mn
new file mode 100644
index 000000000000..2ac99a2b4caa
--- /dev/null
+++ b/editors/mule-common/files/patch-mn
@@ -0,0 +1,11 @@
+--- src/coding.c.orig	Sun Jan 17 04:48:45 1999
++++ src/coding.c	Sun Jan 17 04:49:02 1999
+@@ -154,7 +154,7 @@
+ /* 92.4.3, 92.12.18 by K.Handa */
+ Lisp_Object Qcoding_system, Qcoding_system_p, Qnon_nil_coding_system_p;
+ Lisp_Object Qeol_type;
+-Lisp_Object Qpriority;
++extern Lisp_Object Qpriority;
+ /* end of patch */
+ #endif /* emacs */
+ 
diff --git a/editors/mule-common/pkg-plist b/editors/mule-common/pkg-plist
index ec16183eda67..5d9c87dc6ada 100644
--- a/editors/mule-common/pkg-plist
+++ b/editors/mule-common/pkg-plist
@@ -153,18 +153,18 @@ info/terminology
 @exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).			Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
 @comment
 @exec [ -f %D/share/mule/%%EMACS_VERSION%%/info/dir ] || mkdir -p %D/share/mule/%%EMACS_VERSION%%/info; sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/share/mule/%%EMACS_VERSION%%/info/dir
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/cvtmail
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/digest-doc
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/emacsserver
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/fakemail
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/hexl
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/movemail
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/profile
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/rcs2log
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/sorted-doc
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/vcdiff
-libexec/mule/%%EMACS_VERSION%%/i386--freebsd/yow
-@dirrm libexec/mule/%%EMACS_VERSION%%/i386--freebsd
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/fakemail
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/hexl
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/movemail
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/profile
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/rcs2log
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/sorted-doc
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/vcdiff
+libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/yow
+@dirrm libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%
 @dirrm libexec/mule/%%EMACS_VERSION%%
 @dirrm libexec/mule
 share/mule/%%EMACS_VERSION%%/etc/3B-MAXMEM
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index e8b0e7f72796..555dd3db75bc 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.33 1998/10/07 08:11:28 asami Exp $
+# $Id: Makefile,v 1.34 1998/12/02 08:40:00 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -41,7 +41,8 @@ MAKE_ENV=      LIBDIR="${LIBDIR}"
 CONFIGURE_ENV=	PATH=/usr/bin:$$PATH
 EMACS_PREFIX=	mule
 EMACS_EXECUTABLE =	mule
-CONFIGURE_ARGS=	i386--freebsd --with-executable=${EMACS_EXECUTABLE} \
+EMACS_ARCH=	${MACHINE_ARCH}--freebsd
+CONFIGURE_ARGS=	${EMACS_ARCH} --with-executable=${EMACS_EXECUTABLE} \
 		--with-emacs-prefix=${EMACS_PREFIX} \
 		--with-terminal-face \
 		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \