CVS commit: pkgsrc/editors

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct  6 15:33:03 UTC 2021

Modified Files:
        pkgsrc/editors/emacs20: Makefile
        pkgsrc/editors/emacs21: Makefile Makefile.common

Log Message:
emacs20, emacs21: Make sure MKPIE is properly disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/editors/emacs20/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/editors/emacs21/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/editors/emacs21/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs20/Makefile
diff -u pkgsrc/editors/emacs20/Makefile:1.63 pkgsrc/editors/emacs20/Makefile:1.64
--- pkgsrc/editors/emacs20/Makefile:1.63        Mon May 24 19:52:05 2021
+++ pkgsrc/editors/emacs20/Makefile     Wed Oct  6 15:33:03 2021
@@ -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

Index: pkgsrc/editors/emacs21/Makefile
diff -u pkgsrc/editors/emacs21/Makefile:1.45 pkgsrc/editors/emacs21/Makefile:1.46
--- pkgsrc/editors/emacs21/Makefile:1.45        Mon May 24 19:52:05 2021
+++ pkgsrc/editors/emacs21/Makefile     Wed Oct  6 15:33:03 2021
@@ -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"

Index: pkgsrc/editors/emacs21/Makefile.common
diff -u pkgsrc/editors/emacs21/Makefile.common:1.20 pkgsrc/editors/emacs21/Makefile.common:1.21
--- pkgsrc/editors/emacs21/Makefile.common:1.20 Mon Sep 27 15:26:24 2021
+++ pkgsrc/editors/emacs21/Makefile.common      Wed Oct  6 15:33:03 2021
@@ -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}${
 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