CVS commit: pkgsrc/meta-pkgs

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

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

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

Log Message:
bulk-small/medium: move the things that were pulling in cmake to -medium.

Specifically:
   - weechat
   - ghostscript-gpl
   - icewm
   - fluxbox
   - apache24

ghostscript doesn't really belong in bulk-small any more anyway (some
years back after a round of security alerts there was a concerted
effort to cut it out of things it didn't really need to be in), and
I'm not sure about weechat, but the others are kind of unfortunate.

(There is now no window manager in bulk-small, and there really ought
to be.)


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/meta-pkgs/bulk-medium/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/meta-pkgs/bulk-small/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-medium/Makefile
diff -u pkgsrc/meta-pkgs/bulk-medium/Makefile:1.93 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.94
--- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.93  Sat Sep 16 00:35:22 2023
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile       Sat Sep 16 01:14:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2023/09/16 00:35:22 dholland Exp $
+# $NetBSD: Makefile,v 1.94 2023/09/16 01:14:40 dholland Exp $
 
 DISTNAME=      bulk-medium-20230911
 CATEGORIES=    meta-pkgs
@@ -61,6 +61,7 @@ DEPENDS+=     vorbis-tools-[0-9]*:../../audi
 DEPENDS+=      jabberd>=2:../../chat/jabberd2
 DEPENDS+=      sirc-[0-9]*:../../chat/sirc
 DEPENDS+=      hexchat-[0-9]*:../../chat/hexchat
+DEPENDS+=      weechat-[0-9]*:../../chat/weechat
 DEPENDS+=      fribidi-[0-9]*:../../converters/fribidi
 DEPENDS+=      mariadb-client>=10.5<10.6:../../databases/mariadb105-client
 DEPENDS+=      mariadb-client>=10.6<10.7:../../databases/mariadb106-client
@@ -105,6 +106,7 @@ DEPENDS+=   yt-dlp-[0-9]*:../../net/yt-dlp
 DEPENDS+=      lintpkgsrc-[0-9]*:../../pkgtools/lintpkgsrc
 DEPENDS+=      pkglint-[0-9]*:../../pkgtools/pkglint
 DEPENDS+=      ghostscript-agpl-[0-9]*:../../print/ghostscript-agpl
+DEPENDS+=      ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
 DEPENDS+=      poppler-utils-[0-9]*:../../print/poppler-utils
 DEPENDS+=      mupdf-[0-9]*:../../print/mupdf
 DEPENDS+=      gnupg-[0-9]*:../../security/gnupg
@@ -116,6 +118,9 @@ DEPENDS+=   xenkernel415-[0-9]*:../../sysu
 DEPENDS+=      xentools415-[0-9]*:../../sysutils/xentools415
 .endif
 DEPENDS+=      ispell-[0-9]*:../../textproc/ispell
+DEPENDS+=      icewm>=1.2<1.3:../../wm/icewm
+DEPENDS+=      fluxbox-[0-9]*:../../wm/fluxbox
+DEPENDS+=      apache>=2.4:../../www/apache24
 DEPENDS+=      arcticfox-[0-9]*:../../www/arcticfox
 DEPENDS+=      xlockmore-[0-9]*:../../x11/xlockmore
 

Index: pkgsrc/meta-pkgs/bulk-small/Makefile
diff -u pkgsrc/meta-pkgs/bulk-small/Makefile:1.43 pkgsrc/meta-pkgs/bulk-small/Makefile:1.44
--- pkgsrc/meta-pkgs/bulk-small/Makefile:1.43   Sat Sep 16 00:44:25 2023
+++ pkgsrc/meta-pkgs/bulk-small/Makefile        Sat Sep 16 01:14:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2023/09/16 00:44:25 dholland Exp $
+# $NetBSD: Makefile,v 1.44 2023/09/16 01:14:40 dholland Exp $
 
 DISTNAME=      bulk-small-20230601
 PKGREVISION=   1
@@ -58,7 +58,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 38
 DEPENDS+=      ircII-[0-9]*:../../chat/ircII
 DEPENDS+=      irssi-[0-9]*:../../chat/irssi
 DEPENDS+=      irssi-icb-[0-9]*:../../chat/irssi-icb
-DEPENDS+=      weechat-[0-9]*:../../chat/weechat
 DEPENDS+=      base64-[0-9]*:../../converters/base64
 DEPENDS+=      mpack-[0-9]*:../../converters/mpack
 DEPENDS+=      emacs21>=21<22:../../editors/emacs21
@@ -74,16 +73,12 @@ DEPENDS+=   pkg_chk-[0-9]*:../../pkgtools/
 DEPENDS+=      pkg_rolling-replace-[0-9]*:../../pkgtools/pkg_rolling-replace
 DEPENDS+=      pkgin-[0-9]*:../../pkgtools/pkgin
 DEPENDS+=      enscript-[0-9]*:../../print/enscript
-DEPENDS+=      ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
 DEPENDS+=      papersize-[0-9]*:../../print/papersize
 DEPENDS+=      sudo-[0-9]*:../../security/sudo
 DEPENDS+=      stunnel-[0-9]*:../../security/stunnel
 DEPENDS+=      bash-[0-9]*:../../shells/bash
 DEPENDS+=      tcsh-[0-9]*:../../shells/tcsh
 DEPENDS+=      zsh-[0-9]*:../../shells/zsh
-DEPENDS+=      icewm>=1.2<1.3:../../wm/icewm
-DEPENDS+=      fluxbox-[0-9]*:../../wm/fluxbox
-DEPENDS+=      apache>=2.4:../../www/apache24
 DEPENDS+=      bozohttpd-[0-9]*:../../www/bozohttpd
 DEPENDS+=      curl-[0-9]*:../../www/curl
 DEPENDS+=      xlockmore-lite-[0-9]*:../../x11/xlockmore-lite