- cleanup Makefile

- add support for the PowerPC port
This commit is contained in:
brad 2000-10-21 17:27:56 +00:00
parent 90d269cf14
commit 7214e5d558
3 changed files with 34 additions and 11 deletions

View File

@ -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 VER= 20.7
DISTNAME= emacs-${VER} DISTNAME= emacs-${VER}
CATEGORIES= editors CATEGORIES= editors
NEED_VERSION= 1.317 NEED_VERSION= 1.336
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs MASTER_SITE_SUBDIR= emacs
MAINTAINER= xenophon@irtnog.org MAINTAINER= xenophon@irtnog.org
# GPL
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
FLAVORS= no_X11
CONFIGURE_STYLE= gnu dest
USE_GMAKE= Yes USE_GMAKE= Yes
CONFIGURE_STYLE= gnu dest
FLAVORS= no_x11
FLAVOR?=
.if ${MACHINE} == "arc" || ${MACHINE} == "pmax" || ${MACHINE} == "wgrisc" .if ${MACHINE} == "arc" || ${MACHINE} == "pmax" || ${MACHINE} == "wgrisc"
M_ARCH= mipsel M_ARCH= mipsel
@ -38,10 +38,10 @@ SUBST_VARS= GCCARCH VER
# Uncomment for Hesiod support # Uncomment for Hesiod support
#CONFIGURE_ARGS+=--with-hesiod #CONFIGURE_ARGS+=--with-hesiod
.if defined(FLAVOR) && ${FLAVOR} == "no_X11" .if ${FLAVOR:L} == "no_x11"
CONFIGURE_ARGS+=--without-x CONFIGURE_ARGS+= --without-x
.else .else
CONFIGURE_ARGS+=${GCCARCH} --with-x-toolkit CONFIGURE_ARGS+= ${GCCARCH} --with-x-toolkit
.endif .endif
# Do NOT strip on install. We will strip those things that can be # 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: post-install:
.for file in ${STRIP_PROGS} .for file in ${STRIP_PROGS}
strip ${PREFIX}/bin/${file} @strip ${PREFIX}/bin/${file}
.endfor .endfor
.for file in ${STRIP_EXECS} .for file in ${STRIP_EXECS}
strip ${PREFIX}/libexec/emacs/${VER}/${GCCARCH}/${file} @strip ${PREFIX}/libexec/emacs/${VER}/${GCCARCH}/${file}
.endfor .endfor
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -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

View File

@ -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"