CVS commit: pkgsrc/editors

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 14 05:13:31 UTC 2023

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

Log Message:
emacs29*: fix PLIST for no-native-compilation

XXX: why doesn't emacs29-nox11 use options.mk?
XXX: shouldn't we enable native-compilation by default for emacs29-nox11?


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs29/Makefile.common \
    pkgsrc/editors/emacs29/PLIST pkgsrc/editors/emacs29/options.mk
cvs rdiff -u -r1.1 -r1.2 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/emacs29/Makefile.common
diff -u pkgsrc/editors/emacs29/Makefile.common:1.2 pkgsrc/editors/emacs29/Makefile.common:1.3
--- pkgsrc/editors/emacs29/Makefile.common:1.2  Sat Aug 12 03:20:58 2023
+++ pkgsrc/editors/emacs29/Makefile.common      Mon Aug 14 05:13:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2023/08/12 03:20:58 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2023/08/14 05:13:31 wiz Exp $
 #
 # used by editors/emacs29/Makefile
 # used by editors/emacs29-nox11/Makefile
@@ -43,6 +43,7 @@ PLIST_SRC+=           ../../editors/emacs29/PLIST
 BUILD_TARGET=          bootstrap
 EMACS_VERSION=         ${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}
 PLIST_SUBST+=          EMACS_VERSION=${EMACS_VERSION}
+PLIST_VARS+=           native nonative
 
 MAKE_DIRS_PERMS+=      ${VARBASE}/games/emacs ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 CONF_FILES_PERMS+=     /dev/null ${VARBASE}/games/emacs/snake-scores \
Index: pkgsrc/editors/emacs29/PLIST
diff -u pkgsrc/editors/emacs29/PLIST:1.2 pkgsrc/editors/emacs29/PLIST:1.3
--- pkgsrc/editors/emacs29/PLIST:1.2    Sat Aug 12 03:20:58 2023
+++ pkgsrc/editors/emacs29/PLIST        Mon Aug 14 05:13:31 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/08/12 03:20:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/08/14 05:13:31 wiz Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -1628,10 +1628,12 @@ share/emacs/${PKGVERSION}/lisp/emacs-lis
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-print.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-seq.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-seq.elc
-share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.el.gz
-share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.elc
-share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.el.gz
-share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.elc
+${PLIST.native}share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.el.gz
+${PLIST.native}share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.elc
+${PLIST.nonative}share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.el
+${PLIST.native}share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.el.gz
+${PLIST.native}share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.elc
+${PLIST.nonative}share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.el
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/copyright.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/copyright.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/crm.el.gz
Index: pkgsrc/editors/emacs29/options.mk
diff -u pkgsrc/editors/emacs29/options.mk:1.2 pkgsrc/editors/emacs29/options.mk:1.3
--- pkgsrc/editors/emacs29/options.mk:1.2       Sat Aug 12 03:20:58 2023
+++ pkgsrc/editors/emacs29/options.mk   Mon Aug 14 05:13:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/08/12 03:20:58 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2023/08/14 05:13:31 wiz Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=                       PKG_OPTIONS.emacs
@@ -53,6 +53,9 @@ LDFLAGS+=             ${COMPILER_RPATH_FLAG}${BUILD
 GENERATE_PLIST+=       cd ${DESTDIR}${PREFIX} && \
         ${FIND} lib/emacs/${PKGVERSION_NOREV}/native-lisp/ \( -type f -o -type l \) -print | ${SORT};
 .  include "../../lang/gcc13-libjit/buildlink3.mk"
+PLIST.native=          yes
+.else
+PLIST.nonative=                yes
 .endif
 
 ###

Index: pkgsrc/editors/emacs29-nox11/Makefile
diff -u pkgsrc/editors/emacs29-nox11/Makefile:1.1 pkgsrc/editors/emacs29-nox11/Makefile:1.2
--- pkgsrc/editors/emacs29-nox11/Makefile:1.1   Mon Jul 31 15:05:54 2023
+++ pkgsrc/editors/emacs29-nox11/Makefile       Mon Aug 14 05:13:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/07/31 15:05:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2023/08/14 05:13:31 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/emacs/emacs29/:S/-/-nox11-/}
 CONFLICTS+=    emacs29-[0-9]*
@@ -13,5 +13,7 @@ CONFIGURE_ARGS+=      --without-all --without
 # but we want to gzip installed files
 CONFIGURE_ARGS+=       --with-compress-install
 
+PLIST.nonative=                yes
+
 .include "../../editors/emacs29/Makefile.common"
 .include "../../mk/bsd.pkg.mk"