cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update symon to 2.83

Browse Source 
- take maintainer, agreed with present maintainer(+upstream) Willem Dijkstra
This commit is contained in:
sthen 2011-05-02 21:19:13 +00:00
parent 67c829d0ee
commit 27dab222b0
4 changed files with 14 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysutils/symon/Makefile
View File

@ -1,19 +1,19 @@
# $OpenBSD: Makefile,v 1.46 2011/03/09 08:04:48 landry Exp $
# $OpenBSD: Makefile,v 1.47 2011/05/02 21:19:13 sthen Exp $
COMMENT-main= active monitoring tool
V= 2.82
V= 2.83
DISTNAME= symon-${V}
WRKDIST= ${WRKDIR}/symon
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-mon= symon-mon-${V}
FULLPKGNAME-mux= symon-mux-${V}
FULLPKGNAME-mux= symon-mux-${V}
CATEGORIES= sysutils net
REVISION-main= 1
REVISION-mon= 1
REVISION-mux= 1
HOMEPAGE= http://www.xs4all.nl/~wpd/symon
MAINTAINER= Willem Dijkstra <wpd@xs4all.nl>
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM= Yes
@ -39,8 +39,8 @@ COMMENT-mux= symon data gatherer
USE_GROFF = Yes
NO_REGRESS= Yes
WRKDIST= ${WRKDIR}/symon
MAKE_ENV= LIBS="-L${X11BASE}/lib" MANDIR="man"
.ifdef DEBUG
# avoid stripping the binaries
MAKE_ENV+= DEBUG=1

10
sysutils/symon/distinfo
View File

@ -1,5 +1,5 @@
MD5 (symon-2.82.tar.gz) = dMOqbktMbCMe91ELt55zgw==
RMD160 (symon-2.82.tar.gz) = AQXAXYwDlnD4OHGaXm+E6TwglFU=
SHA1 (symon-2.82.tar.gz) = MarRa+Dzbcqq4Lo4ySyO47dUguo=
SHA256 (symon-2.82.tar.gz) = UnWIGS+pAYNPwuyGoYyWpwdUrQw6b+ovwIYrdV7USYY=
SIZE (symon-2.82.tar.gz) = 102319
MD5 (symon-2.83.tar.gz) = nZ5tBA+36y5VldcHtedhCg==
RMD160 (symon-2.83.tar.gz) = vLjTm2UO4BYKhkbZf5ERcoGvcyk=
SHA1 (symon-2.83.tar.gz) = vueiW5ncIYOIyBVKJDNsxiJiLHs=
SHA256 (symon-2.83.tar.gz) = Y9TLwhjd/nT+V4c+FJ2uTM3bTnvGft/LtSI9G0Z0yoQ=
SIZE (symon-2.83.tar.gz) = 105322

15
sysutils/symon/patches/patch-Makefile_inc
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-Makefile_inc,v 1.1 2010/10/19 01:07:14 sthen Exp $
--- Makefile.inc.orig Mon Oct 18 15:33:00 2010
+++ Makefile.inc Mon Oct 18 15:33:01 2010
@@ -2,11 +2,7 @@ V=2.82
AR?= ar
CC?= cc
-.ifdef DEBUG
-CFLAGS=-g -Wall
-.else
CFLAGS+=-Wall
-.endif
INSTALL?=install
LORDER?=lorder
TSORT?=tsort

49
sysutils/symon/patches/patch-platform_OpenBSD_sm_io_c
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-platform_OpenBSD_sm_io_c,v 1.1 2010/10/19 01:07:14 sthen Exp $
Handle hw.disknames with "devname:" and "devname:uid" formats;
allow either device name or uid to match the device.
--- platform/OpenBSD/sm_io.c.orig Sun Jun 28 19:40:29 2009
+++ platform/OpenBSD/sm_io.c Mon Oct 18 17:22:14 2010
@@ -51,6 +51,7 @@
static char *io_dkstr = NULL;
static struct diskstats *io_dkstats = NULL;
static char **io_dknames = NULL;
+static char **io_dkuids = NULL;
static int io_dks = 0;
static int io_maxdks = 0;
static size_t io_maxstr = 0;
@@ -98,6 +99,7 @@ gets_io()
io_dkstats = xrealloc(io_dkstats, io_maxdks * sizeof(struct diskstats));
io_dknames = xrealloc(io_dknames, io_maxdks * sizeof(char *));
+ io_dkuids = xrealloc(io_dkuids, io_maxdks * sizeof(char *));
io_dkstr = xrealloc(io_dkstr, io_maxstr + 1);
}
@@ -128,7 +130,13 @@ gets_io()
*p = '\0';
io_dks++; p++;
io_dknames[io_dks] = p;
+ io_dkuids[io_dks] = NULL;
}
+ if ((*p == ':') && (*p+1 != '\0')) {
+ *p = '\0';
+ p++;
+ io_dkuids[io_dks] = p;
+ }
p++;
}
}
@@ -146,8 +154,10 @@ get_io(char *symon_buf, int maxlen, struct stream *st)
/* look for disk */
for (i = 0; i <= io_dks; i++) {
- if (strncmp(io_dknames[i], st->arg,
+ if ((strncmp(io_dknames[i], st->arg,
(io_dkstr + io_maxstr - io_dknames[i])) == 0)
+ || (io_dkuids[i] && (strncmp(io_dkuids[i], st->arg,
+ (io_dkstr + io_maxstr - io_dkuids[i])) == 0)))
#ifdef HAS_IO2
return snpack(symon_buf, maxlen, st->arg, MT_IO2,
io_dkstats[i].ds_rxfer,