- Update to 1.7.0 [1]

- Add support for database backends using IDOutils [2]
- Add a rc script for ido2db
- Enable embedded Perl by default
- Enable Event Broker by default
- Enable statuswrl
- Drop unnecessary use of USE_PHP
- Install sample event handlers
- Optionally depend on MySQL or PostgreSQL
- Optionally depend on Apache and install the apropriate configuration for Icinga
- Update pkg-message

PR:             ports/167988 [1], ports/164625 [2]
Submitted by:   gjb[1], Gianpaolo Del Matto <delmatto@phunsites.net> [2]

1 files changed, 19 insertions, 10 deletions

diff --git a/net-mgmt/icinga/files/patch-configure.in b/net-mgmt/icinga/files/patch-configure.in
index 551f0105754a..cf6515a5cbf3 100644
--- a/net-mgmt/icinga/files/patch-configure.in
+++ b/net-mgmt/icinga/files/patch-configure.in
@@ -1,19 +1,19 @@
---- configure.in.orig	2011-08-24 13:57:57.000000000 +0000
-+++ configure.in	2011-09-05 22:30:37.899355262 +0000
+--- configure.in.orig	2012-05-15 13:00:56.000000000 +0000
++++ configure.in	2012-05-16 21:05:28.973178226 +0000
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/icinga.c)
- AC_CONFIG_HEADER(include/config.h include/snprintf.h)
+ AC_CONFIG_HEADER(include/config.h)
 -AC_PREFIX_DEFAULT(/usr/local/icinga)
  
  PKG_NAME=icinga-core
- PKG_VERSION="1.5.0"
-@@ -144,7 +143,15 @@
+ PKG_VERSION="1.7.0"
+@@ -144,6 +143,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
@@ -21,10 +21,10 @@
 +	have_pthreads="yes"
 +	have_thr="yes"
 +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],[
-@@ -205,6 +212,7 @@
+@@ -205,6 +213,7 @@
  if test $have_pthreads = "no"; then
  	AC_PTHREAD_FREEBSD
  fi
@@ -32,7 +32,7 @@
  
  AC_SUBST(THREADLIBS)
  
-@@ -223,7 +231,7 @@
+@@ -223,7 +232,7 @@
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$icinga_user",[user name to run nagios])
  AC_DEFINE_UNQUOTED(DEFAULT_ICINGA_GROUP,"$icinga_grp",[group name to run nagios])
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$icinga_grp",[group name to run nagios])
@@ -41,7 +41,16 @@
  AC_SUBST(INSTALL_OPTS)
  
  AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$icinga_user)
-@@ -950,6 +958,9 @@
+@@ -414,7 +423,7 @@
+ P1FILELOC=no
+ AC_ARG_WITH(p1-file-dir,AC_HELP_STRING([--with-p1-file-dir=<path>],[sets path to embedded perl p1.pl directory]),P1FILELOC=$withval,P1FILELOC=no)
+ if test x$P1FILELOC = xno; then
+-        P1FILELOC="$libdir"
++        P1FILELOC="$bindir"
+ fi
+ AC_SUBST(P1FILELOC)
+ 
+@@ -1033,6 +1042,9 @@
  
  	AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
  	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"