CVS commit: pkgsrc/net

["Christopher KOBAYASHI" <sekiya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sekiya
Date:           Mon Jan  9 00:14:06 UTC 2023

Modified Files:
        pkgsrc/net/nagios-plugin-ldap: Makefile
        pkgsrc/net/nagios-plugin-mysql: Makefile
        pkgsrc/net/nagios-plugin-pgsql: Makefile
        pkgsrc/net/nagios-plugin-radius: Makefile
        pkgsrc/net/nagios-plugin-snmp: Makefile
Added Files:
        pkgsrc/net/nagios-plugins: plugin.mk
Removed Files:
        pkgsrc/net/nagios-plugins: Makefile.plugin

Log Message:
nagios-plugins/Makefile.plugin -> nagios-plugins/plugin.mk


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/nagios-plugin-ldap/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/nagios-plugin-mysql/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/nagios-plugin-pgsql/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/nagios-plugin-radius/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/nagios-plugin-snmp/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/net/nagios-plugins/Makefile.plugin
cvs rdiff -u -r0 -r1.1 pkgsrc/net/nagios-plugins/plugin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nagios-plugin-ldap/Makefile
diff -u pkgsrc/net/nagios-plugin-ldap/Makefile:1.20 pkgsrc/net/nagios-plugin-ldap/Makefile:1.21
--- pkgsrc/net/nagios-plugin-ldap/Makefile:1.20 Sat Jan 18 21:50:19 2020
+++ pkgsrc/net/nagios-plugin-ldap/Makefile      Mon Jan  9 00:14:06 2023
@@ -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 @@ BINARY_TARGET=        check_ldap
 
 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"

Index: pkgsrc/net/nagios-plugin-mysql/Makefile
diff -u pkgsrc/net/nagios-plugin-mysql/Makefile:1.20 pkgsrc/net/nagios-plugin-mysql/Makefile:1.21
--- pkgsrc/net/nagios-plugin-mysql/Makefile:1.20        Wed Jun 23 20:33:15 2021
+++ pkgsrc/net/nagios-plugin-mysql/Makefile     Mon Jan  9 00:14:06 2023
@@ -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 @@ CONFIGURE_ARGS+=      --with-mysql=${BUILDLIN
 
 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"

Index: pkgsrc/net/nagios-plugin-pgsql/Makefile
diff -u pkgsrc/net/nagios-plugin-pgsql/Makefile:1.22 pkgsrc/net/nagios-plugin-pgsql/Makefile:1.23
--- pkgsrc/net/nagios-plugin-pgsql/Makefile:1.22        Sat Jan 18 21:50:19 2020
+++ pkgsrc/net/nagios-plugin-pgsql/Makefile     Mon Jan  9 00:14:06 2023
@@ -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 @@ CONFIGURE_ARGS+=      --with-pgsql=${BUILDLIN
 
 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"

Index: pkgsrc/net/nagios-plugin-radius/Makefile
diff -u pkgsrc/net/nagios-plugin-radius/Makefile:1.20 pkgsrc/net/nagios-plugin-radius/Makefile:1.21
--- pkgsrc/net/nagios-plugin-radius/Makefile:1.20       Sat Jan 18 21:50:20 2020
+++ pkgsrc/net/nagios-plugin-radius/Makefile    Mon Jan  9 00:14:06 2023
@@ -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_FILES.config=   plugins/check_radius
 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"

Index: pkgsrc/net/nagios-plugin-snmp/Makefile
diff -u pkgsrc/net/nagios-plugin-snmp/Makefile:1.30 pkgsrc/net/nagios-plugin-snmp/Makefile:1.31
--- pkgsrc/net/nagios-plugin-snmp/Makefile:1.30 Tue Jun 28 11:35:03 2022
+++ pkgsrc/net/nagios-plugin-snmp/Makefile      Mon Jan  9 00:14:06 2023
@@ -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 @@ BINARY_TARGET=        check_snmp check_hpjd
 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"

Added files:

Index: pkgsrc/net/nagios-plugins/plugin.mk
diff -u /dev/null pkgsrc/net/nagios-plugins/plugin.mk:1.1
--- /dev/null   Mon Jan  9 00:14:06 2023
+++ pkgsrc/net/nagios-plugins/plugin.mk Mon Jan  9 00:14:06 2023
@@ -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