From 150218fd6e5db62f5f339352be1bacc52b6931d2502061df6433bacd1c06866d Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 23 Jun 2024 12:46:10 +0300 Subject: [PATCH] Regroup skels according to FreeBSD's ports layout --- build/skel/audio/flac-1.4.3.do | 2 +- build/skel/{multimedia => audio}/libogg-1.3.5.do | 0 build/skel/audio/libvorbis-1.3.7.do | 2 +- build/skel/audio/opusfile-0.12.do | 2 +- build/skel/{www => devel}/apr-1.7.4.do | 0 build/skel/{www => devel}/apr-util-1.6.3.do | 0 build/skel/devel/cmake-3.28.3.do | 2 +- build/skel/devel/git-full-2.45.2.do | 6 +++--- build/skel/{crypto => devel}/npth-1.7.do | 0 build/skel/{deskutils => editors}/vim-v9.1.0482.do | 0 build/skel/{net => ftp}/aria2-1.37.0.do | 2 +- build/skel/{www => ftp}/curl-8.7.1.do | 2 +- build/skel/{www => ftp}/curl-with-tls-8.7.1.do | 2 +- build/skel/{net => ftp}/lftp-4.9.2.do | 2 +- .../{multimedia => graphics}/exiftool-12.87.do | 0 build/skel/graphics/graphviz-11.0.0.do | 2 +- build/skel/graphics/imagemagick-7.1.1-33.do | 2 +- build/skel/graphics/mod_tile-v0.7.0-58-gc3453bc.do | 6 +++--- build/skel/graphics/zathura-0.5.2.do | 2 +- build/skel/irc/irssi-1.4.5.do | 2 +- build/skel/lang/Python-3.10.14.do | 2 +- build/skel/lang/Python-3.7.3.do | 2 +- build/skel/mail/gmime-3.2.7.do | 2 +- build/skel/mail/mutt-2.2.13.do | 10 +++++----- .../multimedia/ffmpeg-n7.1-dev-785-g784672b833.do | 10 +++++----- build/skel/multimedia/libmatroska-1.7.1.do | 2 +- build/skel/multimedia/mkvtoolnix-58.0.0.do | 4 ++-- build/skel/net/rsync-3.3.0.do | 2 +- build/skel/{graphics => net}/tigervnc-1.13.90.do | 4 ++-- .../{graphics => print}/ghostscript-10.03.1.do | 0 .../{crypto => security}/age-v1.1.1-23-g29b68c2.do | 0 build/skel/{crypto => security}/b3sum-1.5.0.do | 0 .../skel/{crypto => security}/cyrus-sasl-2.1.28.do | 2 +- build/skel/{crypto => security}/gnupg-2.4.5.do | 14 +++++++------- build/skel/{crypto => security}/gnutls-3.7.10.do | 2 +- build/skel/{crypto => security}/gosha3-v1.0.0.do | 0 build/skel/{crypto => security}/gpgme-1.23.2.do | 2 +- build/skel/{crypto => security}/hashers.do | 6 +++--- build/skel/{crypto => security}/libassuan-2.5.7.do | 0 .../skel/{crypto => security}/libgcrypt-1.11.0.do | 2 +- .../skel/{crypto => security}/libgpg-error-1.49.do | 0 build/skel/{crypto => security}/libksba-1.6.6.do | 2 +- build/skel/{crypto => security}/libotr-4.1.1.do | 2 +- build/skel/{crypto => security}/nettle-3.9.1.do | 0 build/skel/{crypto => security}/openssl-1.1.1w.do | 0 build/skel/{crypto => security}/pinentry-1.3.0.do | 4 ++-- build/skel/{crypto => security}/xxhash-v0.8.2.do | 0 build/skel/slave-base.do | 2 +- build/skel/{deskutils => sysutils}/bfs-3.1.3.do | 0 build/skel/{deskutils => textproc}/fzf-0.53.0.do | 0 .../skel/{multimedia => textproc}/libebml-1.4.5.do | 0 build/skel/www/httpd-2.4.59.do | 2 +- build/skel/www/webkitgtk-2.34.6.do | 4 ++-- .../skel/{graphics => x11-toolkits}/fltk-1.3.9.do | 0 .../{graphics => x11-toolkits}/gtk+-3.24.42.do | 0 55 files changed, 59 insertions(+), 59 deletions(-) rename build/skel/{multimedia => audio}/libogg-1.3.5.do (100%) rename build/skel/{www => devel}/apr-1.7.4.do (100%) rename build/skel/{www => devel}/apr-util-1.6.3.do (100%) rename build/skel/{crypto => devel}/npth-1.7.do (100%) rename build/skel/{deskutils => editors}/vim-v9.1.0482.do (100%) rename build/skel/{net => ftp}/aria2-1.37.0.do (94%) rename build/skel/{www => ftp}/curl-8.7.1.do (93%) rename build/skel/{www => ftp}/curl-with-tls-8.7.1.do (94%) rename build/skel/{net => ftp}/lftp-4.9.2.do (94%) rename build/skel/{multimedia => graphics}/exiftool-12.87.do (100%) rename build/skel/{graphics => net}/tigervnc-1.13.90.do (95%) rename build/skel/{graphics => print}/ghostscript-10.03.1.do (100%) rename build/skel/{crypto => security}/age-v1.1.1-23-g29b68c2.do (100%) rename build/skel/{crypto => security}/b3sum-1.5.0.do (100%) rename build/skel/{crypto => security}/cyrus-sasl-2.1.28.do (96%) rename build/skel/{crypto => security}/gnupg-2.4.5.do (83%) rename build/skel/{crypto => security}/gnutls-3.7.10.do (94%) rename build/skel/{crypto => security}/gosha3-v1.0.0.do (100%) rename build/skel/{crypto => security}/gpgme-1.23.2.do (96%) rename build/skel/{crypto => security}/hashers.do (87%) rename build/skel/{crypto => security}/libassuan-2.5.7.do (100%) rename build/skel/{crypto => security}/libgcrypt-1.11.0.do (96%) rename build/skel/{crypto => security}/libgpg-error-1.49.do (100%) rename build/skel/{crypto => security}/libksba-1.6.6.do (95%) rename build/skel/{crypto => security}/libotr-4.1.1.do (95%) rename build/skel/{crypto => security}/nettle-3.9.1.do (100%) rename build/skel/{crypto => security}/openssl-1.1.1w.do (100%) rename build/skel/{crypto => security}/pinentry-1.3.0.do (95%) rename build/skel/{crypto => security}/xxhash-v0.8.2.do (100%) rename build/skel/{deskutils => sysutils}/bfs-3.1.3.do (100%) rename build/skel/{deskutils => textproc}/fzf-0.53.0.do (100%) rename build/skel/{multimedia => textproc}/libebml-1.4.5.do (100%) rename build/skel/{graphics => x11-toolkits}/fltk-1.3.9.do (100%) rename build/skel/{graphics => x11-toolkits}/gtk+-3.24.42.do (100%) diff --git a/build/skel/audio/flac-1.4.3.do b/build/skel/audio/flac-1.4.3.do index 61ac412..3cc31a2 100644 --- a/build/skel/audio/flac-1.4.3.do +++ b/build/skel/audio/flac-1.4.3.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps=multimedia/libogg-1.3.5 +rdeps=audio/libogg-1.3.5 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/multimedia/libogg-1.3.5.do b/build/skel/audio/libogg-1.3.5.do similarity index 100% rename from build/skel/multimedia/libogg-1.3.5.do rename to build/skel/audio/libogg-1.3.5.do diff --git a/build/skel/audio/libvorbis-1.3.7.do b/build/skel/audio/libvorbis-1.3.7.do index 00f5983..b0405e8 100644 --- a/build/skel/audio/libvorbis-1.3.7.do +++ b/build/skel/audio/libvorbis-1.3.7.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="multimedia/libogg-1.3.5" +rdeps=audio/libogg-1.3.5 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/audio/opusfile-0.12.do b/build/skel/audio/opusfile-0.12.do index b70fb13..f351468 100644 --- a/build/skel/audio/opusfile-0.12.do +++ b/build/skel/audio/opusfile-0.12.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="multimedia/libogg-1.3.5 audio/opus-1.5.2" +rdeps="audio/libogg-1.3.5 audio/opus-1.5.2" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/www/apr-1.7.4.do b/build/skel/devel/apr-1.7.4.do similarity index 100% rename from build/skel/www/apr-1.7.4.do rename to build/skel/devel/apr-1.7.4.do diff --git a/build/skel/www/apr-util-1.6.3.do b/build/skel/devel/apr-util-1.6.3.do similarity index 100% rename from build/skel/www/apr-util-1.6.3.do rename to build/skel/devel/apr-util-1.6.3.do diff --git a/build/skel/devel/cmake-3.28.3.do b/build/skel/devel/cmake-3.28.3.do index 3b0a0a6..cb5a6a4 100644 --- a/build/skel/devel/cmake-3.28.3.do +++ b/build/skel/devel/cmake-3.28.3.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd" -rdeps="devel/pkgconf-2.1.1 crypto/openssl-1.1.1w" +rdeps="devel/pkgconf-2.1.1 security/openssl-1.1.1w" ! uname -v | grep -q astra || rdeps="$rdeps lang/gcc-8.5.0" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/devel/git-full-2.45.2.do b/build/skel/devel/git-full-2.45.2.do index 368709d..9d372bd 100644 --- a/build/skel/devel/git-full-2.45.2.do +++ b/build/skel/devel/git-full-2.45.2.do @@ -11,10 +11,10 @@ devel/pkgconf-2.1.1 textproc/xmlto-0.0.26 " rdeps=" -lang/perl-5.32.1 -www/curl-with-tls-8.7.1 -crypto/nettle-3.9.1 devel/pcre2-10.44 +ftp/curl-with-tls-8.7.1 +lang/perl-5.32.1 +security/nettle-3.9.1 " ver=${NAME#git-full-} redo-ifchange $bdeps "$DISTFILES"/git-$ver.tar.xz $rdeps diff --git a/build/skel/crypto/npth-1.7.do b/build/skel/devel/npth-1.7.do similarity index 100% rename from build/skel/crypto/npth-1.7.do rename to build/skel/devel/npth-1.7.do diff --git a/build/skel/deskutils/vim-v9.1.0482.do b/build/skel/editors/vim-v9.1.0482.do similarity index 100% rename from build/skel/deskutils/vim-v9.1.0482.do rename to build/skel/editors/vim-v9.1.0482.do diff --git a/build/skel/net/aria2-1.37.0.do b/build/skel/ftp/aria2-1.37.0.do similarity index 94% rename from build/skel/net/aria2-1.37.0.do rename to build/skel/ftp/aria2-1.37.0.do index 081f34b..c03f53b 100644 --- a/build/skel/net/aria2-1.37.0.do +++ b/build/skel/ftp/aria2-1.37.0.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="crypto/gnutls-3.7.10 dns/c-ares-1.30.0" +rdeps="dns/c-ares-1.30.0 security/gnutls-3.7.10" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/www/curl-8.7.1.do b/build/skel/ftp/curl-8.7.1.do similarity index 93% rename from build/skel/www/curl-8.7.1.do rename to build/skel/ftp/curl-8.7.1.do index f55e1d6..967b9a1 100644 --- a/build/skel/www/curl-8.7.1.do +++ b/build/skel/ftp/curl-8.7.1.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -uname -v | grep -q astra || rdeps="crypto/openssl-1.1.1w" +uname -v | grep -q astra || rdeps="security/openssl-1.1.1w" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/www/curl-with-tls-8.7.1.do b/build/skel/ftp/curl-with-tls-8.7.1.do similarity index 94% rename from build/skel/www/curl-with-tls-8.7.1.do rename to build/skel/ftp/curl-with-tls-8.7.1.do index 1674658..d549637 100644 --- a/build/skel/www/curl-with-tls-8.7.1.do +++ b/build/skel/ftp/curl-with-tls-8.7.1.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="crypto/gnutls-3.7.10 dns/libidn2-2.3.7 www/libnghttp2-1.62.1" +rdeps="security/gnutls-3.7.10 dns/libidn2-2.3.7 www/libnghttp2-1.62.1" ver=${NAME#curl-with-tls-} redo-ifchange $bdeps "$DISTFILES"/curl-$ver.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/net/lftp-4.9.2.do b/build/skel/ftp/lftp-4.9.2.do similarity index 94% rename from build/skel/net/lftp-4.9.2.do rename to build/skel/ftp/lftp-4.9.2.do index 33ee393..94327f9 100644 --- a/build/skel/net/lftp-4.9.2.do +++ b/build/skel/ftp/lftp-4.9.2.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="dns/libidn2-2.3.7 crypto/gnutls-3.7.10" +rdeps="dns/libidn2-2.3.7 security/gnutls-3.7.10" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/multimedia/exiftool-12.87.do b/build/skel/graphics/exiftool-12.87.do similarity index 100% rename from build/skel/multimedia/exiftool-12.87.do rename to build/skel/graphics/exiftool-12.87.do diff --git a/build/skel/graphics/graphviz-11.0.0.do b/build/skel/graphics/graphviz-11.0.0.do index f510c83..46fe137 100644 --- a/build/skel/graphics/graphviz-11.0.0.do +++ b/build/skel/graphics/graphviz-11.0.0.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/gmake-4.4.1 devel/pkgconf-2.1.1" -rdeps="graphics/ghostscript-10.03.1 graphics/cairo-1.16.0" +rdeps="graphics/cairo-1.16.0 print/ghostscript-10.03.1" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/graphics/imagemagick-7.1.1-33.do b/build/skel/graphics/imagemagick-7.1.1-33.do index 25a2451..3cb6c19 100644 --- a/build/skel/graphics/imagemagick-7.1.1-33.do +++ b/build/skel/graphics/imagemagick-7.1.1-33.do @@ -5,7 +5,6 @@ sname=$1.do . "$BASS_ROOT"/lib/rc bdeps="rc-paths stow archivers/zstd devel/gmake-4.4.1 devel/pkgconf-2.1.1" rdeps=" graphics/freetype-2.9.1 -graphics/ghostscript-10.03.1 graphics/libjpeg-turbo-3.0.3 graphics/libjxl-v0.10-snapshot-179-gcdb6a667 graphics/libpng-1.6.43 @@ -13,6 +12,7 @@ graphics/librsvg-2.40.21 graphics/libwebp-1.4.0 graphics/openjpeg-2.5.2 graphics/tiff-4.6.0 +print/ghostscript-10.03.1 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/graphics/mod_tile-v0.7.0-58-gc3453bc.do b/build/skel/graphics/mod_tile-v0.7.0-58-gc3453bc.do index 1612455..b6d4346 100644 --- a/build/skel/graphics/mod_tile-v0.7.0-58-gc3453bc.do +++ b/build/skel/graphics/mod_tile-v0.7.0-58-gc3453bc.do @@ -11,11 +11,11 @@ devel/boost_1_74_0 devel/cmake-3.28.3 " rdeps=" -graphics/cairo-1.16.0 -www/curl-8.7.1 devel/iniparser-v4.2.2 -www/httpd-2.4.59 +ftp/curl-8.7.1 +graphics/cairo-1.16.0 graphics/mapnik-v3.1.0 +www/httpd-2.4.59 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/graphics/zathura-0.5.2.do b/build/skel/graphics/zathura-0.5.2.do index d76bb73..b08ebcb 100644 --- a/build/skel/graphics/zathura-0.5.2.do +++ b/build/skel/graphics/zathura-0.5.2.do @@ -5,8 +5,8 @@ sname=$1.do . "$BASS_ROOT"/lib/rc bdeps=" rc-paths stow archivers/zstd devel/pkgconf-2.1.1 devel/ninja-v1.12.1" rdeps=" graphics/djvulibre-3.5.28 -graphics/gtk+-3.24.42 graphics/mupdf-1.24.0-170-g05063f228 +x11-toolkits/gtk+-3.24.42 " meson=meson-0.63.3 pdfmupdf=zathura-pdf-mupdf-0.4.3 diff --git a/build/skel/irc/irssi-1.4.5.do b/build/skel/irc/irssi-1.4.5.do index 17fe093..e1f1619 100644 --- a/build/skel/irc/irssi-1.4.5.do +++ b/build/skel/irc/irssi-1.4.5.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="devel/ncurses-6.4 crypto/libgcrypt-1.11.0 crypto/libotr-4.1.1" +rdeps="devel/ncurses-6.4 security/libgcrypt-1.11.0 security/libotr-4.1.1" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/lang/Python-3.10.14.do b/build/skel/lang/Python-3.10.14.do index e3b3bd0..ee2b7fa 100644 --- a/build/skel/lang/Python-3.10.14.do +++ b/build/skel/lang/Python-3.10.14.do @@ -11,7 +11,7 @@ devel/pkgconf-2.1.1 databases/sqlite-3450100 textproc/expat-2.6.2 " -rdeps="crypto/openssl-1.1.1w" +rdeps=security/openssl-1.1.1w redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/lang/Python-3.7.3.do b/build/skel/lang/Python-3.7.3.do index 0421c0c..f536edd 100644 --- a/build/skel/lang/Python-3.7.3.do +++ b/build/skel/lang/Python-3.7.3.do @@ -15,7 +15,7 @@ databases/sqlite-3450100 " uname -v | grep -q astra || { bdeps="$bdeps textproc/expat-2.6.2" - rdeps="crypto/openssl-1.1.1w" + rdeps=security/openssl-1.1.1w expat_opts="--with-system-expat" } redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps diff --git a/build/skel/mail/gmime-3.2.7.do b/build/skel/mail/gmime-3.2.7.do index 597d1bc..a7ff46a 100644 --- a/build/skel/mail/gmime-3.2.7.do +++ b/build/skel/mail/gmime-3.2.7.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/gmake-4.4.1 devel/pkgconf-2.1.1" -rdeps="dns/libidn2-2.3.7 crypto/gpgme-1.23.2" +rdeps="dns/libidn2-2.3.7 security/gpgme-1.23.2" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/mail/mutt-2.2.13.do b/build/skel/mail/mutt-2.2.13.do index a0cf9b2..ec18e25 100644 --- a/build/skel/mail/mutt-2.2.13.do +++ b/build/skel/mail/mutt-2.2.13.do @@ -4,12 +4,12 @@ sname=$1.do . "$BASS_ROOT"/lib/rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" rdeps=" -dns/libidn2-2.3.7 -crypto/cyrus-sasl-2.1.28 -crypto/gnutls-3.7.10 -crypto/gpgme-1.23.2 -devel/ncurses-6.4 devel/libiconv-1.17 +devel/ncurses-6.4 +dns/libidn2-2.3.7 +security/cyrus-sasl-2.1.28 +security/gnutls-3.7.10 +security/gpgme-1.23.2 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/multimedia/ffmpeg-n7.1-dev-785-g784672b833.do b/build/skel/multimedia/ffmpeg-n7.1-dev-785-g784672b833.do index 3cf57e3..0cb77f6 100644 --- a/build/skel/multimedia/ffmpeg-n7.1-dev-785-g784672b833.do +++ b/build/skel/multimedia/ffmpeg-n7.1-dev-785-g784672b833.do @@ -12,14 +12,14 @@ textproc/texinfo-7.1 devel/nasm-2.16.01 " rdeps=" +audio/flac-1.4.3 +audio/opus-1.5.2 +audio/wavpack-5.7.0 multimedia/dav1d-1.4.2-8-gda2cc78 -multimedia/svt-av1-v2.1.0-12-gfcf56491 multimedia/libvpx-v1.14.1-303-gd6ae3ea465 +multimedia/svt-av1-v2.1.0-12-gfcf56491 multimedia/x264-2024-05-12 -audio/opus-1.5.2 -audio/wavpack-5.7.0 -audio/flac-1.4.3 -crypto/gnutls-3.7.10 +security/gnutls-3.7.10 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/multimedia/libmatroska-1.7.1.do b/build/skel/multimedia/libmatroska-1.7.1.do index f3d6d5b..53c6a4c 100644 --- a/build/skel/multimedia/libmatroska-1.7.1.do +++ b/build/skel/multimedia/libmatroska-1.7.1.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/cmake-3.28.3 devel/pkgconf-2.1.1" -rdeps="multimedia/libebml-1.4.5" +rdeps=textproc/libebml-1.4.5 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/multimedia/mkvtoolnix-58.0.0.do b/build/skel/multimedia/mkvtoolnix-58.0.0.do index e8add02..22ce358 100644 --- a/build/skel/multimedia/mkvtoolnix-58.0.0.do +++ b/build/skel/multimedia/mkvtoolnix-58.0.0.do @@ -11,10 +11,10 @@ devel/boost_1_74_0 lang/ruby-3.3.3 " rdeps=" -multimedia/libmatroska-1.7.1 +audio/libogg-1.3.5 audio/libvorbis-1.3.7 -multimedia/libogg-1.3.5 devel/pcre2-10.44 +multimedia/libmatroska-1.7.1 " xsl=docbook-xsl-1.79.2 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz "$DISTFILES"/$xsl.zip $rdeps diff --git a/build/skel/net/rsync-3.3.0.do b/build/skel/net/rsync-3.3.0.do index 610b401..debbfed 100644 --- a/build/skel/net/rsync-3.3.0.do +++ b/build/skel/net/rsync-3.3.0.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="crypto/xxhash-v0.8.2" +rdeps=security/xxhash-v0.8.2 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/graphics/tigervnc-1.13.90.do b/build/skel/net/tigervnc-1.13.90.do similarity index 95% rename from build/skel/graphics/tigervnc-1.13.90.do rename to build/skel/net/tigervnc-1.13.90.do index 9192a40..85d1229 100644 --- a/build/skel/graphics/tigervnc-1.13.90.do +++ b/build/skel/net/tigervnc-1.13.90.do @@ -4,10 +4,10 @@ sname=$1.do . "$BASS_ROOT"/lib/rc bdeps="rc-paths stow archivers/zstd devel/cmake-3.28.3 devel/pkgconf-2.1.1" rdeps=" -crypto/gnutls-3.7.10 -graphics/fltk-1.3.9 graphics/libjpeg-turbo-3.0.3 graphics/pixman-0.40.0 +security/gnutls-3.7.10 +x11-toolkits/fltk-1.3.9 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/graphics/ghostscript-10.03.1.do b/build/skel/print/ghostscript-10.03.1.do similarity index 100% rename from build/skel/graphics/ghostscript-10.03.1.do rename to build/skel/print/ghostscript-10.03.1.do diff --git a/build/skel/crypto/age-v1.1.1-23-g29b68c2.do b/build/skel/security/age-v1.1.1-23-g29b68c2.do similarity index 100% rename from build/skel/crypto/age-v1.1.1-23-g29b68c2.do rename to build/skel/security/age-v1.1.1-23-g29b68c2.do diff --git a/build/skel/crypto/b3sum-1.5.0.do b/build/skel/security/b3sum-1.5.0.do similarity index 100% rename from build/skel/crypto/b3sum-1.5.0.do rename to build/skel/security/b3sum-1.5.0.do diff --git a/build/skel/crypto/cyrus-sasl-2.1.28.do b/build/skel/security/cyrus-sasl-2.1.28.do similarity index 96% rename from build/skel/crypto/cyrus-sasl-2.1.28.do rename to build/skel/security/cyrus-sasl-2.1.28.do index 50ee661..2ebbb1e 100644 --- a/build/skel/crypto/cyrus-sasl-2.1.28.do +++ b/build/skel/security/cyrus-sasl-2.1.28.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/gmake-4.4.1 devel/pkgconf-2.1.1" -rdeps=crypto/openssl-1.1.1w +rdeps=security/openssl-1.1.1w redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/crypto/gnupg-2.4.5.do b/build/skel/security/gnupg-2.4.5.do similarity index 83% rename from build/skel/crypto/gnupg-2.4.5.do rename to build/skel/security/gnupg-2.4.5.do index 1bcaf11..9bdfc06 100644 --- a/build/skel/crypto/gnupg-2.4.5.do +++ b/build/skel/security/gnupg-2.4.5.do @@ -4,13 +4,13 @@ sname=$1.do . "$BASS_ROOT"/lib/rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" rdeps=" -crypto/libgpg-error-1.49 -crypto/libassuan-2.5.7 -crypto/libksba-1.6.6 -crypto/libgcrypt-1.11.0 -crypto/npth-1.7 -crypto/gnutls-3.7.10 -crypto/pinentry-1.3.0 +devel/npth-1.7 +security/gnutls-3.7.10 +security/libassuan-2.5.7 +security/libgcrypt-1.11.0 +security/libgpg-error-1.49 +security/libksba-1.6.6 +security/pinentry-1.3.0 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/crypto/gnutls-3.7.10.do b/build/skel/security/gnutls-3.7.10.do similarity index 94% rename from build/skel/crypto/gnutls-3.7.10.do rename to build/skel/security/gnutls-3.7.10.do index dc8f3e7..f653156 100644 --- a/build/skel/crypto/gnutls-3.7.10.do +++ b/build/skel/security/gnutls-3.7.10.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="crypto/nettle-3.9.1 dns/libidn2-2.3.7" +rdeps="dns/libidn2-2.3.7 security/nettle-3.9.1" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/crypto/gosha3-v1.0.0.do b/build/skel/security/gosha3-v1.0.0.do similarity index 100% rename from build/skel/crypto/gosha3-v1.0.0.do rename to build/skel/security/gosha3-v1.0.0.do diff --git a/build/skel/crypto/gpgme-1.23.2.do b/build/skel/security/gpgme-1.23.2.do similarity index 96% rename from build/skel/crypto/gpgme-1.23.2.do rename to build/skel/security/gpgme-1.23.2.do index 6dcf2e7..7ccccb4 100644 --- a/build/skel/crypto/gpgme-1.23.2.do +++ b/build/skel/security/gpgme-1.23.2.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="crypto/gnupg-2.4.5" +rdeps=security/gnupg-2.4.5 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/crypto/hashers.do b/build/skel/security/hashers.do similarity index 87% rename from build/skel/crypto/hashers.do rename to build/skel/security/hashers.do index ee33d90..d569e97 100644 --- a/build/skel/crypto/hashers.do +++ b/build/skel/security/hashers.do @@ -4,9 +4,9 @@ sname=$1.do . "$BASS_ROOT"/lib/rc hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) deps=" -crypto/b3sum-1.5.0 -crypto/xxhash-v0.8.2 -crypto/gosha3-v1.0.0 +security/b3sum-1.5.0 +security/gosha3-v1.0.0 +security/xxhash-v0.8.2 " redo-ifchange $deps "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh diff --git a/build/skel/crypto/libassuan-2.5.7.do b/build/skel/security/libassuan-2.5.7.do similarity index 100% rename from build/skel/crypto/libassuan-2.5.7.do rename to build/skel/security/libassuan-2.5.7.do diff --git a/build/skel/crypto/libgcrypt-1.11.0.do b/build/skel/security/libgcrypt-1.11.0.do similarity index 96% rename from build/skel/crypto/libgcrypt-1.11.0.do rename to build/skel/security/libgcrypt-1.11.0.do index c89724c..ada6f67 100644 --- a/build/skel/crypto/libgcrypt-1.11.0.do +++ b/build/skel/security/libgcrypt-1.11.0.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="crypto/libgpg-error-1.49" +rdeps=security/libgpg-error-1.49 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/crypto/libgpg-error-1.49.do b/build/skel/security/libgpg-error-1.49.do similarity index 100% rename from build/skel/crypto/libgpg-error-1.49.do rename to build/skel/security/libgpg-error-1.49.do diff --git a/build/skel/crypto/libksba-1.6.6.do b/build/skel/security/libksba-1.6.6.do similarity index 95% rename from build/skel/crypto/libksba-1.6.6.do rename to build/skel/security/libksba-1.6.6.do index cf7cf1e..69ecd62 100644 --- a/build/skel/crypto/libksba-1.6.6.do +++ b/build/skel/security/libksba-1.6.6.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="crypto/libgpg-error-1.49" +rdeps=security/libgpg-error-1.49 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/crypto/libotr-4.1.1.do b/build/skel/security/libotr-4.1.1.do similarity index 95% rename from build/skel/crypto/libotr-4.1.1.do rename to build/skel/security/libotr-4.1.1.do index fcd83c2..15f51cc 100644 --- a/build/skel/crypto/libotr-4.1.1.do +++ b/build/skel/security/libotr-4.1.1.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="crypto/libgcrypt-1.11.0" +rdeps=security/libgcrypt-1.11.0 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/crypto/nettle-3.9.1.do b/build/skel/security/nettle-3.9.1.do similarity index 100% rename from build/skel/crypto/nettle-3.9.1.do rename to build/skel/security/nettle-3.9.1.do diff --git a/build/skel/crypto/openssl-1.1.1w.do b/build/skel/security/openssl-1.1.1w.do similarity index 100% rename from build/skel/crypto/openssl-1.1.1w.do rename to build/skel/security/openssl-1.1.1w.do diff --git a/build/skel/crypto/pinentry-1.3.0.do b/build/skel/security/pinentry-1.3.0.do similarity index 95% rename from build/skel/crypto/pinentry-1.3.0.do rename to build/skel/security/pinentry-1.3.0.do index 65dcd59..5fda9b9 100644 --- a/build/skel/crypto/pinentry-1.3.0.do +++ b/build/skel/security/pinentry-1.3.0.do @@ -5,8 +5,8 @@ sname=$1.do . "$BASS_ROOT"/lib/rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" rdeps=" devel/ncurses-6.4 -crypto/libgpg-error-1.49 -crypto/libassuan-2.5.7 +security/libgpg-error-1.49 +security/libassuan-2.5.7 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/crypto/xxhash-v0.8.2.do b/build/skel/security/xxhash-v0.8.2.do similarity index 100% rename from build/skel/crypto/xxhash-v0.8.2.do rename to build/skel/security/xxhash-v0.8.2.do diff --git a/build/skel/slave-base.do b/build/skel/slave-base.do index 9467442..f6a869e 100644 --- a/build/skel/slave-base.do +++ b/build/skel/slave-base.do @@ -8,7 +8,7 @@ deps=" stow archivers/zstd - crypto/b3sum-1.5.0 + security/b3sum-1.5.0 sysutils/daemontools-encore-1.11 sysutils/tmux-3.3 shells/zsh-5.9 diff --git a/build/skel/deskutils/bfs-3.1.3.do b/build/skel/sysutils/bfs-3.1.3.do similarity index 100% rename from build/skel/deskutils/bfs-3.1.3.do rename to build/skel/sysutils/bfs-3.1.3.do diff --git a/build/skel/deskutils/fzf-0.53.0.do b/build/skel/textproc/fzf-0.53.0.do similarity index 100% rename from build/skel/deskutils/fzf-0.53.0.do rename to build/skel/textproc/fzf-0.53.0.do diff --git a/build/skel/multimedia/libebml-1.4.5.do b/build/skel/textproc/libebml-1.4.5.do similarity index 100% rename from build/skel/multimedia/libebml-1.4.5.do rename to build/skel/textproc/libebml-1.4.5.do diff --git a/build/skel/www/httpd-2.4.59.do b/build/skel/www/httpd-2.4.59.do index ceb00b4..33b04bd 100644 --- a/build/skel/www/httpd-2.4.59.do +++ b/build/skel/www/httpd-2.4.59.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps="www/apr-1.7.4 www/apr-util-1.6.3 devel/expat-2.6.2" +rdeps="devel/apr-1.7.4 devel/apr-util-1.6.3 devel/expat-2.6.2" redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/www/webkitgtk-2.34.6.do b/build/skel/www/webkitgtk-2.34.6.do index 2d3b540..c800bf2 100644 --- a/build/skel/www/webkitgtk-2.34.6.do +++ b/build/skel/www/webkitgtk-2.34.6.do @@ -12,14 +12,14 @@ devel/pkgconf-2.1.1 lang/ruby-3.3.3 " rdeps=" -crypto/libgcrypt-1.11.0 graphics/cairo-1.16.0 graphics/freetype-2.9.1 -graphics/gtk+-3.24.42 graphics/libjpeg-turbo-3.0.3 graphics/libpng-1.6.43 graphics/libwebp-1.4.0 graphics/openjpeg-2.5.2 +security/libgcrypt-1.11.0 +x11-toolkits/gtk+-3.24.42 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/graphics/fltk-1.3.9.do b/build/skel/x11-toolkits/fltk-1.3.9.do similarity index 100% rename from build/skel/graphics/fltk-1.3.9.do rename to build/skel/x11-toolkits/fltk-1.3.9.do diff --git a/build/skel/graphics/gtk+-3.24.42.do b/build/skel/x11-toolkits/gtk+-3.24.42.do similarity index 100% rename from build/skel/graphics/gtk+-3.24.42.do rename to build/skel/x11-toolkits/gtk+-3.24.42.do -- 2.48.1