svn commit: r446204 - in head/net-mgmt/netdata: . files

[Mahdi Mokhtari]

Author: mmokhi
Date: Wed Jul 19 15:18:55 2017
New Revision: 446204
URL: https://svnweb.freebsd.org/changeset/ports/446204

Log:
  net-mgmt/netdata: Unbreak for post-ino64 12-CURRENT
  
  Reported by:	lme
  Reviewed by:	mat (mentor)
  Approved by:	mat (mentor)
  Sponsored by:	Netzkommune GmbH
  Differential Revision:	https://reviews.freebsd.org/D11648

Added:
  head/net-mgmt/netdata/files/patch-src_apps__plugin.c   (contents, props changed)
Modified:
  head/net-mgmt/netdata/Makefile

Modified: head/net-mgmt/netdata/Makefile
==============================================================================
--- head/net-mgmt/netdata/Makefile	Wed Jul 19 15:15:42 2017	(r446203)
+++ head/net-mgmt/netdata/Makefile	Wed Jul 19 15:18:55 2017	(r446204)
@@ -25,7 +25,7 @@ USES=		autoreconf pathfix pkgconfig:both python sheban
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-D_WANT_VMMETER -I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 

Added: head/net-mgmt/netdata/files/patch-src_apps__plugin.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/netdata/files/patch-src_apps__plugin.c	Wed Jul 19 15:18:55 2017	(r446204)
@@ -0,0 +1,17 @@
+--- src/apps_plugin.c.orig	2017-07-18 22:52:41 UTC
++++ src/apps_plugin.c
+@@ -1572,7 +1572,13 @@ static inline int read_pid_file_descript
+                             break;
+                         default:
+                             /* print protocol number and socket address */
+-                            sprintf(fdsname, "socket: other: %d %s %s", fds->kf_sock_protocol, fds->kf_sa_local.__ss_pad1, fds->kf_sa_local.__ss_pad2);
++                            sprintf(fdsname, "socket: other: %d %s %s", fds->kf_sock_protocol,
++                #if defined(__FreeBSD__) && (__FreeBSD_version >= 1200031)
++                            fds->kf_un.kf_sock.kf_sa_local.__ss_pad1, fds->kf_un.kf_sock.kf_sa_local.__ss_pad2
++                #else
++                            fds->kf_sa_local.__ss_pad1, fds->kf_sa_local.__ss_pad2
++                #endif
++                            );
+                     }
+                     break;
+                 case KF_TYPE_PIPE: