diff options
| author | obache <obache> | 2007-04-22 06:55:03 +0000 |
|---|---|---|
| committer | obache <obache> | 2007-04-22 06:55:03 +0000 |
| commit | 6b7659322249b9bfdca5bf2b7fb698c855dbb0e5 (patch) | |
| tree | 02d0d6296e31313788192b64d333af7e7585cfbc /editors | |
| parent | 8232c049c1ce0a93a00d1cbdc1506c1c09302e28 (diff) | |
| download | pkgsrc-6b7659322249b9bfdca5bf2b7fb698c855dbb0e5.tar.gz | |
Fix build problem on i386/Darwin.
Patch provided by Tom Yu in PR 36166.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/distinfo | 5 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-ab | 12 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-ai | 12 |
3 files changed, 22 insertions, 7 deletions
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index bca64092b08..fc4179f1586 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,16 +1,17 @@ -$NetBSD: distinfo,v 1.33 2007/03/24 01:30:50 joerg Exp $ +$NetBSD: distinfo,v 1.34 2007/04/22 06:55:03 obache Exp $ SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a Size (emacs-21.4a.tar.gz) = 20403483 bytes SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5 -SHA1 (patch-ab) = 9304a3fe06ab5bcdad4401fd570a1794b7da818f +SHA1 (patch-ab) = 9c268f822b4422307787f27a63ebc67ae43aa8a7 SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55 SHA1 (patch-af) = 821e0c3cce819ce11f393ce5f498f13d652e4d94 SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620 SHA1 (patch-ah) = 6cd1b122b370ee7110e096088a132cd420356714 +SHA1 (patch-ai) = 20fb931d649a55ae7ee6eb27ec5ba7cc938db0f7 SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7 SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b SHA1 (patch-am) = 7109d3a5cf1470e11e33abe97297cde24cf0ec91 diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab index bc111625245..833eafff5fd 100644 --- a/editors/emacs/patches/patch-ab +++ b/editors/emacs/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.23 2006/06/06 16:23:17 minskim Exp $ +$NetBSD: patch-ab,v 1.24 2007/04/22 06:55:03 obache Exp $ --- configure.orig 2003-03-18 14:19:12.000000000 +0000 +++ configure -@@ -822,9 +822,15 @@ case "${canonical}" in +@@ -822,9 +822,17 @@ case "${canonical}" in sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; arm-*-netbsd*) machine=arm ;; @@ -15,10 +15,12 @@ $NetBSD: patch-ab,v 1.23 2006/06/06 16:23:17 minskim Exp $ + ## Darwin / Mac OS X + powerpc-apple-darwin* ) + machine=powermac opsys=darwin ;; ++ i386-apple-darwin* ) ++ machine=intel386 opsys=darwin ;; ## OpenBSD ports *-*-openbsd* ) opsys=openbsd -@@ -909,6 +915,10 @@ case "${canonical}" in +@@ -909,6 +917,10 @@ case "${canonical}" in machine=macppc opsys=gnu-linux ;; @@ -29,7 +31,7 @@ $NetBSD: patch-ab,v 1.23 2006/06/06 16:23:17 minskim Exp $ ## Altos 3068 m68*-altos-sysv* ) machine=altos opsys=usg5-2 -@@ -1659,6 +1669,7 @@ case "${canonical}" in +@@ -1659,6 +1671,7 @@ case "${canonical}" in *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-386bsd* ) opsys=386bsd ;; *-freebsd* ) opsys=freebsd ;; @@ -37,7 +39,7 @@ $NetBSD: patch-ab,v 1.23 2006/06/06 16:23:17 minskim Exp $ *-nextstep* ) opsys=nextstep ;; ## Otherwise, we'll fall through to the generic opsys code at the bottom. esac -@@ -9124,6 +9135,22 @@ EOF +@@ -9124,6 +9137,22 @@ EOF fi diff --git a/editors/emacs/patches/patch-ai b/editors/emacs/patches/patch-ai new file mode 100644 index 00000000000..768b0f192e7 --- /dev/null +++ b/editors/emacs/patches/patch-ai @@ -0,0 +1,12 @@ +$NetBSD: patch-ai,v 1.7 2007/04/22 06:55:03 obache Exp $ + +--- src/m/intel386.h.orig 1997-08-30 07:18:39.000000000 +0000 ++++ src/m/intel386.h +@@ -239,3 +239,7 @@ NOTE-END */ + + #define SEGMENT_MASK ((SEGMENT_SIZE)-1) + #endif ++ ++#ifdef MAC_OSX ++#define CANNOT_DUMP ++#endif |