pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net
Module Name: pkgsrc
Committed By: jperkin
Date: Fri Mar 17 12:40:34 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
pkgsrc/net/nagios-plugin-spamd: Makefile
pkgsrc/net/nagios-plugins: Makefile Makefile.common distinfo
pkgsrc/net/nagios-plugins/patches: patch-configure
patch-lib_Makefile.in patch-plugins-scripts_Makefile.in
Log Message:
nagios-plugins: Update to 2.4.3.
The distribution includes a broken NEWS file that refers to a non-existant
version 2.3.4, and a ChangeLog that has not been updated since 2020, so it is
assumed that the following changes are in this release, even though the version
number is wrong. This update is primarily for the Solaris build fix.
2.3.4 ????-??-??
pst3.c: Fix build issue on Solaris (#537)
check_log: Fix error message for systems that don't use bash (#539)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/nagios-plugin-ldap/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/nagios-plugin-mysql/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/nagios-plugin-pgsql/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/nagios-plugin-radius/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/nagios-plugin-snmp/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/nagios-plugin-spamd/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/net/nagios-plugins/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/nagios-plugins/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/nagios-plugins/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/nagios-plugins/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in \
pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in
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.21 pkgsrc/net/nagios-plugin-ldap/Makefile:1.22
--- pkgsrc/net/nagios-plugin-ldap/Makefile:1.21 Mon Jan 9 00:14:06 2023
+++ pkgsrc/net/nagios-plugin-ldap/Makefile Fri Mar 17 12:40:33 2023
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2023/01/09 00:14:06 sekiya Exp $
-#
+# $NetBSD: Makefile,v 1.22 2023/03/17 12:40:33 jperkin Exp $
PKGNAME= nagios-plugin-ldap-${PLUGINSVERSION}
-PKGREVISION= 1
CATEGORIES= net sysutils databases
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
Index: pkgsrc/net/nagios-plugin-mysql/Makefile
diff -u pkgsrc/net/nagios-plugin-mysql/Makefile:1.21 pkgsrc/net/nagios-plugin-mysql/Makefile:1.22
--- pkgsrc/net/nagios-plugin-mysql/Makefile:1.21 Mon Jan 9 00:14:06 2023
+++ pkgsrc/net/nagios-plugin-mysql/Makefile Fri Mar 17 12:40:33 2023
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2023/01/09 00:14:06 sekiya Exp $
-#
+# $NetBSD: Makefile,v 1.22 2023/03/17 12:40:33 jperkin Exp $
PKGNAME= nagios-plugin-mysql-${PLUGINSVERSION}
-PKGREVISION= 2
CATEGORIES= net sysutils databases
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
Index: pkgsrc/net/nagios-plugin-pgsql/Makefile
diff -u pkgsrc/net/nagios-plugin-pgsql/Makefile:1.23 pkgsrc/net/nagios-plugin-pgsql/Makefile:1.24
--- pkgsrc/net/nagios-plugin-pgsql/Makefile:1.23 Mon Jan 9 00:14:06 2023
+++ pkgsrc/net/nagios-plugin-pgsql/Makefile Fri Mar 17 12:40:34 2023
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2023/01/09 00:14:06 sekiya Exp $
-#
+# $NetBSD: Makefile,v 1.24 2023/03/17 12:40:34 jperkin Exp $
PKGNAME= nagios-plugin-pgsql-${PLUGINSVERSION}
-PKGREVISION= 1
CATEGORIES= net sysutils databases
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -12,7 +10,6 @@ LICENSE= gnu-gpl-v3
DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins
CONFIGURE_ARGS+= --with-pgsql=${BUILDLINK_PREFIX.pgsql-lib}
-#CPPFLAGS+= -I${PGSQL_PREFIX}/include/pgsql
.include "../../net/nagios-plugins/Makefile.common"
Index: pkgsrc/net/nagios-plugin-radius/Makefile
diff -u pkgsrc/net/nagios-plugin-radius/Makefile:1.21 pkgsrc/net/nagios-plugin-radius/Makefile:1.22
--- pkgsrc/net/nagios-plugin-radius/Makefile:1.21 Mon Jan 9 00:14:06 2023
+++ pkgsrc/net/nagios-plugin-radius/Makefile Fri Mar 17 12:40:34 2023
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2023/01/09 00:14:06 sekiya Exp $
-#
+# $NetBSD: Makefile,v 1.22 2023/03/17 12:40:34 jperkin Exp $
PKGNAME= nagios-plugin-radius-${PLUGINSVERSION}
-PKGREVISION= 1
CATEGORIES= net sysutils
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
Index: pkgsrc/net/nagios-plugin-snmp/Makefile
diff -u pkgsrc/net/nagios-plugin-snmp/Makefile:1.31 pkgsrc/net/nagios-plugin-snmp/Makefile:1.32
--- pkgsrc/net/nagios-plugin-snmp/Makefile:1.31 Mon Jan 9 00:14:06 2023
+++ pkgsrc/net/nagios-plugin-snmp/Makefile Fri Mar 17 12:40:34 2023
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2023/01/09 00:14:06 sekiya Exp $
-#
+# $NetBSD: Makefile,v 1.32 2023/03/17 12:40:34 jperkin Exp $
PKGNAME= nagios-plugin-snmp-${PLUGINSVERSION}
-PKGREVISION= 6
CATEGORIES= net sysutils
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
Index: pkgsrc/net/nagios-plugin-spamd/Makefile
diff -u pkgsrc/net/nagios-plugin-spamd/Makefile:1.21 pkgsrc/net/nagios-plugin-spamd/Makefile:1.22
--- pkgsrc/net/nagios-plugin-spamd/Makefile:1.21 Tue Jun 28 11:35:03 2022
+++ pkgsrc/net/nagios-plugin-spamd/Makefile Fri Mar 17 12:40:34 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2022/06/28 11:35:03 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2023/03/17 12:40:34 jperkin Exp $
DISTNAME= check_spamd-1.6.0
PKGNAME= nagios-plugin-${DISTNAME:S/check_//1}
-PKGREVISION= 9
CATEGORIES= net mail
MASTER_SITES= # http://exchange.nagios.org/components/com_mtree/
EXTRACT_SUFX= .pl
Index: pkgsrc/net/nagios-plugins/Makefile
diff -u pkgsrc/net/nagios-plugins/Makefile:1.56 pkgsrc/net/nagios-plugins/Makefile:1.57
--- pkgsrc/net/nagios-plugins/Makefile:1.56 Mon Jan 9 00:28:41 2023
+++ pkgsrc/net/nagios-plugins/Makefile Fri Mar 17 12:40:34 2023
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.56 2023/01/09 00:28:41 sekiya Exp $
-#
+# $NetBSD: Makefile,v 1.57 2023/03/17 12:40:34 jperkin Exp $
-#PKGREVISION= 1
CATEGORIES= net sysutils
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -17,10 +15,13 @@ USE_TOOLS+= msgfmt msgmerge intltool per
PKG_GROUPS+= ${NAGIOS_GROUP}
-CONFIGURE_ARGS+= --without-pgsql --without-mysql \
- --without-smbclient-command --without-snmpget-command \
- --without-snmpgetnext-command --without-fping-command \
- --without-apt-get-command
+CONFIGURE_ARGS+= --without-apt-get-command
+CONFIGURE_ARGS+= --without-fping-command
+CONFIGURE_ARGS+= --without-mysql
+CONFIGURE_ARGS+= --without-pgsql
+CONFIGURE_ARGS+= --without-smbclient-command
+CONFIGURE_ARGS+= --without-snmpget-command
+CONFIGURE_ARGS+= --without-snmpgetnext-command
SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_icmp ${SETUID_ROOT_PERMS}
SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_dhcp ${SETUID_ROOT_PERMS}
@@ -48,8 +49,6 @@ MAKE_ENV+= CPPFLAGS_LFS=${CPPFLAGS_LFS:
.endif
LIBS.SunOS+= -lm
-#DEPENDS+= nagios-base-*:../../net/nagios-base
-
.if !exists(/usr/bin/ssh)
DEPENDS+= {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh
.endif
@@ -80,6 +79,6 @@ post-install:
${CHMOD} -x ${DESTDIR}${PREFIX}/libexec/nagios/utils.pm
.include "../../mk/pthread.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/nagios-plugins/Makefile.common
diff -u pkgsrc/net/nagios-plugins/Makefile.common:1.16 pkgsrc/net/nagios-plugins/Makefile.common:1.17
--- pkgsrc/net/nagios-plugins/Makefile.common:1.16 Mon Jan 9 00:28:41 2023
+++ pkgsrc/net/nagios-plugins/Makefile.common Fri Mar 17 12:40:34 2023
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile.common,v 1.16 2023/01/09 00:28:41 sekiya Exp $
+# $NetBSD: Makefile.common,v 1.17 2023/03/17 12:40:34 jperkin Exp $
#
# used by net/nagios-plugin-ldap/Makefile
# used by net/nagios-plugin-mysql/Makefile
# used by net/nagios-plugin-pgsql/Makefile
# used by net/nagios-plugin-radius/Makefile
# used by net/nagios-plugin-snmp/Makefile
+# used by net/nagios-plugin-spamd/Makefile
# used by net/nagios-plugins/Makefile
-PLUGINSVERSION= 2.3.3
+PLUGINSVERSION= 2.4.3
DISTNAME= nagios-plugins-${PLUGINSVERSION}
MASTER_SITES?= http://nagios-plugins.org/download/
Index: pkgsrc/net/nagios-plugins/distinfo
diff -u pkgsrc/net/nagios-plugins/distinfo:1.29 pkgsrc/net/nagios-plugins/distinfo:1.30
--- pkgsrc/net/nagios-plugins/distinfo:1.29 Wed Jan 11 09:27:27 2023
+++ pkgsrc/net/nagios-plugins/distinfo Fri Mar 17 12:40:34 2023
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.29 2023/01/11 09:27:27 sekiya Exp $
+$NetBSD: distinfo,v 1.30 2023/03/17 12:40:34 jperkin Exp $
-BLAKE2s (nagios-plugins-2.3.3.tar.gz) = 4eee57a0cae28eab4a115d1f518506a7c33ab0ab66e505088a7af2a65308bb22
-SHA512 (nagios-plugins-2.3.3.tar.gz) = 2128601b1098eb82f4e7d720b96a5f92d6ad75dc181a94b25c38172767de8b72f9fece3eddb74933b1cd520928ae9416a7dc665e2f059bfe362dd74041d28cd7
-Size (nagios-plugins-2.3.3.tar.gz) = 2782610 bytes
-SHA1 (patch-configure) = b37e7b7cd1fd1582a36a0906a5a1e532fd231d50
+BLAKE2s (nagios-plugins-2.4.3.tar.gz) = e62a8afe8943759b50f31b9aa02e339125db24ad0c279b878867cb7a9d70b6f5
+SHA512 (nagios-plugins-2.4.3.tar.gz) = 28eb7ec0f51a4c62f134557293bf18dac3a27378b021fc1c3aa4da7a18107c4251ffdddd6ccf5c2465a4e96e0e43e184d28a27606dc2f666420d387b6c3e9a9c
+Size (nagios-plugins-2.4.3.tar.gz) = 2781759 bytes
+SHA1 (patch-configure) = 94e7095cb6039e06c263c3fd6f962cbdf736b2a7
SHA1 (patch-gl_gettext.h) = c6e4917c30a1c4cceb46d1236fe9d2ff24359586
-SHA1 (patch-lib_Makefile.in) = a91faf1b6ee112152ee85b0233466d799dfe30da
+SHA1 (patch-lib_Makefile.in) = bdc62254e08503436b032a4d54f26836ef3f2e12
SHA1 (patch-plugins-root_Makefile.in) = 11a249107265a26b453bba9e3ea951595d3a01fc
-SHA1 (patch-plugins-scripts_Makefile.in) = 442a0be4d4a7b5370a9a25bc5c52f0bd467bdb8c
+SHA1 (patch-plugins-scripts_Makefile.in) = 6618ab351fc1990268ffde5b94c6e491168f2b9a
SHA1 (patch-plugins-scripts_check_breeze.pl) = 80c7f889a0cf3c1f5da4f5b6564f993c25e421b6
SHA1 (patch-plugins-scripts_check_ntp.pl) = 8101604b3227fc9977d992c1e73885b8e3dab86a
SHA1 (patch-plugins-scripts_check_wave.pl) = af42b740b64906fb4c882827165054a84bbddb76
Index: pkgsrc/net/nagios-plugins/patches/patch-configure
diff -u pkgsrc/net/nagios-plugins/patches/patch-configure:1.5 pkgsrc/net/nagios-plugins/patches/patch-configure:1.6
--- pkgsrc/net/nagios-plugins/patches/patch-configure:1.5 Mon Jan 9 00:28:41 2023
+++ pkgsrc/net/nagios-plugins/patches/patch-configure Fri Mar 17 12:40:34 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.5 2023/01/09 00:28:41 sekiya Exp $
+$NetBSD: patch-configure,v 1.6 2023/03/17 12:40:34 jperkin Exp $
Disable all the plugins which are installed by the nagios-plugin-* packages.
---- configure.orig 2020-03-12 01:58:02.000000000 +0900
-+++ configure 2023-01-09 08:50:57.067773726 +0900
-@@ -17494,7 +17494,7 @@
+--- configure.orig 2023-01-17 22:21:31.000000000 +0000
++++ configure
+@@ -15397,7 +15397,7 @@ _ACEOF
fi
@@ -13,109 +13,67 @@ Disable all the plugins which are instal
EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
RADIUSLIBS="-lradiusclient"
-@@ -19019,6 +19019,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #ifdef HAVE_UNISTD_H
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
- #include <unistd.h>
- #endif
- #include <netinet/in.h>
-@@ -21793,7 +21796,7 @@
+@@ -16849,7 +16849,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
ac_cv_ps_cols=9
- { $as_echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
$as_echo "using nagios-plugins internal ps command (pst3) for solaris" >&6; }
- if test `isainfo -b` = 64 ; then
-+ if test "$MACHINE_ARCH" = "x86_64" ; then
++ if test "$MACHINE_ARCH" = "x86_64"; then
pst3_use_64bit=1
- { $as_echo "$as_me:$LINENO: using 64bit pst3" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: using 64bit pst3" >&5
$as_echo "$as_me: using 64bit pst3" >&6;}
-@@ -22856,7 +22859,7 @@
- then
- { $as_echo "$as_me:$LINENO: checking for nslookup syntax" >&5
- $as_echo_n "checking for nslookup syntax... " >&6; }
-- if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
-+ if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep -F "Invalid option: sil" >/dev/null
- then
- ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-@@ -23245,7 +23248,7 @@
+@@ -18133,7 +18133,7 @@ fi
# Check whether --with-snmpget_command was given.
--if test "${with_snmpget_command+set}" = set; then
-+if false; then
+-if test "${with_snmpget_command+set}" = set; then :
++if false; then :
withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval
fi
-@@ -23256,7 +23259,7 @@
+@@ -18144,7 +18144,7 @@ cat >>confdefs.h <<_ACEOF
#define PATH_TO_SNMPGET "$PATH_TO_SNMPGET"
_ACEOF
- EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
+ #EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
else
- { $as_echo "$as_me:$LINENO: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&5
$as_echo "$as_me: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&2;}
-@@ -23317,7 +23320,7 @@
+@@ -18205,7 +18205,7 @@ _ACEOF
fi
-if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null )
+if false
then
- { $as_echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Net::SNMP perl module" >&5
$as_echo_n "checking for Net::SNMP perl module... " >&6; }
-@@ -23480,7 +23483,7 @@
+@@ -18368,7 +18368,7 @@ IFS=$as_save_IFS
esac
fi
PATH_TO_FPING=$ac_cv_path_PATH_TO_FPING
-if test -n "$PATH_TO_FPING"; then
-+if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no"; then
- { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING" >&5
++if test -n "$PATH_TO_FPING6" -a "$PATH_TO_FPING6" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_FPING" >&5
$as_echo "$PATH_TO_FPING" >&6; }
else
-@@ -23520,7 +23523,7 @@
+@@ -18408,7 +18408,7 @@ IFS=$as_save_IFS
esac
fi
PATH_TO_FPING6=$ac_cv_path_PATH_TO_FPING6
-if test -n "$PATH_TO_FPING6"; then
+if test -n "$PATH_TO_FPING6" -a "$PATH_TO_FPING6" != "no"; then
- { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING6" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_FPING6" >&5
$as_echo "$PATH_TO_FPING6" >&6; }
else
-@@ -24211,6 +24214,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
-@@ -24273,6 +24280,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
-+
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -24350,6 +24361,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+#undef _FILE_OFFSET_BITS
-+#endif
+@@ -18439,7 +18439,8 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+
+ EXTRAS="$EXTRAS check_fping\$(EXEEXT)"
+- if test x"$with_ipv6" != xno && test -n "$PATH_TO_FPING6"; then
++ if test x"$with_ipv6" != xno && test -n "$PATH_TO_FPING6" -a "$PATH_TO_FPING6" != "no"; then
+
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
+
+ cat >>confdefs.h <<_ACEOF
+ #define PATH_TO_FPING6 "$PATH_TO_FPING6"
Index: pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in
diff -u pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in:1.1 pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in:1.2
--- pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in:1.1 Mon Jan 9 00:28:41 2023
+++ pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in Fri Mar 17 12:40:34 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-lib_Makefile.in,v 1.1 2023/01/09 00:28:41 sekiya Exp $
+$NetBSD: patch-lib_Makefile.in,v 1.2 2023/03/17 12:40:34 jperkin Exp $
Pull in CPPFLAGS_LFS.
---- lib/Makefile.in.orig 2020-03-12 01:57:59.000000000 +0900
-+++ lib/Makefile.in 2023-01-09 08:50:52.418317845 +0900
-@@ -166,7 +166,7 @@
- am__depfiles_maybe = depfiles
+--- lib/Makefile.in.orig 2023-01-17 22:21:29.000000000 +0000
++++ lib/Makefile.in
+@@ -240,7 +240,7 @@ am__depfiles_remade = ./$(DEPDIR)/extra_
+ ./$(DEPDIR)/utils_tcp.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS_LFS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
Index: pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in
diff -u pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in:1.1 pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in:1.2
--- pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in:1.1 Mon Jan 9 00:28:41 2023
+++ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in Fri Mar 17 12:40:34 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-plugins-scripts_Makefile.in,v 1.1 2023/01/09 00:28:41 sekiya Exp $
+$NetBSD: patch-plugins-scripts_Makefile.in,v 1.2 2023/03/17 12:40:34 jperkin Exp $
Exclude plugins that would require extra dependancies.
Some can be found in specific nagios plugin packages.
---- plugins-scripts/Makefile.in.orig 2020-03-12 01:58:00.000000000 +0900
-+++ plugins-scripts/Makefile.in 2023-01-09 08:50:02.651881773 +0900
-@@ -1348,17 +1348,12 @@
+--- plugins-scripts/Makefile.in.orig 2023-01-17 22:21:30.000000000 +0000
++++ plugins-scripts/Makefile.in
+@@ -1603,17 +1603,12 @@ top_srcdir = @top_srcdir@
with_trusted_path = @with_trusted_path@
@RELEASE_PRESENT_TRUE@NP_VERSION = @NP_RELEASE@
SUFFIXES = .pl .sh
@@ -14,13 +14,12 @@ Some can be found in specific nagios plu
- check_ifstatus check_ifoperstatus check_mailq check_file_age \
- check_ssl_validity \
- utils.sh utils.pm
--
+
-EXTRA_DIST = check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
- check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
- check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
- check_ssl_validity.pl \
- utils.sh.in utils.pm.in t
-+
+libexec_SCRIPTS = check_ircd check_log check_ntp check_rpc \
+ check_mailq check_file_age utils.sh utils.pm
+
Home |
Main Index |
Thread Index |
Old Index