Attachment 83488 Details for Bug 119246 – net-mgmt-nagios-devel-3.0.r1-lthr.diff

[patch] net-mgmt-nagios-devel-3.0.r1-lthr.diff

net-mgmt-nagios-devel-3.0.r1-lthr.diff (text/plain), 2.64 KB, created by Jarrod Sayers on 2008-01-02 05:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jarrod Sayers

Created: 2008-01-02 05:30:03 UTC

Size: 2.64 KB

patch

obsolete

>diff -ruN ports/net-mgmt/nagios-devel.orig/Makefile ports/net-mgmt/nagios-devel/Makefile
>--- ports/net-mgmt/nagios-devel.orig/Makefile	2007-12-20 03:45:33.000000000 +1030
>+++ ports/net-mgmt/nagios-devel/Makefile	2008-01-02 12:24:43.000000000 +1030
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	nagios
> DISTVERSION=	3.0rc1
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	nagios
>diff -ruN ports/net-mgmt/nagios-devel.orig/files/patch-configure.in ports/net-mgmt/nagios-devel/files/patch-configure.in
>--- ports/net-mgmt/nagios-devel.orig/files/patch-configure.in	2007-12-13 21:43:44.000000000 +1030
>+++ ports/net-mgmt/nagios-devel/files/patch-configure.in	2008-01-02 12:15:07.000000000 +1030
>@@ -1,5 +1,5 @@
>---- configure.in.orig	Thu Nov  1 04:05:38 2007
>-+++ configure.in	Thu Nov  1 19:33:42 2007
>+--- 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)
>@@ -7,8 +7,32 @@
> -AC_PREFIX_DEFAULT(/usr/local/nagios)
>  
>  PKG_NAME=nagios
>- PKG_VERSION="3.0b7"
>-@@ -196,7 +195,7 @@
>+ PKG_VERSION="3.0rc1"
>+@@ -119,7 +118,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 <mammad@yahoo-inc.com>
>+ dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
>+ AC_DEFUN(AC_PTHREAD_FREEBSD,[
>+@@ -180,6 +187,7 @@
>+ if test $have_pthreads = "no"; then
>+ 	AC_PTHREAD_FREEBSD
>+ fi
>++fi
>+ 
>+ AC_SUBST(THREADLIBS)
>+ 
>+@@ -196,7 +204,7 @@
>  AC_SUBST(nagios_grp)
>  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
>  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
>@@ -17,7 +41,7 @@
>  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)
>-@@ -520,9 +519,9 @@
>+@@ -520,9 +528,9 @@
>  fi
>  
>  dnl Try and locate glib
>@@ -29,3 +53,13 @@
>  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`" 
>++	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

Actions: View | Diff

Attachments on bug 119246: 83488