git: 9f7ed12f0af9 - main - net/linux-rl9-libproxy: merge into linux_base-rl9
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 21 Apr 2025 06:27:59 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9f7ed12f0af924f3c7aebb92077a8706cdabf49b
commit 9f7ed12f0af924f3c7aebb92077a8706cdabf49b
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-04-20 09:22:31 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-04-21 06:27:37 +0000
net/linux-rl9-libproxy: merge into linux_base-rl9
This library is required by base
---
Mk/Uses/linux.mk | 1 -
astro/google-earth-pro/Makefile | 3 ++-
emulators/linux-rl9/Makefile | 4 ++--
emulators/linux_base-rl9/Makefile | 2 ++
emulators/linux_base-rl9/Makefile.version | 1 +
emulators/linux_base-rl9/distinfo | 10 +++++++++-
emulators/linux_base-rl9/pkg-plist.aarch64 | 7 +++++++
emulators/linux_base-rl9/pkg-plist.amd64 | 10 ++++++++++
graphics/linux-rl9-gdk-pixbuf2/Makefile | 4 ++--
x11-toolkits/linux-rl9-gtk3/Makefile | 4 ++--
10 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 50669c5a764f..609beacbf00c 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -118,7 +118,6 @@ _linux_rl9_libksba= linux-rl9-libksba>0:security/linux-rl9-libksba
_linux_rl9_libnghttp2= linux-rl9-libnghttp2>0:www/linux-rl9-libnghttp2
_linux_${linux_ARGS}_libogg= linux-${linux_ARGS}-libogg>0:audio/linux-${linux_ARGS}-libogg
_linux_${linux_ARGS}_libpciaccess= linux-${linux_ARGS}-libpciaccess>0:devel/linux-${linux_ARGS}-libpciaccess
-_linux_rl9_libproxy= linux-rl9-libproxy>0:net/linux-rl9-libproxy
_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
diff --git a/astro/google-earth-pro/Makefile b/astro/google-earth-pro/Makefile
index 3db1d8aba5e0..4e963b272b3a 100644
--- a/astro/google-earth-pro/Makefile
+++ b/astro/google-earth-pro/Makefile
@@ -5,6 +5,7 @@
PORTNAME= google-earth-pro
DISTVERSION= 7.3.6.10201
DISTVERSIONSUFFIX= -0
+PORTREVISION= 1
CATEGORIES= astro deskutils geography
MASTER_SITES= http://dl.google.com/linux/earth/rpm/stable/x86_64/
DISTFILES_amd64= ${PORTNAME}-stable-${DISTVERSION}${DISTVERSIONSUFFIX}.x86_64.rpm
@@ -23,7 +24,7 @@ LICENSE_PERMS= no-dist-mirror no-pkg-mirror auto-accept
ONLY_FOR_ARCHS= amd64
USES= desktop-file-utils linux:rl9
-USE_LINUX= dbuslibs dri gstreamer1 libproxy libxml2 sqlite3 xorglibs
+USE_LINUX= dbuslibs dri gstreamer1 libxml2 sqlite3 xorglibs
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/emulators/linux-rl9/Makefile b/emulators/linux-rl9/Makefile
index 5bd65860923b..19a1e8ea2d62 100644
--- a/emulators/linux-rl9/Makefile
+++ b/emulators/linux-rl9/Makefile
@@ -1,6 +1,6 @@
PORTNAME= linux-rl9
PORTVERSION= ${LINUX_DIST_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators linux
MAINTAINER= emulation@FreeBSD.org
@@ -18,7 +18,7 @@ USE_LINUX= alsalib alsa-lib-devel alsa-plugins-oss alsa-plugins-pulseaudio \
graphite2 gsm gstreamer1 gstreamer1-libav gtk2 gtk3 harfbuzz icu \
imageformats-libs libassuan libasyncns libdrm libepoxy libevent \
libgcrypt libgfortran libglvnd libgpg-error libidn2 libksba libnghttp2 libogg \
- libpciaccess libproxy libpsl librsvg2 libsecret libsigc++20 \
+ libpciaccess libpsl librsvg2 libsecret libsigc++20 \
libsndfile libsoup libssh libstemmer libtasn1 libthai libtheora libtool-ltdl \
libtracker-sparql libunistring libusb libv4l libva libvdpau \
libvorbis libvpx libxcrypt libxkbcommon libxml2 libxslt llvm \
diff --git a/emulators/linux_base-rl9/Makefile b/emulators/linux_base-rl9/Makefile
index 3890629238a4..e8e0337eefac 100644
--- a/emulators/linux_base-rl9/Makefile
+++ b/emulators/linux_base-rl9/Makefile
@@ -67,6 +67,7 @@ LIB_DISTNAMES= bzip2-libs-${bzip2_ver} \
libgcc-${gcc_ver} \
libgudev-${libgudev_ver} \
libmount-${util_ver} \
+ libproxy-${libproxy_ver} \
libselinux-${selinux_ver} \
libsepol-${sepol_ver} \
libsigsegv-${libsigsegv_ver} \
@@ -126,6 +127,7 @@ SRC_DISTFILES= acl-${libacl_ver}${SRC_SUFX}:SOURCE \
libevdev-${libevdev_ver}${SRC_SUFX}:SOURCE \
libffi-${libffi_ver}${SRC_SUFX}:SOURCE \
libgudev-${libgudev_ver}${SRC_SUFX}:SOURCE \
+ libproxy-${libproxy_ver}${SRC_SUFX}:SOURCE \
libselinux-${selinux_ver}${SRC_SUFX}:SOURCE \
libsepol-${sepol_ver}${SRC_SUFX}:SOURCE \
libsigsegv-${libsigsegv_ver}${SRC_SUFX}:SOURCE \
diff --git a/emulators/linux_base-rl9/Makefile.version b/emulators/linux_base-rl9/Makefile.version
index 31f369e1c483..e71d9c497af6 100644
--- a/emulators/linux_base-rl9/Makefile.version
+++ b/emulators/linux_base-rl9/Makefile.version
@@ -31,6 +31,7 @@ libevdev_ver= 1.11.0-3.el9
libffi_ver= 3.4.2-8.el9
libgudev_ver= 237-1.el9
libnattr_ver= 2.5.1-3.el9
+libproxy_ver= 0.4.15-35.el9
libsigsegv_ver= 2.13-4.el9
libverto_ver= 0.3.2-3.el9
mpfr_ver= 4.1.0-7.el9
diff --git a/emulators/linux_base-rl9/distinfo b/emulators/linux_base-rl9/distinfo
index fb14d349e7ff..6e5aad097208 100644
--- a/emulators/linux_base-rl9/distinfo
+++ b/emulators/linux_base-rl9/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1745137315
+TIMESTAMP = 1745140230
SHA256 (rocky/b/basesystem-11-13.el9.0.1.noarch.rpm) = 9f707e8d1046381c9b4a4df6a6674327df6ffe0298d48e1750972212c97aafad
SIZE (rocky/b/basesystem-11-13.el9.0.1.noarch.rpm) = 6565
SHA256 (rocky/b/bash-5.1.8-9.el9.aarch64.rpm) = f6b8bbdbd96ecb8d240a4d3c4a038f58faeab170015b07c7096d02157838279d
@@ -223,6 +223,12 @@ SHA256 (rocky/l/libmount-2.37.4-20.el9.i686.rpm) = 21eddd2c18c7c9d68d8f5f24786db
SIZE (rocky/l/libmount-2.37.4-20.el9.i686.rpm) = 145048
SHA256 (rocky/l/libmount-2.37.4-20.el9.x86_64.rpm) = 8ae34772bc519310fbb3eae367bb81ebcc0add25d75155cba8d9af67947d7fb0
SIZE (rocky/l/libmount-2.37.4-20.el9.x86_64.rpm) = 137687
+SHA256 (rocky/l/libproxy-0.4.15-35.el9.aarch64.rpm) = 31daa01dfa6eb8e0ae100cbdc20f0d73320598a934f0eabad830b0060027f2d2
+SIZE (rocky/l/libproxy-0.4.15-35.el9.aarch64.rpm) = 71753
+SHA256 (rocky/l/libproxy-0.4.15-35.el9.i686.rpm) = 44c7d66545b791a88f1faf63dc6d686ddfaa8154aa45899cd1469dd7aed9f657
+SIZE (rocky/l/libproxy-0.4.15-35.el9.i686.rpm) = 79219
+SHA256 (rocky/l/libproxy-0.4.15-35.el9.x86_64.rpm) = b5723d56327d929d31efc63d2d746b61a1205269c6dae21d55881bc729a422ec
+SIZE (rocky/l/libproxy-0.4.15-35.el9.x86_64.rpm) = 74998
SHA256 (rocky/l/libselinux-3.6-1.el9.aarch64.rpm) = b54cca70a42bdbebe5bd62ae674e9f80ac6e08f4c2b6179b547edc09bd9d4f6c
SIZE (rocky/l/libselinux-3.6-1.el9.aarch64.rpm) = 86800
SHA256 (rocky/l/libselinux-3.6-1.el9.i686.rpm) = e7e73bf702efd0bc91daad71aa70046d8650ab27b92b07e958ea083a79c511d0
@@ -453,6 +459,8 @@ SHA256 (rocky/l/libffi-3.4.2-8.el9.src.rpm) = 08d292859e2a980b79f578778e9ac50ceb
SIZE (rocky/l/libffi-3.4.2-8.el9.src.rpm) = 1365131
SHA256 (rocky/l/libgudev-237-1.el9.src.rpm) = 2904abffd7583e387e6233cdef9dd9224abc0e482b4bfc97b43c6eb4317fd5fc
SIZE (rocky/l/libgudev-237-1.el9.src.rpm) = 38802
+SHA256 (rocky/l/libproxy-0.4.15-35.el9.src.rpm) = 9ce7f7bf42973bea5fd91e556e554a3ad3b76f63a301b1a280d4af6d45284cd2
+SIZE (rocky/l/libproxy-0.4.15-35.el9.src.rpm) = 120129
SHA256 (rocky/l/libselinux-3.6-1.el9.src.rpm) = 2db2d5d2ad87a9b28eae6cb7c5dfab2b965a2f79d3486ac82aba68413b442071
SIZE (rocky/l/libselinux-3.6-1.el9.src.rpm) = 265639
SHA256 (rocky/l/libsepol-3.6-1.el9.src.rpm) = ae509bd810045681bf3c603ba0f70096809833a3127fe21218840ebaf5e469b5
diff --git a/emulators/linux_base-rl9/pkg-plist.aarch64 b/emulators/linux_base-rl9/pkg-plist.aarch64
index 9ffd6e4f560e..46905d607257 100644
--- a/emulators/linux_base-rl9/pkg-plist.aarch64
+++ b/emulators/linux_base-rl9/pkg-plist.aarch64
@@ -293,6 +293,7 @@ usr/bin/yes
usr/bin/zdump
usr/lib/.build-id/00/28e554acd9c16064b12195dcc8dffd7caea925
usr/lib/.build-id/00/8c49e4fa52d5c6b4421efe93a2e0a97b34953f
+usr/lib/.build-id/00/e9e02ed1f5eceff9fd22ce6b60614cff4923ac
usr/lib/.build-id/01/04e60502be3b325202b17234c18be5ca38aa65
usr/lib/.build-id/01/0d96c7cac4f3abbd6e7952a6501fce60c5a4f9
usr/lib/.build-id/01/583f6240dd9b8816b13a961865f5300765f96f
@@ -1405,6 +1406,8 @@ usr/lib64/libpcre2-posix.so.3
usr/lib64/libpcre2-posix.so.3.0.2
usr/lib64/libpopt.so.0
usr/lib64/libpopt.so.0.0.1
+usr/lib64/libproxy.so.1
+usr/lib64/libproxy.so.1.0.0
usr/lib64/libpsx.so.2
usr/lib64/libpsx.so.2.48
usr/lib64/libpthread.so.0
@@ -1701,6 +1704,8 @@ usr/share/dbus-1/services/org.gtk.GLib.PACRunner.service
%%PORTDOCS%%usr/share/doc/libevdev/COPYING
%%PORTDOCS%%usr/share/doc/libffi/README.md
%%PORTDOCS%%usr/share/doc/libgudev/NEWS
+%%PORTDOCS%%usr/share/doc/libproxy/AUTHORS
+%%PORTDOCS%%usr/share/doc/libproxy/README
%%PORTDOCS%%usr/share/doc/libsigsegv/AUTHORS
%%PORTDOCS%%usr/share/doc/libsigsegv/NEWS
%%PORTDOCS%%usr/share/doc/libsigsegv/README
@@ -1832,6 +1837,8 @@ usr/share/licenses/libgcc/COPYING3.LIB
usr/share/licenses/libgudev/COPYING
usr/share/licenses/libmount/COPYING
usr/share/licenses/libmount/COPYING.LGPL-2.1-or-later
+usr/share/licenses/libproxy/COPYING
+usr/share/licenses/libproxy/Copyright.txt
usr/share/licenses/libselinux/LICENSE
usr/share/licenses/libsepol/LICENSE
usr/share/licenses/libsigsegv/COPYING
diff --git a/emulators/linux_base-rl9/pkg-plist.amd64 b/emulators/linux_base-rl9/pkg-plist.amd64
index a8b53b0c49cf..f74fde7336cc 100644
--- a/emulators/linux_base-rl9/pkg-plist.amd64
+++ b/emulators/linux_base-rl9/pkg-plist.amd64
@@ -655,6 +655,7 @@ usr/lib/.build-id/58/bb916f28a8bafb0c2cf57d9c280d3e10735d7a
usr/lib/.build-id/59/297066a74218178617a1cda5c1baf40172d6a8
usr/lib/.build-id/59/48453eeb4fbe90095e3e09aba11d782bdf8403
usr/lib/.build-id/59/a68e56d5456df11d1339f57f6e91a3af7581f2
+usr/lib/.build-id/59/d80c810d74964488e2a8ae54288d9e51026c60
usr/lib/.build-id/5a/1ef8e14eff76e7eea536b7ddbfdb1e854e5571
usr/lib/.build-id/5a/41662db4931d6c44ab3783c9be124f22b058fe
usr/lib/.build-id/5a/4ab65e82a72e4b984e392401e6ac04ba1a2987
@@ -1108,6 +1109,7 @@ usr/lib/.build-id/c7/4af666d3e2be27f503f53e08e8d2dc07ff9b11
usr/lib/.build-id/c7/8470aa2713df4416fcc65a174ea0f745eb6404
usr/lib/.build-id/c7/8516f81d0c8620eeeea287557aa5cdcfbcdfde
usr/lib/.build-id/c7/897b5562d46bd5e04f3ed28a3f3adf8b64030c
+usr/lib/.build-id/c7/8b941c6cb4b6790887e430352b82a0c045e6a4
usr/lib/.build-id/c7/919c5fe2a8b32eb1a3d5422912707020f3b67b
usr/lib/.build-id/c7/abc241a6b77797795d381ba7c765fbd7545f26
usr/lib/.build-id/c7/bbe3eb07066fe1b27dc4c35baf6ecbda6e69df
@@ -1748,6 +1750,8 @@ usr/lib/libpcre2-posix.so.3
usr/lib/libpcre2-posix.so.3.0.2
usr/lib/libpopt.so.0
usr/lib/libpopt.so.0.0.1
+usr/lib/libproxy.so.1
+usr/lib/libproxy.so.1.0.0
usr/lib/libpsx.so.2
usr/lib/libpsx.so.2.48
usr/lib/libpthread.so.0
@@ -2231,6 +2235,8 @@ usr/lib64/libpcre2-posix.so.3
usr/lib64/libpcre2-posix.so.3.0.2
usr/lib64/libpopt.so.0
usr/lib64/libpopt.so.0.0.1
+usr/lib64/libproxy.so.1
+usr/lib64/libproxy.so.1.0.0
usr/lib64/libpsx.so.2
usr/lib64/libpsx.so.2.48
usr/lib64/libpthread.so.0
@@ -2533,6 +2539,8 @@ usr/share/dbus-1/services/org.gtk.GLib.PACRunner.service
%%PORTDOCS%%usr/share/doc/libevdev/COPYING
%%PORTDOCS%%usr/share/doc/libffi/README.md
%%PORTDOCS%%usr/share/doc/libgudev/NEWS
+%%PORTDOCS%%usr/share/doc/libproxy/AUTHORS
+%%PORTDOCS%%usr/share/doc/libproxy/README
%%PORTDOCS%%usr/share/doc/libsigsegv/AUTHORS
%%PORTDOCS%%usr/share/doc/libsigsegv/NEWS
%%PORTDOCS%%usr/share/doc/libsigsegv/README
@@ -2667,6 +2675,8 @@ usr/share/licenses/libgcc/COPYING3.LIB
usr/share/licenses/libgudev/COPYING
usr/share/licenses/libmount/COPYING
usr/share/licenses/libmount/COPYING.LGPL-2.1-or-later
+usr/share/licenses/libproxy/COPYING
+usr/share/licenses/libproxy/Copyright.txt
usr/share/licenses/libselinux/LICENSE
usr/share/licenses/libsepol/LICENSE
usr/share/licenses/libsigsegv/COPYING
diff --git a/graphics/linux-rl9-gdk-pixbuf2/Makefile b/graphics/linux-rl9-gdk-pixbuf2/Makefile
index 3810f94c2d5c..360955a6473f 100644
--- a/graphics/linux-rl9-gdk-pixbuf2/Makefile
+++ b/graphics/linux-rl9-gdk-pixbuf2/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gdk-pixbuf2
PORTVERSION= 2.42.6
DISTVERSIONSUFFIX= -4.el9_4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics linux
MAINTAINER= emulation@FreeBSD.org
@@ -12,7 +12,7 @@ USES= cpe linux:rl9
CPE_VENDOR= gnome
CPE_PRODUCT= gdk-pixbuf
USE_LDCONFIG= yes
-USE_LINUX= gnutls imageformats-libs libproxy xorglibs
+USE_LINUX= gnutls imageformats-libs xorglibs
USE_LINUX_RPM= yes
WANT_LINUX32= yes
diff --git a/x11-toolkits/linux-rl9-gtk3/Makefile b/x11-toolkits/linux-rl9-gtk3/Makefile
index dec5d71c5f2c..7f5b76d2fb2b 100644
--- a/x11-toolkits/linux-rl9-gtk3/Makefile
+++ b/x11-toolkits/linux-rl9-gtk3/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gtk3
PORTVERSION= 3.24.31
DISTVERSIONSUFFIX= -5.el9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
@@ -16,7 +16,7 @@ CPE_VENDOR= gnome
CPE_PRODUCT= gtk
USE_LDCONFIG= yes
USE_LINUX= at-spi2-atk atk cairo-gobject dbuslibs fontconfig freetype gdkpixbuf2 \
- gnutls icu libepoxy libproxy librsvg2 libstemmer libtracker-sparql \
+ gnutls icu libepoxy librsvg2 libstemmer libtracker-sparql \
libxkbcommon pango wayland xorglibs
USE_LINUX_RPM= yes
WANT_LINUX32= yes