View | Details | Raw Unified | Return to bug 145463 | Differences between
and this patch

Collapse All | Expand All

(-)ports/net-mgmt/nagios/Makefile (-3 / +2 lines)
Lines 6-17 Link Here
6
#
6
#
7
7
8
PORTNAME=	nagios
8
PORTNAME=	nagios
9
PORTVERSION=	3.2.0
9
PORTVERSION=	3.2.1
10
PORTREVISION=	1
11
CATEGORIES=	net-mgmt
10
CATEGORIES=	net-mgmt
12
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
13
12
14
MAINTAINER=	jarrod@netleader.com.au
13
MAINTAINER=	jarrod@downtools.com.au
15
COMMENT=	Extremely powerful network monitoring system
14
COMMENT=	Extremely powerful network monitoring system
16
15
17
LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
16
LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
(-)ports/net-mgmt/nagios/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (nagios-3.2.0.tar.gz) = 3566167cc60ddeaad34e7d2e26ed4a58
1
MD5 (nagios-3.2.1.tar.gz) = d4655ee8c95c9679fd4fd53dac34bbe3
2
SHA256 (nagios-3.2.0.tar.gz) = 7cbf35ba0319f24fa085982c038437c4515003b27863c4897dc86b197a50a5e7
2
SHA256 (nagios-3.2.1.tar.gz) = 8e9a0600dd574977b506613ef81537dccceb2d8f734db049b291e8e21859d9d1
3
SIZE (nagios-3.2.0.tar.gz) = 3170967
3
SIZE (nagios-3.2.1.tar.gz) = 3215350
(-)ports/net-mgmt/nagios/files/patch-configure.in (-12 / +12 lines)
Lines 1-5 Link Here
1
--- configure.in.orig	2007-12-18 04:21:51.000000000 +1030
1
--- configure.in.orig	2010-03-10 05:09:59.000000000 +1030
2
+++ configure.in	2008-01-02 12:15:05.000000000 +1030
2
+++ configure.in	2010-04-18 11:00:31.000000000 +0930
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="3.0rc1"
10
 PKG_VERSION="3.2.1"
11
@@ -119,7 +118,15 @@
11
@@ -125,7 +124,15 @@
12
 dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
12
 dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
13
 THREADLIBS=""
13
 THREADLIBS=""
14
 have_pthreads="no"
14
 have_pthreads="no"
Lines 23-30 Link Here
23
+else
23
+else
24
 dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
24
 dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
25
 dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
25
 dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
26
 AC_DEFUN(AC_PTHREAD_FREEBSD,[
26
 AC_DEFUN([AC_PTHREAD_FREEBSD],[
27
@@ -180,6 +187,7 @@
27
@@ -186,6 +193,7 @@
28
 if test $have_pthreads = "no"; then
28
 if test $have_pthreads = "no"; then
29
 	AC_PTHREAD_FREEBSD
29
 	AC_PTHREAD_FREEBSD
30
 fi
30
 fi
Lines 32-49 Link Here
32
 
32
 
33
 AC_SUBST(THREADLIBS)
33
 AC_SUBST(THREADLIBS)
34
 
34
 
35
@@ -196,7 +204,7 @@
35
@@ -201,7 +209,7 @@
36
 AC_SUBST(nagios_grp)
36
 AC_SUBST(nagios_grp)
37
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
37
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios])
38
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
38
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios])
39
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
39
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
40
+INSTALL_OPTS="-o root -g wheel"
40
+INSTALL_OPTS="-o root -g wheel"
41
 AC_SUBST(INSTALL_OPTS)
41
 AC_SUBST(INSTALL_OPTS)
42
 
42
 
43
 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,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$nagios_user)
44
@@ -667,6 +675,9 @@
44
@@ -668,6 +676,9 @@
45
 
45
 
46
 	AC_DEFINE_UNQUOTED(EMBEDDEDPERL)
46
 	AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
47
 	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" 
47
 	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" 
48
+	if test x$have_thr = xyes; then
48
+	if test x$have_thr = xyes; then
49
+		PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`"
49
+		PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`"

Return to bug 145463