diff options
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/Features/stack_autoinit.mk | 2 | ||||
-rw-r--r-- | Mk/Scripts/qa.sh | 1 | ||||
-rw-r--r-- | Mk/Uses/gnome.mk | 5 | ||||
-rw-r--r-- | Mk/Uses/gssapi.mk | 17 | ||||
-rw-r--r-- | Mk/Uses/gstreamer.mk | 2 | ||||
-rw-r--r-- | Mk/Uses/kde.mk | 4 | ||||
-rw-r--r-- | Mk/Uses/luajit.mk | 6 | ||||
-rw-r--r-- | Mk/Uses/pathfix.mk | 3 | ||||
-rw-r--r-- | Mk/Uses/ruby.mk | 2 | ||||
-rw-r--r-- | Mk/Uses/xorg-cat.mk | 7 | ||||
-rw-r--r-- | Mk/Wrappers/gm4 | 2 | ||||
-rw-r--r-- | Mk/bsd.default-versions.mk | 8 | ||||
-rw-r--r-- | Mk/bsd.port.mk | 6 | ||||
-rw-r--r-- | Mk/bsd.sites.mk | 22 |
14 files changed, 33 insertions, 54 deletions
diff --git a/Mk/Features/stack_autoinit.mk b/Mk/Features/stack_autoinit.mk index 4d79416dbcce..627b785b6ee0 100644 --- a/Mk/Features/stack_autoinit.mk +++ b/Mk/Features/stack_autoinit.mk @@ -7,7 +7,7 @@ # # WITH_STACK_AUTOINIT Enable for all ports. # WITH_STACK_AUTOINIT_PORTS Enable for specified category/port-name -# STACK_AUTOINIT_TYPE Valid options: zero (default), pattern, unitialized +# STACK_AUTOINIT_TYPE Valid options: zero (default), pattern, uninitialized # .if !defined(_STACK_AUTOINIT_MK_INCLUDED) diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index 781143db972e..cb55befee64d 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -371,7 +371,6 @@ proxydeps_suggest_uses() { ${pkg} = "graphics/cairomm" -o \ ${pkg} = "devel/dconf" -o \ ${pkg} = "devel/gconf2" -o \ - ${pkg} = "devel/gconfmm26" -o \ ${pkg} = "devel/glib20" -o \ ${pkg} = "devel/glibmm" -o \ ${pkg} = "audio/gsound" -o \ diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index 7d99d5df0bd0..2cb1485313c6 100644 --- a/Mk/Uses/gnome.mk +++ b/Mk/Uses/gnome.mk @@ -83,7 +83,7 @@ _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 \ +_USE_GNOME_ALL+=atkmm cairomm cairomm11 glibmm glibmm26 gtkmm24 \ gtkmm30 gtkmm40 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \ libsigc++30 pangomm pangomm24 @@ -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 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 f46b29b8c151..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.2 +KDE_PLASMA6_VERSION?= 6.4.3 KDE_PLASMA6_BRANCH?= stable # Legacy KDE frameworks (Qt5 based). @@ -99,7 +99,7 @@ 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: 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/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/ruby.mk b/Mk/Uses/ruby.mk index 620fff71f832..249f0b8bec7e 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -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 diff --git a/Mk/Wrappers/gm4 b/Mk/Wrappers/gm4 index ecc0796c729a..8b1e7a64f700 100644 --- a/Mk/Wrappers/gm4 +++ b/Mk/Wrappers/gm4 @@ -2,5 +2,5 @@ case " $@ " in *" --version "*) echo "m4 (GNU M4) 1.4.18" ;; -*) exec m4 -g $@ ;; +*) exec m4 -g "$@" ;; esac diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 549ad04fd4c1..3192f9cf5ce5 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -79,7 +79,7 @@ JAVA_DEFAULT?= 8 . if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64} LAZARUS_DEFAULT?= 4.99 . else -LAZARUS_DEFAULT?= 4.0 +LAZARUS_DEFAULT?= 4.2 . endif # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) @@ -98,11 +98,7 @@ LLVM_DEFAULT?= 19 # Possible values: 5.1, 5.2, 5.3, 5.4 LUA_DEFAULT?= 5.4 # Possible values: luajit, luajit-devel, luajit-openresty -. if ${ARCH:Mpowerpc64*} -LUAJIT_DEFAULT?= luajit-openresty -. else -LUAJIT_DEFAULT?= luajit-devel -. endif +LUAJIT_DEFAULT?= luajit # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.20 # Possible values: 8.0, 8.4, 9.1, 10.5m, 10.6m, 10.11m, 11.4m diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4553edb0072c..0aa79aed7ed0 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1007,7 +1007,7 @@ PORTSDIR?= /usr/ports LOCALBASE?= /usr/local LINUXBASE?= /compat/linux DISTDIR?= ${PORTSDIR}/distfiles -_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} +_DISTDIR?= ${DISTDIR}${DIST_SUBDIR:D/${DIST_SUBDIR}} INDEXDIR?= ${PORTSDIR} SRC_BASE?= /usr/src USESDIR?= ${PORTSDIR}/Mk/Uses @@ -3600,10 +3600,6 @@ install-ldconfig-file: fixup-lib-pkgconfig: @if [ -d ${STAGEDIR}${PREFIX}/lib/pkgconfig ]; then \ if [ -z "$$(${FIND} ${STAGEDIR}${PREFIX}/lib/pkgconfig -maxdepth 0 -empty)" ]; then \ - if [ -n "${DEVELOPER:Dyes}" ]; then \ - ${ECHO_MSG} "===> File(s) found in lib/pkgconfig while correct path is libdata/pkgconfig"; \ - ${ECHO_MSG} " Applying fix but consider using USES= pathfix or adjust install path"; \ - fi; \ ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \ ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/* ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \ fi; \ diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index 93f2b6f4325c..f3a20128a882 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -40,8 +40,7 @@ MASTER_SITE_PORTS_JP+= \ .if !defined(IGNORE_MASTER_SITE_AFTERSTEP) MASTER_SITE_AFTERSTEP+= \ - ftp://ftp.afterstep.org/%SUBDIR%/ \ - ftp://ftp.kddlabs.co.jp/X11/AfterStep/%SUBDIR%/ + ftp://ftp.afterstep.org/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_APACHE) @@ -51,7 +50,6 @@ MASTER_SITE_APACHE+= \ https://mirror.its.dal.ca/apache/%SUBDIR%/ \ http://mirror.cogentco.com/pub/apache/%SUBDIR%/ \ http://mirror.navercorp.com/apache/%SUBDIR%/ \ - http://ftp.kddi-research.jp/infosystems/apache/%SUBDIR%/ \ http://miroir.univ-lorraine.fr/apache/%SUBDIR%/ .endif @@ -591,25 +589,16 @@ _gnome_ver= ${_version_major}.${_version_minor} . endif . endif -. if !empty(MASTER_SITES:M*/archive/*) -_GNOME_PATH= %SUBDIR% -. else _GNOME_PATH= %SUBDIR%/${_gnome_ver} -. endif MASTER_SITE_GNOME+= \ - https://download.gnome.org/${_GNOME_PATH}/ \ - http://ftp.belnet.be/mirror/ftp.gnome.org/gnomeftp/${_GNOME_PATH}/ \ - https://ftp.acc.umu.se/pub/GNOME/${_GNOME_PATH}/ \ - https://fr2.rpmfind.net/linux/gnome.org/${_GNOME_PATH}/ \ - https://gitlab.gnome.org/GNOME/${PORTNAME}/-/archive/${PORTVERSION}/ - + https://download.gnome.org/${_GNOME_PATH}/ .endif .if !defined(IGNORE_MASTER_SITE_GIMP) MASTER_SITE_GIMP+= \ - http://gimp.mirrors.hoobly.com/pub/%SUBDIR%/ \ - http://gimp.afri.cc/pub/%SUBDIR%/ \ + https://ftp.gwdg.de/pub/misc/grafik/%SUBDIR%/ \ + https://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \ https://download.gimp.org/pub/%SUBDIR%/ .endif @@ -621,7 +610,6 @@ MASTER_SITE_GNU+= \ https://www.nic.funet.fi/pub/gnu/gnu/%SUBDIR%/ \ http://mirror.navercorp.com/gnu/%SUBDIR%/ \ http://ftp.halifax.rwth-aachen.de/gnu/%SUBDIR%/ \ - http://ftp.kddilabs.jp/GNU/gnu/%SUBDIR%/ \ ftp://mirrors.rit.edu/gnu/%SUBDIR%/ \ ftp://ftp.fu-berlin.de/unix/gnu/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.gnu.org/gnu/%SUBDIR%/ \ @@ -812,7 +800,6 @@ MASTER_SITE_PERL_CPAN_BY+= \ https://cpan.metacpan.org/modules/by-module/%SUBDIRPLUS%/ \ https://www.cpan.org/%CPANSORT%/%SUBDIR%/ \ ftp://ftp.cpan.org/pub/CPAN/%CPANSORT%/%SUBDIR%/ \ - ftp://ftp.kddlabs.co.jp/lang/perl/CPAN/%CPANSORT%/%SUBDIR%/ \ http://ftp.jaist.ac.jp/pub/CPAN/%CPANSORT%/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/cpan.perl.org/CPAN/%CPANSORT%/%SUBDIR%/ \ ftp://ftp.auckland.ac.nz/pub/perl/CPAN/%CPANSORT%/%SUBDIR%/ \ @@ -971,7 +958,6 @@ MASTER_SITE_SUNSITE+= \ .if !defined(IGNORE_MASTER_SITE_TCLTK) MASTER_SITE_TCLTK+= \ ftp://ftp.tcl.tk/pub/tcl/%SUBDIR%/ \ - ftp://ftp.kddlabs.co.jp/lang/tcl/ftp.scriptics.com/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.tcl.tk/pub/tcl/%SUBDIR%/ \ ftp://ftp.funet.fi/pub/languages/tcl/tcl/%SUBDIR%/ .endif |