From 7214e5d558de813aaa9e46103861a35942898d2b Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sat, 21 Oct 2000 17:27:56 +0000
Subject: [PATCH] - cleanup Makefile - add support for the PowerPC port

---
 editors/emacs/Makefile                      | 22 ++++++++++-----------
 editors/emacs/patches/patch-src_m_macppc.h  | 10 ++++++++++
 editors/emacs/patches/patch-src_s_openbsd.h | 13 ++++++++++++
 3 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 editors/emacs/patches/patch-src_m_macppc.h
 create mode 100644 editors/emacs/patches/patch-src_s_openbsd.h

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index b321e60fca3..aa94e7c2b81 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,24 +1,24 @@
-# $OpenBSD: Makefile,v 1.20 2000/07/21 18:13:58 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2000/10/21 17:27:56 brad Exp $
 
 VER=		20.7
 DISTNAME=	emacs-${VER}
 CATEGORIES=	editors
-NEED_VERSION=	1.317
+NEED_VERSION=	1.336
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= emacs
 
 MAINTAINER=	xenophon@irtnog.org
 
-# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FLAVORS=	no_X11
-
-CONFIGURE_STYLE=	gnu dest
 USE_GMAKE=	Yes
+CONFIGURE_STYLE= gnu dest
+
+FLAVORS=	no_x11
+FLAVOR?=
 
 .if ${MACHINE} == "arc" || ${MACHINE} == "pmax" || ${MACHINE} == "wgrisc"
 M_ARCH=		mipsel
@@ -38,10 +38,10 @@ SUBST_VARS=	GCCARCH VER
 # Uncomment for Hesiod support
 #CONFIGURE_ARGS+=--with-hesiod
 
-.if defined(FLAVOR) && ${FLAVOR} == "no_X11"
-CONFIGURE_ARGS+=--without-x
+.if ${FLAVOR:L} == "no_x11"
+CONFIGURE_ARGS+= --without-x
 .else
-CONFIGURE_ARGS+=${GCCARCH} --with-x-toolkit
+CONFIGURE_ARGS+= ${GCCARCH} --with-x-toolkit
 .endif
 
 # Do NOT strip on install.  We will strip those things that can be
@@ -58,10 +58,10 @@ STRIP_EXECS=	cvtmail digest-doc emacsserver fakemail hexl movemail \
 
 post-install:
 .for file in ${STRIP_PROGS}
-	strip ${PREFIX}/bin/${file}
+	@strip ${PREFIX}/bin/${file}
 .endfor
 .for file in ${STRIP_EXECS}
-	strip ${PREFIX}/libexec/emacs/${VER}/${GCCARCH}/${file}
+	@strip ${PREFIX}/libexec/emacs/${VER}/${GCCARCH}/${file}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/editors/emacs/patches/patch-src_m_macppc.h b/editors/emacs/patches/patch-src_m_macppc.h
new file mode 100644
index 00000000000..a8dbd151774
--- /dev/null
+++ b/editors/emacs/patches/patch-src_m_macppc.h
@@ -0,0 +1,10 @@
+--- src/m/macppc.h.orig	Fri Oct 20 17:34:43 2000
++++ src/m/macppc.h	Fri Oct 20 17:36:35 2000
+@@ -78,6 +78,7 @@
+ #define ORDINARY_LINK
+ #endif
+ 
++#undef UNEXEC
+ #define UNEXEC unexelf.o
+ 
+ #define NO_TERMIO
diff --git a/editors/emacs/patches/patch-src_s_openbsd.h b/editors/emacs/patches/patch-src_s_openbsd.h
new file mode 100644
index 00000000000..a2fa0dcfb72
--- /dev/null
+++ b/editors/emacs/patches/patch-src_s_openbsd.h
@@ -0,0 +1,13 @@
+--- src/s/openbsd.h.orig	Tue May  2 06:41:43 2000
++++ src/s/openbsd.h	Fri Oct 20 17:44:45 2000
+@@ -3,6 +3,10 @@
+ /* Get most of the stuff from bsd4.3 */
+ #include "bsd4-3.h"
+ 
++#if defined(__OpenBSD__) && defined(__powerpc__)
++#define __ELF__
++#endif
++
+ /* Get the rest of the stuff from that less-POSIX-conformant system */
+ #include "netbsd.h"
+