CVS commit: pkgsrc/editors

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 29 11:31:36 UTC 2025

Modified Files:
        pkgsrc/editors/emacs29: Makefile options.mk
        pkgsrc/editors/emacs30: Makefile options.mk

Log Message:
emacs{29,30}: enable libgccjit option only on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/editors/emacs29/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/emacs29/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs30/Makefile \
    pkgsrc/editors/emacs30/options.mk

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

Modified files:

Index: pkgsrc/editors/emacs29/Makefile
diff -u pkgsrc/editors/emacs29/Makefile:1.33 pkgsrc/editors/emacs29/Makefile:1.34
--- pkgsrc/editors/emacs29/Makefile:1.33        Thu Apr 24 14:13:43 2025
+++ pkgsrc/editors/emacs29/Makefile     Tue Apr 29 11:31:36 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2025/04/24 14:13:43 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2025/04/29 11:31:36 wiz Exp $
 
 CONFLICTS+=    emacs29-nox11-[0-9]*
 
-PKGREVISION=   15
+PKGREVISION=   16
 
 .include "../../editors/emacs29/Makefile.common"
 

Index: pkgsrc/editors/emacs29/options.mk
diff -u pkgsrc/editors/emacs29/options.mk:1.8 pkgsrc/editors/emacs29/options.mk:1.9
--- pkgsrc/editors/emacs29/options.mk:1.8       Wed Aug  7 15:20:07 2024
+++ pkgsrc/editors/emacs29/options.mk   Tue Apr 29 11:31:36 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2024/08/07 15:20:07 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2025/04/29 11:31:36 wiz Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=                       PKG_OPTIONS.emacs
@@ -23,7 +23,7 @@ PKG_OPTIONS_GROUP.toolkit=            gtk gtk2 gtk
 # xaw3d is omitted because it is only valid with xaw
 PKG_SUGGESTED_OPTIONS= dbus gnutls gtk3 jansson libotf libwebp tree-sitter xml x11
 
-.if !${MACHINE_PLATFORM:MDarwin-*} && !${MACHINE_PLATFORM:MSunOS-*}
+.if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=        libgccjit
 .endif
 

Index: pkgsrc/editors/emacs30/Makefile
diff -u pkgsrc/editors/emacs30/Makefile:1.1 pkgsrc/editors/emacs30/Makefile:1.2
--- pkgsrc/editors/emacs30/Makefile:1.1 Mon Apr 28 08:28:54 2025
+++ pkgsrc/editors/emacs30/Makefile     Tue Apr 29 11:31:36 2025
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2025/04/28 08:28:54 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2025/04/29 11:31:36 wiz Exp $
 
 CONFLICTS+=    emacs30-nox11-[0-9]*
 
+PKGREVISION=   1
+
 .include "../../editors/emacs30/Makefile.common"
 
 .include "options.mk"
Index: pkgsrc/editors/emacs30/options.mk
diff -u pkgsrc/editors/emacs30/options.mk:1.1 pkgsrc/editors/emacs30/options.mk:1.2
--- pkgsrc/editors/emacs30/options.mk:1.1       Mon Apr 28 08:28:54 2025
+++ pkgsrc/editors/emacs30/options.mk   Tue Apr 29 11:31:36 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2025/04/28 08:28:54 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2025/04/29 11:31:36 wiz Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=                       PKG_OPTIONS.emacs
@@ -20,7 +20,7 @@ PKG_OPTIONS_GROUP.toolkit=            gtk3 xaw
 # xaw3d is omitted because it is only valid with xaw
 PKG_SUGGESTED_OPTIONS= dbus gnutls gtk3 libotf libwebp tree-sitter xml x11
 
-.if !${MACHINE_PLATFORM:MDarwin-*} && !${MACHINE_PLATFORM:MSunOS-*}
+.if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=        libgccjit
 .endif