diff --git a/MOVED b/MOVED index 7cef68174a79..77b67f7c1bfa 100644 --- a/MOVED +++ b/MOVED @@ -4493,3 +4493,4 @@ security/py-oauth2client||2025-06-02|Has expired: Deprecated by upstream. Use se math/py-grandalf||2025-06-02|Has expired: Depends on expired devel/py-pytest-runner multimedia/py-ffmpeg-python||2025-06-02|Has expired: Depends on expired devel/py-pytest-runner science/py-DendroPy||2025-06-02|Has expired: Depends on expired devel/py-pytest-runner +devel/linux-rl9-libsoup|devel/linux_base-rl9|2025-06-04|Merged into devel/linux_base-rl9 diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index b24961dc8ce1..1aebd91129ef 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -118,7 +118,6 @@ _linux_rl9_libpsl= linux-rl9-libpsl>0:dns/linux-rl9-libpsl _linux_${linux_ARGS}_librsvg2= linux-${linux_ARGS}-librsvg2>0:graphics/linux-${linux_ARGS}-librsvg2 _linux_rl9_libsecret= linux-rl9-libsecret>0:security/linux-rl9-libsecret _linux_${linux_ARGS}_libsigc++20= linux-${linux_ARGS}-libsigc++20>0:devel/linux-${linux_ARGS}-libsigc++20 -_linux_rl9_libsoup= linux-rl9-libsoup>0:devel/linux-rl9-libsoup _linux_${linux_ARGS}_libsndfile= linux-${linux_ARGS}-libsndfile>0:audio/linux-${linux_ARGS}-libsndfile _linux_rl9_libssh= linux-rl9-libssh>0:security/linux-rl9-libssh _linux_c7_libssh2= linux-c7-libssh2>0:security/linux-c7-libssh2 diff --git a/devel/Makefile b/devel/Makefile index ee9af26000d7..b07cc448a7d7 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1557,7 +1557,6 @@ SUBDIR += linux-rl9-libevent SUBDIR += linux-rl9-libpciaccess SUBDIR += linux-rl9-libsigc++20 - SUBDIR += linux-rl9-libsoup SUBDIR += linux-rl9-libthai SUBDIR += linux-rl9-libtool-ltdl SUBDIR += linux-rl9-libunistring diff --git a/devel/linux-rl9-libsoup/Makefile b/devel/linux-rl9-libsoup/Makefile deleted file mode 100644 index 6083436de1c9..000000000000 --- a/devel/linux-rl9-libsoup/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -PORTNAME= libsoup -PORTVERSION= 2.72.0 -DISTVERSIONSUFFIX= -8.el9_5.3 -PORTREVISION= 3 -CATEGORIES= devel linux - -MAINTAINER= emulation@FreeBSD.org -COMMENT= SOAP (Simple Object Access Protocol) implementation in C (Rocky Linux ${LINUX_DIST_VER}) -WWW= https://libsoup.org/ - -LICENSE= LGPL20 - -USES= linux:rl9 -USE_LDCONFIG= yes -USE_LINUX= libgcrypt libpsl -USE_LINUX_RPM= yes -WANT_LINUX32= yes - -CONFLICTS= linux-c7-${PORTNAME} -DESCR= ${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr -DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX} - -OPTIONS_DEFINE= DOCS NLS -OPTIONS_SUB= yes - -.include diff --git a/devel/linux-rl9-libsoup/distinfo b/devel/linux-rl9-libsoup/distinfo deleted file mode 100644 index 6018546e9fca..000000000000 --- a/devel/linux-rl9-libsoup/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -TIMESTAMP = 1740385096 -SHA256 (rocky/l/libsoup-2.72.0-8.el9_5.3.aarch64.rpm) = 9f6a6e17631e14bba8cf236296b56dd6fea327eeb3d1fc1514f87bf357392ecf -SIZE (rocky/l/libsoup-2.72.0-8.el9_5.3.aarch64.rpm) = 390566 -SHA256 (rocky/l/libsoup-2.72.0-8.el9_5.3.i686.rpm) = d172816face90e802801177eb9a3c0c572ef823dc71108ab1e5c2df9df8cb5e4 -SIZE (rocky/l/libsoup-2.72.0-8.el9_5.3.i686.rpm) = 419230 -SHA256 (rocky/l/libsoup-2.72.0-8.el9_5.3.x86_64.rpm) = 2130c3c7f5f9087a637eee21a1d05e9046cd59b23820fcf5227163ec5d113957 -SIZE (rocky/l/libsoup-2.72.0-8.el9_5.3.x86_64.rpm) = 397192 -SHA256 (rocky/l/libsoup-2.72.0-8.el9_5.3.src.rpm) = d328c4308b374f4dbcf7d6fb579690e57591828aa311907c236d2f94f25d7924 -SIZE (rocky/l/libsoup-2.72.0-8.el9_5.3.src.rpm) = 1501799 diff --git a/devel/linux-rl9-libsoup/pkg-plist.aarch64 b/devel/linux-rl9-libsoup/pkg-plist.aarch64 deleted file mode 100644 index 55addbd061c5..000000000000 --- a/devel/linux-rl9-libsoup/pkg-plist.aarch64 +++ /dev/null @@ -1,76 +0,0 @@ -usr/lib64/girepository-1.0/Soup-2.4.typelib -usr/lib64/girepository-1.0/SoupGNOME-2.4.typelib -usr/lib64/libsoup-2.4.so.1 -usr/lib64/libsoup-2.4.so.1.11.0 -usr/lib64/libsoup-gnome-2.4.so.1 -usr/lib64/libsoup-gnome-2.4.so.1.11.0 -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -usr/share/licenses/libsoup/COPYING -%%NLS%%usr/share/locale/an/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/as/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/be/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/bg/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/bn_IN/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/bs/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ca/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ca@valencia/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/cs/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/da/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/de/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/el/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/en_GB/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/eo/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/es/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/et/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/eu/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/fa/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/fi/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/fr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/fur/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/gd/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/gl/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/gu/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/he/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/hi/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/hr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/hu/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/id/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/it/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ja/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/kn/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ko/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/lt/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/lv/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ml/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/mr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ms/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/nb/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ne/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/nl/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/oc/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/or/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/pa/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/pl/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/pt/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ro/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ru/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sk/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sl/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sr@latin/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sv/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ta/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/te/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/tg/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/th/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/tr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ug/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/uk/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/uz@cyrillic/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/vi/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/zh_HK/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/libsoup.mo diff --git a/devel/linux-rl9-libsoup/pkg-plist.amd64 b/devel/linux-rl9-libsoup/pkg-plist.amd64 deleted file mode 100644 index bd7c8765f90d..000000000000 --- a/devel/linux-rl9-libsoup/pkg-plist.amd64 +++ /dev/null @@ -1,82 +0,0 @@ -usr/lib/girepository-1.0/Soup-2.4.typelib -usr/lib/girepository-1.0/SoupGNOME-2.4.typelib -usr/lib/libsoup-2.4.so.1 -usr/lib/libsoup-2.4.so.1.11.0 -usr/lib/libsoup-gnome-2.4.so.1 -usr/lib/libsoup-gnome-2.4.so.1.11.0 -usr/lib64/girepository-1.0/Soup-2.4.typelib -usr/lib64/girepository-1.0/SoupGNOME-2.4.typelib -usr/lib64/libsoup-2.4.so.1 -usr/lib64/libsoup-2.4.so.1.11.0 -usr/lib64/libsoup-gnome-2.4.so.1 -usr/lib64/libsoup-gnome-2.4.so.1.11.0 -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -usr/share/licenses/libsoup/COPYING -%%NLS%%usr/share/locale/an/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/as/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/be/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/bg/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/bn_IN/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/bs/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ca/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ca@valencia/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/cs/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/da/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/de/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/el/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/en_GB/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/eo/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/es/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/et/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/eu/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/fa/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/fi/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/fr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/fur/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/gd/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/gl/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/gu/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/he/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/hi/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/hr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/hu/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/id/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/it/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ja/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/kn/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ko/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/lt/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/lv/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ml/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/mr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ms/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/nb/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ne/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/nl/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/oc/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/or/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/pa/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/pl/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/pt/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ro/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ru/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sk/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sl/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sr@latin/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/sv/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ta/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/te/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/tg/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/th/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/tr/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/ug/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/uk/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/uz@cyrillic/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/vi/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/zh_HK/LC_MESSAGES/libsoup.mo -%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/libsoup.mo diff --git a/emulators/linux-rl9/Makefile b/emulators/linux-rl9/Makefile index ae5f04cdbc48..5344bb93028d 100644 --- a/emulators/linux-rl9/Makefile +++ b/emulators/linux-rl9/Makefile @@ -1,6 +1,6 @@ PORTNAME= linux-rl9 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators linux MAINTAINER= emulation@FreeBSD.org @@ -19,7 +19,7 @@ USE_LINUX= alsalib alsa-lib-devel alsa-plugins-oss alsa-plugins-pulseaudio \ imageformats-libs libassuan libasyncns libdrm libepoxy libevent \ libgcrypt libglvnd libgpg-error libidn2 libksba libnghttp2 libogg \ libpciaccess libpsl librsvg2 libsecret libsigc++20 \ - libsndfile libsoup libssh libstemmer libtasn1 libthai libtheora libtool-ltdl \ + libsndfile libssh libstemmer libtasn1 libthai libtheora libtool-ltdl \ libtracker-sparql libunistring libusb libv4l libva libvdpau \ libvorbis libvpx libxkbcommon libxml2 libxslt llvm \ lz4 nettle npth nspr nss ocl-icd openal-soft openldap opus orc \