Date: Sun, 13 Jul 2003 13:22:38 +0200 (CEST) From: Blaz Zupan <blaz@si.FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/54433: MAINTAINER UPDATE: nagios-plugins update to 1.3.1 Message-ID: <20030713112238.A35225553E@titanic.medinet.si> Resent-Message-ID: <200307131130.h6DBUFT8054766@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54433
>Category: ports
>Synopsis: MAINTAINER UPDATE: nagios-plugins update to 1.3.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 13 04:30:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Blaz Zupan
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
System: FreeBSD titanic.medinet.si 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Sun Apr 6 14:13:39 CEST 2003 root@bigbrother.amis.net:/db/obj/usr/src/sys/TITANIC i386
>Description:
- update port to 1.3.1
- fix compilation with only MySQL plugin (missing -I${PREFIX}/include caused
compilation to fail)
- add MySQL 4.0/4.1 support
- this version needs to run aclocal before autoconf/automake, do it
manually until we grow USE_ACLOCAL support (see PR 41945)
>How-To-Repeat:
>Fix:
diff -urN nagios-plugins.old/Makefile nagios-plugins/Makefile
--- nagios-plugins.old/Makefile Mon Apr 7 06:53:20 2003
+++ nagios-plugins/Makefile Sun Jul 13 12:37:28 2003
@@ -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
@@ -35,6 +35,10 @@
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.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
diff -urN nagios-plugins.old/distinfo nagios-plugins/distinfo
--- nagios-plugins.old/distinfo Mon Apr 7 06:53:20 2003
+++ nagios-plugins/distinfo Sun Jul 13 09:03:29 2003
@@ -1 +1 @@
-MD5 (nagios-plugins-1.3.0.tar.gz) = 74ce3383cb39c85df78a1db7ac50838b
+MD5 (nagios-plugins-1.3.1.tar.gz) = 0078c9c8137694181a4cdf596fdbd74f
diff -urN nagios-plugins.old/files/patch-configure.in nagios-plugins/files/patch-configure.in
--- nagios-plugins.old/files/patch-configure.in Mon Apr 7 06:53:21 2003
+++ nagios-plugins/files/patch-configure.in Sun Jul 13 13:13:44 2003
@@ -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"
diff -urN nagios-plugins.old/pkg-plist nagios-plugins/pkg-plist
--- nagios-plugins.old/pkg-plist Mon Apr 7 06:53:21 2003
+++ nagios-plugins/pkg-plist Sun Jul 13 09:28:58 2003
@@ -37,8 +37,10 @@
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
diff -urN nagios-plugins.old/scripts/configure nagios-plugins/scripts/configure
--- nagios-plugins.old/scripts/configure Mon Feb 24 06:52:38 2003
+++ nagios-plugins/scripts/configure Sun Jul 13 09:09:36 2003
@@ -78,7 +78,15 @@
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=""
;;
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030713112238.A35225553E>