CVS commit: pkgsrc/editors

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Dec 11 15:46:10 UTC 2023

Modified Files:
        pkgsrc/editors/emacs27-nox11: Makefile
        pkgsrc/editors/emacs28-nox11: Makefile
        pkgsrc/editors/emacs29-nox11: Makefile

Log Message:
editors/emacs2[789]-nox11: Disable GUI toolkits harder

Add --without-ns to disable Cocoa as well, because "nox11" means "no
toolkits - command line only" and because with Cocoa, as autodetected
by emacs, lots of stuff shows up in the PLIST.  This makes the
behavior match emacs26-nox11.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/emacs27-nox11/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs28-nox11/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs29-nox11/Makefile

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

Modified files:

Index: pkgsrc/editors/emacs27-nox11/Makefile
diff -u pkgsrc/editors/emacs27-nox11/Makefile:1.4 pkgsrc/editors/emacs27-nox11/Makefile:1.5
--- pkgsrc/editors/emacs27-nox11/Makefile:1.4   Sun Jun 13 11:55:36 2021
+++ pkgsrc/editors/emacs27-nox11/Makefile       Mon Dec 11 15:46:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/06/13 11:55:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2023/12/11 15:46:09 gdt Exp $
 
 PKGNAME=       ${DISTNAME:S/emacs/emacs27/:S/-/-nox11-/}
 CONFLICTS+=    emacs27-[0-9]*
@@ -8,8 +8,8 @@ PATCHDIR=       ${.CURDIR}/../../editors/emacs
 PKGDIR=                ${.CURDIR}/../../editors/emacs27
 DISTINFO_FILE= ${.CURDIR}/../../editors/emacs27/distinfo
 
-# minimal emacs without X
-CONFIGURE_ARGS+=       --without-all --without-x
+# minimal emacs without X, Cocoa, or any other GUI toolkit
+CONFIGURE_ARGS+=       --without-all --without-x --without-ns
 # but we want to gzip installed files
 CONFIGURE_ARGS+=       --with-compress-install
 

Index: pkgsrc/editors/emacs28-nox11/Makefile
diff -u pkgsrc/editors/emacs28-nox11/Makefile:1.2 pkgsrc/editors/emacs28-nox11/Makefile:1.3
--- pkgsrc/editors/emacs28-nox11/Makefile:1.2   Mon Sep 25 12:12:02 2023
+++ pkgsrc/editors/emacs28-nox11/Makefile       Mon Dec 11 15:46:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/09/25 12:12:02 gdt Exp $
+# $NetBSD: Makefile,v 1.3 2023/12/11 15:46:10 gdt Exp $
 
 PKGNAME=       ${DISTNAME:S/emacs/emacs28/:S/-/-nox11-/}
 CONFLICTS+=    emacs28-[0-9]*
@@ -8,12 +8,8 @@ PATCHDIR=      ${.CURDIR}/../../editors/emacs
 PKGDIR=                ${.CURDIR}/../../editors/emacs28
 DISTINFO_FILE= ${.CURDIR}/../../editors/emacs28/distinfo
 
-# minimal emacs without X
-CONFIGURE_ARGS+=       --without-all --without-x
-# on macOS, nextstep (cocoa) is probed for, even if --without-all is
-# given.  Pass it unconditionally, as forcing it off won't hurt on
-# not-mac
-CONFIGURE_ARGS+=       --without-ns
+# minimal emacs without X, Cocoa, or any other GUI toolkit
+CONFIGURE_ARGS+=       --without-all --without-x --without-ns
 # but we want to gzip installed files
 CONFIGURE_ARGS+=       --with-compress-install
 

Index: pkgsrc/editors/emacs29-nox11/Makefile
diff -u pkgsrc/editors/emacs29-nox11/Makefile:1.2 pkgsrc/editors/emacs29-nox11/Makefile:1.3
--- pkgsrc/editors/emacs29-nox11/Makefile:1.2   Mon Aug 14 05:13:31 2023
+++ pkgsrc/editors/emacs29-nox11/Makefile       Mon Dec 11 15:46:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/08/14 05:13:31 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2023/12/11 15:46:10 gdt Exp $
 
 PKGNAME=       ${DISTNAME:S/emacs/emacs29/:S/-/-nox11-/}
 CONFLICTS+=    emacs29-[0-9]*
@@ -8,8 +8,8 @@ PATCHDIR=       ${.CURDIR}/../../editors/emacs
 PKGDIR=                ${.CURDIR}/../../editors/emacs29
 DISTINFO_FILE= ${.CURDIR}/../../editors/emacs29/distinfo
 
-# minimal emacs without X
-CONFIGURE_ARGS+=       --without-all --without-x
+# minimal emacs without X, Cocoa, or any other GUI toolkit
+CONFIGURE_ARGS+=       --without-all --without-x --without-ns
 # but we want to gzip installed files
 CONFIGURE_ARGS+=       --with-compress-install