From 48adf345f44d4cbdc475567af993d4fb4b9b9047 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Tue, 26 Mar 2024 21:22:23 +0100
Subject: [PATCH] xload: update to 1.2.0
---
components/x11/xload/xload.p5m | 1 +
components/x11/xload/manifests/sample-manifest.p5m | 3 ++-
components/x11/xload/pkg5 | 6 +-----
components/x11/xload/Makefile | 6 +++---
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/components/x11/xload/Makefile b/components/x11/xload/Makefile
index b485f7b..c4f5649 100644
--- a/components/x11/xload/Makefile
+++ b/components/x11/xload/Makefile
@@ -18,16 +18,16 @@
include $(WS_MAKE_RULES)/x11.mk
COMPONENT_NAME= xload
-COMPONENT_VERSION= 1.1.4
+COMPONENT_VERSION= 1.2.0
COMPONENT_SUMMARY= xload - system load average display for X
COMPONENT_FMRI= diagnostic/xload
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
-COMPONENT_ARCHIVE_HASH= sha256:8346b99120db24e0f42920f7f12e23e9b1b407d3a66ce419990387b608373031
+COMPONENT_ARCHIVE_HASH= sha256:2c0fe6d624e1a25c1707e2d56407b979d6a78d64271df9ea0a89d99b81b59a80
COMPONENT_LICENSE_FILE= COPYING
include $(WS_MAKE_RULES)/common.mk
-PKG_PROTO_DIRS+=$(BUILD_DIR_64)
+PKG_PROTO_DIRS += $(BUILD_DIR_64)
# Auto-generated dependencies
REQUIRED_PACKAGES += system/library
diff --git a/components/x11/xload/manifests/sample-manifest.p5m b/components/x11/xload/manifests/sample-manifest.p5m
index 4e4871a..af62938 100644
--- a/components/x11/xload/manifests/sample-manifest.p5m
+++ b/components/x11/xload/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
-# Copyright 2016 <contributor>
+# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
diff --git a/components/x11/xload/pkg5 b/components/x11/xload/pkg5
index b8a0426..b9ee34b 100644
--- a/components/x11/xload/pkg5
+++ b/components/x11/xload/pkg5
@@ -1,10 +1,6 @@
{
"dependencies": [
- "SUNWcs",
- "developer/build/autoconf/xorg-macros",
- "shell/ksh93",
"system/library",
- "x11/header/x11-protocols",
"x11/library/libx11",
"x11/library/libxmu",
"x11/library/toolkit/libxaw7",
@@ -14,4 +10,4 @@
"diagnostic/xload"
],
"name": "xload"
-}
\ No newline at end of file
+}
diff --git a/components/x11/xload/xload.p5m b/components/x11/xload/xload.p5m
index c629fe7..2e2d0d6 100644
--- a/components/x11/xload/xload.p5m
+++ b/components/x11/xload/xload.p5m
@@ -14,6 +14,7 @@
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--
Gitblit v1.9.3