diff -ruN ports/net-mgmt/nagios.orig/Makefile ports/net-mgmt/nagios/Makefile --- ports/net-mgmt/nagios.orig/Makefile 2010-02-05 22:12:42.000000000 +1030 +++ ports/net-mgmt/nagios/Makefile 2010-04-18 10:56:35.000000000 +0930 @@ -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 -ruN ports/net-mgmt/nagios.orig/distinfo ports/net-mgmt/nagios/distinfo --- ports/net-mgmt/nagios.orig/distinfo 2009-11-29 00:14:45.000000000 +1030 +++ ports/net-mgmt/nagios/distinfo 2010-04-18 10:56:29.000000000 +0930 @@ -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 -ruN ports/net-mgmt/nagios.orig/files/patch-configure.in ports/net-mgmt/nagios/files/patch-configure.in --- ports/net-mgmt/nagios.orig/files/patch-configure.in 2009-11-29 00:14:45.000000000 +1030 +++ ports/net-mgmt/nagios/files/patch-configure.in 2010-04-18 11:01:01.000000000 +0930 @@ -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-10 05:09:59.000000000 +1030 ++++ configure.in 2010-04-18 11:00:31.000000000 +0930 @@ -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 dnl FreeBSD -pthread check - Jonathan McDowell - 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= 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=],[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 #'`"