summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authormarkd <markd>2006-11-01 11:18:20 +0000
committermarkd <markd>2006-11-01 11:18:20 +0000
commit9a494b70622346d5ceed69c9a6077b9188218c3f (patch)
treec6e583b5b8fb669eaba3863a38e112abfa2a9067 /editors
parentfb7c1f6ddf6330f4d49f6e8710472ed3d1df18cc (diff)
downloadpkgsrc-9a494b70622346d5ceed69c9a6077b9188218c3f.tar.gz
Don't clobber START_FILES in m/pmax.h.
Should fix PR pkg/26679.
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs/distinfo3
-rw-r--r--editors/emacs/patches/patch-af23
2 files changed, 25 insertions, 1 deletions
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 553a81d22e4..16b88acaa7d 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2006/06/06 16:23:17 minskim Exp $
+$NetBSD: distinfo,v 1.30 2006/11/01 11:18:20 markd Exp $
SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
@@ -8,6 +8,7 @@ SHA1 (patch-ab) = 9304a3fe06ab5bcdad4401fd570a1794b7da818f
SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a
SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
+SHA1 (patch-af) = 821e0c3cce819ce11f393ce5f498f13d652e4d94
SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620
SHA1 (patch-ai) = ee6cdc06b101805c79e73bc3aaa04f5d79e48872
SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7
diff --git a/editors/emacs/patches/patch-af b/editors/emacs/patches/patch-af
new file mode 100644
index 00000000000..6179845ed65
--- /dev/null
+++ b/editors/emacs/patches/patch-af
@@ -0,0 +1,23 @@
+$NetBSD: patch-af,v 1.9 2006/11/01 11:18:20 markd Exp $
+
+--- src/m/pmax.h.orig 2006-11-02 00:11:05.000000000 +1300
++++ src/m/pmax.h
+@@ -22,13 +22,17 @@ NOTE-END */
+ #ifdef MACH
+ #define START_FILES pre-crt0.o /usr/lib/crt0.o
+ #else
++#if !defined (__NetBSD__)
+ /* This line starts being needed with ultrix 4.0. */
+ /* You must delete it for version 3.1. */
+ #define START_FILES pre-crt0.o /usr/lib/cmplrs/cc/crt0.o
+ #endif
++#endif
+
+-#if defined (__NetBSD__) || defined (__OpenBSD__)
++#if defined (__OpenBSD__)
+ #undef START_FILES
++#endif
++#if defined (__NetBSD__) || defined (__OpenBSD__)
+ #undef RUN_TIME_REMAP
+ #undef UNEXEC
+ #define UNEXEC unexelf.o