kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

o Update to 1.3.1.

Browse source 
o Fix compilation with only MySQL plugin.
o Add MySQL 4.0/4.1 support.

PR:		ports/54433
Submitted by:	Blaz Zupan <blaz@si.FreeBSD.org> (maintainer)
This commit is contained in:
Jun Kuriyama 2003-08-03 08:17:00 +00:00
parent 9759e2f170
commit 1621e3cc55
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=86216
10 changed files with 64 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net-mgmt/nagios-plugins/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= nagios-plugins
PORTVERSION= 1.3.0
PORTVERSION= 1.3.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nagiosplug
@ -36,6 +36,10 @@ pre-fetch:
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \
--acdir=${ACLOCAL_DIR})
post-clean:
@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc

2
net-mgmt/nagios-plugins/distinfo
View file

@ -1 +1 @@
MD5 (nagios-plugins-1.3.0.tar.gz) = 74ce3383cb39c85df78a1db7ac50838b
MD5 (nagios-plugins-1.3.1.tar.gz) = 0078c9c8137694181a4cdf596fdbd74f

21
net-mgmt/nagios-plugins/files/patch-configure.in
View file

@ -1,5 +1,5 @@
--- configure.in.orig Sun Mar 2 05:58:12 2003
+++ configure.in Thu Mar 6 22:03:33 2003
--- configure.in.orig Fri Jul 11 08:12:23 2003
+++ configure.in Sun Jul 13 13:13:37 2003
@@ -12,7 +12,7 @@
AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
@ -70,7 +70,16 @@
dnl Check for mysql libraries
_SAVEDLIBS="$LIBS"
@@ -818,6 +829,8 @@
@@ -209,7 +220,7 @@
AC_MSG_WARN([Skipping mysql plugin])
AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
fi
-CPPFLAGS="$_SAVEDCPPFLAGS"
+CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE"
LIBS="$_SAVEDLIBS"
dnl Check for OpenSSL location
@@ -841,6 +852,8 @@
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who'])
fi
@ -79,7 +88,7 @@
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
if test -x "$PATH_TO_SNMPGET"
then
@@ -840,7 +853,10 @@
@@ -863,7 +876,10 @@
echo "** Tried $PERL - install Net::SNMP perl module if you want to"
echo " use the perl snmp plugins"
fi
@ -90,7 +99,7 @@
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
if test -x "$PATH_TO_QUAKESTAT"
@@ -854,7 +870,10 @@
@@ -877,7 +893,10 @@
else
echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
fi
@ -101,7 +110,7 @@
AC_PATH_PROG(PATH_TO_FPING,fping)
if test -x "$PATH_TO_FPING"
then
@@ -862,6 +881,7 @@
@@ -885,6 +904,7 @@
EXTRAS="$EXTRAS check_fping"
else
echo "** Get fping from http://www.fping.com in order to make check_fping plugin"

2
net-mgmt/nagios-plugins/pkg-plist
View file

@ -37,8 +37,10 @@ libexec/nagios/check_procs
libexec/nagios/check_real
libexec/nagios/check_rpc
libexec/nagios/check_sensors
libexec/nagios/check_simap
libexec/nagios/check_smtp
%%SUB_SNMP%%libexec/nagios/check_snmp
libexec/nagios/check_spop
libexec/nagios/check_ssh
libexec/nagios/check_swap
libexec/nagios/check_tcp

10
net-mgmt/nagios-plugins/scripts/configure vendored
View file

@ -78,7 +78,15 @@ while [ "$1" ]; do
SUB_RADIUS=""
;;
\"MySQL\")
echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
echo ".if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.12)"
echo "LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client"
echo ".else"
echo ".if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14)"
echo "LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client"
echo ".else"
echo "LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client"
echo ".endif"
echo ".endif"
echo "CONFIGURE_ARGS+= --with-mysql=\${LOCALBASE}"
SUB_MYSQL=""
;;

6
net/nagios-plugins/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= nagios-plugins
PORTVERSION= 1.3.0
PORTVERSION= 1.3.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nagiosplug
@ -36,6 +36,10 @@ pre-fetch:
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \
--acdir=${ACLOCAL_DIR})
post-clean:
@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc

2
net/nagios-plugins/distinfo
View file

@ -1 +1 @@
MD5 (nagios-plugins-1.3.0.tar.gz) = 74ce3383cb39c85df78a1db7ac50838b
MD5 (nagios-plugins-1.3.1.tar.gz) = 0078c9c8137694181a4cdf596fdbd74f

21
net/nagios-plugins/files/patch-configure.in
View file

@ -1,5 +1,5 @@
--- configure.in.orig Sun Mar 2 05:58:12 2003
+++ configure.in Thu Mar 6 22:03:33 2003
--- configure.in.orig Fri Jul 11 08:12:23 2003
+++ configure.in Sun Jul 13 13:13:37 2003
@@ -12,7 +12,7 @@
AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
@ -70,7 +70,16 @@
dnl Check for mysql libraries
_SAVEDLIBS="$LIBS"
@@ -818,6 +829,8 @@
@@ -209,7 +220,7 @@
AC_MSG_WARN([Skipping mysql plugin])
AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
fi
-CPPFLAGS="$_SAVEDCPPFLAGS"
+CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE"
LIBS="$_SAVEDLIBS"
dnl Check for OpenSSL location
@@ -841,6 +852,8 @@
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who'])
fi
@ -79,7 +88,7 @@
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
if test -x "$PATH_TO_SNMPGET"
then
@@ -840,7 +853,10 @@
@@ -863,7 +876,10 @@
echo "** Tried $PERL - install Net::SNMP perl module if you want to"
echo " use the perl snmp plugins"
fi
@ -90,7 +99,7 @@
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
if test -x "$PATH_TO_QUAKESTAT"
@@ -854,7 +870,10 @@
@@ -877,7 +893,10 @@
else
echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
fi
@ -101,7 +110,7 @@
AC_PATH_PROG(PATH_TO_FPING,fping)
if test -x "$PATH_TO_FPING"
then
@@ -862,6 +881,7 @@
@@ -885,6 +904,7 @@
EXTRAS="$EXTRAS check_fping"
else
echo "** Get fping from http://www.fping.com in order to make check_fping plugin"

2
net/nagios-plugins/pkg-plist
View file

@ -37,8 +37,10 @@ libexec/nagios/check_procs
libexec/nagios/check_real
libexec/nagios/check_rpc
libexec/nagios/check_sensors
libexec/nagios/check_simap
libexec/nagios/check_smtp
%%SUB_SNMP%%libexec/nagios/check_snmp
libexec/nagios/check_spop
libexec/nagios/check_ssh
libexec/nagios/check_swap
libexec/nagios/check_tcp

10
net/nagios-plugins/scripts/configure vendored
View file

@ -78,7 +78,15 @@ while [ "$1" ]; do
SUB_RADIUS=""
;;
\"MySQL\")
echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
echo ".if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.12)"
echo "LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client"
echo ".else"
echo ".if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14)"
echo "LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client"
echo ".else"
echo "LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client"
echo ".endif"
echo ".endif"
echo "CONFIGURE_ARGS+= --with-mysql=\${LOCALBASE}"
SUB_MYSQL=""
;;