5 files changed, 43 insertions, 43 deletions

diff --git a/net-mgmt/ndoutils/Makefile b/net-mgmt/ndoutils/Makefile
index 019125653781..60fb60a59c59 100644
--- a/net-mgmt/ndoutils/Makefile
+++ b/net-mgmt/ndoutils/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ndoutils
-PORTVERSION=	2.0.0
+PORTVERSION=	2.1.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
 
@@ -27,15 +27,10 @@ NAGIOS3X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:net-mgmt/nagios
 NAGIOS4X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:net-mgmt/nagios4
 NANOSLEEP_CONFIGURE_ENABLE=	nanosleep
 
-USE_MYSQL=	yes
-USES=		perl5
+USES=		mysql perl5
 USE_RC_SUBR=	ndo2db
 SUB_FILES=	pkg-message
 
-MAKE_JOBS_UNSAFE=	yes
-
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/file2sock ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/log2ndo ${STAGEDIR}${PREFIX}/bin
@@ -46,17 +41,17 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/config/nagios.cfg ${STAGEDIR}${PREFIX}/etc/nagios/ndoutils.cfg-sample
 	${INSTALL_DATA} ${WRKSRC}/config/ndo2db.cfg-sample ${STAGEDIR}${PREFIX}/etc/nagios/ndo2db.cfg-sample
 	${INSTALL_DATA} ${WRKSRC}/config/ndomod.cfg-sample ${STAGEDIR}${PREFIX}/etc/nagios/ndomod.cfg-sample
-.if ${PORT_OPTIONS:MNAGIOS3X}
+
+do-install-NAGIOS3X-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ndo2db-3x ${STAGEDIR}${PREFIX}/bin/ndo2db
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ndomod-3x.o ${STAGEDIR}${PREFIX}/bin/ndomod.o
-.endif
-.if ${PORT_OPTIONS:MNAGIOS4X}
+
+do-install-NAGIOS4X-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ndo2db-4x ${STAGEDIR}${PREFIX}/bin/ndo2db
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ndomod-4x.o ${STAGEDIR}${PREFIX}/bin/ndomod.o
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/)
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ndoutils/distinfo b/net-mgmt/ndoutils/distinfo
index d9097d54d21d..1112b19303b4 100644
--- a/net-mgmt/ndoutils/distinfo
+++ b/net-mgmt/ndoutils/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ndoutils-2.0.0.tar.gz) = b95047c812fb61465e66a9e1a6d4a42bf00620f334f08a6faf5afe20bdd43ba1
-SIZE (ndoutils-2.0.0.tar.gz) = 2207263
+TIMESTAMP = 1470350374
+SHA256 (ndoutils-2.1.0.tar.gz) = 0ae1efe227980c083a865f5e85d003750a9055f24cc387e6a10078e43600d857
+SIZE (ndoutils-2.1.0.tar.gz) = 2260878
diff --git a/net-mgmt/ndoutils/files/patch-config__ndomod.cfg-sample.in b/net-mgmt/ndoutils/files/patch-config_ndomod.cfg-sample.in
index eaae6aa06012..35494d4dcea8 100644
--- a/net-mgmt/ndoutils/files/patch-config__ndomod.cfg-sample.in
+++ b/net-mgmt/ndoutils/files/patch-config_ndomod.cfg-sample.in
@@ -1,6 +1,6 @@
---- config/ndomod.cfg-sample.in.orig	2014-05-27 03:33:53.216081844 +0600
-+++ config/ndomod.cfg-sample.in	2014-05-27 03:37:39.843066041 +0600
-@@ -82,7 +82,7 @@
+--- config/ndomod.cfg-sample.in.orig	2016-07-29 17:03:04 UTC
++++ config/ndomod.cfg-sample.in
+@@ -82,7 +82,7 @@ output_buffer_items=5000
  # Nagios (re)starts, the NDO NEB module will read the contents of this
  # file and send it to the NDO2DB daemon for processing.
  
diff --git a/net-mgmt/ndoutils/files/patch-src_Makefile.in b/net-mgmt/ndoutils/files/patch-src_Makefile.in
index 00a7fd26b279..61de79e9bef8 100644
--- a/net-mgmt/ndoutils/files/patch-src_Makefile.in
+++ b/net-mgmt/ndoutils/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2014-05-27 04:25:19.498867720 +0600
-+++ src/Makefile.in	2014-05-27 04:28:22.097854573 +0600
-@@ -60,13 +60,9 @@
+--- src/Makefile.in.orig	2016-07-29 17:03:04 UTC
++++ src/Makefile.in
+@@ -68,13 +68,9 @@ log2ndo: log2ndo.c $(COMMON_INC) $(COMMO
  	$(CC) $(CFLAGS) -o $@ log2ndo.c $(COMMON_OBJS) $(LDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(OTHERLIBS)
  
  ndo2db:
@@ -8,27 +8,27 @@
  	$(MAKE) ndo2db-3x
  	$(MAKE) ndo2db-4x
  
--ndo2db-2x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-2x.o
--	$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_2X -o ndo2db-2x queue.c ndo2db.c dbhandlers-2x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
+-ndo2db-2x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-2x.o $(SNPRINTF_O)
+-	$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_2X -o ndo2db-2x queue.c ndo2db.c dbhandlers-2x.o $(SNPRINTF_O) $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
 -
- ndo2db-3x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-3x.o
- 	$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_3X -o ndo2db-3x queue.c ndo2db.c dbhandlers-3x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
+ ndo2db-3x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-3x.o $(SNPRINTF_O)
+ 	$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_3X -o ndo2db-3x queue.c ndo2db.c dbhandlers-3x.o $(SNPRINTF_O) $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
  
-@@ -74,13 +70,9 @@
- 	$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_4X -o ndo2db-4x queue.c ndo2db.c dbhandlers-4x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
+@@ -82,13 +78,9 @@ ndo2db-4x: queue.c ndo2db.c $(NDO_INC) $
+ 	$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_4X -o ndo2db-4x queue.c ndo2db.c dbhandlers-4x.o $(SNPRINTF_O) $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
  
  ndomod: 
 -	$(MAKE) ndomod-2x.o
  	$(MAKE) ndomod-3x.o
  	$(MAKE) ndomod-4x.o
  
--ndomod-2x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS)
--	$(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_2X -o ndomod-2x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
+-ndomod-2x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS) $(SNPRINTF_O)
+-	$(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_2X -o ndomod-2x.o ndomod.c $(SNPRINTF_O) $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
 -
- ndomod-3x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS)
- 	$(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_3X -o ndomod-3x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
+ ndomod-3x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS) $(SNPRINTF_O)
+ 	$(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_3X -o ndomod-3x.o ndomod.c $(SNPRINTF_O) $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
  
-@@ -99,9 +91,6 @@
+@@ -107,9 +99,6 @@ utils.o: utils.c $(SRC_INCLUDE)/utils.h
  db.o: db.c $(SRC_INCLUDE)/db.h
  	$(CC) $(CFLAGS) -c -o $@ db.c
  
@@ -38,7 +38,7 @@
  dbhandlers-3x.o: dbhandlers.c $(SRC_INCLUDE)/dbhandlers.h
  	$(CC) $(CFLAGS) -D BUILD_NAGIOS_3X -c -o $@ dbhandlers.c
  
-@@ -109,7 +98,7 @@
+@@ -117,7 +106,7 @@ dbhandlers-4x.o: dbhandlers.c $(SRC_INCL
  	$(CC) $(CFLAGS) $(CFLAGS_4X) -D BUILD_NAGIOS_4X -c -o $@ dbhandlers.c
  
  clean:
@@ -47,7 +47,7 @@
  	rm -f *~ */*~
  
  distclean: clean
-@@ -128,27 +117,24 @@
+@@ -136,30 +125,26 @@ install: install-4x
  	@echo "  If you want to install NDOUtils for Nagios v3.x"
  	@echo "  please type  'make install-3x"
  	@echo ""
@@ -62,22 +62,25 @@
  	@echo ""
  
 -install-2x:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
--	$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db
--	$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(PIPEDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR)
+-	$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-2x $(BINDIR)/ndo2db
+-	$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-2x.o $(BINDIR)/ndomod.o
 -
  install-3x:
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(PIPEDIR)
 +	$(INSTALL) -m 774 $(INSTALL_OPTS) file2sock $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 774 $(INSTALL_OPTS) log2ndo $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 774 $(INSTALL_OPTS) sockdebug $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR)
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-3x $(BINDIR)/ndo2db
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-3x.o $(BINDIR)/ndomod.o
  
  install-4x:
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(PIPEDIR)
 +	$(INSTALL) -m 774 $(INSTALL_OPTS) file2sock $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 774 $(INSTALL_OPTS) log2ndo $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 774 $(INSTALL_OPTS) sockdebug $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db
- 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR)
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-4x $(BINDIR)/ndo2db
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-4x.o $(BINDIR)/ndomod.o
diff --git a/net-mgmt/ndoutils/pkg-plist b/net-mgmt/ndoutils/pkg-plist
index 931b4a7134f6..20bc2ad8357e 100644
--- a/net-mgmt/ndoutils/pkg-plist
+++ b/net-mgmt/ndoutils/pkg-plist
@@ -91,6 +91,7 @@ etc/nagios/ndoutils.cfg-sample
 %%DATADIR%%/mysql-upgrade-1.4b8.sql
 %%DATADIR%%/mysql-upgrade-2.0.0.sql
 %%DATADIR%%/mysql-upgrade-2.0.1.sql
+%%DATADIR%%/mysql-upgrade-2.1.0.sql
 %%DATADIR%%/mysql.sql
 %%DATADIR%%/prepsql
 %%DATADIR%%/queries/comment_history.sql