Framework: sync with upstream

Taken from: FreeBSD

MOVED

@@ -17786,3 +17786,5 @@ databases/postgresql10-plpython||2023-03-07|Has expired: PostgreSQL 10 has reach
 databases/postgresql10-pltcl||2023-03-07|Has expired: PostgreSQL 10 has reached end-of-life
 databases/postgresql10-server||2023-03-07|Has expired: PostgreSQL 10 has reached end-of-life
 audio/ximp3||2023-03-09|Has expired: Abandonware and obsolete, uses old decoder library and no ID3v2 support
+devel/libpthread-stubs||2023-03-12|No consumers left and never supported pthread stubs in libc on FreeBSD
+multimedia/mkvtoolnix-nox11|multimedia/mkvtoolnix@nogui|2023-03-13|Converted to flavor

Mk/Uses/cabal.mk

@@ -31,6 +31,10 @@
 #			out possible values for this variable.
 #					default: ${PORTNAME}
 #
+#  HACKAGE_DISTNAME	Use this knob if PORTNAME or PORTVERSION doesn't match
+#			with package name and version on Hackage.
+#					default: ${PORTNAME}-${PORTVERSION}
+#
 #  opt_USE_CABAL	Variant of USE_CABAL to be used with options framework.
 #  opt_CABAL_FLAGS	Variant of CABAL_FLAGS to be used with options framework.
 #			Note that it works a bit differently from CABAL_FLAGS:
@@ -84,6 +88,7 @@ CABAL_EXECUTABLES?=	${PORTNAME}
 CABAL_CMD?=	cabal
 CABAL_PORT=	devel/hs-cabal-install
 CABAL_HOME=	${WRKDIR}/cabal-home
+CABAL_HOME_ENV=XDG_DATA_HOME=${CABAL_HOME} XDG_CONFIG_HOME=${CABAL_HOME} XDG_CACHE_HOME=${CABAL_HOME} HOME=${CABAL_HOME}
 CABAL_LIBEXEC=	libexec/cabal
 CABAL_EXTRACT_SUFX=	.tar.gz
 CABAL_ARCH=	${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/powerpc64/ppc64/}
@@ -123,13 +128,20 @@ _hackage_is_default=	yes
 _hackage_is_default=	no
 .  endif
 
-MASTER_SITES+=	https://hackage.haskell.org/package/${_hackage_group} \
-		http://hackage.haskell.org/package/${_hackage_group}
+.  if defined(HACKAGE_DISTNAME) && ${_hackage_is_default} == no
+IGNORE=		HACKAGE_DISTNAME is set, but it makes no sense if the default MASTER_SITES isn't HACKAGE
+.  endif
+
+MASTER_SITES+=		HACKAGE/${_hackage_group}
+.  if defined(HACKAGE_DISTNAME)
+WRKSRC?=		${WRKDIR}/${HACKAGE_DISTNAME}
+.  endif
+HACKAGE_DISTNAME?=	${PORTNAME}-${PORTVERSION}
 
 .  if ${_hackage_is_default} == yes
-DISTFILES+=	${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX}
+DISTFILES+=	${HACKAGE_DISTNAME}/${HACKAGE_DISTNAME}${CABAL_EXTRACT_SUFX}
 .    ifdef CABAL_REVISION
-DISTFILES+=	${PORTNAME}-${PORTVERSION}/revision/${CABAL_REVISION}.cabal
+DISTFILES+=	${HACKAGE_DISTNAME}/revision/${CABAL_REVISION}.cabal
 .    endif
 .  else
 _hackage_group=	:cabal_mk_hackage
@@ -187,25 +199,25 @@ cabal-extract: check-cabal
 .  if ${_hackage_is_default} == no
 	@${ECHO_MSG} "===> Recursing down to make extract"
 	@${MAKE} -C ${.CURDIR} extract SKIP_CABAL_EXTRACT=yes USE_CABAL=
-	${RM} -rf ${CABAL_HOME}
+	${RM} -r ${CABAL_HOME}
 .  endif
 	@${ECHO_MSG} "===> Fetching Hackage index into ${CABAL_HOME}/.cabal"
-	@${SETENV} HOME=${CABAL_HOME} ${CABAL_CMD} update
+	${SETENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update
 .  if ${_hackage_is_default} == yes
-	@cd ${WRKDIR} && \
-		${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} get ${PORTNAME}-${PORTVERSION}
+	cd ${WRKDIR} && \
+		${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} get ${HACKAGE_DISTNAME}
 .  else
 .    if ${cabal_ARGS:Mhpack}
 	@${ECHO_MSG} "===> Running ${HPACK_CMD} to generate .cabal file"
-	@cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} ${HPACK_CMD}
+	cd ${WRKSRC} && ${SETENV} ${CABAL_HOME_ENV} ${HPACK_CMD}
 .    endif
 .  endif
 # Remove Haskell dependencies that come from GH_TUPLE
 	@${RM} -r ${WRKSRC}/dist-newstyle
 .  ifdef CABAL_REPOSITORIES
 	@${ECHO_MSG} "===> Fetching additional Cabal repositories index into ${CABAL_HOME}/.cabal"
 	@cd ${WRKSRC} && \
-		${SETENV} HOME=${CABAL_HOME} ${CABAL_CMD} update
+		${SETENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update
 .  endif
 # Create a cookie for cabal-post-patch
 	@${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE}
@@ -215,12 +227,12 @@ cabal-extract: check-cabal
 # This pulls in all source dependencies, resolves them and generates build plan
 cabal-configure: check-cabal
 	cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --dry-run --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} ${BUILD_TARGET}
+		${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --dry-run --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} ${BUILD_TARGET}
 
 # Calls cabal build on the Haskell package located in ${WRKSRC}
 cabal-build: check-cabal
 	cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} ${BUILD_TARGET}
+		${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} ${BUILD_TARGET}
 
 # Generates USE_CABAL= ... line ready to be pasted into the port based on the plan.json file generated by cabal configure.
 make-use-cabal: check-cabal2tuple
@@ -257,7 +269,7 @@ cabal-post-extract:
 .    endif
 # Copy revised .cabal file if present
 .    if defined(CABAL_REVISION) && ${_hackage_is_default} == yes
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${PORTVERSION}/revision/${CABAL_REVISION}.cabal `find ${WRKSRC} -name '*.cabal' -depth 1`
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HACKAGE_DISTNAME}/revision/${CABAL_REVISION}.cabal `find ${WRKSRC} -name '*.cabal' -depth 1`
 .    endif
 
 # Move extracted dependencies into ${CABAL_DEPSDIR} directory
@@ -300,13 +312,13 @@ cabal-post-patch:
 cabal-pre-configure:
 # Generate .cabal file with hpack if requested
 .  if ${cabal_ARGS:Mhpack}
-	cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} hpack
+	cd ${WRKSRC} && ${SETENV} ${CABAL_HOME_ENV} hpack
 .  endif
 
 .  if !target(do-build)
 do-build:
 	cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET}
+		${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET}
 .  endif
 
 .  if !target(do-install)

Mk/Uses/meson.mk

@@ -24,7 +24,7 @@ _INCLUDE_USES_MESON_MK=	yes
 IGNORE=	Incorrect 'USES+= meson:${meson_ARGS}'. meson takes no arguments
 .  endif
 
-BUILD_DEPENDS+=		meson>=0.57.1_1:devel/meson
+BUILD_DEPENDS+=		meson:devel/meson
 
 # meson uses ninja
 .include "${USESDIR}/ninja.mk"

Mk/bsd.sites.mk

@@ -624,6 +624,12 @@ MASTER_SITE_GNU_ALPHA+= \
 	https://alpha-gnu-org.ip-connect.vn.ua/%SUBDIR%/
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_HACKAGE)
+MASTER_SITE_HACKAGE+= \
+	https://hackage.haskell.org/package/ \
+	http://hackage.haskell.org/package/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_HORDE)
 MASTER_SITE_HORDE+= \
 	https://ftp.horde.org/pub/%SUBDIR%/ \

UPDATING

@@ -5,6 +5,68 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20230313:
+  AFFECTS: users of databases/sqlite3
+  AUTHOR: [email protected]
+
+  Due to various ports not being prepared for this change (see 20230227
+  entry), the DQS option of databases/sqlite3 has been reenabled as a
+  stop gap measure.  It is scheduled to be disabled again for good no
+  earlier than 20240101, giving downstream software authors more time
+  to fix their queries.
+
+  See also: https://sqlite.org/quirks.html#dblquote
+
+20230311:
+  AFFECTS: users of net/dshell
+  AUTHOR: [email protected]
+
+  net/dshell now depends on net/py-pcapy-ng instead of net/py-pcapy.
+  Because net/py-pcapy-ng conflicts with net/py-pcapy, please uninstall
+  py39-pcapy with the following command before upgrading:
+  # pkg delete -f py39-pcapy
+
+20230310:
+  AFFECTS: users of net-mgmt/unifi7
+  AUTHOR: [email protected]
+
+  The mongodb dependency has been changed from 36 to 44, as MongoDB 3.6
+  is long out out support and end of life.
+
+  The upgrade path should be as following:
+
+  1. Take a backup from within the unifi7 application PRIOR to
+     updating!
+
+  2. Stop the unifi7 service (if running)
+
+  3. Copy the "backup" directory from LOCALBASE/share/java/unifi/data
+     to a safe location. Also copy keystore and system.properties if
+     you have made any modifications to those files
+
+  4. Remove files and directories under LOCALBASE/share/java/unifi/data
+
+  5. Upgrade the package
+
+  6. Copy the "backup" directory from a safe location back to
+     LOCALBASE/share/java/unifi/data
+
+  7. Start the service
+
+  8. Restore the configuration from backup
+
+  As an optional step, review system.properties and keystore to merge any
+  manual modifications you have made (this has to be done with the application
+  stopped)
+
+20230310:
+  AFFECTS: user of benchmarks/ddosify
+  AUTHOR: [email protected]
+
+  keep-alive is removed from config file. In default mode, the engine will use
+  keep-alive for all requests. If you want to disable keep-alive for a step, you
+  can add Connection: close header to the step.
+
 20230306:
   AFFECTS: users of www/qt5-webengine
   AUTHOR: [email protected]