--- ports/net-mgmt/nagios/Makefile 2007-12-13 21:43:43.000000000 +1030 +++ ports/net-mgmt/nagios/Makefile 2008-01-30 23:21:57.000000000 +1030 @@ -7,6 +7,7 @@ PORTNAME= nagios PORTVERSION= 2.10 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= nagios @@ -20,7 +21,7 @@ USE_GETOPT_LONG= yes USE_ICONV= yes USE_PERL5_BUILD= yes -USE_AUTOTOOLS= autoconf:261 +USE_AUTOTOOLS= autoconf:261 libltdl:15 USE_RC_SUBR= nagios.sh CONFLICTS= nagios-[13].* --- ports/net-mgmt/nagios/files/patch-configure.in 2005-02-15 08:22:42.000000000 +1030 +++ ports/net-mgmt/nagios/files/patch-configure.in 2008-01-30 23:25:30.000000000 +1030 @@ -1,5 +1,5 @@ ---- configure.in.orig Thu Feb 10 02:00:10 2005 -+++ configure.in Sat Feb 12 14:11:54 2005 +--- configure.in.orig 2007-10-22 00:09:51.000000000 +0930 ++++ configure.in 2008-01-30 23:25:03.000000000 +1030 @@ -6,7 +6,6 @@ AC_INIT(base/nagios.c) @@ -7,8 +7,32 @@ -AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios - PKG_VERSION="2.0b2" -@@ -137,7 +136,7 @@ + PKG_VERSION="2.10" +@@ -60,7 +59,15 @@ + dnl Test for pthreads support - taken from ICU FreeBSD Port configure script + THREADLIBS="" + have_pthreads="no" ++have_thr="no" + ++dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues ++AC_CHECK_LIB(thr,pthread_create) ++if test $ac_cv_lib_thr_pthread_create = yes; then ++ THREADLIBS="-lthr" ++ have_pthreads="yes" ++ have_thr="yes" ++else + dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh + dnl FreeBSD -pthread check - Jonathan McDowell + AC_DEFUN(AC_PTHREAD_FREEBSD,[ +@@ -121,6 +128,7 @@ + if test $have_pthreads = "no"; then + AC_PTHREAD_FREEBSD + fi ++fi + + AC_SUBST(THREADLIBS) + +@@ -137,7 +145,7 @@ AC_SUBST(nagios_grp) AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user") AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp") @@ -17,3 +41,13 @@ 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) +@@ -599,6 +607,9 @@ + + AC_DEFINE_UNQUOTED(EMBEDDEDPERL) + PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" ++ if test x$have_thr = xyes; then ++ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`" ++ fi + PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`" + CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`" + USEPERL=yes