net-mgmt/ndoutils: Update version 2.1.3=>2.1.4

- Pet portclippy
- Add new MASTER_SITES from Github
- Switch to NAGIOS4X as the default option
- On next update support for Nagios 3.X will be dropped

Changelog: https://github.com/NagiosEnterprises/ndoutils/blob/ndoutils-2.1.4/Changelog

3 files changed, 53 insertions, 35 deletions

diff --git a/net-mgmt/ndoutils/Makefile b/net-mgmt/ndoutils/Makefile
index e12029379457..1156ccea2d3f 100644
--- a/net-mgmt/ndoutils/Makefile
+++ b/net-mgmt/ndoutils/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	ndoutils
-PORTVERSION=	2.1.3
+DISTVERSION=	2.1.4
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION} \
+		https://github.com/NagiosEnterprises/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Keep Nagios perfdata in MySQL database
@@ -10,29 +11,33 @@ WWW=		https://www.nagios.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		compiler:c11 mysql perl5 ssl
+USE_RC_SUBR=	ndo2db
+
 GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include -fPIC
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/ndoutils \
 			--localstatedir=/var/run --enable-mysql \
 			--with-mysql=${LOCALBASE}
 
 MAKE_JOBS_UNSAFE=	yes
 
+CFLAGS+=	-I${LOCALBASE}/include -fPIC
+
+SUB_FILES=	pkg-message
+
 OPTIONS_DEFINE=	DOCS NANOSLEEP
+OPTIONS_DEFAULT=	NAGIOS4X NANOSLEEP
 OPTIONS_SINGLE=		NAGIOS_BACKEND
 OPTIONS_SINGLE_NAGIOS_BACKEND=	NAGIOS3X NAGIOS4X
-OPTIONS_DEFAULT=	NAGIOS3X NANOSLEEP
+
 NAGIOS3X_DESC=		For Nagios 3.X Series
 NAGIOS4X_DESC=		For Nagios 4.X Series
 NANOSLEEP_DESC=		Use of nanosleep in event timing
+
 NAGIOS3X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:net-mgmt/nagios
 NAGIOS4X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:net-mgmt/nagios4
 NANOSLEEP_CONFIGURE_ENABLE=	nanosleep
 
-USES=		compiler:c11 mysql perl5 ssl
-USE_RC_SUBR=	ndo2db
-SUB_FILES=	pkg-message
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/file2sock ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/log2ndo ${STAGEDIR}${PREFIX}/bin
@@ -44,6 +49,10 @@ do-install:
 	${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
 
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/)
+
 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
@@ -52,8 +61,4 @@ 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
 
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/)
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/ndoutils/distinfo b/net-mgmt/ndoutils/distinfo
index d967aedec8ad..e2fbfb1adbef 100644
--- a/net-mgmt/ndoutils/distinfo
+++ b/net-mgmt/ndoutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524573695
-SHA256 (ndoutils-2.1.3.tar.gz) = 8f0bcc098e5098b8c048c42000fc08c17b36d8bb3cc4fb6972b7b8e8edfa91b7
-SIZE (ndoutils-2.1.3.tar.gz) = 2182958
+TIMESTAMP = 1741764848
+SHA256 (ndoutils-2.1.4.tar.gz) = a9c1151a6257d5133d513d744a8b8d347f0236b4f43a14f4128a9796dcce33e7
+SIZE (ndoutils-2.1.4.tar.gz) = 2188281
diff --git a/net-mgmt/ndoutils/files/patch-src_Makefile.in b/net-mgmt/ndoutils/files/patch-src_Makefile.in
index 0f2568b05d97..bbe821887ec3 100644
--- a/net-mgmt/ndoutils/files/patch-src_Makefile.in
+++ b/net-mgmt/ndoutils/files/patch-src_Makefile.in
@@ -1,6 +1,17 @@
---- src/Makefile.in.orig	2017-04-13 14:11:57 UTC
+--- src/Makefile.in.orig	2024-08-01 17:09:21 UTC
 +++ src/Makefile.in
-@@ -68,13 +68,9 @@ log2ndo: log2ndo.c $(COMMON_INC) $(COMMON_OBJS)
+@@ -29,8 +29,8 @@ CC=@CC@
+ 
+ CC=@CC@
+ 
+-CFLAGS=-fPIC @CFLAGS@ @DEFS@ 
+-CFLAGS_4X=-I $(SRC_INCLUDE)/nagios-4x 
++CFLAGS=-fPIC @CFLAGS@ @DEFS@
++CFLAGS_4X=-I $(SRC_INCLUDE)/nagios-4x
+ 
+ # We don't like ANSI because ANSI doesn't like us! phhht!
+ #CFLAGS=-fPIC -g -Wall -ansi -pedantic -DHAVE_CONFIG_H
+@@ -67,27 +67,19 @@ ndo2db:
  	$(CC) $(CFLAGS) -o $@ log2ndo.c $(COMMON_OBJS) $(LDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(OTHERLIBS)
  
  ndo2db:
@@ -14,11 +25,12 @@
  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)
  
-@@ -82,13 +78,9 @@ ndo2db-4x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(C
+ ndo2db-4x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-4x.o $(SNPRINTF_O)
  	$(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: 
+-ndomod: 
 -	$(MAKE) ndomod-2x.o
++ndomod:
  	$(MAKE) ndomod-3x.o
  	$(MAKE) ndomod-4x.o
  
@@ -28,7 +40,7 @@
  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)
  
-@@ -107,9 +99,6 @@ utils.o: utils.c $(SRC_INCLUDE)/utils.h
+@@ -106,9 +98,6 @@ db.o: db.c $(SRC_INCLUDE)/db.h
  db.o: db.c $(SRC_INCLUDE)/db.h
  	$(CC) $(CFLAGS) -c -o $@ db.c
  
@@ -38,7 +50,7 @@
  dbhandlers-3x.o: dbhandlers.c $(SRC_INCLUDE)/dbhandlers.h
  	$(CC) $(CFLAGS) -D BUILD_NAGIOS_3X -c -o $@ dbhandlers.c
  
-@@ -117,7 +106,7 @@ dbhandlers-4x.o: dbhandlers.c $(SRC_INCLUDE)/dbhandler
+@@ -116,7 +105,7 @@ clean:
  	$(CC) $(CFLAGS) $(CFLAGS_4X) -D BUILD_NAGIOS_4X -c -o $@ dbhandlers.c
  
  clean:
@@ -47,13 +59,13 @@
  	rm -f *~ */*~
  
  distclean: clean
-@@ -136,30 +125,26 @@ install: install-4x
+@@ -135,31 +124,27 @@ install: install-4x
  	@echo "  If you want to install NDOUtils for Nagios v3.x"
  	@echo "  please type  'make install-3x"
  	@echo ""
 -	@echo "  If you want to install NDOUtils for Nagios v2.x"
 -	@echo "  please type  'make install-2x"
--	@echo ""
+ 	@echo ""
 -	@echo ""
  	@echo "  Next step should be the database initialization/upgrade"
  	@echo "  cd into the db/ directory and either:"
@@ -62,25 +74,26 @@
  	@echo ""
  
 -install-2x:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
--	$(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 -d $(DESTDIR)$(PIPEDIR)
+-	$(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 755 ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db
+-	$(INSTALL) -m 755 ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o
 -
  install-3x:
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR)
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 755 ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db
+ 	$(INSTALL) -m 755 ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o
 +	$(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-4x:
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR)
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR)
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 755 ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db
+ 	$(INSTALL) -m 755 ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o
+-
 +	$(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