CVS commit: pkgsrc/editors

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec 24 22:21:00 UTC 2025

Modified Files:
        pkgsrc/editors/emacs30: Makefile.common PLIST options.mk
        pkgsrc/editors/emacs30-nox11: Makefile

Log Message:
emacs30*: remove PLIST.native

According to SmartOS build, it's now wrong.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs30/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs30/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs30/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs30-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/emacs30/Makefile.common
diff -u pkgsrc/editors/emacs30/Makefile.common:1.2 pkgsrc/editors/emacs30/Makefile.common:1.3
--- pkgsrc/editors/emacs30/Makefile.common:1.2  Wed Apr 30 12:36:36 2025
+++ pkgsrc/editors/emacs30/Makefile.common      Wed Dec 24 22:21:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2025/04/30 12:36:36 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.3 2025/12/24 22:21:00 wiz Exp $
 #
 # used by editors/emacs30/Makefile
 # used by editors/emacs30-nox11/Makefile
@@ -38,8 +38,6 @@ USE_GAMESGROUP=               yes
 BUILD_DEFS+=           VARBASE
 BUILD_DEFS+=           GAMEDATAMODE
 PLIST_SRC+=            ../../editors/emacs30/PLIST
-# also used by the nox11 package, so needs to be set here
-PLIST_VARS+=           native
 
 MAKE_DIRS_PERMS+=      ${VARBASE}/games/emacs ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 CONF_FILES_PERMS+=     /dev/null ${VARBASE}/games/emacs/snake-scores \

Index: pkgsrc/editors/emacs30/PLIST
diff -u pkgsrc/editors/emacs30/PLIST:1.1 pkgsrc/editors/emacs30/PLIST:1.2
--- pkgsrc/editors/emacs30/PLIST:1.1    Mon Apr 28 08:28:54 2025
+++ pkgsrc/editors/emacs30/PLIST        Wed Dec 24 22:21:00 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2025/04/28 08:28:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/12/24 22:21:00 wiz Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -1737,11 +1737,11 @@ share/emacs/${PKGVERSION}/lisp/emacs-lis
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-common.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-common.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.el.gz
-${PLIST.native}share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.elc
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-run.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-run.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.el.gz
-${PLIST.native}share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.elc
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/compat.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/compat.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/copyright.el.gz

Index: pkgsrc/editors/emacs30/options.mk
diff -u pkgsrc/editors/emacs30/options.mk:1.3 pkgsrc/editors/emacs30/options.mk:1.4
--- pkgsrc/editors/emacs30/options.mk:1.3       Fri May  2 13:02:46 2025
+++ pkgsrc/editors/emacs30/options.mk   Wed Dec 24 22:21:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2025/05/02 13:02:46 jperkin Exp $
+# $NetBSD: options.mk,v 1.4 2025/12/24 22:21:00 wiz Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=                       PKG_OPTIONS.emacs
@@ -45,7 +45,6 @@ LDFLAGS+=             ${COMPILER_RPATH_FLAG}${BUILD
 GENERATE_PLIST+=       cd ${DESTDIR}${PREFIX} && \
         ${FIND} share/emacs/${PKGVERSION_NOREV}/lisp/native-lisp lib/emacs/${PKGVERSION_NOREV}/native-lisp/ \( -type f -o -type l \) -print | ${SORT};
 .  include "../../lang/gcc14-libjit/buildlink3.mk"
-PLIST.native=          yes
 .endif
 
 ###

Index: pkgsrc/editors/emacs30-nox11/Makefile
diff -u pkgsrc/editors/emacs30-nox11/Makefile:1.1 pkgsrc/editors/emacs30-nox11/Makefile:1.2
--- pkgsrc/editors/emacs30-nox11/Makefile:1.1   Mon Apr 28 08:29:13 2025
+++ pkgsrc/editors/emacs30-nox11/Makefile       Wed Dec 24 22:21:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/04/28 08:29:13 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2025/12/24 22:21:00 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/emacs/emacs30/:S/-/-nox11-/}
 
@@ -15,7 +15,5 @@ CONFIGURE_ARGS+=      --without-all --without
 CONFIGURE_ARGS+=       --with-compress-install
 CONFIGURE_ARGS+=       --with-modules
 
-PLIST.native=  no
-
 .include "../../editors/emacs30/Makefile.common"
 .include "../../mk/bsd.pkg.mk"