CVS commit: pkgsrc/meta-pkgs

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sat Sep 16 01:32:32 UTC 2023

Modified Files:
        pkgsrc/meta-pkgs/bulk-large: Makefile
        pkgsrc/meta-pkgs/bulk-medium: Makefile

Log Message:
bulk-medium/large: rearrange emacs again.

At gdt's suggestion, put emacs-nox11 in bulk-medium; it doesn't pull
in rust. The x11 emacs, which does, goes in -large, as does
emacs-packages, which will pull it in by default.

As before (but this wasn't visible in -medium's commit log) depend on
the meta-package instead of an explicit emacs version.

This moves the version of emacs we're building from 26 to 28. As best
anyone's been able to figure, the only reason these were building 26
was bitrot. :-|

While here,
  - don't list xemacs in both -medium and -large; it goes in -medium;
  - list xemacs along with xemacs-packages; this does not change what
    actually happens, but makes things a lot clearer to passersby.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/meta-pkgs/bulk-large/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/meta-pkgs/bulk-medium/Makefile

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

Modified files:

Index: pkgsrc/meta-pkgs/bulk-large/Makefile
diff -u pkgsrc/meta-pkgs/bulk-large/Makefile:1.65 pkgsrc/meta-pkgs/bulk-large/Makefile:1.66
--- pkgsrc/meta-pkgs/bulk-large/Makefile:1.65   Sat Sep 16 00:40:11 2023
+++ pkgsrc/meta-pkgs/bulk-large/Makefile        Sat Sep 16 01:32:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2023/09/16 00:40:11 dholland Exp $
+# $NetBSD: Makefile,v 1.66 2023/09/16 01:32:32 dholland Exp $
 
 DISTNAME=      bulk-large-20230903
 CATEGORIES=    meta-pkgs
@@ -72,7 +72,6 @@ DEPENDS+=     postgresql13-[0-9]*:../../data
 DEPENDS+=      abiword-[0-9]*:../../editors/abiword
 DEPENDS+=      emacs-[0-9]*:../../editors/emacs
 DEPENDS+=      emacs-packages-[0-9]*:../../editors/emacs-packages
-DEPENDS+=      xemacs-packages-[0-9]*:../../editors/xemacs-packages
 DEPENDS+=      p5-Padre-[0-9]*:../../editors/p5-Padre
 DEPENDS+=      glusterfs-[0-9]*:../../filesystems/glusterfs
 DEPENDS+=      tahoe-lafs-[0-9]*:../../filesystems/tahoe-lafs
@@ -112,8 +111,6 @@ DEPENDS+=   mit-krb5-[0-9]*:../../security
 #
 DEPENDS+=      gd-[0-9]*:../../graphics/gd
 DEPENDS+=      ${PYPKGPREFIX}-pspdfutils-[0-9]*:../../print/py-pspdfutils
-DEPENDS+=      emacs-[0-9]*:../../editors/emacs
-DEPENDS+=      emacs-packages-[0-9]*:../../editors/emacs-packages
 DEPENDS+=      qemu-[0-9]*:../../emulators/qemu
 DEPENDS+=      gnuplot-[0-9]*:../../graphics/gnuplot
 DEPENDS+=      ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib

Index: pkgsrc/meta-pkgs/bulk-medium/Makefile
diff -u pkgsrc/meta-pkgs/bulk-medium/Makefile:1.95 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.96
--- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.95  Sat Sep 16 01:16:28 2023
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile       Sat Sep 16 01:32:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2023/09/16 01:16:28 dholland Exp $
+# $NetBSD: Makefile,v 1.96 2023/09/16 01:32:32 dholland Exp $
 
 DISTNAME=      bulk-medium-20230911
 CATEGORIES=    meta-pkgs
@@ -72,6 +72,9 @@ DEPENDS+=     git-docs-[0-9]*:../../devel/gi
 DEPENDS+=      mercurial-[0-9]*:../../devel/mercurial
 DEPENDS+=      nvi-[0-9]*:../../editors/nvi
 DEPENDS+=      vim-gtk3-[0-9]*:../../editors/vim-gtk3
+# emacs with x11 also brings in rust, which doesn't fit in this package
+DEPENDS+=      emacs-nox11-[0-9]*:../../editors/emacs-nox11
+DEPENDS+=      xemacs-[0-9]*:../../editors/xemacs
 DEPENDS+=      xemacs-packages-[0-9]*:../../editors/xemacs-packages
 DEPENDS+=      simh-[0-9]*:../../emulators/simh
 DEPENDS+=      tme-[0-9]*:../../emulators/tme