From 8ec9f214bc819c0ca4c328d32f784a851c1dfb5b Mon Sep 17 00:00:00 2001
From: nia <nia@pkgsrc.org>
Date: Wed, 6 Oct 2021 15:33:03 +0000
Subject: emacs20, emacs21: Make sure MKPIE is properly disabled.

---
 editors/emacs20/Makefile        | 4 +++-
 editors/emacs21/Makefile        | 4 +++-
 editors/emacs21/Makefile.common | 4 +---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'editors')

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 3b770923922..fd0bb0c8c14 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2021/05/24 19:52:05 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2021/10/06 15:33:03 nia Exp $
 
 DISTNAME=	emacs-20.7
 PKGNAME=	${DISTNAME:S/emacs/emacs20/}
@@ -38,6 +38,8 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 GNU_ARCH.mipsbe=	mips
 
+MKPIE_SUPPORTED=	no
+
 # build PATH in the dumped emacs is not a problem
 CHECK_WRKREF_SKIP+=	bin/emacs
 CHECK_WRKREF_SKIP+=	bin/emacs-20.7
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 99aef9e45aa..e5a22e54633 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2021/05/24 19:52:05 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2021/10/06 15:33:03 nia Exp $
 
 PKGREVISION=	44
 CATEGORIES=	editors
@@ -7,6 +7,8 @@ CONFLICTS+=	emacs21-nox11-[0-9]*
 
 USE_TOOLS+=	imake
 
+MKPIE_SUPPORTED=	no
+
 .include "options.mk"
 
 .include "../../editors/emacs21/Makefile.common"
diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common
index 127f539e3ab..7a96ad2f114 100644
--- a/editors/emacs21/Makefile.common
+++ b/editors/emacs21/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2021/09/27 15:26:24 nia Exp $
+# $NetBSD: Makefile.common,v 1.21 2021/10/06 15:33:03 nia Exp $
 #
 # used by editors/emacs21/Makefile
 # used by editors/emacs21-nox11/Makefile
@@ -37,8 +37,6 @@ INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
 INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 INSTALL_MAKE_FLAGS+=	infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
 
-MKPIE_SUPPORTED=        no
-
 .include "../../mk/bsd.prefs.mk"
 
 # If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
-- 
cgit v1.2.3