From b29c65ace8a589a2b51fbdbda626081214f2e376 Mon Sep 17 00:00:00 2001
From: MANTANI Nobutaka <nobutaka@FreeBSD.org>
Date: Sun, 27 Oct 2002 13:04:44 +0000
Subject: Add a patch to fix segmentation fault on -current.

Submitted by:  motoyuki
---
 editors/emacs21/Makefile                    |  2 +-
 editors/emacs21/files/patch-src:Makefile.in | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 editors/emacs21/files/patch-src:Makefile.in

(limited to 'editors/emacs21')

diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 100a880a8943..8dc427bee1a3 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	21.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/emacs21/files/patch-src:Makefile.in b/editors/emacs21/files/patch-src:Makefile.in
new file mode 100644
index 000000000000..d0e31255cc3b
--- /dev/null
+++ b/editors/emacs21/files/patch-src:Makefile.in
@@ -0,0 +1,13 @@
+--- src/Makefile.in.orig	Mon Dec 17 23:09:32 2001
++++ src/Makefile.in	Mon Oct 21 13:37:26 2002
+@@ -155,6 +155,10 @@
+ /* This holds special options for linking temacs
+    that should be used for linking anything else.  */
+ #ifndef LD_SWITCH_SYSTEM_TEMACS
++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042)
++#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
++#else
+ #define LD_SWITCH_SYSTEM_TEMACS
++#endif
+ #endif
+ 
-- 
cgit v1.2.3