7 files changed, 44 insertions, 49 deletions

diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index 60933ba33484..0a994056f7fd 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	symon
-PORTVERSION=	2.71
-PORTREVISION=	2
+PORTVERSION=	2.72
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.xs4all.nl/~wpd/symon/philes/
 
@@ -24,11 +23,11 @@ WITHOUT_SYMUX=	yes
 .endif
 
 .if !defined(WITHOUT_SYMUX)
-LIB_DEPENDS=	rrd.2:${PORTSDIR}/net/rrdtool
+LIB_DEPENDS+=	rrd.2:${PORTSDIR}/net/rrdtool
 .endif
 
 .if defined(WITHOUT_SYMUX) && defined(WITHOUT_SYMON)
-IGNORE=	You have defined both WITHOUT_SYMUX or WITHOUT_RRD *and* WITHOUT_SYMON
+IGNORE=	you have defined both WITHOUT_SYMUX or WITHOUT_RRD *and* WITHOUT_SYMON
 .endif
 
 SUBDIR=		lib
diff --git a/sysutils/symon/distinfo b/sysutils/symon/distinfo
index 466fed19936b..3a2f5872cb6f 100644
--- a/sysutils/symon/distinfo
+++ b/sysutils/symon/distinfo
@@ -1,2 +1,3 @@
-MD5 (symon-2.71.tar.gz) = a9c0c77239c834fad0f326521d76437e
-SIZE (symon-2.71.tar.gz) = 79223
+MD5 (symon-2.72.tar.gz) = c88eeb4c7fb1c99e7d4448a8c3977bb2
+SHA256 (symon-2.72.tar.gz) = b91a084ad6e8d91cd8c01a01a56a88e97e6a42f2036cdd844206ca5ff1f88bf1
+SIZE (symon-2.72.tar.gz) = 82218
diff --git a/sysutils/symon/files/patch-platform__FreeBSD__platform.h b/sysutils/symon/files/patch-platform__FreeBSD__platform.h
new file mode 100644
index 000000000000..61f075a122fb
--- /dev/null
+++ b/sysutils/symon/files/patch-platform__FreeBSD__platform.h
@@ -0,0 +1,14 @@
+--- platform/FreeBSD/platform.h.orig	Fri Oct 21 16:58:43 2005
++++ platform/FreeBSD/platform.h	Fri Dec  2 12:03:04 2005
+@@ -4,8 +4,10 @@
+ #define _CONF_FREEBSD_H
+ 
+ #include <sys/queue.h>
+-#include <sys/socket.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
++#include <sys/time.h>
++#include <sys/dkstat.h>
+ #include <sys/resource.h>
+ 
+ #include <net/if.h>
diff --git a/sysutils/symon/files/patch-platform__FreeBSD__sm_pf.c b/sysutils/symon/files/patch-platform__FreeBSD__sm_pf.c
new file mode 100644
index 000000000000..ce0ee19c0453
--- /dev/null
+++ b/sysutils/symon/files/patch-platform__FreeBSD__sm_pf.c
@@ -0,0 +1,15 @@
+--- platform/FreeBSD/sm_pf.c.orig	Fri Dec  2 12:06:20 2005
++++ platform/FreeBSD/sm_pf.c	Fri Dec  2 12:06:38 2005
+@@ -73,6 +73,12 @@
+     fatal("pf support not available");
+ }
+ 
++void
++gets_pf()
++{
++    fatal("pf support not available");
++}
++
+ int
+ get_pf(char *symon_buf, int maxlen, struct stream *st)
+ {
diff --git a/sysutils/symon/files/patch-sm_io.c b/sysutils/symon/files/patch-sm_io.c
index f1d898f2736c..01d889e4b4dc 100644
--- a/sysutils/symon/files/patch-sm_io.c
+++ b/sysutils/symon/files/patch-sm_io.c
@@ -1,6 +1,6 @@
---- platform/FreeBSD/sm_io.c.orig	Mon Jul 25 12:08:47 2005
-+++ platform/FreeBSD/sm_io.c	Mon Jul 25 12:12:27 2005
-@@ -81,7 +81,7 @@
+--- platform/FreeBSD/sm_io.c.orig	Sat Nov 12 20:16:41 2005
++++ platform/FreeBSD/sm_io.c	Sat Nov 12 20:17:10 2005
+@@ -80,7 +80,7 @@
  void
  gets_io()
  {
@@ -9,7 +9,7 @@
      io_numdevs = devstat_getnumdevs(NULL);
  #else
      io_numdevs = getnumdevs();
-@@ -98,7 +98,7 @@
+@@ -97,7 +97,7 @@
      /* clear the devinfo struct, as getdevs expects it to be all zeroes */
      bzero(io_stats.dinfo, sizeof(struct devinfo));
  
@@ -18,12 +18,12 @@
      devstat_getdevs(NULL, &io_stats);
  #else
      getdevs(&io_stats);
-@@ -118,7 +118,7 @@
- 	    strlen(ds->device_name) < strlen(dev) &&
- 	    isdigit(dev[strlen(ds->device_name)]) &&
- 	    atoi(&dev[strlen(ds->device_name)]) == ds->unit_number) {
+@@ -117,7 +117,7 @@
+ 	    strlen(ds->device_name) < strlen(st->arg) &&
+ 	    isdigit(st->arg[strlen(ds->device_name)]) &&
+ 	    atoi(&st->arg[strlen(ds->device_name)]) == ds->unit_number) {
 -#if DEVSTAT_USER_API_VER == 5
 +#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6
- 	    return snpack(symon_buf, maxlen, dev, MT_IO2,
+ 	    return snpack(symon_buf, maxlen, st->arg, MT_IO2,
  			  ds->operations[DEVSTAT_READ],
  			  ds->operations[DEVSTAT_WRITE],
diff --git a/sysutils/symon/files/patch-sm_mem.c b/sysutils/symon/files/patch-sm_mem.c
deleted file mode 100644
index 214892ff23ce..000000000000
--- a/sysutils/symon/files/patch-sm_mem.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- platform/FreeBSD/sm_mem.c.orig	Tue Sep 27 18:32:40 2005
-+++ platform/FreeBSD/sm_mem.c	Tue Sep 27 19:00:29 2005
-@@ -119,6 +119,7 @@
-     me_stats[1] = pagetob(me_vmtotal.t_rm);
-     me_stats[2] = pagetob(me_vmtotal.t_free);
- 
-+    me_stats[3] = me_stats[4] = 0;
- #ifdef HAS_XSWDEV
-     vmnswp_siz = sizeof (int);
-     if (sysctl(me_vmnswp_mib_nam, me_vmnswp_mib_len, &vmnswp_dat, (void *)&vmnswp_siz, NULL, 0) < 0) {
-@@ -134,8 +135,6 @@
- 	me_stats[3] += (vmiswp_dat.xsw_used * DEV_BSIZE);
- 	me_stats[4] += (vmiswp_dat.xsw_nblks * DEV_BSIZE);
-     }
--#else
--    me_stats[3] = me_stats[4] = 0;
- #endif
- 
-     return snpack(symon_buf, maxlen, s, MT_MEM,
diff --git a/sysutils/symon/files/patch-sm_proc.c b/sysutils/symon/files/patch-sm_proc.c
deleted file mode 100644
index 9c6e33432bfb..000000000000
--- a/sysutils/symon/files/patch-sm_proc.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- platform/FreeBSD/sm_proc.c.orig	Mon Apr 25 17:34:28 2005
-+++ platform/FreeBSD/sm_proc.c	Mon Apr 25 17:34:43 2005
-@@ -182,9 +182,9 @@
- 		if (kvm_read(proc_kd, (unsigned long)pp->ki_paddr, &pproc,
- 			     sizeof(pproc)) == sizeof(pproc)) {
- #ifdef HAS_RUSAGE_EXT
--		    cpu_uticks += pproc.p_rux.p_uticks;  /* user */
--		    cpu_sticks += pproc.p_rux.p_sticks;  /* sys  */
--		    cpu_iticks += pproc.p_rux.p_iticks;  /* int  */
-+		    cpu_uticks += pproc.p_rux.rux_uticks;  /* user */
-+		    cpu_sticks += pproc.p_rux.rux_sticks;  /* sys  */
-+		    cpu_iticks += pproc.p_rux.rux_iticks;  /* int  */
- #else
- 		    cpu_uticks += pproc.p_uticks;  /* user */
- 		    cpu_sticks += pproc.p_sticks;  /* sys  */