diff options
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/cargo.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/gnome.mk | 10 | ||||
| -rw-r--r-- | Mk/Uses/gssapi.mk | 17 | ||||
| -rw-r--r-- | Mk/Uses/gstreamer.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/kde.mk | 8 | ||||
| -rw-r--r-- | Mk/Uses/luajit.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/mlt.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/pathfix.mk | 3 | ||||
| -rw-r--r-- | Mk/Uses/php.mk | 8 | ||||
| -rw-r--r-- | Mk/Uses/ruby.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/xorg-cat.mk | 7 |
11 files changed, 36 insertions, 33 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 19b0ac1e294e..f5325f39afdb 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} CARGO_BUILDDEP?= yes . if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.87.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.88.0:lang/${RUST_DEFAULT} . elif ${CARGO_BUILDDEP:tl} == "any-version" BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT} . endif diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index 7d99d5df0bd0..59d070c747f8 100644 --- a/Mk/Uses/gnome.mk +++ b/Mk/Uses/gnome.mk @@ -83,8 +83,8 @@ _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \ _USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5 gnomedesktop4 nautilus4 # C++ bindings -_USE_GNOME_ALL+=atkmm cairomm cairomm11 gconfmm26 glibmm glibmm26 gtkmm24 \ - gtkmm30 gtkmm40 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \ +_USE_GNOME_ALL+=atkmm cairomm cairomm11 glibmm glibmm26 gtkmm24 \ + gtkmm30 gtkmm40 gtksourceviewmm3 libxml++26 libsigc++20 \ libsigc++30 pangomm pangomm24 # glib-mkenums often fails with C locale @@ -116,9 +116,6 @@ cairomm_USE_GNOME_IMPL= cairo libsigc++20 cairomm11_LIB_DEPENDS= libcairomm-1.16.so:graphics/cairomm11 cairomm11_USE_GNOME_IMPL= cairo libsigc++30 -gconfmm26_LIB_DEPENDS= libgconfmm-2.6.so:devel/gconfmm26 -gconfmm26_USE_GNOME_IMPL= glibmm gconf2 - glibmm_LIB_DEPENDS= libglibmm-2.4.so:devel/glibmm glibmm_USE_GNOME_IMPL= libsigc++20 glib20 @@ -142,9 +139,6 @@ gtkmm40_USE_GNOME_IMPL= cairomm11 gdkpixbuf glibmm26 gtk40 pangomm24 gtksourceviewmm3_LIB_DEPENDS= libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3 gtksourceviewmm3_USE_GNOME_IMPL= gtkmm30 gtksourceview3 -libgdamm5_LIB_DEPENDS= libgdamm-5.0.so:databases/libgdamm5 -libgdamm5_USE_GNOME_IMPL= libgda5 glibmm - libsigc++20_LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 libsigc++30_LIB_DEPENDS= libsigc-3.0.so:devel/libsigc++30 diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index 46eea2d10071..fecf29895a5a 100644 --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -86,6 +86,18 @@ _local:= ${_A} . if ${SSL_DEFAULT} != base IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value . endif +. if exists(/usr/libexec/krb5kdc) + # Base has MIT KRB5 installed +KRB5_HOME?= /usr +GSSAPIBASEDIR= ${KRB5_HOME} +GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib +GSSAPIINCDIR= ${GSSAPIBASEDIR}/include +_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h +GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" +GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 +GSSAPILDFLAGS= +. else + # Base has Heimdal KRB5 installed HEIMDAL_HOME= /usr GSSAPIBASEDIR= ${HEIMDAL_HOME} GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib @@ -94,7 +106,9 @@ _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 GSSAPILDFLAGS= +. endif . elif ${_local} == "heimdal" + # Heimdal port selected HEIMDAL_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${HEIMDAL_HOME} GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib/heimdal @@ -111,11 +125,12 @@ GSSAPILIBS= -lkrb5 -lgssapi GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" _RPATH= ${GSSAPILIBDIR} . elif ${_local} == "mit" + # MIT KRB5 port selected KRB5_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${KRB5_HOME} GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib GSSAPIINCDIR= ${GSSAPIBASEDIR}/include -_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h +_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h . if !defined(_KRB_BOOTSTRAP) BUILD_DEPENDS+= ${_MITKRB5_DEPENDS} RUN_DEPENDS+= ${_MITKRB5_DEPENDS} diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk index 22d1c3ea73af..221b146a2128 100644 --- a/Mk/Uses/gstreamer.mk +++ b/Mk/Uses/gstreamer.mk @@ -48,7 +48,7 @@ _GST_VER= ${_GST_VER_DEFAULT} # - multimedia/gstreamer1-rtsp-server # - multimedia/gstreamer1-vaapi # - multimedia/py-gstreamer1 -_GST1_VERSION= 1.26.2 +_GST1_VERSION= 1.26.3 _GST1_LIB_VER= 1.0 _GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0 diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 2db876e02ad8..812619911717 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -91,7 +91,7 @@ KDE_PLASMA5_VERSION?= 5.27.12 KDE_PLASMA5_BRANCH?= stable # Current KDE Plasma desktop. -KDE_PLASMA6_VERSION?= 6.4.1 +KDE_PLASMA6_VERSION?= 6.4.3 KDE_PLASMA6_BRANCH?= stable # Legacy KDE frameworks (Qt5 based). @@ -99,13 +99,13 @@ KDE_FRAMEWORKS5_VERSION?= 5.116.0 KDE_FRAMEWORKS5_BRANCH?= stable # Current KDE Frameworks (Qt6 based). -KDE_FRAMEWORKS6_VERSION?= 6.15.0 +KDE_FRAMEWORKS6_VERSION?= 6.16.0 KDE_FRAMEWORKS6_BRANCH?= stable # Current KDE applications. Update _${PORTNAME}_PROJECT_VERSION for the following ports: # devel/kdevelop, games/libkdegames, games/libkmahjongg, graphics/kgraphviewer -KDE_APPLICATIONS6_VERSION?= 25.04.2 -KDE_APPLICATIONS6_SHLIB_VER?= 6.4.2 +KDE_APPLICATIONS6_VERSION?= 25.04.3 +KDE_APPLICATIONS6_SHLIB_VER?= 6.4.3 # G as in KDE Gear, and as in "don't make the variable name longer than required". KDE_APPLICATIONS6_SHLIB_G_VER?= ${KDE_APPLICATIONS6_VERSION} KDE_APPLICATIONS6_BRANCH?= stable diff --git a/Mk/Uses/luajit.mk b/Mk/Uses/luajit.mk index c7a15b191209..7e62c192fd77 100644 --- a/Mk/Uses/luajit.mk +++ b/Mk/Uses/luajit.mk @@ -7,7 +7,7 @@ # LUAJIT_VER: The selected luajit version # LUAJIT_INCDIR: The path to luajit's header files # LUAJIT_LUAVER: Which luajit spec version is selected -# (2.0 for luajit, else 2.1) +# (always 2.1) .if !defined(_INCLUDE_USES_LUAJIT_MK) _INCLUDE_USES_LUAJIT_MK=yes @@ -28,11 +28,7 @@ IGNORE= Invalid luajit default version ${LUAJIT_DEFAULT}: valid versions are ${V IGNORE= Invalid luajit version ${LUAJIT_VER}: valid versions are ${VALID_LUAJIT_VER} .endif -.if ${LUAJIT_VER} == luajit -LUAJIT_LUAVER= 2.0 -.else LUAJIT_LUAVER= 2.1 -.endif LIB_DEPENDS+= libluajit-5.1.so:lang/${LUAJIT_VER} LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-${LUAJIT_LUAVER} diff --git a/Mk/Uses/mlt.mk b/Mk/Uses/mlt.mk index da70a759d558..2cf044dcad0a 100644 --- a/Mk/Uses/mlt.mk +++ b/Mk/Uses/mlt.mk @@ -37,7 +37,7 @@ _MLT_NODEPEND= yes . endif # Library dependencies -_MLT7_VERSION= 7.30.0 +_MLT7_VERSION= 7.32.0 _MLT7_PORTNAME= mlt7 _MLT7_LIB= libmlt-7.so _MLT7_MELT= ${LOCALBASE}/bin/melt-7 diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk index 049224a15621..57c734f93cb3 100644 --- a/Mk/Uses/pathfix.mk +++ b/Mk/Uses/pathfix.mk @@ -54,8 +54,7 @@ pathfix: s|[{]datadir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]prefix[)]/share/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ - s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \ - s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' + s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g' . endfor . endif diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 9d5568e05047..d6b59898cb5b 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -110,7 +110,7 @@ DIST_SUBDIR= PECL PHPBASE?= ${LOCALBASE} -_ALL_PHP_VERSIONS= 81 82 83 84 +_ALL_PHP_VERSIONS= 81 82 83 84 85 # Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) @@ -179,7 +179,10 @@ PHP_VER= ${FLAVOR:S/^php//} (${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]}) # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -. if ${PHP_VER} == 84 +. if ${PHP_VER} == 85 +PHP_EXT_DIR= 20240925 +PHP_EXT_INC= hash json openssl pcre random spl +. elif ${PHP_VER} == 84 PHP_EXT_DIR= 20240924 PHP_EXT_INC= hash json openssl pcre random spl . elif ${PHP_VER} == 83 @@ -387,6 +390,7 @@ _USE_PHP_VER81= ${_USE_PHP_ALL} _USE_PHP_VER82= ${_USE_PHP_ALL} _USE_PHP_VER83= ${_USE_PHP_ALL} _USE_PHP_VER84= ${_USE_PHP_ALL} +_USE_PHP_VER85= ${_USE_PHP_ALL} bcmath_DEPENDS= math/php${PHP_VER}-bcmath bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR} diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index 620fff71f832..79fb4a0cf751 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -147,7 +147,7 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX} # # Ruby 3.2 # -RUBY_DISTVERSION= 3.2.8 +RUBY_DISTVERSION= 3.2.9 RUBY_PORTREVISION= 0 . elif ${RUBY_VER} == 3.3 @@ -162,7 +162,7 @@ RUBY_PORTREVISION= 0 # # Ruby 3.4 # -RUBY_DISTVERSION= 3.4.4 +RUBY_DISTVERSION= 3.4.5 RUBY_PORTREVISION= 0 diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk index 0853fd6b3e3c..b81972b4ae5f 100644 --- a/Mk/Uses/xorg-cat.mk +++ b/Mk/Uses/xorg-cat.mk @@ -14,8 +14,6 @@ # * font don't install .pc file # * lib various dependencies, install .pc file, needs # pathfix -# * proto install .pc file, needs pathfix, most only needed at -# build time. # * util no particular notes # # These categories has to match upstream categories. Don't invent @@ -34,7 +32,7 @@ .if !defined(_INCLUDE_USES_XORG_CAT_MK) _INCLUDE_USES_XORG_CAT_MK=yes -_XORG_CATEGORIES= app data doc driver font lib proto util +_XORG_CATEGORIES= app data doc driver font lib util _XORG_BUILDSYSTEMS= autotools meson _XORG_CAT= # empty @@ -158,9 +156,6 @@ USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-malloc0returnsnull . endif -. elif ${_XORG_CAT} == proto -.include "${USESDIR}/pathfix.mk" - . endif # ${_XORG_CAT} == <category> # We only need to include xorg.mk if we want USE_XORG modules |