From 404178e579d0f948296f200ba6f71ad7ac06830d Mon Sep 17 00:00:00 2001 From: hubertf Date: Sat, 6 Oct 2001 22:04:22 +0000 Subject: Make this build on sgimips --- editors/emacs/Makefile | 3 ++- editors/emacs/distinfo | 6 +++--- editors/emacs/patches/patch-ab | 11 ++++++----- editors/emacs/patches/patch-ac | 20 ++++++++++++++++++++ editors/emacs/patches/patch-bg | 13 +++++++------ 5 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 editors/emacs/patches/patch-ac diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 65cc3604de9..b84bbd64332 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2001/09/27 23:17:59 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2001/10/06 22:04:22 hubertf Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp DISTNAME= emacs-20.7 @@ -13,6 +13,7 @@ CONFLICTS= mule-[0-9]* GNU_CONFIGURE= yes USE_GMAKE= yes +GNU_ARCH.mipsbe= mips BUILD_DEFS+= USE_INET6 EMACS_USE_POP EMACS_USE_X EMACS_USE_X_TOOLKIT diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 29a5c7e86af..7af1d5196bf 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:01:00 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/10/06 22:04:22 hubertf Exp $ SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452 Size (emacs-20.7.tar.gz) = 15043428 bytes SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d -SHA1 (patch-ab) = f096c32ebe1174341c189dc3d1be3c4dcb0a0c75 +SHA1 (patch-ab) = cfcdda22c41f2080d31a2560550838ccb9b8935f SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6 SHA1 (patch-ae) = 7aaca5409a71f8a292ac57f828ee5ec7a07e3880 SHA1 (patch-af) = 185c8e045236eb87fafa585288610bbd7f8ca01c @@ -17,7 +17,7 @@ SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc SHA1 (patch-az) = 643f927b726d825238b14cd6a4b70e3a0722104e SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27 SHA1 (patch-bf) = 8a55b30ec5992e0408b3693b4f31f7d9e931d731 -SHA1 (patch-bg) = 368d6da638b42afd563251ad2e155262d3f501d6 +SHA1 (patch-bg) = 20b01848039dbf171f8fd4271efff4bccf0ee57a SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a SHA1 (patch-bi) = d97512603b313ee730687e3b5680d45002ade51c SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2 diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab index f97cd3c951f..b6deccd5491 100644 --- a/editors/emacs/patches/patch-ab +++ b/editors/emacs/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.12 2000/09/26 21:42:34 eeh Exp $ +$NetBSD: patch-ab,v 1.13 2001/10/06 22:04:22 hubertf Exp $ ---- configure.orig Mon Jun 12 13:05:56 2000 -+++ configure Tue Sep 26 14:18:05 2000 +--- configure.orig Mon Jun 12 22:05:56 2000 ++++ configure @@ -21,6 +21,9 @@ --with-x-toolkit=KIT use an X toolkit (KIT = yes/lucid/athena/motif/no)" ac_help="$ac_help @@ -12,11 +12,12 @@ $NetBSD: patch-ab,v 1.12 2000/09/26 21:42:34 eeh Exp $ # Initialize some variables set by options. # The variables have the same names as the options, with -@@ -718,9 +721,12 @@ +@@ -718,9 +721,13 @@ machine=hp9000s300 ;; powerpc-apple-netbsd*) machine=macppc ;; mips-*-netbsd*) machine=pmax ;; + mipsel-*-netbsd*) machine=pmax ;; ++ mipseb-*-netbsd*) machine=mips ;; # HF what else? ns32k-*-netbsd*) machine=ns32000 ;; - sparc-*-netbsd*) machine=sparc ;; + powerpc-*-netbsd*) machine=macppc ;; @@ -26,7 +27,7 @@ $NetBSD: patch-ab,v 1.12 2000/09/26 21:42:34 eeh Exp $ esac ;; -@@ -4903,6 +4909,64 @@ +@@ -4903,6 +4910,64 @@ cat >> confdefs.h <<\EOF #define HAVE_AIX_SMT_EXP 1 EOF diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac new file mode 100644 index 00000000000..dd5103a2d22 --- /dev/null +++ b/editors/emacs/patches/patch-ac @@ -0,0 +1,20 @@ +--- config.sub.orig Sat Oct 6 22:14:24 2001 ++++ config.sub Sat Oct 6 22:15:18 2001 +@@ -168,7 +168,7 @@ + | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ + | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ + | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ +- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ ++ | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipseb | mipsel | mips64el \ + | mips64orion | mips64orionel | mipstx39 | mipstx39el \ + | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ + | mips64vr5000 | miprs64vr5000el \ +@@ -201,7 +201,7 @@ + | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ + | clipper-* | orion-* \ + | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ +- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ ++ | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipseb-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ + | mipstx39-* | mipstx39el-* \ diff --git a/editors/emacs/patches/patch-bg b/editors/emacs/patches/patch-bg index 9332340f84a..ec22b1ff8e5 100644 --- a/editors/emacs/patches/patch-bg +++ b/editors/emacs/patches/patch-bg @@ -1,7 +1,7 @@ -$NetBSD: patch-bg,v 1.3 2000/09/26 21:42:35 eeh Exp $ +$NetBSD: patch-bg,v 1.4 2001/10/06 22:04:22 hubertf Exp $ ---- configure.in.orig Tue Jun 6 00:42:49 2000 -+++ configure.in Sun Jun 18 09:22:42 2000 +--- configure.in.orig Mon Jun 5 17:42:49 2000 ++++ configure.in @@ -66,6 +66,8 @@ esac with_x_toolkit=$val @@ -11,21 +11,22 @@ $NetBSD: patch-bg,v 1.3 2000/09/26 21:42:35 eeh Exp $ #### Make srcdir absolute, if it isn't already. It's important to #### avoid running the path through pwd unnecessary, since pwd can -@@ -158,9 +160,12 @@ +@@ -158,9 +160,13 @@ machine=hp9000s300 ;; powerpc-apple-netbsd*) machine=macppc ;; mips-*-netbsd*) machine=pmax ;; + mipsel-*-netbsd*) machine=pmax ;; ++ mipsev-*-netbsd*) machine=mips ;; # HF: what else? ns32k-*-netbsd*) machine=ns32000 ;; -+ powerpc-*-netbsd*) machine=macppc ;; - sparc-*-netbsd*) machine=sparc ;; ++ powerpc-*-netbsd*) machine=macppc ;; + sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; + arm*-*-netbsd*) machine=arm ;; esac ;; -@@ -1745,6 +1750,10 @@ +@@ -1745,6 +1751,10 @@ if test -f /usr/lpp/X11/bin/smt.exp; then AC_DEFINE(HAVE_AIX_SMT_EXP) -- cgit v1.2.3