diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2017-03-21 08:03:00 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2017-03-21 08:03:00 +0000 |
| commit | 51e4d91e24982c17fc2a08b811b718209c4d1752 (patch) | |
| tree | 60576d56e7b381a53ac9296a0a2135b2c4b3184c /sysutils/gkrellm2 | |
| parent | 4945dd912791bb7dd6d8f2dbba0d8d80f495a3bf (diff) | |
| download | ports-51e4d91e24982c17fc2a08b811b718209c4d1752.tar.gz ports-51e4d91e24982c17fc2a08b811b718209c4d1752.zip | |
Notes
Diffstat (limited to 'sysutils/gkrellm2')
| -rw-r--r-- | sysutils/gkrellm2/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c | 24 |
2 files changed, 21 insertions, 5 deletions
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index 8ae537ad1c98..8c4071292472 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -2,7 +2,7 @@ PORTNAME= gkrellm PORTVERSION= 2.3.10 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= sysutils ipv6 MASTER_SITES= http://gkrellm.srcbox.net/releases/ \ LOCAL/ume diff --git a/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c b/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c index f0aef691ce1f..b479fd4e0970 100644 --- a/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c +++ b/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c @@ -1,6 +1,22 @@ ---- src/sysdeps/freebsd.c.orig 2010-10-07 14:29:35 UTC -+++ src/sysdeps/freebsd.c -@@ -1441,7 +1441,9 @@ get_data(int iodev, u_char command, int +--- src/sysdeps/freebsd.c.orig 2014-10-14 17:46:57.000000000 -0700 ++++ src/sysdeps/freebsd.c 2017-03-21 00:00:48.928710000 -0700 +@@ -701,9 +701,15 @@ + xig->xig_len > sizeof(struct xinpgen); + xig = (struct xinpgen *)((char *)xig + xig->xig_len)) + { ++#if __FreeBSD_version >= 1200026 ++ struct xtcpcb *tp = (struct xtcpcb *)xig; ++ struct xinpcb *inp = &tp->xt_inp; ++ struct xsocket *so = &inp->xi_socket; ++#else + struct tcpcb *tp = &((struct xtcpcb *)xig)->xt_tp; + struct inpcb *inp = &((struct xtcpcb *)xig)->xt_inp; + struct xsocket *so = &((struct xtcpcb *)xig)->xt_socket; ++#endif + + /* Ignore sockets for protocols other than tcp. */ + if (so->xso_protocol != IPPROTO_TCP) +@@ -1441,7 +1447,9 @@ struct smbcmd cmd; bzero(&cmd, sizeof(cmd)); @@ -10,7 +26,7 @@ cmd.slave = 0x5a; cmd.cmd = command; if (ioctl(iodev, SMB_READB, (caddr_t)&cmd) == -1) -@@ -1449,6 +1451,9 @@ get_data(int iodev, u_char command, int +@@ -1449,6 +1457,9 @@ close(iodev); return FALSE; } |