Index: head/net-mgmt/nagcon/Makefile =================================================================== --- head/net-mgmt/nagcon/Makefile (revision 458850) +++ head/net-mgmt/nagcon/Makefile (revision 458851) @@ -1,34 +1,34 @@ # Created by: Douglas K. Rand # $FreeBSD$ PORTNAME= nagcon -PORTVERSION= 0.0.30 +PORTVERSION= 0.0.31 CATEGORIES= net-mgmt MASTER_SITES= http://www.vanheusden.com/nagcon/ MAINTAINER= rand@meridian-enviro.com COMMENT= Nagios console monitor LIB_DEPENDS= libstrfunc.so:devel/libstrfunc PLIST_FILES= bin/nagcon CFILES= error.c CPPFILES= utils.cpp br.cpp nc.cpp pl.cpp USES= ncurses tar:tgz CFLAGS+= -DVERSION=\"${PORTVERSION}\" -I${LOCALBASE}/include -LDFLAGS+= -lncurses -lstdc++ -L${LOCALBASE}/lib -lstrfunc +LDFLAGS+= -lncurses -lstdc++ -L${LOCALBASE}/lib -lstrfunc -ltinfo do-build: ${CC} ${CFLAGS} -c -o ${WRKSRC}/${CFILES:C/\.c//}.o ${WRKSRC}/${CFILES} .for f in ${CPPFILES} ${CXX} ${CFLAGS} -c -o ${WRKSRC}/${f:C/\.cpp//}.o ${WRKSRC}/${f} .endfor ${CC} ${LDFLAGS} ${WRKSRC}/error.o ${CPPFILES:C/(.*)\.cpp/${WRKSRC}\/\1.o/} \ -o ${WRKSRC}/${PORTNAME} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include Index: head/net-mgmt/nagcon/distinfo =================================================================== --- head/net-mgmt/nagcon/distinfo (revision 458850) +++ head/net-mgmt/nagcon/distinfo (revision 458851) @@ -1,2 +1,3 @@ -SHA256 (nagcon-0.0.30.tgz) = e115f62fdd315b85dfe3a4d0e52a17e7e10ae064b012caa45f4b5dc50889020e -SIZE (nagcon-0.0.30.tgz) = 15479 +TIMESTAMP = 1514478086 +SHA256 (nagcon-0.0.31.tgz) = 592a3607fb7ac3e7f530e3560f4027bcac43dfb15977680e797769e7aca22da1 +SIZE (nagcon-0.0.31.tgz) = 15745 Index: head/net-mgmt/nagcon/files/patch-br.cpp =================================================================== --- head/net-mgmt/nagcon/files/patch-br.cpp (revision 458850) +++ head/net-mgmt/nagcon/files/patch-br.cpp (revision 458851) @@ -1,10 +1,10 @@ ---- br.cpp.orig Thu Feb 28 15:12:00 2008 -+++ br.cpp Thu Feb 28 15:12:12 2008 -@@ -28,6 +28,7 @@ +--- br.cpp.orig 2017-12-27 12:07:16 UTC ++++ br.cpp +@@ -12,6 +12,7 @@ #include #include #include +#include #include "br.h" buffered_reader::buffered_reader(int cur_fd, int cur_block_size) Index: head/net-mgmt/nagcon/files/patch-br.h =================================================================== --- head/net-mgmt/nagcon/files/patch-br.h (revision 458850) +++ head/net-mgmt/nagcon/files/patch-br.h (revision 458851) @@ -1,15 +1,15 @@ ---- ./br.h.orig Tue Mar 28 20:54:02 2006 -+++ ./br.h Tue Mar 28 20:56:02 2006 -@@ -8,6 +8,12 @@ +--- br.h.orig 2017-12-27 12:07:16 UTC ++++ br.h +@@ -10,6 +10,12 @@ #define likely(x) __builtin_expect((x),1) #define unlikely(x) __builtin_expect((x),0) +/* FreeBSD uses open/stat/lseek/off_t rather than open64/stat64/lseek64/off64_t */ +#define stat64 stat +#define lseek64 lseek +#define open64 open +#define off64_t off_t + class buffered_reader { private: Index: head/net-mgmt/nagcon/files/patch-nc.cpp =================================================================== --- head/net-mgmt/nagcon/files/patch-nc.cpp (revision 458850) +++ head/net-mgmt/nagcon/files/patch-nc.cpp (revision 458851) @@ -1,29 +1,29 @@ ---- nc.cpp.orig Tue May 2 09:29:37 2006 -+++ nc.cpp Sat May 6 21:42:59 2006 -@@ -258,7 +258,7 @@ +--- nc.cpp.orig 2017-12-27 12:07:16 UTC ++++ nc.cpp +@@ -178,7 +178,7 @@ void help(void) printf("-f file what file to monitor (usuallly:\n"); printf("-F host:port connect to a host for retrieving the status.log information\n"); - printf(" /usr/local/nagios/var/status.log, look for status_file in\n"); + printf(" /var/spool/nagios/status.log, look for status_file in\n"); printf(" the nagios.cfg file\n"); printf("-i x check interval (in seconds)\n"); printf("-a list also the services for hosts that are down\n"); -@@ -288,7 +288,7 @@ +@@ -210,7 +210,7 @@ int main(int argc, char *argv[]) WINDOW *win; int sw; - char *status_log = "/usr/local/nagios/var/status.log"; + char *status_log = "/var/spool/nagios/status.log"; int interval = 5; char list_all_problems = 0; char always_notify = 0; -@@ -390,7 +390,7 @@ +@@ -322,7 +322,7 @@ int main(int argc, char *argv[]) wattroff(win, COLOR_PAIR(MY_DRAW)); if (file_mode == 0) /* file */ - fd = open64(status_log, O_RDONLY); + fd = open(status_log, O_RDONLY); else fd = connect_to(status_log); Index: head/net-mgmt/nagcon/files/patch-utils.cpp =================================================================== --- head/net-mgmt/nagcon/files/patch-utils.cpp (revision 458850) +++ head/net-mgmt/nagcon/files/patch-utils.cpp (revision 458851) @@ -1,12 +1,12 @@ ---- utils.cpp.orig Thu Feb 28 14:48:39 2008 -+++ utils.cpp Thu Feb 28 15:11:48 2008 -@@ -29,6 +29,9 @@ +--- utils.cpp.orig 2017-12-27 12:07:16 UTC ++++ utils.cpp +@@ -10,6 +10,9 @@ #include #include #include +#include +#include +#include extern "C" { #include "error.h" }