Regroup skels according to FreeBSD's ports layout

diff --git a/build/skel/audio/flac-1.4.3.do b/build/skel/audio/flac-1.4.3.do
index 61ac412b26f0028c58768ba6b5061317a4cf2c7cd08bd255e10dc9fbf29d697c..3cc31a267b3c1ded45a86f0eb03119aebb3d37a767cdcaf5e5891089684dd459 100644 (file)
--- 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 00f5983e25b28934c09e04d728f54be591d7a9674869880e1d714a3099b5f48a..b0405e8fd4be07626e8011ce79071ead13154d3d30c49607ea2f73d72347fd11 100644 (file)
--- 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 b70fb131c7e2ac04f619dcfc2222c8e8d6079d83f4373db9e873e6694b98dbef..f3514685b61312dcdff40d506e02124bcd4d92a92b72a15d48ea2a728b9eeaef 100644 (file)
--- 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 3b0a0a6a3c58487e3b8194a76c979b6c03cca7aa7379319b9329a194eae431dd..cb5a6a43ad6775f15a85824090b9e130725f5ce7f2a2516860e5fab0d2168436 100644 (file)
--- 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 368709d55ad2c27c31ca6b473f988c1fe24ee8adedd139658764dc40be6a8ca5..9d372bd1ad5660aca524b9d9ba713fdf3fec18e8474ad5fbeafa4820d5c1eaf2 100644 (file)
--- 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 081f34b12edce7badfefddad2828d189d71fc507b066ff646dde808b6c1d7a69..c03f53bfe856a3c01172a9a35299712af2f5a10e96b74a05c5fc96ca39433a9a 100644 (file)
--- 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 f55e1d694be7291a61aee757299b92afb6e796e3a9b359138e835a50c8508094..967b9a1c35866421c8b9156e965a658324c9ab9eddbd013c7968ab873348a9ae 100644 (file)
--- 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 167465834e6291015753b72d6594c9b92a63eb1bc380d422a07316b9108b6c5d..d54963751b5c103b9092d13bcc6576fca803bab60bbeeb0a2e63b88acd399610 100644 (file)
--- 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 33ee3935179e772c0a19e11f7803a2d746e4a9d09dd75d412eb2b3829f67af05..94327f9f485e0a783ad589ee38783d5cd734328426026b559b48b4d6f3c46018 100644 (file)
--- 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 f510c83b3bb8c20a3e8fe005360a72f07d889593260edc2c175ad441d99e03ad..46fe137fe91c922b76c1357f71e724c2432282c15807611ddbbbc686a584a2d1 100644 (file)
--- 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 25a2451b6b62191fa7c83b0569b76faaa507e41efade0c80d3942dd403f5c914..3cb6c196b9bfb1f1c66c14ca8dc3a4da0b472fd3eca0d63a015f3587c9cac93a 100644 (file)
--- 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 161245538953d4bb7a225a9a3de495b7a124ad5b51b7d0b90b7b65bbf5316b03..b6d43461e9ef46b315d91115b77f2cd089b60cc0d82073bbc71acec3f152930e 100644 (file)
--- 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 d76bb7371eb3adfff5b2b611791769bc5ebc06035a7e78c579fc2353b221debd..b08ebcb52999fab9dbcf5f95393cf55cf27e23b8ebce96ad8aa901c2ff0fe663 100644 (file)
--- 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 17fe093d608dba63ff2b18751d449dd35b8fe9dd99b10f0fe6bd5f8dc51374f8..e1f161974f2a2fdc15304b3c864149aff09033d37a422b75960e78bcc41411f5 100644 (file)
--- 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 e3b3bd0b9dbce5603e794c885f8f9bbcbdcedbfc2f65cdce5f9f42c9f5e0fb7a..ee2b7fab5394f53f9dcdd4b1bdf27a5d91ee35d54198d0245d25dc3d8ca4497b 100644 (file)
--- 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 0421c0c1e1f2e93af2e7a5e678eeea351288edca80f0918f9a79ccec6ff05bf0..f536edd66ae5d9540a16ca00849cc975ff1784f302206ba3327906a96a702e2b 100644 (file)
--- 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 597d1bc92e94a3084839c9300733437bc73bd4b734e89da064f60817946bd12a..a7ff46ad2731530777c4530e98e1f05767967cf7ccc3f5f8d95c614742451f59 100644 (file)
--- 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 a0cf9b2761953500aaf0c05188a1a77df48537e9f6945cf2d7b759ec861051a0..ec18e252ee29a2d55391b5953148b86f7aab65544f4d1924a1ce0f85dcd6d5ec 100644 (file)
--- 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 3cf57e3b87768b5990c506caaac342e87e2f6dc8f787aeaed462e75470802f1f..0cb77f6ffcfba16848b59ab2cedfccdddc47683091d68b0bd321075a778d9485 100644 (file)
--- 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 f3d6d5b55addbddca86899bbccf8daa5bdceb1e0543fcde65131f972638d219c..53c6a4ccd6fa16c17c1f7f77e0978856773130ee1314af006d0cb76a02d5956d 100644 (file)
--- 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 e8add023368865fc6a7b25ec202a82d07a6746ff08ac9bd5268146d785c6e860..22ce358567cae2236085dbfab9a8ea25bbefce5236ad85659b7b5f5c0bbd8539 100644 (file)
--- 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 610b401c5e140733d09966f89e54564dae7a8d1c9dffae3fa85c279b9f66fd8a..debbfed070baea70735940f0c771c28c54bd86f6df17fdfe812fb288b43bafe8 100644 (file)
--- 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 9192a40ada152441c772a9899e20b33219313def2defd70d672795b7c570bbbc..85d122957403a4dbe6db8021ed7d9b4ded1ed6a36a647be4c18aa5a0a50df150 100644 (file)
--- 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 50ee6614a13f9804340cf22d10735773e1fba619daed0bb31073e8b6c4a06f9d..2ebbb1ec105e2076bf48c21e2173723134de9bcd7898e144792f30277ce12f51 100644 (file)
--- 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 1bcaf11c44aca31f6cbb4e62058c31659ffc30e67e0b4b390ebe8e15ee436922..9bdfc06f0eab5ba9ac963807aea8720d5fad2e8d3a1ea4e897a241714a7d18bf 100644 (file)
--- 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 dc8f3e75d8f069ddd280d7f8d943749a87baf653fae3e6158fc308955dbcd842..f6531567a49f33b5c28e164176088c86e2896e508782df2f897119572c8c0287 100644 (file)
--- 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 6dcf2e7a0af71fbd37e0cb16e9a573e5c8f841039da8b8ee5e2dbe88d5c90596..7ccccb47f28c3a8e1b4a6caaf2183b5ac648a1ce1d3299220b2eba0a781313d5 100644 (file)
--- 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 ee33d903be5cfc3e77961fe02f95dede45321030bb1615393726d84a00124c1b..d569e97241fab26dfb3df6586dfb029de3ca2cb12f084b80245447bd54162ba9 100644 (file)
--- 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 c89724c35320d632722213510c0eab143b3ca5e6e77e8ad1f46877b009aa9472..ada6f672e929418ae1a2fc7fb2fd535d523a4a62a0a0d8a8e9cb0093da4bb5f9 100644 (file)
--- 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 cf7cf1e3d105cb41cb6bcaa5c71b5604894579ba7fafc5d3e28f143e61772667..69ecd6290cb5c916c00555789e53707c97133663ebb5f6004251023b32df0d94 100644 (file)
--- 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 fcd83c25de15ef1da3570de62e3892506bec65a064473174a6821f4f2bae87d9..15f51ccb1dad010799881d87e579cc1a4c57bf4e568613693361634c18a460c1 100644 (file)
--- 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 65dcd59b65468e24107ce43ac3bb1f2809e9831fb14161f51ddccb67837eba15..5fda9b97b868ec7081d5e6e1da5d094f301ac89b616cdd32779c12297638e717 100644 (file)
--- 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 94674428ebb3d10928494faa713d9edf16bce3358ead7d55a1cf0609391fdf54..f6a869ec3c47a686ec3393f0a3dd0001c11cc31519fa73810243b3eb947654a5 100644 (file)
--- 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 ceb00b430bde97acbb9282650a494883569327a9b7c0af8cbc48a506f59e98a1..33b04bd883e4e32d8104924bb1c01bd38841bf1deaaf3993e74a5dc774445226 100644 (file)
--- 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 2d3b540e35a7269d133ca5387695ce62902c835f81aa29d32cc4b310d5683fcd..c800bf23b0c8155cfa06b1a102562a51920f43d2dc0a8687c4a4d42519a597ce 100644 (file)
--- 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