- repocopy net-mgmt/nagios -> net-mgmt/nagios2

  and connect net-mgmt/nagios2 to the build

- Move net-mgmt/nagios-devel -> net-mgmt/nagios
  (v3.0.3)

- Add note to UPDATING

o net-mgmt/nagios [3]
   SF Macro
   USE_RC_SUBR != yes (rename files/nagios.sh.in -> files/nagios.in)
   OPTIONS+= EVENT_BROKER [1]
   use @dirrmtry in pkg-plist

o net-mgmt/nagios12 [2]
   SF Macro
   USE_RC_SUBR != yes (files/nagios.sh.tmpl -> files/nagios.in)
   Conversion to pkg-install, pkg-deinstall, pkg-message
   use @dirrmtry in pkg-plist

o net-mgmt/nagios2 [4]
   SF Macro
   USE_RC_SUBR != yes (rename files/nagios.sh.in -> files/nagios.in)

PRs:    ports/126758 [4]
    ports/126761 [3]
    ports/126754 [2]
    ports/126684 [1]

Submitted by:   Jarrod Sayers <jarrod@netleader.com.au> (maintainer)
Reworked by:    pgollucci - freebsd ports infrastructure changes
Reviewed by:    pgollucci
Approved by:    gabor (mentor)

1 files changed, 19 insertions, 16 deletions

diff --git a/net-mgmt/nagios/files/patch-configure.in b/net-mgmt/nagios/files/patch-configure.in
index 7a67b5fb6901..58ac6002360c 100644
--- a/net-mgmt/nagios/files/patch-configure.in
+++ b/net-mgmt/nagios/files/patch-configure.in
@@ -1,14 +1,14 @@
---- configure.in.orig	2008-03-13 00:31:04.000000000 +1030
-+++ configure.in	2008-03-19 23:58:49.000000000 +1030
+--- configure.in.orig	2007-12-18 04:21:51.000000000 +1030
++++ configure.in	2008-01-02 12:15:05.000000000 +1030
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/nagios.c)
- AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cgiutils.h)
+ AC_CONFIG_HEADER(include/config.h include/snprintf.h include/cgiutils.h)
 -AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  PKG_NAME=nagios
- PKG_VERSION="2.11"
-@@ -60,7 +59,15 @@
+ PKG_VERSION="3.0rc1"
+@@ -119,7 +118,15 @@
  dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
  THREADLIBS=""
  have_pthreads="no"
@@ -24,7 +24,7 @@
  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,[
-@@ -121,6 +128,7 @@
+@@ -180,6 +187,7 @@
  if test $have_pthreads = "no"; then
  	AC_PTHREAD_FREEBSD
  fi
@@ -32,7 +32,7 @@
  
  AC_SUBST(THREADLIBS)
  
-@@ -137,7 +145,7 @@
+@@ -196,7 +204,7 @@
  AC_SUBST(nagios_grp)
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
@@ -41,16 +41,19 @@
  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)
-@@ -170,7 +178,7 @@
- 	AC_PATH_PROG(MAIL_PROG,mail) 
- fi 
- dnl Fix for systems that don't (yet) have mail/mailx installed...
--if test x$MAIL_PROG=x; then
-+if test x$MAIL_PROG = x; then
- 	MAIL_PROG="/bin/mail"
+@@ -520,9 +528,9 @@
  fi
- AC_SUBST(MAIL_PROG)
-@@ -599,6 +607,9 @@
+ 
+ dnl Try and locate glib
+-GLIB_INCLUDE=`pkg-config --cflags glib-2.0`
++GLIB_INCLUDE=""
+ AC_SUBST(GLIB_INCLUDE)
+-GLIB_LIBS=`pkg-config --libs glib-2.0`
++GLIB_LIBS=""
+ AC_SUBST(GLIB_LIBS)
+ if test x$GLIB_LIBS != x; then
+ 	AC_DEFINE_UNQUOTED(HAVE_GLIB)
+@@ -667,6 +675,9 @@
  
  	AC_DEFINE_UNQUOTED(EMBEDDEDPERL)
  	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"