View | Details | Raw Unified | Return to bug 120150
Collapse All | Expand All

(-)ports/net-mgmt/nagios/Makefile (-1 / +2 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	nagios
8
PORTNAME=	nagios
9
PORTVERSION=	2.10
9
PORTVERSION=	2.10
10
PORTREVISION=	1
10
CATEGORIES=	net-mgmt
11
CATEGORIES=	net-mgmt
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	nagios
13
MASTER_SITE_SUBDIR=	nagios
Lines 20-26 Link Here
20
USE_GETOPT_LONG=	yes
21
USE_GETOPT_LONG=	yes
21
USE_ICONV=	yes
22
USE_ICONV=	yes
22
USE_PERL5_BUILD=	yes
23
USE_PERL5_BUILD=	yes
23
USE_AUTOTOOLS=	autoconf:261
24
USE_AUTOTOOLS=	autoconf:261 libltdl:15
24
USE_RC_SUBR=	nagios.sh
25
USE_RC_SUBR=	nagios.sh
25
26
26
CONFLICTS=	nagios-[13].*
27
CONFLICTS=	nagios-[13].*
(-)ports/net-mgmt/nagios/files/patch-configure.in (-4 / +38 lines)
Lines 1-5 Link Here
1
--- configure.in.orig	Thu Feb 10 02:00:10 2005
1
--- configure.in.orig	2007-10-22 00:09:51.000000000 +0930
2
+++ configure.in	Sat Feb 12 14:11:54 2005
2
+++ configure.in	2008-01-30 23:25:03.000000000 +1030
3
@@ -6,7 +6,6 @@
3
@@ -6,7 +6,6 @@
4
 
4
 
5
 AC_INIT(base/nagios.c)
5
 AC_INIT(base/nagios.c)
Lines 7-14 Link Here
7
-AC_PREFIX_DEFAULT(/usr/local/nagios)
7
-AC_PREFIX_DEFAULT(/usr/local/nagios)
8
 
8
 
9
 PKG_NAME=nagios
9
 PKG_NAME=nagios
10
 PKG_VERSION="2.0b2"
10
 PKG_VERSION="2.10"
11
@@ -137,7 +136,7 @@
11
@@ -60,7 +59,15 @@
12
 dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
13
 THREADLIBS=""
14
 have_pthreads="no"
15
+have_thr="no"
16
 
17
+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues
18
+AC_CHECK_LIB(thr,pthread_create)
19
+if test $ac_cv_lib_thr_pthread_create = yes; then
20
+	THREADLIBS="-lthr"
21
+	have_pthreads="yes"
22
+	have_thr="yes"
23
+else
24
 dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
25
 dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
26
 AC_DEFUN(AC_PTHREAD_FREEBSD,[
27
@@ -121,6 +128,7 @@
28
 if test $have_pthreads = "no"; then
29
 	AC_PTHREAD_FREEBSD
30
 fi
31
+fi
32
 
33
 AC_SUBST(THREADLIBS)
34
 
35
@@ -137,7 +145,7 @@
12
 AC_SUBST(nagios_grp)
36
 AC_SUBST(nagios_grp)
13
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
37
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
14
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
38
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
Lines 17-19 Link Here
17
 AC_SUBST(INSTALL_OPTS)
41
 AC_SUBST(INSTALL_OPTS)
18
 
42
 
19
 AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
43
 AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
44
@@ -599,6 +607,9 @@
45
 
46
 	AC_DEFINE_UNQUOTED(EMBEDDEDPERL)
47
 	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" 
48
+	if test x$have_thr = xyes; then
49
+		PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`"
50
+	fi
51
 	PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`" 
52
 	CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`" 
53
 	USEPERL=yes

Return to bug 120150