aboutsummaryrefslogtreecommitdiff
path: root/net-mgmt/nagios
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2010-04-18 08:16:40 +0000
committerMartin Matuska <mm@FreeBSD.org>2010-04-18 08:16:40 +0000
commitcfb69728983217b26d5cca30107c097b12393ca4 (patch)
tree1ba962b4a61880f6a24f256188ab5ce0644587e5 /net-mgmt/nagios
parent35a4dd71d574d12e9c8222d14687ffc8768a13bc (diff)
downloadports-cfb69728983217b26d5cca30107c097b12393ca4.tar.gz
ports-cfb69728983217b26d5cca30107c097b12393ca4.zip
- Update to 3.2.1 [1]
- Update maintainer e-mail address [2] PR: ports/145463 Submitted by: myself [1], maintainer [2] Approved by: maintainer
Notes
Notes: svn path=/head/; revision=252857
Diffstat (limited to 'net-mgmt/nagios')
-rw-r--r--net-mgmt/nagios/Makefile5
-rw-r--r--net-mgmt/nagios/distinfo6
-rw-r--r--net-mgmt/nagios/files/patch-configure.in24
3 files changed, 17 insertions, 18 deletions
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 5dfbd4408368..fe2a904c4baa 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= nagios
-PORTVERSION= 3.2.0
-PORTREVISION= 1
+PORTVERSION= 3.2.1
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
-MAINTAINER= jarrod@netleader.com.au
+MAINTAINER= jarrod@downtools.com.au
COMMENT= Extremely powerful network monitoring system
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo
index c411d3e77f32..2cdee604da27 100644
--- a/net-mgmt/nagios/distinfo
+++ b/net-mgmt/nagios/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagios-3.2.0.tar.gz) = 3566167cc60ddeaad34e7d2e26ed4a58
-SHA256 (nagios-3.2.0.tar.gz) = 7cbf35ba0319f24fa085982c038437c4515003b27863c4897dc86b197a50a5e7
-SIZE (nagios-3.2.0.tar.gz) = 3170967
+MD5 (nagios-3.2.1.tar.gz) = d4655ee8c95c9679fd4fd53dac34bbe3
+SHA256 (nagios-3.2.1.tar.gz) = 8e9a0600dd574977b506613ef81537dccceb2d8f734db049b291e8e21859d9d1
+SIZE (nagios-3.2.1.tar.gz) = 3215350
diff --git a/net-mgmt/nagios/files/patch-configure.in b/net-mgmt/nagios/files/patch-configure.in
index f8601c6c3afe..0a2b8152cb94 100644
--- a/net-mgmt/nagios/files/patch-configure.in
+++ b/net-mgmt/nagios/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig 2007-12-18 04:21:51.000000000 +1030
-+++ configure.in 2008-01-02 12:15:05.000000000 +1030
+--- configure.in.orig 2010-03-09 19:39:59.000000000 +0100
++++ configure.in 2010-04-07 20:18:58.585012048 +0200
@@ -6,7 +6,6 @@
AC_INIT(base/nagios.c)
@@ -7,8 +7,8 @@
-AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nagios
- PKG_VERSION="3.0rc1"
-@@ -119,7 +118,15 @@
+ PKG_VERSION="3.2.1"
+@@ -125,7 +124,15 @@
dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
THREADLIBS=""
have_pthreads="no"
@@ -23,8 +23,8 @@
+else
dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
- AC_DEFUN(AC_PTHREAD_FREEBSD,[
-@@ -180,6 +187,7 @@
+ AC_DEFUN([AC_PTHREAD_FREEBSD],[
+@@ -186,6 +193,7 @@
if test $have_pthreads = "no"; then
AC_PTHREAD_FREEBSD
fi
@@ -32,18 +32,18 @@
AC_SUBST(THREADLIBS)
-@@ -196,7 +204,7 @@
+@@ -201,7 +209,7 @@
AC_SUBST(nagios_grp)
- AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
- AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
+ AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios])
+ AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios])
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
+INSTALL_OPTS="-o root -g wheel"
AC_SUBST(INSTALL_OPTS)
- AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
-@@ -667,6 +675,9 @@
+ AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$nagios_user)
+@@ -668,6 +676,9 @@
- AC_DEFINE_UNQUOTED(EMBEDDEDPERL)
+ AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"
+ if test x$have_thr = xyes; then
+ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`"