CVS commit: pkgsrc/meta-pkgs

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct 30 13:00:05 UTC 2023

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

Log Message:
bulk-*: Be more aware of the differences between NetBSD and non-X11 platforms


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/meta-pkgs/bulk-medium/Makefile
cvs rdiff -u -r1.53 -r1.54 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.105 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.106
--- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.105 Mon Oct 30 12:47:18 2023
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile       Mon Oct 30 13:00:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2023/10/30 12:47:18 nia Exp $
+# $NetBSD: Makefile,v 1.106 2023/10/30 13:00:05 nia Exp $
 
 DISTNAME=      bulk-medium-20231022
 CATEGORIES=    meta-pkgs
@@ -79,7 +79,6 @@ DEPENDS+=     dosbox-[0-9]*:../../emulators/
 DEPENDS+=      simh-[0-9]*:../../emulators/simh
 DEPENDS+=      tme-[0-9]*:../../emulators/tme
 DEPENDS+=      ImageMagick-[0-9]*:../../graphics/ImageMagick
-DEPENDS+=      feh-[0-9]*:../../graphics/feh
 DEPENDS+=      netpbm-[0-9]*:../../graphics/netpbm
 DEPENDS+=      gawk-[0-9]*:../../lang/gawk
 DEPENDS+=      php>=7.4<7.5:../../lang/php74
@@ -101,8 +100,6 @@ DEPENDS+=   bind>=9.16<9.17:../../net/bind
 DEPENDS+=      nmap-[0-9]*:../../net/nmap
 DEPENDS+=      rtorrent-[0-9]*:../../net/rtorrent
 DEPENDS+=      samba>=4.2:../../net/samba4
-DEPENDS+=      wpa_supplicant-[0-9]*:../../net/wpa_supplicant
-DEPENDS+=      tightvncviewer-[0-9]*:../../net/tightvncviewer
 DEPENDS+=      xymon-[0-9]*:../../net/xymon
 DEPENDS+=      xymonclient-[0-9]*:../../net/xymonclient
 DEPENDS+=      yt-dlp-[0-9]*:../../net/yt-dlp
@@ -113,21 +110,15 @@ DEPENDS+= poppler-utils-[0-9]*:../../pri
 DEPENDS+=      mupdf-[0-9]*:../../print/mupdf
 DEPENDS+=      gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
-DEPENDS+=      desktop-file-utils-[0-9]*:../../sysutils/desktop-file-utils
 DEPENDS+=      xe-guest-utilities-[0-9]*:../../sysutils/xe-guest-utilities
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
 DEPENDS+=      xenkernel415-[0-9]*:../../sysutils/xenkernel415
 DEPENDS+=      xentools415-[0-9]*:../../sysutils/xentools415
 .endif
 DEPENDS+=      ispell-[0-9]*:../../textproc/ispell
-DEPENDS+=      i3-[0-9]*:../../wm/i3
-DEPENDS+=      fluxbox-[0-9]*:../../wm/fluxbox
 DEPENDS+=      apache>=2.4:../../www/apache24
 DEPENDS+=      arcticfox-[0-9]*:../../www/arcticfox
 DEPENDS+=      nginx-[0-9]*:../../www/nginx
-DEPENDS+=      slim-[0-9]*:../../x11/slim
-DEPENDS+=      x11vnc-[0-9]*:../../x11/x11vnc
-DEPENDS+=      xlockmore-[0-9]*:../../x11/xlockmore
 
 #
 # 2. Archivers and build tools
@@ -191,7 +182,6 @@ DEPENDS+=   libpcap-[0-9]*:../../net/libpc
 DEPENDS+=      poppler-[0-9]*:../../print/poppler
 DEPENDS+=      poppler-includes-[0-9]*:../../print/poppler-includes
 DEPENDS+=      cyrus-sasl-[0-9]*:../../security/cyrus-sasl
-DEPENDS+=      openssl-[0-9]*:../../security/openssl
 DEPENDS+=      tcp_wrappers-[0-9]*:../../security/tcp_wrappers
 DEPENDS+=      libnotify-[0-9]*:../../sysutils/libnotify
 DEPENDS+=      gtk3+-[0-9]*:../../x11/gtk3
@@ -204,12 +194,21 @@ DEPENDS+= suse>=13.1:../../meta-pkgs/sus
 .endif
 
 #
-# 5. Desktop infrastructure and support services
+# 5. X11 desktop infrastructure and support services
 #
-DEPENDS+=      eawpatches-[0-9]*:../../audio/eawpatches
+.if ${OPSYS} != "Darwin"
 DEPENDS+=      fuse-ntfs-3g-[0-9]*:../../filesystems/fuse-ntfs-3g
+DEPENDS+=      feh-[0-9]*:../../graphics/feh
 DEPENDS+=      shared-mime-info-[0-9]*:../../databases/shared-mime-info
 DEPENDS+=      hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
+DEPENDS+=      tightvncviewer-[0-9]*:../../net/tightvncviewer
+DEPENDS+=      desktop-file-utils-[0-9]*:../../sysutils/desktop-file-utils
+DEPENDS+=      i3-[0-9]*:../../wm/i3
+DEPENDS+=      fluxbox-[0-9]*:../../wm/fluxbox
+DEPENDS+=      slim-[0-9]*:../../x11/slim
+DEPENDS+=      x11vnc-[0-9]*:../../x11/x11vnc
+DEPENDS+=      xlockmore-[0-9]*:../../x11/xlockmore
+.endif
 
 #
 # 6. Other very small packages

Index: pkgsrc/meta-pkgs/bulk-small/Makefile
diff -u pkgsrc/meta-pkgs/bulk-small/Makefile:1.53 pkgsrc/meta-pkgs/bulk-small/Makefile:1.54
--- pkgsrc/meta-pkgs/bulk-small/Makefile:1.53   Mon Oct 30 12:40:13 2023
+++ pkgsrc/meta-pkgs/bulk-small/Makefile        Mon Oct 30 13:00:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2023/10/30 12:40:13 nia Exp $
+# $NetBSD: Makefile,v 1.54 2023/10/30 13:00:05 nia Exp $
 
 DISTNAME=      bulk-small-20231022
 CATEGORIES=    meta-pkgs
@@ -58,7 +58,7 @@ DEPENDS+=     ircII-[0-9]*:../../chat/ircII
 DEPENDS+=      irssi-[0-9]*:../../chat/irssi
 DEPENDS+=      base64-[0-9]*:../../converters/base64
 DEPENDS+=      mpack-[0-9]*:../../converters/mpack
-DEPENDS+=      emacs21>=21<22:../../editors/emacs21
+DEPENDS+=      emacs21-nox11>=21<22:../../editors/emacs21-nox11
 DEPENDS+=      nano-[0-9]*:../../editors/nano
 DEPENDS+=      vim-[0-9]*:../../editors/vim
 DEPENDS+=      vim-share-[0-9]*:../../editors/vim-share
@@ -78,11 +78,25 @@ DEPENDS+=   bash-[0-9]*:../../shells/bash
 DEPENDS+=      tcsh-[0-9]*:../../shells/tcsh
 DEPENDS+=      zsh-[0-9]*:../../shells/zsh
 DEPENDS+=      htop-[0-9]*:../../sysutils/htop
-DEPENDS+=      fvwm-[0-9]*:../../wm/fvwm
-DEPENDS+=      bozohttpd-[0-9]*:../../www/bozohttpd
 DEPENDS+=      curl-[0-9]*:../../www/curl
 DEPENDS+=      lynx-[0-9]*:../../www/lynx
+
+.include "../../mk/bsd.prefs.mk"
+
+# We do not want to build software that's already included.
+
+.if ${OPSYS} != "NetBSD"
+DEPENDS+=      bozohttpd-[0-9]*:../../www/bozohttpd
+.endif
+
+.if ${OPSYS} != "NetBSD" && ${OPSYS} != "OpenBSD"
+DEPENDS+=      tmux-[0-9]*:../../sysutils/tmux
+.endif
+
+.if ${X11_TYPE} == "native"
+DEPENDS+=      fvwm-[0-9]*:../../wm/fvwm
 DEPENDS+=      xlockmore-lite-[0-9]*:../../x11/xlockmore-lite
+.endif
 
 #
 # 2. Base packages for the very popular languages that enormous
@@ -115,8 +129,6 @@ DEPENDS+=   pkgconf-[0-9]*:../../devel/pkg
 #DEPENDS+=     osabi-[0-9]*:../../pkgtools/osabi
 DEPENDS+=      pkg_tarup-[0-9]*:../../pkgtools/pkg_tarup
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${X11_TYPE} == "native"
 DEPENDS+=      x11-links-[0-9]*:../../pkgtools/x11-links
 .endif
@@ -215,7 +227,9 @@ TRANSITIVE+=        libpsl-[0-9]*:../../www/lib
 TRANSITIVE+=   libfetch-[0-9]*:../../net/libfetch
 
 # required by www/bozohttpd
+.if ${OPSYS} != "NetBSD"
 TRANSITIVE+=   lua54-[0-9]*:../../lang/lua54
+.endif
 
 # required by www/curl
 TRANSITIVE+=   libidn2-[0-9]*:../../devel/libidn2
@@ -275,7 +289,9 @@ TRANSITIVE+=        libgcrypt-[0-9]*:../../secu
 TRANSITIVE+=   libgpg-error-[0-9]*:../../security/libgpg-error
 
 # required by wm/fvwm
+.if ${X11_TYPE} == "native"
 TRANSITIVE+=   libstroke-[0-9]*:../../devel/libstroke
+.endif
 
 # Provide a way to hide these when doing dependency analysis.
 .if !defined(SUPPRESS_TRANSITIVE)