*/*: sync with upstream

Taken from: FreeBSD

accessibility/wlsunset/distinfo

@@ -1,5 +1,5 @@
 TIMESTAMP = 1619384190
 SHA256 (wlsunset-0.2.0.tar.gz) = 88bce695722a09d79545f14d404cc0659f7176bb08d5db5f4f23228b6ba8bb03
 SIZE (wlsunset-0.2.0.tar.gz) = 12605
-SHA256 (601dfc87ff6e.patch) = 2d058d5badc307a89a909b73e8bd7cf454549f6c88c805f23b409aa9c4ec40b4
+SHA256 (601dfc87ff6e.patch) = 6c484b40dd584a42a6d12bece902d9da5f6187ba0305a66e280a5cb0f015a7b8
 SIZE (601dfc87ff6e.patch) = 1289

archivers/Makefile

@@ -185,6 +185,7 @@
     SUBDIR += py-lzstring
     SUBDIR += py-python-lhafile
     SUBDIR += py-python-lzo
+    SUBDIR += py-python-rpm-packaging
     SUBDIR += py-python-snappy
     SUBDIR += py-rarfile
     SUBDIR += py-rcssmin
@@ -221,6 +222,7 @@
     SUBDIR += snzip
     SUBDIR += squsq
     SUBDIR += star
+    SUBDIR += stormlib
     SUBDIR += streamvbyte
     SUBDIR += stuffit
     SUBDIR += szip

archivers/kf5-karchive/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1641054145
-SHA256 (KDE/frameworks/5.90.0/karchive-5.90.0.tar.xz) = a6e2f3a7cb1aef7db7b4f7dfb9ffb1d929d0d5b147c25a93fbc0b794dfcd2110
-SIZE (KDE/frameworks/5.90.0/karchive-5.90.0.tar.xz) = 986272
+TIMESTAMP = 1644208945
+SHA256 (KDE/frameworks/5.91.0/karchive-5.91.0.tar.xz) = a3602cbed2aaf4d446ff7af78b626042aa6fbce1df60eb2b8332b5f6ff214cce
+SIZE (KDE/frameworks/5.91.0/karchive-5.91.0.tar.xz) = 986296

archivers/kf5-karchive/pkg-plist

@@ -15,6 +15,7 @@ include/KF5/KArchive/k7zip.h
 include/KF5/KArchive/kar.h
 include/KF5/KArchive/karchive.h
 include/KF5/KArchive/karchive_export.h
+include/KF5/KArchive/karchive_version.h
 include/KF5/KArchive/karchivedirectory.h
 include/KF5/KArchive/karchiveentry.h
 include/KF5/KArchive/karchivefile.h
@@ -25,7 +26,6 @@ include/KF5/KArchive/krcc.h
 include/KF5/KArchive/ktar.h
 include/KF5/KArchive/kzip.h
 include/KF5/KArchive/kzipfileentry.h
-include/KF5/karchive_version.h
 lib/cmake/KF5Archive/KF5ArchiveConfig.cmake
 lib/cmake/KF5Archive/KF5ArchiveConfigVersion.cmake
 lib/cmake/KF5Archive/KF5ArchiveTargets-%%CMAKE_BUILD_TYPE%%.cmake

archivers/libunrar6/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	libunrar6
-PORTVERSION=	6.0.5
+PORTVERSION=	6.0.7
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/
 DISTNAME=	unrarsrc-${PORTVERSION}

archivers/libunrar6/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1618770435
-SHA256 (unrarsrc-6.0.5.tar.gz) = 7e34064c9e97464462c81aed80c25619149f71d4900995021780787f51dd63f0
-SIZE (unrarsrc-6.0.5.tar.gz) = 232702
+TIMESTAMP = 1645632381
+SHA256 (unrarsrc-6.0.7.tar.gz) = a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518
+SIZE (unrarsrc-6.0.7.tar.gz) = 232903

archivers/nfpm/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	nfpm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.12.1
+DISTVERSION=	2.14.0
 CATEGORIES=	archivers
 
 MAINTAINER=	[email protected]

archivers/nfpm/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1644168788
-SHA256 (go/archivers_nfpm/nfpm-v2.12.1/v2.12.1.mod) = 924c3ad3b2c0545bd1208b62d2eb06a82ea2fe5d7ecedc1d07a80f850926eb1a
-SIZE (go/archivers_nfpm/nfpm-v2.12.1/v2.12.1.mod) = 3129
-SHA256 (go/archivers_nfpm/nfpm-v2.12.1/v2.12.1.zip) = 9ca9df82fa36479d5a989ce6a35eebe6c564bad21988e58d2ba2d8a34b37ca88
-SIZE (go/archivers_nfpm/nfpm-v2.12.1/v2.12.1.zip) = 505980
+TIMESTAMP = 1645981881
+SHA256 (go/archivers_nfpm/nfpm-v2.14.0/v2.14.0.mod) = ddc890a03e9de8c5c474d7e6098b53eefd2e81e32765e11c9d77b7e68ac5c854
+SIZE (go/archivers_nfpm/nfpm-v2.14.0/v2.14.0.mod) = 3134
+SHA256 (go/archivers_nfpm/nfpm-v2.14.0/v2.14.0.zip) = 571b47efd2beaefa8dd5426976947a7d61bb129b815b9f0eb84a8db2168f5bdb
+SIZE (go/archivers_nfpm/nfpm-v2.14.0/v2.14.0.zip) = 508431

archivers/py-python-rpm-packaging/Makefile

@@ -0,0 +1,38 @@
+PORTNAME=	python-rpm-packaging
+PORTVERSION=	0.0.20210526
+CATEGORIES=	archivers python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	[email protected]
+COMMENT=	Python rpm packaging
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml-include>0:devel/py-pyyaml-include@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		python shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	rpm-software-management
+GH_PROJECT=	python-rpm-packaging
+GH_TAGNAME=	a18ca48959c95aefa725317084dd2d3e242e4f71
+
+SHEBANG_FILES=	scripts/brp-python-bytecompile scripts/pythondistdeps.py
+NO_BUILD=	yes
+
+PLIST_FILES=	lib/rpm/brp-python-bytecompile \
+		lib/rpm/brp-python-hardlink \
+		lib/rpm/pythondistdeps.py
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/rpm/
+.for l in brp-python-bytecompile brp-python-hardlink pythondistdeps.py
+	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/${l} ${STAGEDIR}${PREFIX}/lib/rpm/
+.endfor
+
+.include <bsd.port.mk>

archivers/py-python-rpm-packaging/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1635496540
+SHA256 (rpm-software-management-python-rpm-packaging-0.0.20210526-a18ca48959c95aefa725317084dd2d3e242e4f71_GH0.tar.gz) = bc39fe7d09ebda56292c825e7ce2cce77491b6ca7a6c674612e18aafe5f1e6f8
+SIZE (rpm-software-management-python-rpm-packaging-0.0.20210526-a18ca48959c95aefa725317084dd2d3e242e4f71_GH0.tar.gz) = 35144

archivers/py-python-rpm-packaging/pkg-descr

@@ -0,0 +1,3 @@
+Python rpm packaging helpers and scripts
+
+WWW: https://github.com/rpm-software-management/python-rpm-packaging

archivers/rpm4/Makefile

@@ -1,10 +1,10 @@
 # Created by: Greg Lewis <[email protected]>
 
 PORTNAME=	rpm
-PORTVERSION=	4.16.1.3
+PORTVERSION=	4.17.0
 PORTREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=	http://ftp.rpm.org/releases/rpm-4.16.x/
+MASTER_SITES=	http://ftp.rpm.org/releases/rpm-4.17.x/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	[email protected]
@@ -22,16 +22,15 @@ RUN_DEPENDS=	bash:shells/bash \
 		gxargs:misc/findutils
 
 USES=		alias bdb sqlite cpe gmake iconv libarchive libtool \
-		lua:52+ pathfix pkgconfig shebangfix tar:bzip2
+		lua:53+ pathfix pkgconfig shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
-SHEBANG_FILES=	scripts/brp-python-bytecompile scripts/check-prereqs \
+SHEBANG_FILES=	scripts/check-prereqs \
 		scripts/check-rpaths-worker scripts/pkgconfigdeps.sh \
 		scripts/fontconfig.prov scripts/perl.prov scripts/perl.req  \
-		scripts/pythondistdeps.py scripts/find-lang.sh scripts/ocamldeps.sh \
-		scripts/find-debuginfo.sh
+		scripts/find-lang.sh scripts/ocamldeps.sh
 CONFIGURE_ARGS=	--enable-sqlite=yes\
 		--with-popt-prefix="${LOCALBASE}" \
 		--sysconfdir=${PREFIX}/etc \
@@ -60,32 +59,27 @@ OPTIONS_DEFINE=	PYTHON PLUGINS NLS DOCS
 OPTIONS_DEFAULT=PYTHON
 OPTIONS_SUB=	yes
 
-PYTHON_CONFIGURE_ENABLE=python
-PYTHON_USES=		python
-
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 NLS_LIBS=		-lintl
 
+PYTHON_RUN_DEPENDS=    ${LOCALBASE}/lib/rpm/pythondistdeps.py:archivers/py-python-rpm-packaging
+
 PLUGINS_CONFIGURE_ENABLE=plugins
 PLUGINS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \
 		${WRKSRC}/system.h
-	@${REINPLACE_CMD} -e 's/\<xargs\>/gxargs/g' ${WRKSRC}/scripts/brp-python-bytecompile \
+	@${REINPLACE_CMD} -e 's/\<xargs\>/gxargs/g' \
 		${WRKSRC}/scripts/brp-strip-static-archive \
 		${WRKSRC}/scripts/check-buildroot \
 		${WRKSRC}/scripts/check-rpaths \
-		${WRKSRC}/scripts/find-debuginfo.sh \
 		${WRKSRC}/scripts/vpkg-provides.sh
 
-post-install-PYTHON-off:
-	@${RM} ${STAGEDIR}${PREFIX}/lib/rpm/pythondistdeps.py
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

archivers/rpm4/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1619221631
-SHA256 (rpm-4.16.1.3.tar.bz2) = 513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d
-SIZE (rpm-4.16.1.3.tar.bz2) = 4354652
+TIMESTAMP = 1635434706
+SHA256 (rpm-4.17.0.tar.bz2) = 2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a
+SIZE (rpm-4.17.0.tar.bz2) = 4514138

archivers/rpm4/pkg-plist

@@ -10,6 +10,7 @@ bin/rpmquery
 bin/rpmsign
 bin/rpmspec
 bin/rpmverify
+%%PLUGINS%%etc/dbus-1/system.d/org.rpm.conf
 include/rpm/argv.h
 include/rpm/header.h
 include/rpm/rpmarchive.h
@@ -48,26 +49,25 @@ include/rpm/rpmutil.h
 include/rpm/rpmver.h
 lib/librpm.so
 lib/librpm.so.9
-lib/librpm.so.9.1.3
+lib/librpm.so.9.2.0
 lib/librpmbuild.so
 lib/librpmbuild.so.9
-lib/librpmbuild.so.9.1.3
+lib/librpmbuild.so.9.2.0
 lib/librpmio.so
 lib/librpmio.so.9
-lib/librpmio.so.9.1.3
+lib/librpmio.so.9.2.0
 lib/librpmsign.so
 lib/librpmsign.so.9
-lib/librpmsign.so.9.1.3
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
+lib/librpmsign.so.9.2.0
+%%PLUGINS%%lib/rpm-plugins/dbus_announce.so
+%%PLUGINS%%lib/rpm-plugins/prioreset.so
+%%PLUGINS%%lib/rpm-plugins/syslog.so
+%%PLUGINS%%lib/rpm-plugins/systemd_inhibit.so
+lib/rpm/brp-elfperms
 lib/rpm/brp-compress
-lib/rpm/brp-java-gcjcompile
-lib/rpm/brp-python-bytecompile
-lib/rpm/brp-python-hardlink
+lib/rpm/brp-remove-la-files
 lib/rpm/brp-strip
 lib/rpm/brp-strip-comment-note
-lib/rpm/brp-strip-shared
 lib/rpm/brp-strip-static-archive
 lib/rpm/check-buildroot
 lib/rpm/check-files
@@ -78,20 +78,16 @@ lib/rpm/fileattrs/debuginfo.attr
 lib/rpm/fileattrs/desktop.attr
 lib/rpm/fileattrs/elf.attr
 lib/rpm/fileattrs/font.attr
-lib/rpm/fileattrs/libtool.attr
 lib/rpm/fileattrs/metainfo.attr
 lib/rpm/fileattrs/ocaml.attr
 lib/rpm/fileattrs/perl.attr
 lib/rpm/fileattrs/perllib.attr
 lib/rpm/fileattrs/pkgconfig.attr
-lib/rpm/fileattrs/python.attr
-lib/rpm/fileattrs/pythondist.attr
 lib/rpm/fileattrs/script.attr
 lib/rpm/find-lang.sh
 lib/rpm/find-provides
 lib/rpm/find-requires
 lib/rpm/fontconfig.prov
-lib/rpm/libtooldeps.sh
 lib/rpm/macros
 lib/rpm/mkinstalldirs
 lib/rpm/ocamldeps.sh
@@ -164,7 +160,6 @@ lib/rpm/platform/sparcv8-%%OPSYS%%/macros
 lib/rpm/platform/sparcv9-%%OPSYS%%/macros
 lib/rpm/platform/sparcv9v-%%OPSYS%%/macros
 lib/rpm/platform/x86_64-%%OPSYS%%/macros
-%%PYTHON%%lib/rpm/pythondistdeps.py
 lib/rpm/rpm.daily
 lib/rpm/rpm.log
 lib/rpm/rpm.supp
@@ -186,6 +181,11 @@ man/ko/man8/rpm.8.gz
 man/ko/man8/rpm2cpio.8.gz
 man/man1/gendiff.1.gz
 man/man8/rpm-misc.8.gz
+%%PLUGINS%%man/man8/rpm-plugin-dbus-announce.8.gz
+%%PLUGINS%%man/man8/rpm-plugin-prioreset.8.gz
+%%PLUGINS%%man/man8/rpm-plugin-syslog.8.gz
+%%PLUGINS%%man/man8/rpm-plugin-systemd-inhibit.8.gz
+%%PLUGINS%%man/man8/rpm-plugins.8.gz
 man/man8/rpm.8.gz
 man/man8/rpm2archive.8.gz
 man/man8/rpm2cpio.8.gz
@@ -217,6 +217,8 @@ man/sk/man8/rpm.8.gz
 %%NLS%%share/locale/es/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/he/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/id/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/is/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/it/LC_MESSAGES/rpm.mo
@@ -225,10 +227,12 @@ man/sk/man8/rpm.8.gz
 %%NLS%%share/locale/ms/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/si/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/rpm.mo
@@ -240,5 +244,6 @@ man/sk/man8/rpm.8.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo
+%%PLUGINS%%@dir lib/rpm-plugins
 @dir lib/rpm/lua
 @dir lib/rpm/macros.d

archivers/stormlib/Makefile

@@ -0,0 +1,30 @@
+PORTNAME=	stormlib
+PORTVERSION=	9.23
+DISTVERSIONPREFIX=	v
+CATEGORIES=	archivers
+
+MAINTAINER=	[email protected]
+COMMENT=	Library to process MPQ (MoPaQ) archives
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libtomcrypt.so:security/libtomcrypt
+
+USES=		cmake compiler:c++11-lang pkgconfig
+USE_GITHUB=	yes
+USE_LDCONFIG=	yes
+GH_ACCOUNT=	ladislav-zezula
+GH_PROJECT=	StormLib
+CMAKE_ON=	BUILD_SHARED_LIBS WITH_LIBTOMCRYPT
+
+OPTIONS_DEFINE=		DOCS
+
+PORTDOCS=	*
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+
+.include <bsd.port.mk>

archivers/stormlib/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1640272865
+SHA256 (ladislav-zezula-StormLib-v9.23_GH0.tar.gz) = d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+SIZE (ladislav-zezula-StormLib-v9.23_GH0.tar.gz) = 605295

archivers/stormlib/files/patch-CMakeLists.txt

@@ -0,0 +1,16 @@
+--- CMakeLists.txt.orig	2020-11-21 03:27:09 UTC
++++ CMakeLists.txt
+@@ -293,7 +293,12 @@ else()
+
+     option(WITH_LIBTOMCRYPT "Use system LibTomCrypt library" OFF)
+     if(WITH_LIBTOMCRYPT)
+-        set(LINK_LIBS ${LINK_LIBS} tomcrypt)
++        include(FindPkgConfig)
++        pkg_check_modules(PC_LIBTOMCRYPT libtomcrypt REQUIRED)
++        find_path(LIBTOMCRYPT_INCLUDE_DIR NAMES tomcrypt.h HINTS ${PC_LIBTOMCRYPT_INCLUDE_DIRS} REQUIRED)
++        find_library(LIBTOMCRYPT_LIBRARY NAMES tomcrypt HINTS ${PC_LIBTOMCRYPT_LIBRARY_DIRS} REQUIRED)
++        set(LINK_LIBS ${LINK_LIBS} ${LIBTOMCRYPT_LIBRARY})
++        include_directories(${LIBTOMCRYPT_INCLUDE_DIR})
+     else()
+         set(SRC_ADDITIONAL_FILES ${TOMCRYPT_FILES} ${TOMMATH_FILES})
+     endif()

archivers/stormlib/pkg-descr

@@ -0,0 +1,9 @@
+StormLib is a pack of C++ modules, which provide the user means to modify MPQ
+archives
+
+MPQ (MoPaQ) is an archive format developed by Blizzard Entertainment, purposed
+for storing data files, images, sounds, music and videos for their games. The
+name MoPaQ comes from the author of the format, Mike O'Brien (Mike O'brien
+PaCK).
+
+WWW: http://www.zezula.net/en/mpq/main.html

archivers/stormlib/pkg-plist

@@ -0,0 +1,5 @@
+include/StormLib.h
+include/StormPort.h
+lib/libstorm.so
+lib/libstorm.so.9
+lib/libstorm.so.9.22.0

archivers/zchunk/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	zchunk
-DISTVERSION=	1.1.16
+DISTVERSION=	1.2.0
 CATEGORIES=	archivers
 
 MAINTAINER=	[email protected]

archivers/zchunk/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1623781309
-SHA256 (zchunk-zchunk-1.1.16_GH0.tar.gz) = 33934adecddc50c64615dd8cdfe52a79df674a5bb1d5e83a9c09e1d1e6e9b92c
-SIZE (zchunk-zchunk-1.1.16_GH0.tar.gz) = 1452197
+TIMESTAMP = 1645979328
+SHA256 (zchunk-zchunk-1.2.0_GH0.tar.gz) = 8c9eca82845b656ccae5c0e9dc097cd7a6830981e2529677ce9a5617a1f50321
+SIZE (zchunk-zchunk-1.2.0_GH0.tar.gz) = 1508213