Merge branch 'main' into mm-ports_merge

.gitignore

@@ -2,6 +2,8 @@
 /packages
 /security/vuxml/vuln-flat.xml
 Makefile.local
+Mk/bsd.local.mk
+Mk/bsd.overlay.mk
 /*/*/work
 /*/*/work-*
 /INDEX-[0-9]*

COPYRIGHT

@@ -3,7 +3,7 @@
 The compilation of software known as the FreeBSD Ports Collection is
 distributed under the following terms:
 
-Copyright (C) 1994-2023 The FreeBSD Project.
+Copyright (C) 1994-2024 The FreeBSD Project.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

GIDs

@@ -287,7 +287,7 @@ openfire:*:342:
 # free: 344
 # free: 345
 # free: 346
-# free: 347
+eturnal:*:347:
 # free: 348
 # free: 349
 _sabnzbd:*:350:

Mk/Scripts/depends-list.sh

@@ -69,6 +69,12 @@ check_dep() {
 			d=${overlay}/${2}
 			f=
 			case "${d}" in
+			*~*/*) ;; # Ignore ~ in the path which would not be a subpkg
+			*~*)
+			    d=${d%~*}
+				;;
+			esac
+			case "${d}" in
 			*@*/*) ;; # Ignore @ in the path which would not be a flavor
 			*@*)
 				f=${d##*@}

Mk/Scripts/do-depends.sh

@@ -21,15 +21,22 @@ install_depends()
 {
 	origin=$1
 	target=$2
-	depends_args=$3
+	subpkg=$3
+	depends_args=$4
 	if [ -z "${dp_USE_PACKAGE_DEPENDS}" -a -z "${dp_USE_PACKAGE_DEPENDS_ONLY}" ]; then
 		MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args}
 		return 0
 	fi
 
-	port_var_fetch "${origin}" "${depends_args}" \
-	    PKGFILE pkgfile \
-	    PKGBASE pkgbase
+	if [ -z "${subpkg}" ]; then
+		port_var_fetch "${origin}" "${depends_args}" \
+			PKGFILE pkgfile \
+			PKGBASE pkgbase
+	else
+		port_var_fetch "${origin}" "${depends_args}" \
+			PKGFILE.${subpkg} pkgfile \
+			PKGBASE.${subpkg} pkgbase
+	fi
 
 	if [ -r "${pkgfile}" -a "${target}" = "${dp_DEPENDS_TARGET}" ]; then
 		echo "===>   Installing existing package ${pkgfile}"
@@ -123,12 +130,18 @@ for _line in ${dp_RAWDEPENDS} ; do
 		continue
 	fi
 
+	subpkg=
 	case "${origin}" in
 	*@*/*) ;; # Ignore @ in the path which would not be a flavor
 	*@*)
 		export FLAVOR="${origin##*@}"
 		origin=${origin%@*}
 		;;
+	*~*/*) ;; # Ignore ~ in the path which would not be a subpackage
+	*~*)
+		subpkg="${origin##*~}"
+		origin=${origin%~*}
+		;;
 	esac
 
 	case "${origin}" in
@@ -194,7 +207,7 @@ for _line in ${dp_RAWDEPENDS} ; do
 	fi
 
 	# Now actually install the dependencies
-	install_depends "${origin}" "${target}" "${depends_args}"
+	install_depends "${origin}" "${target}" "${subpkg}" "${depends_args}"
 	# Recheck if the installed dependency validates the pattern except for /nonexistent
 	[ "${fct}" = "false" ] || ${fct} "${pattern}"
 	echo "===>   Returning to build of ${dp_PKGNAME}"

Mk/Scripts/functions.sh

@@ -6,7 +6,8 @@
 # Strip (owner,group,perm) from keywords
 _strip_perms() {
 	sed -Ee 's/^@\([^)]*\)[[:space:]]+//' \
-	    -e 's/^(@[[:alpha:]]+)\([^)]*\)[[:space:]]+/\1 /'
+	    -e 's/^(@[[:alpha:]]+)\([^)]*\)[[:space:]]+/\1 /' \
+		-e 's/^@@[[:alnum:]]+@@//'
 }
 
 # Expand TMPPLIST to absolute paths, splitting files and dirs into separate

Mk/Scripts/qa.sh

@@ -425,7 +425,7 @@ proxydeps_suggest_uses() {
 	elif [ ${pkg} = "x11/mate-panel" ]; then warn "you need USE_MATE+=panel"
 	elif [ ${pkg} = "sysutils/mate-polkit" ]; then warn "you need USE_MATE+=polkit"
 	# KDE
-	# grep -B1 _LIB= Mk/Uses/kde.mk | grep _PORT=|sed -e 's/^kde-\(.*\)_PORT=[[:space:]]*\([^[:space:]]*\).*/elif [ ${pkg} = "\2" ]; then warn "you need to use USE_KDE+=\1"/' 
+	# grep -B1 _LIB= Mk/Uses/kde.mk | grep _PORT=|sed -e 's/^kde-\(.*\)_PORT=[[:space:]]*\([^[:space:]]*\).*/elif [ ${pkg} = "\2" ]; then warn "you need to use USE_KDE+=\1"/'
 	# KDE Applications
 	elif [ ${pkg} = "net/akonadi-contacts" ]; then warn "you need to use USE_KDE+=akonadicontacts"
 	elif [ ${pkg} = "deskutils/akonadi-import-wizard" ]; then warn "you need to use USE_KDE+=akonadiimportwizard"
@@ -496,7 +496,6 @@ proxydeps_suggest_uses() {
 	elif [ ${pkg} = "x11/kf5-kded" ]; then warn "you need to use USE_KDE+=kded"
 	elif [ ${pkg} = "x11/kf5-kdelibs4support" ]; then warn "you need to use USE_KDE+=kdelibs4support"
 	elif [ ${pkg} = "security/kf5-kdesu" ]; then warn "you need to use USE_KDE+=kdesu"
-	elif [ ${pkg} = "www/kf5-kdewebkit" ]; then warn "you need to use USE_KDE+=kdewebkit"
 	elif [ ${pkg} = "www/kf5-khtml" ]; then warn "you need to use USE_KDE+=khtml"
 	elif [ ${pkg} = "devel/kf5-kio" ]; then warn "you need to use USE_KDE+=kio"
 	elif [ ${pkg} = "lang/kf5-kross" ]; then warn "you need to use USE_KDE+=kross"
@@ -885,24 +884,24 @@ gemfiledeps()
 	if [ -z "$USE_RUBY" ]; then
 		return 0
 	fi
-	
+
 	# skip check if port is a rubygem-* one; they have no Gemfiles
 	if [ "${PKGBASE%%-*}" = "rubygem" ]; then
 		return 0
 	fi
-	
+
 	# advise install of bundler if its not present for check
 	if ! type bundle > /dev/null 2>&1; then
 		notice "Please install sysutils/rubygem-bundler for additional Gemfile-checks"
 		return 0
 	fi
- 
+
 	# locate the Gemfile(s)
 	while read -r f; do
-	
+
 		# no results presents a blank line from heredoc
 		[ -z "$f" ] && continue
-	
+
 		# if there is no Gemfile everything is fine - stop here
 		[ ! -f "$f" ] && return 0;
 
@@ -912,7 +911,7 @@ gemfiledeps()
 		if ! bundle check --dry-run --gemfile $f > /dev/null 2>&1; then
 			warn "Dependencies defined in ${f} are not satisfied"
 		fi
-      
+
 	done <<-EOF
 		$(find ${STAGEDIR} -name Gemfile)
 		EOF

Mk/Uses/cabal.mk

@@ -81,12 +81,6 @@ IGNORE=		CABAL_PROJECT: invalid value: ${CABAL_PROJECT}
 BROKEN=		${USE_CABAL:Mbasement-0.0.1[4-5]} package doesn't compile on i386
 .  endif
 
-.  if ${OSVERSION} < 1302000 && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*}
-# Band-aids for a Clang bug that is shipped with FreeBSD < 13.2
-BUILD_DEPENDS+=	clang15:devel/llvm15
-BUILD_ARGS+=	--ghc-options='-pgmc clang++15'
-.  endif
-
 PKGNAMEPREFIX?=	hs-
 
 CABAL_EXECUTABLES?=	${PORTNAME}

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.73.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.74.0:lang/${RUST_DEFAULT}
 .  elif ${CARGO_BUILDDEP:tl} == "any-version"
 BUILD_DEPENDS+=	${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
 .  endif
@@ -155,11 +155,6 @@ RUSTFLAGS+=	-C target-cpu=${CPUTYPE:C/\+.+//g}
 RUSTFLAGS+=	${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/}
 .  endif
 
-.  if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
-USE_GCC?=	yes
-STRIP_CMD=	${LOCALBASE}/bin/strip # unsupported e_type with base strip
-.  endif
-
 # Helper to shorten cargo calls.
 _CARGO_RUN=		${SETENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO}
 CARGO_CARGO_RUN=	cd ${WRKSRC}; ${SETENV} CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE=1 ${_CARGO_RUN}

Mk/Uses/cmake.mk

@@ -50,7 +50,7 @@ _INCLUDE_USES_CMAKE_MK=	yes
 
 _valid_ARGS=		insource run noninja testing _internal
 
-_CMAKE_VERSION=		3.27.8
+_CMAKE_VERSION=		3.28.1
 
 # Sanity check
 .  for arg in ${cmake_ARGS}

Mk/Uses/fortran.mk

@@ -29,6 +29,7 @@ F90FLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
 FCFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 		-L${LOCALBASE}/lib/gcc${_GCC_VER}
+CFLAGS_F2018=	-I${LOCALBASE}/include/gcc${_GCC_VER}
 .  else
 IGNORE=		USES=fortran: invalid arguments: ${fortran_ARGS}
 .  endif

Mk/Uses/gem.mk

@@ -23,9 +23,10 @@ IGNORE= Incorrect 'USES+= gem:${gem_ARGS}' usage: argument [${arg}] is not recog
 .include "${USESDIR}/ruby.mk"
 
 PKGNAMEPREFIX?=	rubygem-
-EXTRACT_SUFX=	.gem
-EXTRACT_ONLY=
-DIST_SUBDIR=	rubygem
+GEM_EXT=	.gem
+# needs to be disabled that rust cargo directories are correctly extracted
+#EXTRACT_ONLY=
+GEM_DIST_SUBDIR?=	rubygem
 
 BUILD_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 EXTRACT_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
@@ -63,15 +64,16 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
 		GEM_DOC_DIR="${GEM_DOC_DIR}" \
 		GEM_SPEC="${GEM_SPEC}" \
 		GEM_CACHE="${GEM_CACHE}" \
-		EXTRACT_SUFX="${EXTRACT_SUFX}"
+		GEM_EXT="${GEM_EXT}"
 
 RUBYGEMBIN=	${LOCALBASE}/bin/gem
 
 .  if defined(DISTFILES)
-GEMFILES=	${DISTFILES:C/:[^:]+$//}
+GEMFILES?=	${DISTFILES:C/:[^:]+$//}
 .  else
-GEMFILES=	${DISTNAME}${EXTRACT_SUFX}
+GEMFILES?=	${DISTNAME}${GEM_EXT}
 .  endif
+DISTFILES+=	${GEM_DIST_SUBDIR}/${GEMFILES}
 
 RUBYGEM_ARGS=-l --no-update-sources --install-dir ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} --ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin
 
@@ -81,17 +83,16 @@ RUBYGEM_ARGS+=	--document rdoc,ri
 RUBYGEM_ARGS+=	--no-document
 .  endif
 
-.  if !target(do-extract)
-do-extract:
-	@${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES}
-	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \
+_USES_extract+=		590:gem-extract
+gem-extract:
+	@${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${GEM_DIST_SUBDIR}/${GEMFILES}
+	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${GEM_DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \
 		if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
 			${ECHO_MSG} "===> Extraction failed unexpectedly."; \
 			(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \
 			fi; \
 		${FALSE}; \
 		fi)
-.  endif
 
 .  if !target(do-build)
 do-build:

Mk/Uses/ghostscript.mk

@@ -4,12 +4,12 @@
 # Usage:	USES=ghostscript or USES=ghostscript:args
 # Valid ARGS:	<version>, build, lib, run, test, x11
 #
-# version 	The chooseable versions are 9, agpl and 10. If no version is
-#		specified version 10 is selected. 9 and agpl are synonymous.
+# version 	The chooseable versions are 10 only. If no version is
+#		specified version 10 is selected.
 #
 #		USES=ghostscript:10	    # Use Ghostscript 10
 #		USES=ghostscript:run	# Use to set default Ghostscript as a run dependency
-#		USES=ghostscript:9,build # Use Ghostscript 9 as a build dependency.
+#		USES=ghostscript:10,build # Use Ghostscript 10 as a build dependency.
 #
 # build		Ghostscript is used as BUILD_DEPENDS
 # lib		Ghostscript is used as LIB_DEPENDS
@@ -29,15 +29,15 @@ _INCLUDE_USES_GHOSTSCRIPT_MK=	yes
 # allowed versions
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-_GS_VERSION=	9 agpl 10
+_GS_VERSION=	10
 
 _GS_ARGS=	${ghostscript_ARGS}
 
-.  if ${_GS_ARGS:N9:N10:Nagpl:Nbuild:Nlib:Nrun:Ntest:Nx11}
+.  if ${_GS_ARGS:N10:Nbuild:Nlib:Nrun:Ntest:Nx11}
 IGNORE?=	Unknown ghostscript argument ${_GS_ARGS}
 .  endif
 
-.  if ${GHOSTSCRIPT_DEFAULT:N9:Nagpl:N10}
+.  if ${GHOSTSCRIPT_DEFAULT:N10}
 IGNORE?=	Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
 .  endif
 
@@ -72,48 +72,25 @@ _GS_RUN_DEP=	yes
 _V=${V}
 .    if ${_V:M10}
 _GS_SELECTED?=		10
-.    elif ${_V:M9}
-_GS_SELECTED?=		9-agpl
-.    elif ${_V:Magpl}
-_GS_SELECTED?=		9-agpl
 .    endif
 .  endfor
 
-.  undef _GS_STATIC
-.  if empty(_GS_SELECTED:M9-agpl)
-_GS_STATIC=	yes
-.  endif
-
-# Resolve minor version number for X11.so library.
 .  if !empty(_GS_SELECTED:M10)
-_GS_VERSION_MINOR=	10.02.0
-.  elif !empty(_GS_SELECTED:M9-agpl)
-_GS_VERSION_MINOR=	9.56.1
+_GS_FULL_VERSION=	10.02.0
 .  endif
 
 # dependencies
 _GS_LIB=	libgs.so
-_GS_PKGNAME=	ghostscript${_GS_SELECTED}${_GS_STATIC:?:-base}
-_GS_X11_PKGNAME=ghostscript${_GS_SELECTED}${_GS_STATIC:?:-x11}
-_GS_PORT=	print/ghostscript${_GS_SELECTED}${_GS_STATIC:?:-base}
-_GS_X11_PORT=	print/ghostscript${_GS_SELECTED}${_GS_STATIC:?:-x11}
+_GS_PKGNAME=	ghostscript${_GS_SELECTED}
+_GS_PORT=	print/ghostscript${_GS_SELECTED}
 
 .  for type in BUILD LIB RUN TEST
 .    if defined(_GS_${type}_DEP)
-.      if !defined(_GS_STATIC) || !${_GS_ARGS:Mx11}
 .        if ${type:MLIB}
 ${type}_DEPENDS+=	${_GS_LIB}:${_GS_PORT}
 .        else
-${type}_DEPENDS+=	${_GS_PKGNAME}>=${_GS_VERSION_MINOR}:${_GS_PORT}
-.        endif
-.      endif
-.      if ${_GS_ARGS:Mx11}
-.        if ${type:MLIB}
-${type}_DEPENDS+=	${_GS_LIB}:${_GS_X11_PORT}
-.        else
-${type}_DEPENDS+=	${_GS_X11_PKGNAME}>=${_GS_VERSION_MINOR}:${_GS_X11_PORT}
+${type}_DEPENDS+=	${_GS_PKGNAME}>=${_GS_FULL_VERSION}:${_GS_PORT}
 .        endif
-.      endif
 .    endif
 .  endfor
 

Mk/Uses/gnome.mk

@@ -42,6 +42,10 @@
 #				add the following to your Makefile:
 #				"GLIB_SCHEMAS=foo.gschema.xml bar.gschema.xml".
 #
+# INSTALLS_OMF		- If set, bsd.gnome.mk will automatically scan pkg-plist
+#				file and add apropriate @postexec/@postunexec directives for
+#				each .omf file found to track OMF registration database.
+#
 # MAINTAINER: [email protected]
 
 .if !defined(_INCLUDE_USES_GNOME_MK)
@@ -423,5 +427,16 @@ gnome-post-gconf-schemas:
 PLIST_FILES+=	${GLIB_SCHEMAS:C,^,share/glib-2.0/schemas/,}
 .  endif
 
+.  if defined(INSTALLS_OMF)
+_USES_install+=	690:gnome-post-omf
+gnome-post-omf:
+	@for i in `${GREP} "\.omf$$" ${TMPPLIST}`; do \
+		${ECHO_CMD} "@postexec scrollkeeper-install -q %D/$${i} 2>/dev/null || /usr/bin/true" \
+			>> ${TMPPLIST}; \
+		${ECHO_CMD} "@postunexec scrollkeeper-uninstall -q %D/$${i} 2>/dev/null || /usr/bin/true" \
+			>> ${TMPPLIST}; \
+	done
+.  endif
+
 .endif
 # End of use part.