Merge branch 'main' into devel

GIDs

@@ -768,7 +768,7 @@ dotlrn:*:821:
 selenium:*:824:
 polw:*:825:
 statsd:*:826:
-# free: 827
+_tuptime:*:827:
 # free: 828
 # free: 829
 # free: 830

MOVED

@@ -7775,7 +7775,6 @@ devel/py-experimental.cssselect||2015-11-15|The only consumer of this port switc
 databases/mariadb-client||2015-11-18|Vulnerable, no updates expected, use mariadb55 or mariadb100 instead
 databases/mariadb-server||2015-11-18|Vulnerable, no updates expected, use mariadb55 or mariadb100 instead
 databases/mariadb-scripts||2015-11-18|Vulnerable, no updates expected, use mariadb55 or mariadb100 instead
-devel/py-asn1|devel/py-pyasn1|2015-11-18|Renamed to match upstream naming
 devel/py-pytz3|devel/py3-pytz|2015-11-19|Port Renamed
 devel/ocaml-typeconv|devel/ocaml-type_conv|2015-11-20|Renamed to match upstream naming
 www/py3-aiohttp|www/py-aiohttp|2015-11-21|Duplicate port
@@ -17894,3 +17893,4 @@ www/horde-base||2023-03-31|Has expired: Requires php74
 multimedia/transcode||2023-03-31|Has expired: abandoned by upstream and does not build
 security/teleport5|security/teleport|2023-03-31|More recent version than expired teleport port
 www/anyterm||2023-04-01|Has expired: upstream is dead
+audio/mousai-devel|audio/mousai|2023-04-06|Updated to the latest stable version

Mk/Uses/cargo.mk

@@ -203,7 +203,7 @@ CARGO_INSTALL_ARGS+=	--debug
 .  endif
 
 .  if ${_CARGO_CRATES:Mcmake}
-BUILD_DEPENDS+=	cmake:devel/cmake
+BUILD_DEPENDS+=	cmake:devel/cmake-core
 .  endif
 
 .  if ${_CARGO_CRATES:Mgettext-sys}
@@ -249,6 +249,11 @@ CARGO_ENV+=	OPENSSL_LIB_DIR=${OPENSSLLIB} \
 .include "${USESDIR}/pkgconfig.mk"
 .  endif
 
+.  if ${_CARGO_CRATES:Mzstd-sys}
+# Use the system's zstd instead of building the bundled version
+CARGO_ENV+=	ZSTD_SYS_USE_PKG_CONFIG=1
+.  endif
+
 .  for _index _crate _name _version in ${_CARGO_CRATES}
 # Split up semantic version and try to sanitize it by removing
 # pre-release identifier (-) or build metadata (+)

Mk/Uses/python.mk

@@ -153,7 +153,7 @@
 #			  default: <empty>
 #
 # PEP517_INSTALL_CMD	- Command sequence for a PEP-517 install frontend that installs a wheel.
-#			  default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --no-compile-bytecode --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl
+#			  default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl
 #
 # PEP517_INSTALL_DEPEND	- Port needed to execute ${PEP517_INSTALL_CMD}.
 #			  default: ${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR}
@@ -687,7 +687,7 @@ PEP517_BUILD_DEPEND?=	${PYTHON_PKGNAMEPREFIX}gpep517>=0:devel/py-gpep517@${PY_FL
 PEP517_BUILD_CMD?=	${PYTHON_CMD} -m build --no-isolation --wheel ${PEP517_BUILD_CONFIG_SETTING}
 PEP517_BUILD_DEPEND?=	${PYTHON_PKGNAMEPREFIX}build>=0:devel/py-build@${PY_FLAVOR}
 .  endif
-PEP517_INSTALL_CMD?=	${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --no-compile-bytecode --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl
+PEP517_INSTALL_CMD?=	${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl
 PEP517_INSTALL_DEPEND?=	${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR}
 
 # nose support
@@ -920,6 +920,7 @@ do-install:
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../sbin/|sbin/|' \
 		-e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../share/|share/|' \
 		${_PYTHONPKGLIST}
+	@cd ${STAGEDIR}${PREFIX} && ${FIND} lib -name '*.pyc' >> ${_PYTHONPKGLIST}
 .    endif
 .  endif # defined(_PYTHON_FEATURE_PEP517)
 

Mk/bsd.java.mk

@@ -22,7 +22,7 @@ Java_Include_MAINTAINER=	[email protected]
 #
 # JAVA_VERSION		List of space-separated suitable java versions for the
 #					port. An optional "+" allows you to specify a range of
-#					versions. (allowed values: 7[+] 8[+] 11[+] 17[+] 18[+])
+#					versions. (allowed values: 8[+] 11[+] 17[+] 18[+])
 #
 # JAVA_OS			List of space-separated suitable JDK port operating systems
 #					for the port. (allowed values: native linux)
@@ -159,7 +159,7 @@ SUB_LIST+=		JAVA_OS="${JAVA_OS}"
 .    endif
 
 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	7 8 11 17 18
+__JAVA_VERSION_LIST=	8 11 17 18
 _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
 _JAVA_VENDOR_LIST=		openjdk oracle
@@ -265,7 +265,7 @@ JAVA_RUN=	jre
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
 .    if defined(JAVA_VERSION)
-_JAVA_VERSION=	${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18/}
+_JAVA_VERSION=	${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18/}
 .    else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .    endif

UIDs

@@ -773,7 +773,7 @@ titus-keys:*:823:65533::0:0:Titus Keyserver User:/nonexistent:/usr/sbin/nologin
 selenium:*:824:824::0:0:Selenium Daemon User:/usr/local/selenium:/bin/sh
 polw:*:825:825::0:0:Policyd-weight Cache Owner:/nonexistent:/sbin/nologin
 statsd:*:826:826::0:0:Statsd Daemon:/nonexistent:/sbin/nologin
-# free: 827
+_tuptime:*:827:827::0:0:Tuptime:/var/lib/tuptime:/usr/sbin/nologin
 # free: 828
 # free: 829
 # free: 830

archivers/Makefile

@@ -142,6 +142,7 @@
     SUBDIR += paq
     SUBDIR += par
     SUBDIR += par2cmdline
+    SUBDIR += par2cmdline-turbo
     SUBDIR += parchive
     SUBDIR += pbzip2
     SUBDIR += pear-File_Archive
@@ -184,6 +185,7 @@
     SUBDIR += py-bup
     SUBDIR += py-bz2file
     SUBDIR += py-compressed-rtf
+    SUBDIR += py-cramjam
     SUBDIR += py-libarchive-c
     SUBDIR += py-lz4
     SUBDIR += py-lzma
@@ -195,6 +197,7 @@
     SUBDIR += py-rarfile
     SUBDIR += py-rcssmin
     SUBDIR += py-rjsmin
+    SUBDIR += py-sozipfile
     SUBDIR += py-warctools
     SUBDIR += py-xopen
     SUBDIR += py-zopfli

archivers/maxcso/Makefile

@@ -1,27 +1,30 @@
-PORTNAME=		maxcso
+PORTNAME=	maxcso
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.10.0
-PORTREVISION=	2
-CATEGORIES=		archivers
+DISTVERSION=	1.13.0-27
+DISTVERSIONSUFFIX=	-g528c69bf
+CATEGORIES=	archivers
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Fast ISO to CSO compressor for PSP and PS2 emulators
 WWW=		https://github.com/unknownbrackets/maxcso
 
 LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-LIB_DEPENDS=	libuv.so:devel/libuv \
+LIB_DEPENDS=	libdeflate.so:archivers/libdeflate \
 		liblz4.so:archivers/liblz4 \
+		libuv.so:devel/libuv \
 		libzopfli.so:archivers/zopfli
 
-USES=		gmake pkgconfig compiler:c++11-lang
-
+USES=		compiler:c++11-lang gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	unknownbrackets
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} \
+		share/man/man1/${PORTNAME}.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>

archivers/maxcso/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1541531490
-SHA256 (unknownbrackets-maxcso-v1.10.0_GH0.tar.gz) = 8fc56ab96536c0b12f890b34a83b4c4a5c1013756f8664037313132b7c2515eb
-SIZE (unknownbrackets-maxcso-v1.10.0_GH0.tar.gz) = 3170809
+TIMESTAMP = 1680728618
+SHA256 (unknownbrackets-maxcso-v1.13.0-27-g528c69bf_GH0.tar.gz) = 5b09c933adc5e5bae54fdf85305e2b58841dc3ad33f095d4ff422491cd4a3fa0
+SIZE (unknownbrackets-maxcso-v1.13.0-27-g528c69bf_GH0.tar.gz) = 3738129

archivers/maxcso/files/patch-Makefile

@@ -1,23 +1,13 @@
---- Makefile.orig	2018-11-08 20:43:35 UTC
+--- Makefile.orig	2023-02-12 18:33:37 UTC
 +++ Makefile
-@@ -5,6 +5,9 @@ CFLAGS += -W -Wall -Wextra -O2 -Wno-implicit-function-
- CXXFLAGS += -W -Wall -Wextra -std=c++11 -O2 -Izopfli/src -I7zip -DNDEBUG=1 \
- 	-Wno-unused-parameter -pthread
+@@ -68,8 +68,8 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c $(OBJDIR)/.done
+ 	$(CC) -c $(SRC_CFLAGS) $(CFLAGS) -o $@ $<
 
-+CFLAGS += $(shell pkg-config --cflags libuv liblz4)
-+CXXFLAGS += $(shell pkg-config --cflags libuv liblz4)
-+
- SRC_CXX_SRC = $(wildcard src/*.cpp)
- SRC_CXX_OBJ = $(SRC_CXX_SRC:.cpp=.o)
- CLI_CXX_SRC = $(wildcard cli/*.cpp)
-@@ -23,8 +26,8 @@ ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o)
- %.o: %.c
- 	$(CC) -c $(CFLAGS) -o $@ $<
+ # TODO: Perhaps detect and use system libdeflate if available.
+-maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) $(SRC_7ZIP) $(SRC_LIBDEFLATE)
+-	$(CXX) $(LDFLAGS) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ $(LIBS) $(EXTRA_LIBS)
++maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(SRC_7ZIP)
++	$(CXX) $(LDFLAGS) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ $(LIBS) $(EXTRA_LIBS) -lzopfli -ldeflate
 
--maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a
--	$(CXX) -o $@ $(CXXFLAGS) $^ -luv -llz4 -lz
-+maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) 7zip/7zip.a
-+	$(CXX) -o $@ $(CXXFLAGS) $^ $(shell pkg-config --libs libuv liblz4) -lzopfli -lz
-
- 7zip/7zip.a:
- 	$(MAKE) -C 7zip 7zip.a
+ $(SRC_7ZIP):
+ 	$(MAKE) -f $(SRCDIR)/7zip/Makefile 7zip.a

archivers/par2cmdline-turbo/Makefile

@@ -0,0 +1,36 @@
+PORTNAME=	par2cmdline-turbo
+PORTVERSION=	0.9.0
+DISTVERSIONPREFIX=	v
+CATEGORIES=	archivers
+
+MAINTAINER=	[email protected]
+COMMENT=	Tools for using Parity v2 Archive files using ParPar backend
+WWW=		https://github.com/animetosho/par2cmdline-turbo
+
+LICENSE=	GPLv2
+
+ONLY_FOR_ARCHS=	amd64
+ONLY_FOR_ARCHS_REASON=	untested on other archs
+
+USES=		autoreconf compiler:c++11-lang
+GNU_CONFIGURE=	yes
+LDFLAGS+=	-lpthread
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	animetosho
+
+PORTDOCS=	README.md
+CONFLICTS=	par2cmdline
+
+PLIST_FILES=	bin/par2 bin/par2create bin/par2repair bin/par2verify \
+	man/man1/par2.1.gz
+
+OPTIONS_DEFINE=	DOCS
+
+TEST_TARGET=	check
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
+		${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>

archivers/par2cmdline-turbo/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1680203173
+SHA256 (animetosho-par2cmdline-turbo-v0.9.0_GH0.tar.gz) = 95817b4d944e2ae01d045c5b569d04ff591fc7992e97ca9a13657d094642917a
+SIZE (animetosho-par2cmdline-turbo-v0.9.0_GH0.tar.gz) = 3838037

archivers/par2cmdline-turbo/files/patch-parpar-gf16-threadqueue.h

@@ -0,0 +1,11 @@
+--- parpar/gf16/threadqueue.h.orig	2023-03-22 08:33:16 UTC
++++ parpar/gf16/threadqueue.h
+@@ -252,7 +252,7 @@ class MessageThread {
+ 		pthread_t self = pthread_self();
+ 		if(!pthread_getschedparam(self, &policy, &param)) {
+ 			if(policy == SCHED_OTHER) {
+-				#ifdef __MACH__
++				#if defined(__MACH__) || defined(__FreeBSD__)
+ 				// MacOS doesn't support SCHED_BATCH, but does seem to permit priorities on SCHED_OTHER
+ 				int min = sched_get_priority_min(policy);
+ 				if(min < param.sched_priority) {

archivers/par2cmdline-turbo/pkg-descr

@@ -0,0 +1,5 @@
+Parity v2 Archive create/verify/recover using ParPar backend
+
+This is a simple fork of par2cmdline which replaces core computation routines
+with ParPar's processing backend, improving par2cmdline's performance on
+x86/ARM platforms.

archivers/par2cmdline/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	par2cmdline
 PORTVERSION=	0.8.1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers
 
@@ -16,7 +17,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Parchive
 
 PORTDOCS=	README
-CONFLICTS=	par2cmdline-tbb
+CONFLICTS=	par2cmdline-turbo
 
 PLIST_FILES=	bin/par2 bin/par2create bin/par2repair bin/par2verify man/man1/par2.1.gz
 

archivers/py-cramjam/Makefile

@@ -0,0 +1,26 @@
+PORTNAME=	cramjam
+PORTVERSION=	2.6.2
+CATEGORIES=	archivers python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	[email protected]
+COMMENT=	Thin Python bindings to de/compression algorithms in Rust
+WWW=		https://github.com/milesgranger/pyrus-cramjam
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}maturin>=0.13<0.14:devel/py-maturin@${PY_FLAVOR}
+
+USES=		cargo python:3.7+
+USE_PYTHON=	autoplist concurrent pep517
+
+CARGO_BUILD=	no
+CARGO_INSTALL=	no
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
+
+.include <bsd.port.mk>

archivers/py-cramjam/Makefile.crates

@@ -0,0 +1,62 @@
+CARGO_CRATES=	adler-1.0.2 \
+		ahash-0.7.6 \
+		alloc-no-stdlib-2.0.4 \
+		alloc-stdlib-0.2.2 \
+		autocfg-1.1.0 \
+		bitflags-1.3.2 \
+		brotli-3.3.4 \
+		brotli-decompressor-2.3.2 \
+		bzip2-0.4.3 \
+		bzip2-sys-0.1.11+1.0.8 \
+		cc-1.0.73 \
+		cfg-if-1.0.0 \
+		crc32fast-1.3.2 \
+		flate2-1.0.23 \
+		getrandom-0.2.8 \
+		indoc-1.0.6 \
+		jobserver-0.1.24 \
+		libc-0.2.126 \
+		libmimalloc-sys-0.1.25 \
+		lock_api-0.4.7 \
+		lz4-1.23.3 \
+		lz4-sys-1.9.4 \
+		matrixmultiply-0.3.2 \
+		memoffset-0.6.5 \
+		mimalloc-0.1.29 \
+		miniz_oxide-0.5.1 \
+		ndarray-0.15.4 \
+		num-complex-0.4.1 \
+		num-integer-0.1.45 \
+		num-traits-0.2.15 \
+		numpy-0.17.2 \
+		once_cell-1.10.0 \
+		parking_lot-0.12.0 \
+		parking_lot_core-0.9.3 \
+		pkg-config-0.3.25 \
+		proc-macro2-1.0.39 \
+		pyo3-0.17.3 \
+		pyo3-build-config-0.17.3 \
+		pyo3-ffi-0.17.3 \
+		pyo3-macros-0.17.3 \
+		pyo3-macros-backend-0.17.3 \
+		quote-1.0.18 \
+		rawpointer-0.2.1 \
+		redox_syscall-0.2.13 \
+		scopeguard-1.1.0 \
+		smallvec-1.8.0 \
+		snap-1.0.5 \
+		syn-1.0.95 \
+		target-lexicon-0.12.3 \
+		unicode-ident-1.0.0 \
+		unindent-0.1.9 \
+		version_check-0.9.4 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.36.1 \
+		zstd-0.11.2+zstd.1.5.2 \
+		zstd-safe-5.0.2+zstd.1.5.2 \
+		zstd-sys-2.0.1+zstd.1.5.2