pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/meta-pkgs



Module Name:    pkgsrc
Committed By:   dholland
Date:           Sat Sep 16 00:35:22 UTC 2023

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

Log Message:
bulk-small/medium/large: restrict rust to bulk-large

Rust is too expensive for bulk-medium (let alone bulk-small, where it's
crept in recently via libimagequant.)

Move the packages that were pulling it in to bulk-large.

XXX: Since this includes (modern) emacs we may need to reconsider :-|


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/meta-pkgs/bulk-large/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/meta-pkgs/bulk-medium/Makefile
cvs rdiff -u -r1.41 -r1.42 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-large/Makefile
diff -u pkgsrc/meta-pkgs/bulk-large/Makefile:1.62 pkgsrc/meta-pkgs/bulk-large/Makefile:1.63
--- pkgsrc/meta-pkgs/bulk-large/Makefile:1.62   Wed Sep 13 21:44:13 2023
+++ pkgsrc/meta-pkgs/bulk-large/Makefile        Sat Sep 16 00:35:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2023/09/13 21:44:13 dholland Exp $
+# $NetBSD: Makefile,v 1.63 2023/09/16 00:35:22 dholland Exp $
 
 DISTNAME=      bulk-large-20230903
 CATEGORIES=    meta-pkgs
@@ -105,6 +105,24 @@ DEPENDS+=  heimdal-[0-9]*:../../security/
 DEPENDS+=      mit-krb5-[0-9]*:../../security/mit-krb5
 
 #
+# 3A. Stuff that uses Rust that might otherwise be in bulk-medium or bulk-small
+# (and used to be)
+#
+DEPENDS+=      gd-[0-9]*:../../graphics/gd
+DEPENDS+=      ${PYPKGPREFIX}-pspdfutils-[0-9]*:../../print/py-pspdfutils
+DEPENDS+=      emacs26>=26<27:../../editors/emacs26
+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
+.if ${LIBRSVG_TYPE} == "rust"
+DEPENDS+=      librsvg-[0-9]*:../../graphics/librsvg
+.else
+DEPENDS+=      librsvg-[0-9]*:../../graphics/librsvg-c
+.endif
+DEPENDS+=      libsoup-[0-9]*:../../net/libsoup
+
+#
 # 4. TeX
 #
 DEPENDS+=      texlive-collection-fontsrecommended-[0-9]*:../../meta-pkgs/texlive-collection-fontsrecommended

Index: pkgsrc/meta-pkgs/bulk-medium/Makefile
diff -u pkgsrc/meta-pkgs/bulk-medium/Makefile:1.92 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.93
--- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.92  Fri Sep 15 22:38:46 2023
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile       Sat Sep 16 00:35:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2023/09/15 22:38:46 dholland Exp $
+# $NetBSD: Makefile,v 1.93 2023/09/16 00:35:22 dholland Exp $
 
 DISTNAME=      bulk-medium-20230911
 CATEGORIES=    meta-pkgs
@@ -69,19 +69,14 @@ DEPENDS+=   git-[0-9]*:../../devel/git
 DEPENDS+=      git-base-[0-9]*:../../devel/git-base
 DEPENDS+=      git-docs-[0-9]*:../../devel/git-docs
 DEPENDS+=      mercurial-[0-9]*:../../devel/mercurial
-DEPENDS+=      emacs26>=26<27:../../editors/emacs26
-DEPENDS+=      emacs-packages-[0-9]*:../../editors/emacs-packages
 DEPENDS+=      nvi-[0-9]*:../../editors/nvi
 DEPENDS+=      vim-gtk3-[0-9]*:../../editors/vim-gtk3
 DEPENDS+=      xemacs-packages-[0-9]*:../../editors/xemacs-packages
-DEPENDS+=      qemu-[0-9]*:../../emulators/qemu
 DEPENDS+=      simh-[0-9]*:../../emulators/simh
 DEPENDS+=      tme-[0-9]*:../../emulators/tme
 DEPENDS+=      wine-[0-9]*:../../emulators/wine
 DEPENDS+=      ImageMagick-[0-9]*:../../graphics/ImageMagick
-DEPENDS+=      gnuplot-[0-9]*:../../graphics/gnuplot
 DEPENDS+=      netpbm-[0-9]*:../../graphics/netpbm
-DEPENDS+=      ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=      gawk-[0-9]*:../../lang/gawk
 DEPENDS+=      php>=7.4<7.5:../../lang/php74
 DEPENDS+=      php>=8.0<8.1:../../lang/php80
@@ -177,18 +172,12 @@ DEPENDS+= openjpeg-[0-9]*:../../graphics
 DEPENDS+=      lcms-[0-9]*:../../graphics/lcms
 DEPENDS+=      lcms2-[0-9]*:../../graphics/lcms2
 .include "../../graphics/librsvg/available.mk"
-.if ${LIBRSVG_TYPE} == "rust"
-DEPENDS+=      librsvg-[0-9]*:../../graphics/librsvg
-.else
-DEPENDS+=      librsvg-[0-9]*:../../graphics/librsvg-c
-.endif
 DEPENDS+=      blas-[0-9]*:../../math/blas
 DEPENDS+=      lapack-[0-9]*:../../math/lapack
 DEPENDS+=      boost-[0-9]*:../../meta-pkgs/boost
 DEPENDS+=      ffmpeg4-[0-9]*:../../multimedia/ffmpeg4
 DEPENDS+=      libogg-[0-9]*:../../multimedia/libogg
 DEPENDS+=      libpcap-[0-9]*:../../net/libpcap
-DEPENDS+=      libsoup-[0-9]*:../../net/libsoup
 DEPENDS+=      poppler-[0-9]*:../../print/poppler
 DEPENDS+=      poppler-includes-[0-9]*:../../print/poppler-includes
 DEPENDS+=      cyrus-sasl-[0-9]*:../../security/cyrus-sasl

Index: pkgsrc/meta-pkgs/bulk-small/Makefile
diff -u pkgsrc/meta-pkgs/bulk-small/Makefile:1.41 pkgsrc/meta-pkgs/bulk-small/Makefile:1.42
--- pkgsrc/meta-pkgs/bulk-small/Makefile:1.41   Fri Sep 15 22:38:46 2023
+++ pkgsrc/meta-pkgs/bulk-small/Makefile        Sat Sep 16 00:35:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2023/09/15 22:38:46 dholland Exp $
+# $NetBSD: Makefile,v 1.42 2023/09/16 00:35:22 dholland Exp $
 
 DISTNAME=      bulk-small-20230601
 PKGREVISION=   1
@@ -76,7 +76,6 @@ DEPENDS+=     pkgin-[0-9]*:../../pkgtools/pk
 DEPENDS+=      enscript-[0-9]*:../../print/enscript
 DEPENDS+=      ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
 DEPENDS+=      papersize-[0-9]*:../../print/papersize
-DEPENDS+=      ${PYPKGPREFIX}-pspdfutils-[0-9]*:../../print/py-pspdfutils
 DEPENDS+=      sudo-[0-9]*:../../security/sudo
 DEPENDS+=      stunnel-[0-9]*:../../security/stunnel
 DEPENDS+=      bash-[0-9]*:../../shells/bash
@@ -131,7 +130,6 @@ DEPENDS+=   sqlite3-[0-9]*:../../databases
 DEPENDS+=      gettext-lib-[0-9]*:../../devel/gettext-lib
 DEPENDS+=      readline-[0-9]*:../../devel/readline
 DEPENDS+=      zlib-[0-9]*:../../devel/zlib
-DEPENDS+=      gd-[0-9]*:../../graphics/gd
 DEPENDS+=      giflib-[0-9]*:../../graphics/giflib
 .include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_DEPMETHOD.${JPEG_DEFAULT}=   build



Home | Main Index | Thread Index | Old Index