Date: Tue, 26 Oct 2021 22:34:41 GMT From: Eugene Grosbein <eugen@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bcc1dd2fa250 - main - sysutils/cciss_vol_status: update to 1.12a Message-ID: <202110262234.19QMYfMW038297@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcc1dd2fa2501aab2f2ea3dfff345e1db3a0316a commit bcc1dd2fa2501aab2f2ea3dfff345e1db3a0316a Author: Eugene Grosbein <eugen@FreeBSD.org> AuthorDate: 2021-10-26 22:22:27 +0000 Commit: Eugene Grosbein <eugen@FreeBSD.org> CommitDate: 2021-10-26 22:34:31 +0000 sysutils/cciss_vol_status: update to 1.12a Changes since 1.12 * Correct some logic, use bitwise instead of logical ands While here, fix port Makefile bug checking for SRC_BASE without including bsd.port.pre.mk, so SRC_BASE was always empty and the check works due to /sys symlink pointing to real source tree; the check failed without such /sys symlink. Also, remove the patch upstreamed. PR: 259462 Approved by: Frank Wall (maintainer, initial patch) --- sysutils/cciss_vol_status/Makefile | 12 ++++++------ sysutils/cciss_vol_status/distinfo | 6 +++--- sysutils/cciss_vol_status/files/patch-cciss_vol_status.c | 11 ----------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/sysutils/cciss_vol_status/Makefile b/sysutils/cciss_vol_status/Makefile index f5fbd014afb8..25768bce78a4 100644 --- a/sysutils/cciss_vol_status/Makefile +++ b/sysutils/cciss_vol_status/Makefile @@ -1,7 +1,7 @@ # Created by: mm PORTNAME= cciss_vol_status -PORTVERSION= 1.12 +PORTVERSION= 1.12a CATEGORIES= sysutils MASTER_SITES= SF/cciss/${PORTNAME} @@ -16,12 +16,12 @@ GNU_CONFIGURE= yes PLIST_FILES= bin/cciss_vol_status etc/periodic/daily/cciss_vol_status man/man8/cciss_vol_status.8.gz SUB_FILES= cciss_vol_status -.if !exists(${SRC_BASE}/sys/dev/ciss/cissio.h) -IGNORE= cciss_vol_status requires kernel sources of the ciss driver -.endif - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${WRKDIR}/cciss_vol_status ${STAGEDIR}${PREFIX}/etc/periodic/daily/cciss_vol_status -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if !exists(${SRC_BASE}/sys/dev/ciss/cissio.h) +IGNORE= cciss_vol_status requires kernel sources of the ciss driver +.endif +.include <bsd.port.post.mk> diff --git a/sysutils/cciss_vol_status/distinfo b/sysutils/cciss_vol_status/distinfo index 161c51069c90..48ee99ab3e20 100644 --- a/sysutils/cciss_vol_status/distinfo +++ b/sysutils/cciss_vol_status/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510485982 -SHA256 (cciss_vol_status-1.12.tar.gz) = a49abbfde6369416ac3d71bca6f60f342584eb99c786c080f8722ad19a17f91f -SIZE (cciss_vol_status-1.12.tar.gz) = 120346 +TIMESTAMP = 1635285613 +SHA256 (cciss_vol_status-1.12a.tar.gz) = db5a2508e4a5c57fb35a8b6d9c841db339b7386798a6c560d92f2369cf1cca47 +SIZE (cciss_vol_status-1.12a.tar.gz) = 120748 diff --git a/sysutils/cciss_vol_status/files/patch-cciss_vol_status.c b/sysutils/cciss_vol_status/files/patch-cciss_vol_status.c deleted file mode 100644 index 5ab0ec4b21af..000000000000 --- a/sysutils/cciss_vol_status/files/patch-cciss_vol_status.c +++ /dev/null @@ -1,11 +0,0 @@ ---- cciss_vol_status.c.orig 2017-10-18 07:49:43.578445000 +0200 -+++ cciss_vol_status.c 2017-10-18 07:51:20.372056000 +0200 -@@ -1098,7 +1098,7 @@ - break; - case 1: sprintf(raid_level, "RAID 4"); - break; -- case 2: sprintf(raid_level, "RAID 1"); -+ case 2: sprintf(raid_level, "RAID 1(1+0)"); - break; - case 3: sprintf(raid_level, "RAID 5"); - break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110262234.19QMYfMW038297>