diff options
Diffstat (limited to 'sysutils')
75 files changed, 316 insertions, 464 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 4ee85417f978..ae05c95773c3 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -266,7 +266,6 @@ SUBDIR += daemonize SUBDIR += daemontools SUBDIR += daemontools-encore - SUBDIR += daggy SUBDIR += damager SUBDIR += dar SUBDIR += data-prepper diff --git a/sysutils/appjail-devel/Makefile b/sysutils/appjail-devel/Makefile index a50358cf4bb3..18123073dfcb 100644 --- a/sysutils/appjail-devel/Makefile +++ b/sysutils/appjail-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= appjail -DISTVERSION= 3.9.0.20250603 +DISTVERSION= 4.0.0.20250624 PORTEPOCH= 1 CATEGORIES= sysutils PKGNAMESUFFIX= -devel @@ -16,7 +16,7 @@ CONFLICTS= appjail USE_GITHUB= yes GH_ACCOUNT= DtxdF GH_PROJECT= AppJail -GH_TAGNAME= 99c8d8cd5e1d15c7e74865dae32902a10f5f3c1f +GH_TAGNAME= 4e20bc92f0b5c1d799ef8166236dc2cee7029d43 MAKE_ARGS= APPJAIL_VERSION=${DISTVERSION}+${GH_TAGNAME} ALL_TARGET= utils-strip diff --git a/sysutils/appjail-devel/distinfo b/sysutils/appjail-devel/distinfo index 85a5e163a02b..94f021430af3 100644 --- a/sysutils/appjail-devel/distinfo +++ b/sysutils/appjail-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748988845 -SHA256 (DtxdF-AppJail-3.9.0.20250603-99c8d8cd5e1d15c7e74865dae32902a10f5f3c1f_GH0.tar.gz) = 6d176d609920a41cfc0855da656a516aa78a6e25cf295c7958da4f58fc742953 -SIZE (DtxdF-AppJail-3.9.0.20250603-99c8d8cd5e1d15c7e74865dae32902a10f5f3c1f_GH0.tar.gz) = 1016843 +TIMESTAMP = 1750799138 +SHA256 (DtxdF-AppJail-4.0.0.20250624-4e20bc92f0b5c1d799ef8166236dc2cee7029d43_GH0.tar.gz) = b37409877acd36b07da39a24b3d0acb98ccc622c2058478932669a7c79308164 +SIZE (DtxdF-AppJail-4.0.0.20250624-4e20bc92f0b5c1d799ef8166236dc2cee7029d43_GH0.tar.gz) = 1017332 diff --git a/sysutils/appjail/Makefile b/sysutils/appjail/Makefile index 62c04fdbe51b..209e44e87d59 100644 --- a/sysutils/appjail/Makefile +++ b/sysutils/appjail/Makefile @@ -1,6 +1,6 @@ PORTNAME= appjail DISTVERSIONPREFIX= v -DISTVERSION= 3.9.0 +DISTVERSION= 4.0.0 CATEGORIES= sysutils MAINTAINER= dtxdf@FreeBSD.org diff --git a/sysutils/appjail/distinfo b/sysutils/appjail/distinfo index ed7ec0d0784a..e799452d5059 100644 --- a/sysutils/appjail/distinfo +++ b/sysutils/appjail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747503555 -SHA256 (DtxdF-AppJail-v3.9.0_GH0.tar.gz) = 437fed67d953492dca0e84ce6c7db349f9406487687ae98cca112f1ee1b50f56 -SIZE (DtxdF-AppJail-v3.9.0_GH0.tar.gz) = 1016550 +TIMESTAMP = 1750799003 +SHA256 (DtxdF-AppJail-v4.0.0_GH0.tar.gz) = 6a83e2ef2434c3b2c6a3824bd2c04ea431bcace5d5b71a334cd2550d2d194504 +SIZE (DtxdF-AppJail-v4.0.0_GH0.tar.gz) = 1017052 diff --git a/sysutils/bacnet-stack-apps/Makefile b/sysutils/bacnet-stack-apps/Makefile index d9a684062159..dce98d691dc0 100644 --- a/sysutils/bacnet-stack-apps/Makefile +++ b/sysutils/bacnet-stack-apps/Makefile @@ -1,5 +1,5 @@ PORTNAME= bacnet-stack -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.1 CATEGORIES= sysutils PKGNAMESUFFIX= -apps @@ -10,12 +10,13 @@ WWW= https://github.com/bacnet-stack/bacnet-stack LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license/readme.txt +LIB_DEPENDS= libdispatch.so:devel/libdispatch RUN_DEPENDS= bash:shells/bash -USES= gmake compiler:c++11-lang shebangfix +USES= gmake compiler:c++11-lang localbase:ldflags shebangfix USE_GITHUB= yes GH_ACCOUNT= bacnet-stack -GH_TAGNAME= 8a0a01c +GH_TAGNAME= c111154 LDFLAGS= -lm diff --git a/sysutils/bacnet-stack-apps/distinfo b/sysutils/bacnet-stack-apps/distinfo index 1b2491c50b4f..2c45b9374c43 100644 --- a/sysutils/bacnet-stack-apps/distinfo +++ b/sysutils/bacnet-stack-apps/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734773474 -SHA256 (bacnet-stack-bacnet-stack-1.4.0-8a0a01c_GH0.tar.gz) = 12bb1b2d8aaa9ee2fbc7f2a703870d1fce6eee6e7ce9774b4822c34afa202fa4 -SIZE (bacnet-stack-bacnet-stack-1.4.0-8a0a01c_GH0.tar.gz) = 8045059 +TIMESTAMP = 1750719787 +SHA256 (bacnet-stack-bacnet-stack-1.4.1-c111154_GH0.tar.gz) = 6259c9c5c25b16e2c51f10bc53fe1ea1bfec79725bb1d00fbb354ab7d0fdd94c +SIZE (bacnet-stack-bacnet-stack-1.4.1-c111154_GH0.tar.gz) = 10019494 diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile index 356794f4a3d4..eefbf3cf2881 100644 --- a/sysutils/buildah/Makefile +++ b/sysutils/buildah/Makefile @@ -1,7 +1,6 @@ PORTNAME= buildah DISTVERSIONPREFIX= v -DISTVERSION= 1.38.1 -PORTREVISION= 2 +DISTVERSION= 1.40.1 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -20,7 +19,7 @@ RUN_DEPENDS= containernetworking-plugins>=0:net/containernetworking-plugins \ containers-common>=0:sysutils/containers-common \ ocijail:sysutils/ocijail -USES= gmake go:no_targets,1.22 pkgconfig +USES= gmake go:no_targets,1.23 pkgconfig USE_GITHUB= yes GH_ACCOUNT= containers diff --git a/sysutils/buildah/distinfo b/sysutils/buildah/distinfo index 56588414a7d4..116b4b83ced5 100644 --- a/sysutils/buildah/distinfo +++ b/sysutils/buildah/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738598545 -SHA256 (containers-buildah-v1.38.1_GH0.tar.gz) = d0d5996207b80de8ed39b0fe2563617e538309fefc1c0a707c43832d1cd82c9f -SIZE (containers-buildah-v1.38.1_GH0.tar.gz) = 18550893 +TIMESTAMP = 1750102691 +SHA256 (containers-buildah-v1.40.1_GH0.tar.gz) = 27678b7ced9f096c34d19c12922d8cc9eea2464e4c59dcb249f0f717b80c50bc +SIZE (containers-buildah-v1.40.1_GH0.tar.gz) = 12329760 diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go deleted file mode 100644 index 5e0faca26083..000000000000 --- a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go +++ /dev/null @@ -1,35 +0,0 @@ ---- vendor/github.com/containers/common/pkg/config/config.go.orig 2025-01-20 18:22:54 UTC -+++ vendor/github.com/containers/common/pkg/config/config.go -@@ -12,7 +12,6 @@ import ( - - "github.com/containers/common/internal/attributedstring" - "github.com/containers/common/libnetwork/types" -- "github.com/containers/common/pkg/capabilities" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/unshare" - units "github.com/docker/go-units" -@@ -963,24 +962,6 @@ func (c *Config) GetDefaultEnvEx(envHost, httpProxy bo - } - } - return append(env, c.Containers.Env.Get()...) --} -- --// Capabilities returns the capabilities parses the Add and Drop capability --// list from the default capabilities for the container --func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { -- userNotRoot := func(user string) bool { -- if user == "" || user == "root" || user == "0" { -- return false -- } -- return true -- } -- -- defaultCapabilities := c.Containers.DefaultCapabilities.Get() -- if userNotRoot(user) { -- defaultCapabilities = []string{} -- } -- -- return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities) - } - - // Device parses device mapping string to a src, dest & permissions string diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go deleted file mode 100644 index 2e60526c7ecd..000000000000 --- a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go +++ /dev/null @@ -1,33 +0,0 @@ ---- vendor/github.com/containers/common/pkg/config/config_linux.go.orig 2025-01-20 18:22:54 UTC -+++ vendor/github.com/containers/common/pkg/config/config_linux.go -@@ -1,6 +1,7 @@ import ( - package config - - import ( -+ "github.com/containers/common/pkg/capabilities" - selinux "github.com/opencontainers/selinux/go-selinux" - ) - -@@ -25,4 +26,22 @@ var defaultHelperBinariesDir = []string{ - "/usr/local/lib/podman", - "/usr/libexec/podman", - "/usr/lib/podman", -+} -+ -+// Capabilities returns the capabilities parses the Add and Drop capability -+// list from the default capabilities for the container -+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { -+ userNotRoot := func(user string) bool { -+ if user == "" || user == "root" || user == "0" { -+ return false -+ } -+ return true -+ } -+ -+ defaultCapabilities := c.Containers.DefaultCapabilities.Get() -+ if userNotRoot(user) { -+ defaultCapabilities = []string{} -+ } -+ -+ return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities) - } diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go deleted file mode 100644 index 3940ab594954..000000000000 --- a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go +++ /dev/null @@ -1,12 +0,0 @@ ---- vendor/github.com/containers/common/pkg/config/config_unsupported.go.orig 2025-01-20 18:22:54 UTC -+++ vendor/github.com/containers/common/pkg/config/config_unsupported.go -@@ -5,3 +5,9 @@ func selinuxEnabled() bool { - func selinuxEnabled() bool { - return false - } -+ -+// Capabilities returns the capabilities parses the Add and Drop capability -+// list from the default capabilities for the container -+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { -+ return nil, nil -+} diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go b/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go deleted file mode 100644 index d17e29d695ee..000000000000 --- a/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go +++ /dev/null @@ -1,9 +0,0 @@ ---- vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go.orig 2025-02-04 11:32:21 UTC -+++ vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go -@@ -13,5 +13,5 @@ func GetDiffer(ctx context.Context, store storage.Stor - - // GetDiffer returns a differ than can be used with ApplyDiffWithDiffer. - func GetDiffer(ctx context.Context, store storage.Store, blobDigest digest.Digest, blobSize int64, annotations map[string]string, iss ImageSourceSeekable) (graphdriver.Differ, error) { -- return nil, errors.New("format not supported on this system") -+ return nil, newErrFallbackToOrdinaryLayerDownload(errors.New("format not supported on this system")) - } diff --git a/sysutils/containers-common/Makefile b/sysutils/containers-common/Makefile index e57f4549c2ff..bee209d11a5f 100644 --- a/sysutils/containers-common/Makefile +++ b/sysutils/containers-common/Makefile @@ -1,6 +1,6 @@ PORTNAME= containers-common DISTVERSIONPREFIX= v -DISTVERSION= 0.61.1 +DISTVERSION= 0.63.1 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -25,9 +25,9 @@ GH_TAGNAME= v${DISTVERSION}:common v${IMAGEVERSION}:image \ NO_ARCH= yes -IMAGEVERSION= 5.33.1 -SKOPEOVERSION= 1.17.0 -STORAGEVERSION= 1.56.1 +IMAGEVERSION= 5.35.0 +SKOPEOVERSION= 1.19.0 +STORAGEVERSION= 1.58.0 do-build: ${GMAKE} -C ${WRKSRC_common}/docs diff --git a/sysutils/containers-common/distinfo b/sysutils/containers-common/distinfo index 8835ccc636f1..1a6c1a0089a0 100644 --- a/sysutils/containers-common/distinfo +++ b/sysutils/containers-common/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1738598026 -SHA256 (containers-common-v0.61.1_GH0.tar.gz) = 3eb531f28564ac78067945c59fa69a0c7c79131ad1e9cfc9f6404e6e8f907b53 -SIZE (containers-common-v0.61.1_GH0.tar.gz) = 13216471 -SHA256 (containers-image-v5.33.1_GH0.tar.gz) = c54581c03a950543fdeaa38296b98086d8ee15d359f375344e9b15145e8fa54b -SIZE (containers-image-v5.33.1_GH0.tar.gz) = 738022 -SHA256 (containers-storage-v1.56.1_GH0.tar.gz) = 88feb5c4bf572cc92cec065f1edb388209c0094794f32eead438c09d640aaf05 -SIZE (containers-storage-v1.56.1_GH0.tar.gz) = 4227161 -SHA256 (containers-skopeo-v1.17.0_GH0.tar.gz) = e548c044c7b644ba455f482df387ec90aceea432b9c61a0bab0ec8534970eb69 -SIZE (containers-skopeo-v1.17.0_GH0.tar.gz) = 10682765 +TIMESTAMP = 1750104348 +SHA256 (containers-common-v0.63.1_GH0.tar.gz) = 6090742e60ebf99e1d9e1580711a9bb556b250551eeef7058aa2f681e93651b9 +SIZE (containers-common-v0.63.1_GH0.tar.gz) = 13515794 +SHA256 (containers-image-v5.35.0_GH0.tar.gz) = 1c2c4a87cd47d9c56d2794b71ae58d7b8f7dde284afb54abfab5f6c85f7ef4ec +SIZE (containers-image-v5.35.0_GH0.tar.gz) = 766486 +SHA256 (containers-skopeo-v1.19.0_GH0.tar.gz) = 043e9f568440accf1aafca122a25c4d21441f16de49475192ec4abeef7430358 +SIZE (containers-skopeo-v1.19.0_GH0.tar.gz) = 10819827 +SHA256 (containers-storage-v1.58.0_GH0.tar.gz) = 51c689bcfcdcbb4c0192c9a99354db145b65bf4ced3a0f70efd01ec99f39f3f8 +SIZE (containers-storage-v1.58.0_GH0.tar.gz) = 4256083 diff --git a/sysutils/daggy/Makefile b/sysutils/daggy/Makefile deleted file mode 100644 index 7b41a78d740e..000000000000 --- a/sysutils/daggy/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -PORTNAME= daggy -DISTVERSIONPREFIX= v -DISTVERSION= 2.1.3 -PORTREVISION= 1 -CATEGORIES= sysutils - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Data Aggregation Utility: runs commands on remote hosts simultaneously -WWW= https://daggy.dev/ - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/../LICENSE - -DEPRECATED= Depends on expired security/botan2 -EXPIRATION_DATE=2025-06-21 - -BUILD_DEPENDS= ${LOCALBASE}/include/kainjow/mustache.hpp:devel/mustache -LIB_DEPENDS= libbotan-2.so:security/botan2 \ - libssh2.so:security/libssh2 \ - libyaml-cpp.so:devel/yaml-cpp - -USES= gl cmake compiler:c++17-lang localbase:ldflags pkgconfig qt:6 ssl -USE_QT= base tools:build -USE_GL= gl -USE_LDCONFIG= yes - -USE_GITHUB= yes -GH_ACCOUNT= synacker - -CMAKE_ARGS= -DVERSION=${DISTVERSION} -CMAKE_ON= BUILD_SHARED_LIBS - -CXXFLAGS+= -I${LOCALBASE}/include/kainjow - -WRKSRC_SUBDIR= src - -.include <bsd.port.mk> diff --git a/sysutils/daggy/distinfo b/sysutils/daggy/distinfo deleted file mode 100644 index aa30af897cfb..000000000000 --- a/sysutils/daggy/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1661708767 -SHA256 (synacker-daggy-v2.1.3_GH0.tar.gz) = f96419b2199402eef31dd5fc8b4d15f64948bbdd350728549c890fdb8f0d2805 -SIZE (synacker-daggy-v2.1.3_GH0.tar.gz) = 498338 diff --git a/sysutils/daggy/pkg-descr b/sysutils/daggy/pkg-descr deleted file mode 100644 index 3fc62184f0af..000000000000 --- a/sysutils/daggy/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -Daggy is an IT automation tool. It can run terminal commands on local or remote -serveres and aggregate their output locally. - -Daggy main goals are simplicity and ease-of-use. If you know about yaml/json, -bash/powershell and ssh you know how to use Daggy. - -Daggy can be helpful for developers, QA, DevOps and engenieers for debug, -analyze and control distributed network systems, for example, based on -microservice architecture. - -Daggy is serverless, cross-platform solution and don't require installation on -remote servers. Commands execution work under SSH transport protocol or via -local terminal. diff --git a/sysutils/daggy/pkg-plist b/sysutils/daggy/pkg-plist deleted file mode 100644 index 7294820be33f..000000000000 --- a/sysutils/daggy/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/daggy -include/DaggyCore/Core.h -include/DaggyCore/Core.hpp -include/DaggyCore/Errors.h -include/DaggyCore/Errors.hpp -include/DaggyCore/Result.hpp -include/DaggyCore/Sources.hpp -include/DaggyCore/Types.h -include/DaggyCore/Types.hpp -include/DaggyCore/aggregators/CConsole.hpp -include/DaggyCore/aggregators/CFile.hpp -include/DaggyCore/aggregators/IAggregator.hpp -include/DaggyCore/daggycore_export.h -include/DaggyCore/providers/IFabric.hpp -include/DaggyCore/providers/IProvider.hpp -lib/libDaggyCore.so diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile index d4fb8c9e3de7..4ef43249b757 100644 --- a/sysutils/dar/Makefile +++ b/sysutils/dar/Makefile @@ -1,5 +1,6 @@ PORTNAME= dar DISTVERSION= 2.7.18 +PORTREVISION= 1 CATEGORIES= sysutils archivers MASTER_SITES= SF diff --git a/sysutils/devedeng/Makefile b/sysutils/devedeng/Makefile index 6cbffd29a6b9..70b1a8b1d502 100644 --- a/sysutils/devedeng/Makefile +++ b/sysutils/devedeng/Makefile @@ -1,6 +1,5 @@ PORTNAME= devedeng -DISTVERSION= 4.18.0 -PORTREVISION= 2 +DISTVERSION= 4.21.0 CATEGORIES= sysutils multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,12 +21,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ USES= python gettext-tools gnome USE_GITLAB= yes GL_ACCOUNT= rastersoft -GL_TAGNAME= 8cd457b494c1b746633d2490e319c07f6905e1f2 USE_GNOME= gtk30 pygobject3:run -USE_PYTHON= distutils autoplist +USE_PYTHON= concurrent distutils autoplist NO_ARCH= yes -PLIST_FILES= bin/devede_ng OPTIONS_DEFAULT= BRASERO MPV OPTIONS_MULTI= PLAYER BURNER @@ -52,7 +49,4 @@ XFBURN_RUN_DEPENDS= xfburn:sysutils/xfburn pre-configure: ${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/setup.py -post-install: - ${LN} -s devede_ng.py ${STAGEDIR}${PREFIX}/bin/devede_ng - .include <bsd.port.mk> diff --git a/sysutils/devedeng/distinfo b/sysutils/devedeng/distinfo index 9c777c46d39d..9abf4175f254 100644 --- a/sysutils/devedeng/distinfo +++ b/sysutils/devedeng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729512128 -SHA256 (rastersoft-devedeng-8cd457b494c1b746633d2490e319c07f6905e1f2_GL0.tar.gz) = 94d9bad3dbaa2458c6e5f64822a6a0e8a33a2038de820e1d62e95f50ff09eb47 -SIZE (rastersoft-devedeng-8cd457b494c1b746633d2490e319c07f6905e1f2_GL0.tar.gz) = 1886012 +TIMESTAMP = 1750105512 +SHA256 (devedeng-4.21.0.tar.bz2) = 115f071c10f3e8e40f76bb9c862ca854294b3f75c118f59e6ab234c4c0dcbe5b +SIZE (devedeng-4.21.0.tar.bz2) = 1809164 diff --git a/sysutils/dnf/Makefile b/sysutils/dnf/Makefile index ddc5c03a4792..ffde2094bd61 100644 --- a/sysutils/dnf/Makefile +++ b/sysutils/dnf/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= libcomps>0:misc/libcomps \ libdnf>0:sysutils/libdnf \ rpm4>0:archivers/rpm4 \ - ${PYTHON_PKGNAMEPREFIX}gpgme>0:security/py-gpgme@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}gpg>=2.0.0:security/py-gpg@${PY_FLAVOR} USES= cmake gettext-tools python diff --git a/sysutils/kf5-kwallet/Makefile b/sysutils/kf5-kwallet/Makefile index efce12e80700..e4774c7eea32 100644 --- a/sysutils/kf5-kwallet/Makefile +++ b/sysutils/kf5-kwallet/Makefile @@ -1,6 +1,6 @@ PORTNAME= kwallet DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils kde kde-frameworks MAINTAINER= kde@FreeBSD.org @@ -12,9 +12,9 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ - libgpgmepp.so:security/gpgme-cpp \ + libgpgmepp.so:security/gpgmepp \ libqca-qt5.so:devel/qca@qt5 \ - libqgpgme.so:security/gpgme-qt@qt5 + libqgpgme.so:security/qgpgme@qt5 USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \ diff --git a/sysutils/kf6-baloo/distinfo b/sysutils/kf6-baloo/distinfo index dade28c9b7c3..403707fac523 100644 --- a/sysutils/kf6-baloo/distinfo +++ b/sysutils/kf6-baloo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746358561 -SHA256 (KDE/frameworks/6.14/baloo-6.14.0.tar.xz) = ab60f943607f67929b619c029498f07fa8767aec6a7fb02ecf7392ced25734b4 -SIZE (KDE/frameworks/6.14/baloo-6.14.0.tar.xz) = 326884 +TIMESTAMP = 1749476629 +SHA256 (KDE/frameworks/6.15/baloo-6.15.0.tar.xz) = 241015fd14ea0fcf281080fd160994f92b6e0ba0750cfafd488d31bf0e0a7f4f +SIZE (KDE/frameworks/6.15/baloo-6.15.0.tar.xz) = 327264 diff --git a/sysutils/kf6-kuserfeedback/distinfo b/sysutils/kf6-kuserfeedback/distinfo index 5dc32db3d1ed..62bafc564007 100644 --- a/sysutils/kf6-kuserfeedback/distinfo +++ b/sysutils/kf6-kuserfeedback/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746358561 -SHA256 (KDE/frameworks/6.14/kuserfeedback-6.14.0.tar.xz) = 24acd6d2b8582bdd6ae9bfca97278a96763ee184a6cdecbc0dcd64fd4fc238b2 -SIZE (KDE/frameworks/6.14/kuserfeedback-6.14.0.tar.xz) = 266380 +TIMESTAMP = 1749476630 +SHA256 (KDE/frameworks/6.15/kuserfeedback-6.15.0.tar.xz) = 0c1ead89ba98f7aa2d3e427620a365cd4f1c9ca30250eec6afb4f90fec187f83 +SIZE (KDE/frameworks/6.15/kuserfeedback-6.15.0.tar.xz) = 267268 diff --git a/sysutils/kf6-kwallet/Makefile b/sysutils/kf6-kwallet/Makefile index 84351addbc8b..d85d52148b6b 100644 --- a/sysutils/kf6-kwallet/Makefile +++ b/sysutils/kf6-kwallet/Makefile @@ -1,5 +1,6 @@ PORTNAME= kwallet DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils kde kde-frameworks MAINTAINER= kde@FreeBSD.org @@ -9,7 +10,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ libsecret-1.so:security/libsecret \ libgpgme.so:security/gpgme \ - libgpgmepp.so:security/gpgme-cpp \ + libgpgmepp.so:security/gpgmepp \ libqca-qt6.so:devel/qca@qt6 USES= cmake gettext-tools gl kde:6 pkgconfig qt:6 tar:xz xorg @@ -20,5 +21,4 @@ USE_KDE= colorscheme config coreaddons crash dbusaddons i18n \ USE_QT= base USE_XORG= x11 -KDE_FRAMEWORKS_VERSION= 6.14.1 .include <bsd.port.mk> diff --git a/sysutils/kf6-kwallet/distinfo b/sysutils/kf6-kwallet/distinfo index 7c99b099df02..3d7d3b7362d9 100644 --- a/sysutils/kf6-kwallet/distinfo +++ b/sysutils/kf6-kwallet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747419947 -SHA256 (KDE/frameworks/6.14/kwallet-6.14.1.tar.xz) = ef482be2d5211f711d578aa1d1f37f71e641a6a52fd37e11327e19915fd42127 -SIZE (KDE/frameworks/6.14/kwallet-6.14.1.tar.xz) = 365448 +TIMESTAMP = 1749476630 +SHA256 (KDE/frameworks/6.15/kwallet-6.15.0.tar.xz) = fdbac44c2525b12e24b3ba5971912a2ffd91fdfea79c3a124bce89621735893c +SIZE (KDE/frameworks/6.15/kwallet-6.15.0.tar.xz) = 365136 diff --git a/sysutils/lxqt-powermanagement/files/patch-CMakeLists.txt b/sysutils/lxqt-powermanagement/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..4db1454a7eb8 --- /dev/null +++ b/sysutils/lxqt-powermanagement/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2025-06-23 16:01:57 UTC ++++ CMakeLists.txt +@@ -29,7 +29,7 @@ find_package(lxqt-globalkeys-ui ${LXQT_GLOBALKEYS_MINI + find_package(KF6Solid ${KF6_MINIMUM_VERSION} REQUIRED) + find_package(lxqt ${LXQT_MINIMUM_VERSION} REQUIRED) + find_package(lxqt-globalkeys-ui ${LXQT_GLOBALKEYS_MINIMUM_VERSION} REQUIRED) +-find_package(XCB REQUIRED COMPONENTS xcb-dpms xcb-screensaver) ++find_package(XCB REQUIRED COMPONENTS DPMS SCREENSAVER) + + message(STATUS "Building with Qt${Qt6Core_VERSION}") + diff --git a/sysutils/memtest86+/Makefile b/sysutils/memtest86+/Makefile index d7af147888cf..ba427a6c100a 100644 --- a/sysutils/memtest86+/Makefile +++ b/sysutils/memtest86+/Makefile @@ -16,6 +16,9 @@ USES= gmake ALL_TARGET= all PORTDOCS= * +DEPRECATED= ELF binary for BIOS boot has been broken for a long while +EXPIRATION_DATE=2025-07-31 + USE_GCC= yes:build # Please provide absolute path below (cannot be root) diff --git a/sysutils/oc/Makefile b/sysutils/oc/Makefile index 0f89ad18c4f3..17b18df14afc 100644 --- a/sysutils/oc/Makefile +++ b/sysutils/oc/Makefile @@ -1,7 +1,7 @@ PORTNAME= oc PORTVERSION= 4.9 DISTVERSIONPREFIX= release- -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= sysutils MAINTAINER= jhixson@freebsd.org diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile index 33859d25bfb1..d6712d66b5ab 100644 --- a/sysutils/pacman/Makefile +++ b/sysutils/pacman/Makefile @@ -1,5 +1,6 @@ PORTNAME= pacman DISTVERSION= 7.0.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://gitlab.archlinux.org/${PORTNAME}/${PORTNAME}/-/releases/v${DISTVERSION}/downloads/ @@ -40,8 +41,8 @@ PLIST_SUB= PACMAN_ROOT="${PACMAN_ROOT:C,^${PREFIX}/,,}" PORTEXAMPLES= * PKGMESSAGE= ${PKGDIR}/pkg-message-${FLAVOR:U} -OPTIONS_DEFINE= CURL DOCS GPGME EXAMPLES NLS -OPTIONS_DEFAULT=CURL DOCS GPGME +OPTIONS_DEFINE= CURL EXAMPLES GPGME MANPAGES NLS +OPTIONS_DEFAULT=CURL GPGME MANPAGES OPTIONS_EXCLUDE=NLS # XXX: meson cannot find ngettext(3) despite gettext-runtime OPTIONS_SUB= yes @@ -49,8 +50,8 @@ CURL_DESC= Use libcurl fetcher instead of external curl/wget CURL_MESON_ENABLED= curl CURL_LIB_DEPENDS= libcurl.so:ftp/curl -DOCS_MESON_ENABLED= doc -DOCS_BUILD_DEPENDS= a2x:textproc/asciidoc +MANPAGES_MESON_ENABLED= doc +MANPAGES_BUILD_DEPENDS= a2x:textproc/asciidoc GPGME_DESC= Use GPGME for PGP signature verification GPGME_MESON_ENABLED= gpgme diff --git a/sysutils/pacman/pkg-plist b/sysutils/pacman/pkg-plist index bb636fed10b8..c90e4b174627 100644 --- a/sysutils/pacman/pkg-plist +++ b/sysutils/pacman/pkg-plist @@ -239,22 +239,22 @@ share/makepkg/util/pkgbuild.sh share/makepkg/util/schema.sh share/makepkg/util/source.sh share/makepkg/util/util.sh -%%DOCS%%share/man/man1/makepkg-template.1.gz -%%DOCS%%share/man/man5/BUILDINFO.5.gz -%%DOCS%%share/man/man5/PKGBUILD.5.gz -%%DOCS%%share/man/man5/alpm-hooks.5.gz -%%DOCS%%share/man/man5/makepkg.conf.5.gz -%%DOCS%%share/man/man5/pacman-hooks.5.gz -%%DOCS%%share/man/man5/pacman.conf.5.gz -%%DOCS%%share/man/man8/makepkg.8.gz -%%DOCS%%share/man/man8/pacman-conf.8.gz -%%DOCS%%share/man/man8/pacman-db-upgrade.8.gz -%%DOCS%%share/man/man8/pacman-key.8.gz -%%DOCS%%share/man/man8/pacman.8.gz -%%DOCS%%share/man/man8/repo-add.8.gz -%%DOCS%%share/man/man8/repo-remove.8.gz -%%DOCS%%share/man/man8/testpkg.8.gz -%%DOCS%%share/man/man8/vercmp.8.gz +%%MANPAGES%%share/man/man1/makepkg-template.1.gz +%%MANPAGES%%share/man/man5/BUILDINFO.5.gz +%%MANPAGES%%share/man/man5/PKGBUILD.5.gz +%%MANPAGES%%share/man/man5/alpm-hooks.5.gz +%%MANPAGES%%share/man/man5/makepkg.conf.5.gz +%%MANPAGES%%share/man/man5/pacman-hooks.5.gz +%%MANPAGES%%share/man/man5/pacman.conf.5.gz +%%MANPAGES%%share/man/man8/makepkg.8.gz +%%MANPAGES%%share/man/man8/pacman-conf.8.gz +%%MANPAGES%%share/man/man8/pacman-db-upgrade.8.gz +%%MANPAGES%%share/man/man8/pacman-key.8.gz +%%MANPAGES%%share/man/man8/pacman.8.gz +%%MANPAGES%%share/man/man8/repo-add.8.gz +%%MANPAGES%%share/man/man8/repo-remove.8.gz +%%MANPAGES%%share/man/man8/testpkg.8.gz +%%MANPAGES%%share/man/man8/vercmp.8.gz %%DATADIR%%/PKGBUILD-split.proto %%DATADIR%%/PKGBUILD-vcs.proto %%DATADIR%%/PKGBUILD.proto diff --git a/sysutils/plasma-pass/Makefile b/sysutils/plasma-pass/Makefile index fe41409493a1..fbb22955201e 100644 --- a/sysutils/plasma-pass/Makefile +++ b/sysutils/plasma-pass/Makefile @@ -1,5 +1,6 @@ PORTNAME= plasma-pass DISTVERSION= 1.2.2 +PORTREVISION= 1 MASTER_SITES= KDE/stable/${PORTNAME} CATEGORIES= sysutils kde @@ -13,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ - libgpgmepp.so:security/gpgme-cpp \ + libgpgmepp.so:security/gpgmepp \ liboath.so:security/oath-toolkit \ - libqgpgmeqt6.so:security/gpgme-qt@qt6 + libqgpgmeqt6.so:security/qgpgme@qt6 RUN_DEPENDS= pass:sysutils/password-store USES= cmake compiler:c++20-lang gettext kde:6 qt:6 tar:xz diff --git a/sysutils/plasma6-discover/distinfo b/sysutils/plasma6-discover/distinfo index 7f6af19640ef..4a1f89401962 100644 --- a/sysutils/plasma6-discover/distinfo +++ b/sysutils/plasma6-discover/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010499 -SHA256 (KDE/plasma/6.4.0/discover-6.4.0.tar.xz) = 09fb1d63aa6ec3ad56e606f48b6e10d59eeb37d9b527e54a211b4a79d6e52242 -SIZE (KDE/plasma/6.4.0/discover-6.4.0.tar.xz) = 1110064 +TIMESTAMP = 1750789614 +SHA256 (KDE/plasma/6.4.1/discover-6.4.1.tar.xz) = f34cea438a8a0ae0bb6fd13e4164d49c7a2a9857e204300ccc276f2d5f898230 +SIZE (KDE/plasma/6.4.1/discover-6.4.1.tar.xz) = 1110016 diff --git a/sysutils/plasma6-kde-cli-tools/distinfo b/sysutils/plasma6-kde-cli-tools/distinfo index af26d545adab..56b50db7c2f8 100644 --- a/sysutils/plasma6-kde-cli-tools/distinfo +++ b/sysutils/plasma6-kde-cli-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010499 -SHA256 (KDE/plasma/6.4.0/kde-cli-tools-6.4.0.tar.xz) = 4f4ebed7c17a25079c54ef031929ac55d6777acd3cf595ca6343f4d0a4f00ba9 -SIZE (KDE/plasma/6.4.0/kde-cli-tools-6.4.0.tar.xz) = 638504 +TIMESTAMP = 1750789615 +SHA256 (KDE/plasma/6.4.1/kde-cli-tools-6.4.1.tar.xz) = 2d90ab0c034fb9d2816750da9ace39b708b712d3f7341663ebbbfe88d5b02ca4 +SIZE (KDE/plasma/6.4.1/kde-cli-tools-6.4.1.tar.xz) = 638508 diff --git a/sysutils/plasma6-kinfocenter/distinfo b/sysutils/plasma6-kinfocenter/distinfo index 6f99586a2dcc..089fd5283ef2 100644 --- a/sysutils/plasma6-kinfocenter/distinfo +++ b/sysutils/plasma6-kinfocenter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010499 -SHA256 (KDE/plasma/6.4.0/kinfocenter-6.4.0.tar.xz) = 4d2deaf4c1ff76ff100ed6b07d7cb158ba116c4c221b7b5f7b25440285054494 -SIZE (KDE/plasma/6.4.0/kinfocenter-6.4.0.tar.xz) = 758072 +TIMESTAMP = 1750789616 +SHA256 (KDE/plasma/6.4.1/kinfocenter-6.4.1.tar.xz) = 20eafbae78a437f767b8b6e9493875b230033f9760454732e810483c82127927 +SIZE (KDE/plasma/6.4.1/kinfocenter-6.4.1.tar.xz) = 758196 diff --git a/sysutils/plasma6-kmenuedit/distinfo b/sysutils/plasma6-kmenuedit/distinfo index 4c5ea94fb48e..5bf724c2af64 100644 --- a/sysutils/plasma6-kmenuedit/distinfo +++ b/sysutils/plasma6-kmenuedit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010500 -SHA256 (KDE/plasma/6.4.0/kmenuedit-6.4.0.tar.xz) = 4ae4a67adca07e10c2475b9a19acbd283d1840a996bbc084d9b1b237c7e6ef88 -SIZE (KDE/plasma/6.4.0/kmenuedit-6.4.0.tar.xz) = 884652 +TIMESTAMP = 1750789616 +SHA256 (KDE/plasma/6.4.1/kmenuedit-6.4.1.tar.xz) = 55db175f0f3deda6154bfb0c721adf183f63c134b77858c9fbbe0858ae9c7773 +SIZE (KDE/plasma/6.4.1/kmenuedit-6.4.1.tar.xz) = 884588 diff --git a/sysutils/plasma6-ksystemstats/distinfo b/sysutils/plasma6-ksystemstats/distinfo index 9fb97858e8fa..e483eac81117 100644 --- a/sysutils/plasma6-ksystemstats/distinfo +++ b/sysutils/plasma6-ksystemstats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010500 -SHA256 (KDE/plasma/6.4.0/ksystemstats-6.4.0.tar.xz) = e0f8855a4db91508066b9da5108ddbce48bbadda64bb96653ac2fb312fc1468e -SIZE (KDE/plasma/6.4.0/ksystemstats-6.4.0.tar.xz) = 156636 +TIMESTAMP = 1750789617 +SHA256 (KDE/plasma/6.4.1/ksystemstats-6.4.1.tar.xz) = a70a74d3bd24116f6001086b942cc9d69f7514f3f5b7c2a0382d5dc281e7f0aa +SIZE (KDE/plasma/6.4.1/ksystemstats-6.4.1.tar.xz) = 156608 diff --git a/sysutils/plasma6-libksysguard/distinfo b/sysutils/plasma6-libksysguard/distinfo index 447fe51cd45c..e79c11159df0 100644 --- a/sysutils/plasma6-libksysguard/distinfo +++ b/sysutils/plasma6-libksysguard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010500 -SHA256 (KDE/plasma/6.4.0/libksysguard-6.4.0.tar.xz) = bfd0baf7973407444093e13a5ce2b310cee586e3bbc5d4e10785bc1a0d45a663 -SIZE (KDE/plasma/6.4.0/libksysguard-6.4.0.tar.xz) = 333964 +TIMESTAMP = 1750789618 +SHA256 (KDE/plasma/6.4.1/libksysguard-6.4.1.tar.xz) = 7c33949dbdccceece35fbefd244a4449b23b5071e0cad082f91aee64f7b281e1 +SIZE (KDE/plasma/6.4.1/libksysguard-6.4.1.tar.xz) = 333936 diff --git a/sysutils/plasma6-plasma-disks/distinfo b/sysutils/plasma6-plasma-disks/distinfo index 8ae9a5ed1dcf..67586b754218 100644 --- a/sysutils/plasma6-plasma-disks/distinfo +++ b/sysutils/plasma6-plasma-disks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010500 -SHA256 (KDE/plasma/6.4.0/plasma-disks-6.4.0.tar.xz) = 94c95ed1bd494448c81e35360dc8b49ae05acec131651ec81716f4a52218ea90 -SIZE (KDE/plasma/6.4.0/plasma-disks-6.4.0.tar.xz) = 105216 +TIMESTAMP = 1750789618 +SHA256 (KDE/plasma/6.4.1/plasma-disks-6.4.1.tar.xz) = c98f9a0d5322982a908497d7cc02867825486257b8e25462d197f336011c5314 +SIZE (KDE/plasma/6.4.1/plasma-disks-6.4.1.tar.xz) = 105220 diff --git a/sysutils/plasma6-plasma-systemmonitor/distinfo b/sysutils/plasma6-plasma-systemmonitor/distinfo index 9edfe0851fd7..23da83c40cc6 100644 --- a/sysutils/plasma6-plasma-systemmonitor/distinfo +++ b/sysutils/plasma6-plasma-systemmonitor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010501 -SHA256 (KDE/plasma/6.4.0/plasma-systemmonitor-6.4.0.tar.xz) = 94369cd6cbeff5ffaf3605ee7660ea4aaa03d959282b0f20d659a953ae2d975a -SIZE (KDE/plasma/6.4.0/plasma-systemmonitor-6.4.0.tar.xz) = 216888 +TIMESTAMP = 1750789619 +SHA256 (KDE/plasma/6.4.1/plasma-systemmonitor-6.4.1.tar.xz) = b1810d329b81ac35afca75f5ff2887b724e2fc7b1f9c510198b87c29cb8bde5f +SIZE (KDE/plasma/6.4.1/plasma-systemmonitor-6.4.1.tar.xz) = 216880 diff --git a/sysutils/plasma6-polkit-kde-agent-1/distinfo b/sysutils/plasma6-polkit-kde-agent-1/distinfo index 1d463517ef62..0547c56fd276 100644 --- a/sysutils/plasma6-polkit-kde-agent-1/distinfo +++ b/sysutils/plasma6-polkit-kde-agent-1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010502 -SHA256 (KDE/plasma/6.4.0/polkit-kde-agent-1-6.4.0.tar.xz) = a8ab5df6ab1ea05e63ef08ebbe536e1393d4f6d6dd4b297305619fc1e87515c5 -SIZE (KDE/plasma/6.4.0/polkit-kde-agent-1-6.4.0.tar.xz) = 57580 +TIMESTAMP = 1750789619 +SHA256 (KDE/plasma/6.4.1/polkit-kde-agent-1-6.4.1.tar.xz) = bb1cc037725368334439d13dc7de12c5f517b398385f1c9f529571a5392a9302 +SIZE (KDE/plasma/6.4.1/polkit-kde-agent-1-6.4.1.tar.xz) = 57548 diff --git a/sysutils/plasma6-powerdevil/distinfo b/sysutils/plasma6-powerdevil/distinfo index 0cb16c6da920..cde01e852ee0 100644 --- a/sysutils/plasma6-powerdevil/distinfo +++ b/sysutils/plasma6-powerdevil/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010502 -SHA256 (KDE/plasma/6.4.0/powerdevil-6.4.0.tar.xz) = d0ad54cb6d4ccf39c0d5b7f0c7df2f51bc99ffd3fd6ca7538ed3f41dfc4f677e -SIZE (KDE/plasma/6.4.0/powerdevil-6.4.0.tar.xz) = 1228936 +TIMESTAMP = 1750789620 +SHA256 (KDE/plasma/6.4.1/powerdevil-6.4.1.tar.xz) = 93e4381f253f9e960787feb5fcb86ea1a7c0e2978e3b3009ae192a86ae73462f +SIZE (KDE/plasma/6.4.1/powerdevil-6.4.1.tar.xz) = 1229008 diff --git a/sysutils/plasma6-systemsettings/distinfo b/sysutils/plasma6-systemsettings/distinfo index 38dd6affd68b..c4cd89095f2a 100644 --- a/sysutils/plasma6-systemsettings/distinfo +++ b/sysutils/plasma6-systemsettings/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750010502 -SHA256 (KDE/plasma/6.4.0/systemsettings-6.4.0.tar.xz) = 4c385519aa40e90dcb0b1a0b070d3313fd9ed5fb33c963ea5459ce5d31692f3f -SIZE (KDE/plasma/6.4.0/systemsettings-6.4.0.tar.xz) = 219380 +TIMESTAMP = 1750789621 +SHA256 (KDE/plasma/6.4.1/systemsettings-6.4.1.tar.xz) = a27f312a292ac4c5c3efa1af71e70ca834d7ec8e8f37a710cf85ae2d7bbeff95 +SIZE (KDE/plasma/6.4.1/systemsettings-6.4.1.tar.xz) = 219344 diff --git a/sysutils/podman-suite/Makefile b/sysutils/podman-suite/Makefile index fe500aa57d63..c322defdd711 100644 --- a/sysutils/podman-suite/Makefile +++ b/sysutils/podman-suite/Makefile @@ -1,5 +1,5 @@ PORTNAME= podman-suite -PORTVERSION= 20250203 +PORTVERSION= 20250618 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index ae0280461b06..65c6a1c00031 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,7 +1,6 @@ PORTNAME= podman DISTVERSIONPREFIX= v -DISTVERSION= 5.3.2 -PORTREVISION= 2 +DISTVERSION= 5.5.1 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -21,7 +20,7 @@ RUN_DEPENDS= conmon:sysutils/conmon \ containers-common>=0:sysutils/containers-common \ ocijail:sysutils/ocijail -USES= gmake go:no_targets,1.22 pkgconfig python:build shebangfix +USES= gmake go:no_targets,1.23 pkgconfig python:build shebangfix USE_RC_SUBR= podman podman_service SHEBANG_FILES= ${WRKSRC}/hack/markdown-preprocess diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo index 75743cf73366..48cdbe5f6f89 100644 --- a/sysutils/podman/distinfo +++ b/sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738598697 -SHA256 (containers-podman-v5.3.2_GH0.tar.gz) = e7d7abf2d4ecae7217af017a4199d555563721bf6c3ae52e68704ee8268c432b -SIZE (containers-podman-v5.3.2_GH0.tar.gz) = 24207488 +TIMESTAMP = 1750101580 +SHA256 (containers-podman-v5.5.1_GH0.tar.gz) = 00d02f85ad27a46e77456fef1be81865a43147544ed2487e6c4c8decd0e3748f +SIZE (containers-podman-v5.5.1_GH0.tar.gz) = 21338501 diff --git a/sysutils/podman/files/patch-libpod_container__internal__common.go b/sysutils/podman/files/patch-libpod_container__internal__common.go new file mode 100644 index 000000000000..9eeb358bca34 --- /dev/null +++ b/sysutils/podman/files/patch-libpod_container__internal__common.go @@ -0,0 +1,11 @@ +--- libpod/container_internal_common.go.orig 2025-06-18 16:07:27 UTC ++++ libpod/container_internal_common.go +@@ -192,7 +192,7 @@ func (c *Container) createInitRootfs() error { + } + + c.config.Rootfs = tmpDir +- c.config.RootfsOverlay = true ++ //c.config.RootfsOverlay = true + return nil + } + diff --git a/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go b/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go deleted file mode 100644 index 5908c595098c..000000000000 --- a/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go +++ /dev/null @@ -1,18 +0,0 @@ ---- libpod/runtime_migrate_freebsd.go.orig 2024-10-03 14:39:32 UTC -+++ libpod/runtime_migrate_freebsd.go -@@ -0,0 +1,15 @@ -+//go:build !remote -+ -+package libpod -+ -+import ( -+ "errors" -+) -+ -+func (r *Runtime) stopPauseProcess() error { -+ return nil -+} -+ -+func (r *Runtime) Migrate(newRuntime string) error { -+ return errors.New("not implemented (*Runtime) migrate") -+} diff --git a/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go b/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go deleted file mode 100644 index 0c38a6d35a56..000000000000 --- a/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go +++ /dev/null @@ -1,8 +0,0 @@ ---- libpod/runtime_migrate_unsupported.go.orig 2024-10-03 14:38:54 UTC -+++ libpod/runtime_migrate_unsupported.go -@@ -1,4 +1,4 @@ --//go:build !remote && !linux -+//go:build !remote && !linux && !freebsd - - package libpod - diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go deleted file mode 100644 index efd0b17a0aef..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go +++ /dev/null @@ -1,35 +0,0 @@ ---- vendor/github.com/containers/common/pkg/config/config.go.orig 2025-01-21 18:41:34 UTC -+++ vendor/github.com/containers/common/pkg/config/config.go -@@ -12,7 +12,6 @@ import ( - - "github.com/containers/common/internal/attributedstring" - "github.com/containers/common/libnetwork/types" -- "github.com/containers/common/pkg/capabilities" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/unshare" - units "github.com/docker/go-units" -@@ -963,24 +962,6 @@ func (c *Config) GetDefaultEnvEx(envHost, httpProxy bo - } - } - return append(env, c.Containers.Env.Get()...) --} -- --// Capabilities returns the capabilities parses the Add and Drop capability --// list from the default capabilities for the container --func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { -- userNotRoot := func(user string) bool { -- if user == "" || user == "root" || user == "0" { -- return false -- } -- return true -- } -- -- defaultCapabilities := c.Containers.DefaultCapabilities.Get() -- if userNotRoot(user) { -- defaultCapabilities = []string{} -- } -- -- return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities) - } - - // Device parses device mapping string to a src, dest & permissions string diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go deleted file mode 100644 index cf91d1d981ef..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go +++ /dev/null @@ -1,33 +0,0 @@ ---- vendor/github.com/containers/common/pkg/config/config_linux.go.orig 2025-01-21 18:41:34 UTC -+++ vendor/github.com/containers/common/pkg/config/config_linux.go -@@ -1,6 +1,7 @@ import ( - package config - - import ( -+ "github.com/containers/common/pkg/capabilities" - selinux "github.com/opencontainers/selinux/go-selinux" - ) - -@@ -25,4 +26,22 @@ var defaultHelperBinariesDir = []string{ - "/usr/local/lib/podman", - "/usr/libexec/podman", - "/usr/lib/podman", -+} -+ -+// Capabilities returns the capabilities parses the Add and Drop capability -+// list from the default capabilities for the container -+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { -+ userNotRoot := func(user string) bool { -+ if user == "" || user == "root" || user == "0" { -+ return false -+ } -+ return true -+ } -+ -+ defaultCapabilities := c.Containers.DefaultCapabilities.Get() -+ if userNotRoot(user) { -+ defaultCapabilities = []string{} -+ } -+ -+ return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities) - } diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go deleted file mode 100644 index 96b618fe65ae..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go +++ /dev/null @@ -1,12 +0,0 @@ ---- vendor/github.com/containers/common/pkg/config/config_unsupported.go.orig 2025-01-21 18:41:34 UTC -+++ vendor/github.com/containers/common/pkg/config/config_unsupported.go -@@ -5,3 +5,9 @@ func selinuxEnabled() bool { - func selinuxEnabled() bool { - return false - } -+ -+// Capabilities returns the capabilities parses the Add and Drop capability -+// list from the default capabilities for the container -+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { -+ return nil, nil -+} diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go b/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go deleted file mode 100644 index d17e29d695ee..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go +++ /dev/null @@ -1,9 +0,0 @@ ---- vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go.orig 2025-02-04 11:32:21 UTC -+++ vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go -@@ -13,5 +13,5 @@ func GetDiffer(ctx context.Context, store storage.Stor - - // GetDiffer returns a differ than can be used with ApplyDiffWithDiffer. - func GetDiffer(ctx context.Context, store storage.Store, blobDigest digest.Digest, blobSize int64, annotations map[string]string, iss ImageSourceSeekable) (graphdriver.Differ, error) { -- return nil, errors.New("format not supported on this system") -+ return nil, newErrFallbackToOrdinaryLayerDownload(errors.New("format not supported on this system")) - } diff --git a/sysutils/podman/pkg-plist b/sysutils/podman/pkg-plist index 60a484d79067..c7a1db09da81 100644 --- a/sysutils/podman/pkg-plist +++ b/sysutils/podman/pkg-plist @@ -5,6 +5,14 @@ share/bash-completion/completions/podman share/bash-completion/completions/podman-remote share/fish/vendor_completions.d/podman-remote.fish share/fish/vendor_completions.d/podman.fish +share/man/man1/podman-artifact-add.1.gz +share/man/man1/podman-artifact-extract.1.gz +share/man/man1/podman-artifact-inspect.1.gz +share/man/man1/podman-artifact-ls.1.gz +share/man/man1/podman-artifact-pull.1.gz +share/man/man1/podman-artifact-push.1.gz +share/man/man1/podman-artifact-rm.1.gz +share/man/man1/podman-artifact.1.gz share/man/man1/podman-attach.1.gz share/man/man1/podman-auto-update.1.gz share/man/man1/podman-build.1.gz @@ -109,6 +117,7 @@ share/man/man1/podman-load.1.gz share/man/man1/podman-login.1.gz share/man/man1/podman-logout.1.gz share/man/man1/podman-logs.1.gz +share/man/man1/podman-machine-cp.1.gz share/man/man1/podman-machine-info.1.gz share/man/man1/podman-machine-init.1.gz share/man/man1/podman-machine-inspect.1.gz diff --git a/sysutils/py-azure-cli-base/Makefile b/sysutils/py-azure-cli-base/Makefile index e82cdf3f931b..d8a00e873d68 100644 --- a/sysutils/py-azure-cli-base/Makefile +++ b/sysutils/py-azure-cli-base/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT NO_BUILD= yes NO_ARCH= yes USES= python -USE_PYTHON= flavors py3kplist +USE_PYTHON= flavors do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/azure/cli/command_modules diff --git a/sysutils/py-azure-cli-base/pkg-plist b/sysutils/py-azure-cli-base/pkg-plist index 3220829c629d..159bf0fa73b1 100644 --- a/sysutils/py-azure-cli-base/pkg-plist +++ b/sysutils/py-azure-cli-base/pkg-plist @@ -1,15 +1,15 @@ %%PYTHON_SITELIBDIR%%/azure/__init__.py +%%PYTHON_SITELIBDIR%%/azure/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/azure/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/azure/cli/__init__.py +%%PYTHON_SITELIBDIR%%/azure/cli/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/azure/cli/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/azure/cli/command_modules/__init__.py +%%PYTHON_SITELIBDIR%%/azure/cli/command_modules/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/azure/cli/command_modules/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/azure/mgmt/__init__.py +%%PYTHON_SITELIBDIR%%/azure/mgmt/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/azure/mgmt/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/azure/mgmt/datalake/__init__.py -%%PYTHON_SITELIBDIR%%/azure/__init__.pyo -%%PYTHON_SITELIBDIR%%/azure/__init__.pyc -%%PYTHON_SITELIBDIR%%/azure/cli/__init__.pyo -%%PYTHON_SITELIBDIR%%/azure/cli/__init__.pyc -%%PYTHON_SITELIBDIR%%/azure/cli/command_modules/__init__.pyo -%%PYTHON_SITELIBDIR%%/azure/cli/command_modules/__init__.pyc -%%PYTHON_SITELIBDIR%%/azure/mgmt/__init__.pyo -%%PYTHON_SITELIBDIR%%/azure/mgmt/__init__.pyc -%%PYTHON_SITELIBDIR%%/azure/mgmt/datalake/__init__.pyo -%%PYTHON_SITELIBDIR%%/azure/mgmt/datalake/__init__.pyc +%%PYTHON_SITELIBDIR%%/azure/mgmt/datalake/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/azure/mgmt/datalake/__pycache__/__init__%%PYTHON_TAG%%.pyc diff --git a/sysutils/py-director/Makefile b/sysutils/py-director/Makefile index 76230f1a021d..09b5a6a15486 100644 --- a/sysutils/py-director/Makefile +++ b/sysutils/py-director/Makefile @@ -1,6 +1,6 @@ PORTNAME= director DISTVERSIONPREFIX= v -DISTVERSION= 0.13.1 +DISTVERSION= 0.14.0 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-director/distinfo b/sysutils/py-director/distinfo index 64157e549645..bd404dbbac49 100644 --- a/sysutils/py-director/distinfo +++ b/sysutils/py-director/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747504889 -SHA256 (DtxdF-director-v0.13.1_GH0.tar.gz) = 9a6611edca28425e203dcc955a5cf639a2e243cc67d8c5a0d41401f4fa02cd1d -SIZE (DtxdF-director-v0.13.1_GH0.tar.gz) = 21071 +TIMESTAMP = 1750799228 +SHA256 (DtxdF-director-v0.14.0_GH0.tar.gz) = 4ea99029d1436cdcf96a2dbefc0657e137473dce3c4efe54c6b837c2609b77b3 +SIZE (DtxdF-director-v0.14.0_GH0.tar.gz) = 21262 diff --git a/sysutils/py-overlord/Makefile b/sysutils/py-overlord/Makefile index 5abfd603348d..fc448181c4a1 100644 --- a/sysutils/py-overlord/Makefile +++ b/sysutils/py-overlord/Makefile @@ -1,6 +1,6 @@ PORTNAME= overlord DISTVERSIONPREFIX= v -DISTVERSION= 0.10.0 +DISTVERSION= 0.12.0 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-overlord/distinfo b/sysutils/py-overlord/distinfo index b1b2da27d519..3a995a3a79c0 100644 --- a/sysutils/py-overlord/distinfo +++ b/sysutils/py-overlord/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749862430 -SHA256 (DtxdF-overlord-v0.10.0_GH0.tar.gz) = 17377ceaf820880c9307deadc1a6b53db5f239c5c55301a52d31de10e75a612f -SIZE (DtxdF-overlord-v0.10.0_GH0.tar.gz) = 87272 +TIMESTAMP = 1750804685 +SHA256 (DtxdF-overlord-v0.12.0_GH0.tar.gz) = d32c3b33051361e2e1c42d004896f2b71d6fceac7944d9186335f791d871d60e +SIZE (DtxdF-overlord-v0.12.0_GH0.tar.gz) = 88333 diff --git a/sysutils/reproduce/Makefile b/sysutils/reproduce/Makefile index 7edc6f481dc3..d54bc52a910a 100644 --- a/sysutils/reproduce/Makefile +++ b/sysutils/reproduce/Makefile @@ -1,6 +1,6 @@ PORTNAME= reproduce DISTVERSIONPREFIX= v -DISTVERSION= 0.5.0 +DISTVERSION= 0.6.0 CATEGORIES= sysutils MAINTAINER= dtxdf@FreeBSD.org diff --git a/sysutils/reproduce/distinfo b/sysutils/reproduce/distinfo index 0fa94c1453ee..27bdcc1bfc9e 100644 --- a/sysutils/reproduce/distinfo +++ b/sysutils/reproduce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735927896 -SHA256 (DtxdF-reproduce-v0.5.0_GH0.tar.gz) = c409b4d5916934944df219f03eb3620b7386a2e1caba4db0f36038028f277d49 -SIZE (DtxdF-reproduce-v0.5.0_GH0.tar.gz) = 10439 +TIMESTAMP = 1750799323 +SHA256 (DtxdF-reproduce-v0.6.0_GH0.tar.gz) = c9b3685163123d8167928ffd62c3282ea5fdc003f7b866541ec7d2754ccc93b4 +SIZE (DtxdF-reproduce-v0.6.0_GH0.tar.gz) = 10473 diff --git a/sysutils/skopeo/Makefile b/sysutils/skopeo/Makefile index 0dfe23142843..8d380f917e93 100644 --- a/sysutils/skopeo/Makefile +++ b/sysutils/skopeo/Makefile @@ -1,7 +1,6 @@ PORTNAME= skopeo DISTVERSIONPREFIX= v -DISTVERSION= 1.17.0 -PORTREVISION= 2 +DISTVERSION= 1.19.0 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -17,7 +16,7 @@ BUILD_DEPENDS= bash:shells/bash \ LIB_DEPENDS= libgpgme.so:security/gpgme RUN_DEPENDS= ${LOCALBASE}/etc/containers/containers.conf.sample:sysutils/containers-common -USES= gmake go:modules,no_targets,1.22 pkgconfig +USES= gmake go:modules,no_targets,1.23 pkgconfig USE_GITHUB= yes GH_ACCOUNT= containers diff --git a/sysutils/skopeo/distinfo b/sysutils/skopeo/distinfo index 9d4508ce79a5..25eb3e5a86f1 100644 --- a/sysutils/skopeo/distinfo +++ b/sysutils/skopeo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738598110 -SHA256 (containers-skopeo-v1.17.0_GH0.tar.gz) = e548c044c7b644ba455f482df387ec90aceea432b9c61a0bab0ec8534970eb69 -SIZE (containers-skopeo-v1.17.0_GH0.tar.gz) = 10682765 +TIMESTAMP = 1750104581 +SHA256 (containers-skopeo-v1.19.0_GH0.tar.gz) = 043e9f568440accf1aafca122a25c4d21441f16de49475192ec4abeef7430358 +SIZE (containers-skopeo-v1.19.0_GH0.tar.gz) = 10819827 diff --git a/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go b/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go deleted file mode 100644 index d17e29d695ee..000000000000 --- a/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go +++ /dev/null @@ -1,9 +0,0 @@ ---- vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go.orig 2025-02-04 11:32:21 UTC -+++ vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go -@@ -13,5 +13,5 @@ func GetDiffer(ctx context.Context, store storage.Stor - - // GetDiffer returns a differ than can be used with ApplyDiffWithDiffer. - func GetDiffer(ctx context.Context, store storage.Store, blobDigest digest.Digest, blobSize int64, annotations map[string]string, iss ImageSourceSeekable) (graphdriver.Differ, error) { -- return nil, errors.New("format not supported on this system") -+ return nil, newErrFallbackToOrdinaryLayerDownload(errors.New("format not supported on this system")) - } diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile index 7b20314c0220..e4c2395741aa 100644 --- a/sysutils/usermin/Makefile +++ b/sysutils/usermin/Makefile @@ -1,5 +1,5 @@ PORTNAME= usermin -PORTVERSION= 2.301 +PORTVERSION= 2.302 CATEGORIES= sysutils MASTER_SITES= http://www.webmin.com/uupdates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf @@ -17,11 +17,11 @@ RUN_DEPENDS= p5-Authen-PAM>=0:security/p5-Authen-PAM \ p5-IO-Tty>=0:devel/p5-IO-Tty \ p5-Net-SSLeay>=0:security/p5-Net-SSLeay -NO_ARCH= yes -NO_BUILD= yes USES= cpe perl5 CPE_VENDOR= webmin USE_RC_SUBR= usermin +NO_ARCH= yes +NO_BUILD= yes SUB_FILES= pkg-message SUB_LIST= PERL=${PERL} diff --git a/sysutils/usermin/distinfo b/sysutils/usermin/distinfo index 3ac1a88e02b8..1799cc515aa9 100644 --- a/sysutils/usermin/distinfo +++ b/sysutils/usermin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749976024 -SHA256 (usermin-2.301.tar.gz) = 524ac4864afd50c7b71deb047f19dcaed97765da2fc067b8825a50dbd5e6f556 -SIZE (usermin-2.301.tar.gz) = 16253163 +TIMESTAMP = 1750756861 +SHA256 (usermin-2.302.tar.gz) = 55ce97852f6de533605284d0dd8e43e90e5851f4b4bc0264b2bf86cc65d7f658 +SIZE (usermin-2.302.tar.gz) = 16244927 diff --git a/sysutils/vimpager/Makefile b/sysutils/vimpager/Makefile index 3cd535016297..4e60790ac91e 100644 --- a/sysutils/vimpager/Makefile +++ b/sysutils/vimpager/Makefile @@ -1,6 +1,10 @@ PORTNAME= vimpager DISTVERSION= 2.06.20250412 +PORTREVISION= 1 CATEGORIES= sysutils +MASTER_SITES= https://github.com/rkitover/vimpager/releases/download/${DISTVERSION:R}/ +DISTFILES+= man${EXTRACT_SUFX} +DIST_SUBDIR= ${PORTNAME} MAINTAINER= nxjoseph@protonmail.com COMMENT= Use Vim/NeoVim as a pager (${FLAVOR:U} flavor) @@ -9,6 +13,8 @@ WWW= https://github.com/rkitover/vimpager LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +TEST_DEPENDS= bats:devel/bats-core + FLAVORS= console gtk2 gtk3 motif tiny x11 neovim FLAVOR?= ${FLAVORS:[1]} @@ -39,10 +45,19 @@ CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/vimpager-/} NO_ARCH= yes -OPTIONS_DEFINE= DOCS TEST +OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= pandoc:textproc/hs-pandoc -TEST_RUN_DEPENDS= bats:devel/bats-core +DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-docs-off + +post-extract: + @(${MKDIR} ${WRKSRC}/man && \ + ${MV} ${WRKDIR}/*.1 \ + ${WRKSRC}/man) + +post-install: + @${MV} ${STAGEDIR}${PREFIX}/etc/vimpagerrc \ + ${STAGEDIR}${PREFIX}/etc/vimpagerrc.sample .include <bsd.port.mk> diff --git a/sysutils/vimpager/distinfo b/sysutils/vimpager/distinfo index 1b68ff67dcf5..3773d87ea92c 100644 --- a/sysutils/vimpager/distinfo +++ b/sysutils/vimpager/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1748713928 -SHA256 (rkitover-vimpager-2.06.20250412-842f746_GH0.tar.gz) = 935c6e80e3c66fba31ba6f1d7fb2f3f471599f21848c1b6b5063ccd7dd5374c5 -SIZE (rkitover-vimpager-2.06.20250412-842f746_GH0.tar.gz) = 164299 +TIMESTAMP = 1750325570 +SHA256 (vimpager/man.tar.gz) = 9aad1e1dd3546ce64626627f4684fdef04f0ca9d40a4815d84e6ef8ceacc6cdf +SIZE (vimpager/man.tar.gz) = 2769 +SHA256 (vimpager/rkitover-vimpager-2.06.20250412-842f746_GH0.tar.gz) = 935c6e80e3c66fba31ba6f1d7fb2f3f471599f21848c1b6b5063ccd7dd5374c5 +SIZE (vimpager/rkitover-vimpager-2.06.20250412-842f746_GH0.tar.gz) = 164299 diff --git a/sysutils/vimpager/files/extra-patch-docs-off b/sysutils/vimpager/files/extra-patch-docs-off new file mode 100644 index 000000000000..e85794547edb --- /dev/null +++ b/sysutils/vimpager/files/extra-patch-docs-off @@ -0,0 +1,61 @@ +--- Makefile.orig 2025-04-12 08:53:59 UTC ++++ Makefile +@@ -6,7 +6,6 @@ INSTALLMAN=${INSTALL} -m 444 + INSTALLBIN=${INSTALL} -m 555 + INSTALLFILE=${INSTALL} -m 444 + INSTALLMAN=${INSTALL} -m 444 +-INSTALLDOC=${INSTALL} -m 444 + INSTALLCONF=${INSTALL} -m 644 + PANDOC=./scripts/pandoc-sh + +@@ -140,22 +139,6 @@ install: docs vimpager.configured vimcat.configured + echo ${INSTALLMAN} man/vimcat.1 "${DESTDIR}${prefix}/share/man/man1/vimcat.1"; \ + ${INSTALLMAN} man/vimcat.1 "${DESTDIR}${prefix}/share/man/man1/vimcat.1"; \ + fi +- @${MKPATH} "${DESTDIR}${prefix}/share/doc/vimpager" +- ${INSTALLDOC} markdown_src/vimpager.md "${DESTDIR}${prefix}/share/doc/vimpager/vimpager.md" +- ${INSTALLDOC} markdown_src/vimcat.md "${DESTDIR}${prefix}/share/doc/vimpager/vimcat.md" +- ${INSTALLDOC} TODO.yml "${DESTDIR}${prefix}/share/doc/vimpager/TODO.yml" +- ${INSTALLDOC} DOC_AUTHORS.yml "${DESTDIR}${prefix}/share/doc/vimpager/DOC_AUTHORS.yml" +- ${INSTALLDOC} ChangeLog_vimpager.yml "${DESTDIR}${prefix}/share/doc/vimpager/ChangeLog_vimpager.yml" +- ${INSTALLDOC} ChangeLog_vimcat.yml "${DESTDIR}${prefix}/share/doc/vimpager/ChangeLog_vimcat.yml" +- ${INSTALLDOC} uganda.txt "${DESTDIR}${prefix}/share/doc/vimpager/uganda.txt" +- ${INSTALLDOC} debian/copyright "${DESTDIR}${prefix}/share/doc/vimpager/copyright" +- @if [ -d html ]; then \ +- ${MKPATH} "${DESTDIR}${prefix}/share/doc/vimpager/html"; \ +- echo ${INSTALLDOC} html/vimpager.html "${DESTDIR}${prefix}/share/doc/vimpager/html/vimpager.html"; \ +- ${INSTALLDOC} html/vimpager.html "${DESTDIR}${prefix}/share/doc/vimpager/html/vimpager.html"; \ +- echo ${INSTALLDOC} html/vimcat.html "${DESTDIR}${prefix}/share/doc/vimpager/html/vimcat.html"; \ +- ${INSTALLDOC} html/vimcat.html "${DESTDIR}${prefix}/share/doc/vimpager/html/vimcat.html"; \ +- fi + ${MKPATH} "${DESTDIR}${prefix}/share/vimpager" + @for rt_file in ${RUNTIME}; do \ + if [ ! -d "`dirname "${DESTDIR}${prefix}/share/vimpager/$$rt_file"`" ]; then \ +@@ -264,13 +247,6 @@ man/%.1: markdown_src/%.md + echo 'generating $@'; \ + ${MKPATH} `dirname '$@'` 2>/dev/null || true; \ + ${PANDOC} -s -f markdown_github $< -o $@; \ +- else \ +- if [ ! -r docs-warn-stamp ]; then \ +- echo >&2; \ +- echo "[1;31mWARNING[0m: pandoc is not available, man pages and html will not be generated. If you want to install the man pages and html, install pandoc and re-run make." >&2; \ +- echo >&2; \ +- touch docs-warn-stamp; \ +- fi; \ + fi + + .SECONDARY: vimpager.md.work vimcat.md.work +@@ -285,13 +261,6 @@ html/%.html: %.md.work + ${MKPATH} `dirname '$@'` 2>/dev/null || true; \ + ${PANDOC} -s --toc -f markdown_github $< -o $@; \ + rm -f $<; \ +- else \ +- if [ ! -r docs-warn-stamp ]; then \ +- echo >&2; \ +- echo "[1;31mWARNING[0m: pandoc is not available, man pages and html will not be generated. If you want to install the man pages and html, install pandoc and re-run make." >&2; \ +- echo >&2; \ +- touch docs-warn-stamp; \ +- fi; \ + fi + + realclean distclean clean: diff --git a/sysutils/vimpager/pkg-plist b/sysutils/vimpager/pkg-plist index 0ff111dfc741..6acf7ebd3520 100644 --- a/sysutils/vimpager/pkg-plist +++ b/sysutils/vimpager/pkg-plist @@ -1,16 +1,16 @@ bin/vimcat bin/vimpager -%%ETCDIR%%rc -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog_vimcat.yml -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog_vimpager.yml -%%PORTDOCS%%%%DOCSDIR%%/DOC_AUTHORS.yml -%%PORTDOCS%%%%DOCSDIR%%/TODO.yml -%%PORTDOCS%%%%DOCSDIR%%/copyright -%%PORTDOCS%%%%DOCSDIR%%/html/vimcat.html -%%PORTDOCS%%%%DOCSDIR%%/html/vimpager.html -%%PORTDOCS%%%%DOCSDIR%%/uganda.txt -%%PORTDOCS%%%%DOCSDIR%%/vimcat.md -%%PORTDOCS%%%%DOCSDIR%%/vimpager.md +@sample etc/vimpagerrc.sample +%%DOCS%%%%DOCSDIR%%/ChangeLog_vimcat.yml +%%DOCS%%%%DOCSDIR%%/ChangeLog_vimpager.yml +%%DOCS%%%%DOCSDIR%%/DOC_AUTHORS.yml +%%DOCS%%%%DOCSDIR%%/TODO.yml +%%DOCS%%%%DOCSDIR%%/copyright +%%DOCS%%%%DOCSDIR%%/html/vimcat.html +%%DOCS%%%%DOCSDIR%%/html/vimpager.html +%%DOCS%%%%DOCSDIR%%/uganda.txt +%%DOCS%%%%DOCSDIR%%/vimcat.md +%%DOCS%%%%DOCSDIR%%/vimpager.md share/man/man1/vimcat.1.gz share/man/man1/vimpager.1.gz %%DATADIR%%/autoload/AnsiEsc.vim diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index dca7f97736bc..8380f882fac6 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,5 +1,6 @@ PORTNAME= webmin PORTVERSION= 2.402 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh index 4126d48f2bd9..b7acc29be455 100644 --- a/sysutils/webmin/files/patch-setup.sh +++ b/sysutils/webmin/files/patch-setup.sh @@ -14,7 +14,7 @@ cd `dirname $0` if [ -x /bin/pwd ]; then wadir=`/bin/pwd` -@@ -113,7 +120,7 @@ +@@ -113,15 +120,16 @@ echo "" envetcdir="$config_dir" if [ "$envetcdir" = "" ]; then @@ -23,8 +23,10 @@ envetcdirnotfound=1 fi printf "Config file directory [$envetcdir]: " -@@ -121,7 +128,7 @@ - read config_dir + if [ "$config_dir" = "" ]; then +- read config_dir ++ config_dir="$envetcdir" ++ echo "$envetcdir" fi if [ "$config_dir" = "" ]; then - config_dir=/etc/webmin @@ -32,7 +34,7 @@ fi abspath=`echo $config_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -232,7 +239,7 @@ +@@ -232,7 +240,7 @@ else # Config directory exists .. make sure it is not in use ls $config_dir | grep -v rpmsave >/dev/null 2>&1 @@ -41,7 +43,7 @@ echo "ERROR: Config directory $config_dir is not empty" echo "" exit 2 -@@ -241,7 +248,7 @@ +@@ -241,15 +249,16 @@ # Ask for log directory envvardir="$var_dir" if [ "$envvardir" = "" ]; then @@ -50,8 +52,10 @@ envvardirnotfound=1 fi printf "Log file directory [$envvardir]: " -@@ -249,7 +256,7 @@ - read var_dir + if [ "$var_dir" = "" ]; then +- read var_dir ++ var_dir="$envvardir" ++ echo "$envvardir" fi if [ "$var_dir" = "" ]; then - var_dir=/var/webmin @@ -59,3 +63,26 @@ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then +@@ -290,7 +299,8 @@ + if [ "$perl" = "" ]; then + if [ "$perldef" = "" ]; then + printf "Full path to perl: " +- read perl ++ perl="%%PERL%%" ++ echo "$perl" + if [ "$perl" = "" ]; then + echo "ERROR: No path entered!" + echo "" +@@ -298,10 +308,8 @@ + fi + else + printf "Full path to perl (default $perldef): " +- read perl +- if [ "$perl" = "" ]; then +- perl=$perldef +- fi ++ perl=$perldef ++ echo "$perldef" + fi + fi + echo "" |