Make at least the CANNOT_DUMP version of emacs work on NetBSD/pmax.

Two patches provided by Jonathan Stone.

6 files changed, 71 insertions, 9 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 3134372b7a6..95453dedc63 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/01/04 09:30:46 frueauf Exp $
+# $NetBSD: Makefile,v 1.23 1999/01/31 17:29:32 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 #
 
@@ -11,11 +11,9 @@ HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 
 CONFLICTS=	emacs-20.2
 
-NOT_FOR_ARCHS=	mips	# ${WRKSRC}/src/m/{pmax.h,mips.h} need porting
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=	--with-pop --with-x --with-x-toolkit=lucid
+CONFIGURE_ARGS+=--with-pop --with-x --with-x-toolkit=lucid
 OPSYS!=         uname -s
 MAKE_ENV+=	INSTALL_STRIP=${STRIPFLAG}
 INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message widget reftex forms customize
@@ -26,6 +24,9 @@ pre-install:
 	@find ${WRKSRC} -type f -name "*.orig" | xargs ${RM} -f
 
 post-install:
+	# needed for archs that CANNOT_DUMP like pmax
+	${LN} -sf ${PREFIX}/share/emacs/20.3/etc/DOC-20.3.1 \
+		${PREFIX}/share/emacs/20.3/etc/DOC
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs/patches/patch-af b/editors/emacs/patches/patch-af
index 9f1b452911d..97f0dc6b25f 100644
--- a/editors/emacs/patches/patch-af
+++ b/editors/emacs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 1998/08/07 10:40:31 agc Exp $
+$NetBSD: patch-af,v 1.4 1999/01/31 17:29:32 frueauf Exp $
 
---- src/Makefile.in.orig	Mon Aug 25 15:09:35 1997
-+++ src/Makefile.in	Mon Apr  6 14:09:15 1998
-@@ -401,7 +401,7 @@
+--- src/Makefile.in.orig	Sun Aug  2 02:29:21 1998
++++ src/Makefile.in	Sun Jan 31 14:36:49 1999
+@@ -402,7 +402,7 @@
     ask GCC explicitly where to find libgcc.a.  */
  
  #ifndef LINKER
@@ -11,3 +11,20 @@ $NetBSD: patch-af,v 1.3 1998/08/07 10:40:31 agc Exp $
  #endif
  
  #ifndef LIB_GCC
+@@ -457,7 +457,7 @@
+ #endif /* not ORDINARY_LINK */
+ 
+ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
+-	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS)
++	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE
+ 
+ /* A macro which other sections of Makefile can redefine to munge the
+    flags before they're passed to LD.  This is helpful if you have
+@@ -810,6 +810,7 @@
+ #ifdef CANNOT_DUMP
+ 	rm -f emacs
+ 	ln temacs emacs
++	cp -p ../etc/DOC ../etc/DOC-20.3.1
+ #else
+ #ifdef HAVE_SHM
+ 	./temacs -nl -batch -l loadup dump
diff --git a/editors/emacs/patches/patch-aw b/editors/emacs/patches/patch-aw
new file mode 100644
index 00000000000..3dcf7cf2c37
--- /dev/null
+++ b/editors/emacs/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1 1999/01/31 17:29:33 frueauf Exp $
+
+--- src/emacs.c-orig	Tue Jul 21 03:39:52 1998
++++ src/emacs.c	Sat Jan 30 14:29:44 1999
+@@ -1004,7 +1004,7 @@
+     }
+ 
+   no_loadup
+-    = !argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
++    = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
+ 
+ 
+ #ifdef HAVE_X_WINDOWS
diff --git a/editors/emacs/patches/patch-ax b/editors/emacs/patches/patch-ax
new file mode 100644
index 00000000000..efb303c9536
--- /dev/null
+++ b/editors/emacs/patches/patch-ax
@@ -0,0 +1,16 @@
+$NetBSD: patch-ax,v 1.1 1999/01/31 17:29:33 frueauf Exp $
+
+--- src/m/mips.h-orig	Mon Jun 23 03:49:57 1997
++++ src/m/mips.h	Sat Jan 30 14:28:48 1999
+@@ -149,8 +149,10 @@
+ #define LD_SWITCH_MACHINE -D 800000
+ #define LIBS_DEBUG
+ 
++#if defined (__NetBSD__) || defined (__OpenBSD__)
++#else  /* bsd with elf */
+ #define LINKER /bsd43/bin/ld
+-  
++#endif /* bsd with elf */
+ #else /* not BSD_SYSTEM */
+ 
+ #if defined(__GNUC__) && defined(_ABIN32)
diff --git a/editors/emacs/patches/patch-ay b/editors/emacs/patches/patch-ay
new file mode 100644
index 00000000000..3edd8b64a41
--- /dev/null
+++ b/editors/emacs/patches/patch-ay
@@ -0,0 +1,14 @@
+$NetBSD: patch-ay,v 1.1 1999/01/31 17:29:33 frueauf Exp $
+
+--- src/m/pmax.h-orig	Sun Sep  7 07:23:09 1997
++++ src/m/pmax.h	Sat Jan 30 21:20:40 1999
+@@ -51,7 +51,9 @@
+ #endif
+ 
+ /* Override what mips.h says about this.  */
++#if !defined (__NetBSD__)
+ #undef LINKER
++#endif
+ 
+ #ifdef ultrix
+ /* Ultrix 4.2 (perhaps also 4.1) implements O_NONBLOCK
diff --git a/editors/emacs/pkg/PLIST b/editors/emacs/pkg/PLIST
index fdef58b2e72..c0afb1ef77e 100644
--- a/editors/emacs/pkg/PLIST
+++ b/editors/emacs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 1998/11/17 14:45:36 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.17 1999/01/31 17:29:33 frueauf Exp $
 bin/emacs
 bin/emacs-20.3
 bin/emacs-etags
@@ -167,6 +167,7 @@ share/emacs/20.3/etc/MH-E-ONEWS
 share/emacs/20.3/etc/MORE.STUFF
 share/emacs/20.3/etc/MOTIVATION
 share/emacs/20.3/etc/DOC-20.3.1
+share/emacs/20.3/etc/DOC
 share/emacs/20.3/etc/NEWS
 share/emacs/20.3/etc/ONEWS
 share/emacs/20.3/etc/OONEWS