summaryrefslogtreecommitdiff
path: root/editors/emacs
diff options
context:
space:
mode:
authorHidetoshi Shimokawa <simokawa@FreeBSD.org>1999-01-23 14:28:28 +0000
committerHidetoshi Shimokawa <simokawa@FreeBSD.org>1999-01-23 14:28:28 +0000
commitac34d7309cc9ed2bb1b9fcadf01a3153a50b41bf (patch)
tree06ad86b5acdc3f1aaf5ff6a5f594e87d816f05e7 /editors/emacs
parentUpgrade to mod_ssl-2.1.8. (diff)
Add fix for Alpha.
- patch for configure, unexelf.c, alpha.h, PLIST and etc.
Notes
Notes: svn path=/head/; revision=16277
Diffstat (limited to 'editors/emacs')
-rw-r--r--editors/emacs/Makefile9
-rw-r--r--editors/emacs/files/patch-ac17
-rw-r--r--editors/emacs/files/patch-af13
-rw-r--r--editors/emacs/files/patch-ag34
-rw-r--r--editors/emacs/files/patch-ah54
-rw-r--r--editors/emacs/pkg-plist24
6 files changed, 129 insertions, 22 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