Date: Tue, 21 Mar 2017 08:03:00 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436568 - in head/sysutils/gkrellm2: . files Message-ID: <201703210803.v2L8302W092690@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius (src committer) Date: Tue Mar 21 08:03:00 2017 New Revision: 436568 URL: https://svnweb.freebsd.org/changeset/ports/436568 Log: Make it compilable on FreeBSD 12 after struct inpcb and struct tcpcb were stopped being exported. Modified: head/sysutils/gkrellm2/Makefile head/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c Modified: head/sysutils/gkrellm2/Makefile ============================================================================== --- head/sysutils/gkrellm2/Makefile Tue Mar 21 07:36:38 2017 (r436567) +++ head/sysutils/gkrellm2/Makefile Tue Mar 21 08:03:00 2017 (r436568) @@ -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 Modified: head/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c ============================================================================== --- head/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c Tue Mar 21 07:36:38 2017 (r436567) +++ head/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c Tue Mar 21 08:03:00 2017 (r436568) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703210803.v2L8302W092690>