[pkgsrc/trunk]: pkgsrc/net nagios-plugins/Makefile.plugin -> nagios-plugins/p...

[sekiya <sekiya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7b8914a75c5
branches:  trunk
changeset: 391377:c7b8914a75c5
user:      sekiya <sekiya%pkgsrc.org@localhost>
date:      Mon Jan 09 00:14:06 2023 +0000

description:
nagios-plugins/Makefile.plugin -> nagios-plugins/plugin.mk

diffstat:

 net/nagios-plugin-ldap/Makefile    |   4 ++--
 net/nagios-plugin-mysql/Makefile   |   4 ++--
 net/nagios-plugin-pgsql/Makefile   |   4 ++--
 net/nagios-plugin-radius/Makefile  |   4 ++--
 net/nagios-plugin-snmp/Makefile    |   4 ++--
 net/nagios-plugins/Makefile.plugin |  32 --------------------------------
 net/nagios-plugins/plugin.mk       |  32 ++++++++++++++++++++++++++++++++
 7 files changed, 42 insertions(+), 42 deletions(-)

diffs (162 lines):

diff -r 1b60dd3c4e84 -r c7b8914a75c5 net/nagios-plugin-ldap/Makefile
--- a/net/nagios-plugin-ldap/Makefile   Sun Jan 08 23:35:11 2023 +0000
+++ b/net/nagios-plugin-ldap/Makefile   Mon Jan 09 00:14:06 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/01/18 21:50:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2023/01/09 00:14:06 sekiya Exp $
 #
 
 PKGNAME=       nagios-plugin-ldap-${PLUGINSVERSION}
@@ -17,7 +17,7 @@
 
 CONFIGURE_ARGS+=       --with-ldap=yes
 
-.include "../../net/nagios-plugins/Makefile.plugin"
+.include "../../net/nagios-plugins/plugin.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 1b60dd3c4e84 -r c7b8914a75c5 net/nagios-plugin-mysql/Makefile
--- a/net/nagios-plugin-mysql/Makefile  Sun Jan 08 23:35:11 2023 +0000
+++ b/net/nagios-plugin-mysql/Makefile  Mon Jan 09 00:14:06 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/06/23 20:33:15 nia Exp $
+# $NetBSD: Makefile,v 1.21 2023/01/09 00:14:06 sekiya Exp $
 #
 
 PKGNAME=       nagios-plugin-mysql-${PLUGINSVERSION}
@@ -17,7 +17,7 @@
 
 BINARY_TARGET= check_mysql
 
-.include "../../net/nagios-plugins/Makefile.plugin"
+.include "../../net/nagios-plugins/plugin.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 1b60dd3c4e84 -r c7b8914a75c5 net/nagios-plugin-pgsql/Makefile
--- a/net/nagios-plugin-pgsql/Makefile  Sun Jan 08 23:35:11 2023 +0000
+++ b/net/nagios-plugin-pgsql/Makefile  Mon Jan 09 00:14:06 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/01/18 21:50:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2023/01/09 00:14:06 sekiya Exp $
 #
 
 PKGNAME=       nagios-plugin-pgsql-${PLUGINSVERSION}
@@ -18,7 +18,7 @@
 
 BINARY_TARGET= check_pgsql
 
-.include "../../net/nagios-plugins/Makefile.plugin"
+.include "../../net/nagios-plugins/plugin.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 1b60dd3c4e84 -r c7b8914a75c5 net/nagios-plugin-radius/Makefile
--- a/net/nagios-plugin-radius/Makefile Sun Jan 08 23:35:11 2023 +0000
+++ b/net/nagios-plugin-radius/Makefile Mon Jan 09 00:14:06 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/01/18 21:50:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2023/01/09 00:14:06 sekiya Exp $
 #
 
 PKGNAME=       nagios-plugin-radius-${PLUGINSVERSION}
@@ -27,7 +27,7 @@
 SUBST_SED.config=      -e "s|@SYSCONFDIR@|${PKG_SYSCONFBASE}|g"
 SUBST_MESSAGE.config=  Fixing configuration file path.
 
-.include "../../net/nagios-plugins/Makefile.plugin"
+.include "../../net/nagios-plugins/plugin.mk"
 .include "../../net/radiusclient-ng/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 1b60dd3c4e84 -r c7b8914a75c5 net/nagios-plugin-snmp/Makefile
--- a/net/nagios-plugin-snmp/Makefile   Sun Jan 08 23:35:11 2023 +0000
+++ b/net/nagios-plugin-snmp/Makefile   Mon Jan 09 00:14:06 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/06/28 11:35:03 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2023/01/09 00:14:06 sekiya Exp $
 #
 
 PKGNAME=       nagios-plugin-snmp-${PLUGINSVERSION}
@@ -20,7 +20,7 @@
 SCRIPT_TARGET= check_ifoperstatus check_ifstatus
 SCRIPT_TARGET+=        check_breeze check_wave
 
-.include "../../net/nagios-plugins/Makefile.plugin"
+.include "../../net/nagios-plugins/plugin.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 1b60dd3c4e84 -r c7b8914a75c5 net/nagios-plugins/Makefile.plugin
--- a/net/nagios-plugins/Makefile.plugin        Sun Jan 08 23:35:11 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile.plugin,v 1.5 2019/11/03 11:45:43 rillig Exp $
-#
-
-INSTALLATION_DIRS+=    libexec/nagios
-
-do-build:
-       cd ${WRKSRC}/lib && ${SETENV} ${MAKE_ENV} \
-       ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE}
-       cd ${WRKSRC}/gl && ${SETENV} ${MAKE_ENV} \
-       ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE}
-.if ${BINARY_TARGET:D1}
-       cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV}   \
-       ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BINARY_TARGET}
-.endif
-.if ${SCRIPT_TARGET:D1}
-       cd ${WRKSRC}/plugins-scripts && ${SETENV} ${MAKE_ENV}   \
-       ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${SCRIPT_TARGET}
-.endif
-
-do-install:
-.if ${BINARY_TARGET:D1}
-       for PROG in ${BINARY_TARGET}; do        \
-               ${INSTALL_PROGRAM} ${WRKSRC}/plugins/$${PROG}   \
-               ${DESTDIR}${PREFIX}/libexec/nagios;     \
-       done
-.endif
-.if ${SCRIPT_TARGET:D1}
-       for PROG in ${SCRIPT_TARGET}; do        \
-               ${INSTALL_SCRIPT} ${WRKSRC}/plugins-scripts/$${PROG}    \
-               ${DESTDIR}${PREFIX}/libexec/nagios;     \
-       done
-.endif
diff -r 1b60dd3c4e84 -r c7b8914a75c5 net/nagios-plugins/plugin.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nagios-plugins/plugin.mk      Mon Jan 09 00:14:06 2023 +0000
@@ -0,0 +1,32 @@
+# $NetBSD: plugin.mk,v 1.1 2023/01/09 00:14:06 sekiya Exp $
+#
+
+INSTALLATION_DIRS+=    libexec/nagios
+
+do-build:
+       cd ${WRKSRC}/lib && ${SETENV} ${MAKE_ENV} \
+       ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE}
+       cd ${WRKSRC}/gl && ${SETENV} ${MAKE_ENV} \
+       ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE}
+.if ${BINARY_TARGET:D1}
+       cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV}   \
+       ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BINARY_TARGET}
+.endif
+.if ${SCRIPT_TARGET:D1}
+       cd ${WRKSRC}/plugins-scripts && ${SETENV} ${MAKE_ENV}   \
+       ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${SCRIPT_TARGET}
+.endif
+
+do-install:
+.if ${BINARY_TARGET:D1}
+       for PROG in ${BINARY_TARGET}; do        \
+               ${INSTALL_PROGRAM} ${WRKSRC}/plugins/$${PROG}   \
+               ${DESTDIR}${PREFIX}/libexec/nagios;     \
+       done
+.endif
+.if ${SCRIPT_TARGET:D1}
+       for PROG in ${SCRIPT_TARGET}; do        \
+               ${INSTALL_SCRIPT} ${WRKSRC}/plugins-scripts/$${PROG}    \
+               ${DESTDIR}${PREFIX}/libexec/nagios;     \
+       done
+.endif