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

Collapse All | Expand All

(-)Makefile (-40 / +33 lines)
Lines 1-12 Link Here
1
# New ports collection makefile for:	nagios
1
# Created by: Blaz Zupan <blaz@si.FreeBSD.org>
2
# Date created:				19 May 2002
3
# Whom:					Blaz Zupan <blaz@si.FreeBSD.org>
4
#
5
# $FreeBSD$
2
# $FreeBSD$
6
#
7
3
8
PORTNAME=	nagios
4
PORTNAME=	nagios
9
PORTVERSION=	3.4.1
5
PORTVERSION=	3.4.3
10
CATEGORIES=	net-mgmt
6
CATEGORIES=	net-mgmt
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
12
8
Lines 15-56 Link Here
15
11
16
LICENSE=	GPLv2
12
LICENSE=	GPLv2
17
13
18
LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
14
LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
19
RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
15
RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
20
16
21
USE_ICONV=	yes
17
USE_ICONV=	yes
22
USE_PERL5_BUILD=yes
18
USE_PERL5_BUILD=yes
23
USE_AUTOTOOLS=	autoconf libltdl
19
USE_AUTOTOOLS=	autoconf libltdl
20
USE_PHP=	yes
24
USE_RC_SUBR=	nagios
21
USE_RC_SUBR=	nagios
25
22
26
CONFLICTS=	nagios-[12].* nagios-devel-*
23
CONFLICTS=	nagios-[12].* nagios-devel-*
27
24
28
OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8.0+]" off \
29
		NANOSLEEP "Use nanosleep in event timing" off \
30
		EVENT_BROKER "Enable event broker functionality" off \
31
		UNHANDLED_HACK "Display passive checks in unhandled queries" off
32
33
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
34
35
NAGIOSUSER?=	nagios
36
NAGIOSGROUP?=	nagios
37
NAGIOSDIR?=	/var/spool/nagios
38
39
NAGIOSUID=	181
40
NAGIOSGID=	${NAGIOSUID}
41
42
NAGIOSWWWDIR?=	www/nagios
43
NAGIOSHTMURL?=	/nagios
44
NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
45
46
USERS=		${NAGIOSUSER}
47
GROUPS=		${NAGIOSGROUP}
48
49
.include <bsd.port.pre.mk>
50
51
CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
52
CFLAGS+=	${CPPFLAGS}
53
54
CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
26
CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
55
		--with-command-group=${WWWGRP} \
27
		--with-command-group=${WWWGRP} \
56
		--with-nagios-user=${NAGIOSUSER} \
28
		--with-nagios-user=${NAGIOSUSER} \
Lines 66-79 Link Here
66
		--with-httpd-conf=${PREFIX}/etc \
38
		--with-httpd-conf=${PREFIX}/etc \
67
		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
39
		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
68
		--disable-statuswrl
40
		--disable-statuswrl
69
70
CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
41
CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
71
		PERL=${PERL}
42
		PERL=${PERL}
72
43
44
CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
45
CFLAGS+=	${CPPFLAGS}
46
73
MAKE_JOBS_UNSAFE=	yes
47
MAKE_JOBS_UNSAFE=	yes
74
48
75
INSTALL_TARGET=	install install-commandmode install-config
49
INSTALL_TARGET=	install install-commandmode install-config
76
77
PLIST_SUB=	NAGIOSDIR=${NAGIOSDIR} \
50
PLIST_SUB=	NAGIOSDIR=${NAGIOSDIR} \
78
		NAGIOSWWWDIR=${NAGIOSWWWDIR} \
51
		NAGIOSWWWDIR=${NAGIOSWWWDIR} \
79
		NAGIOSUSER=${NAGIOSUSER} \
52
		NAGIOSUSER=${NAGIOSUSER} \
Lines 90-98 Link Here
90
SUB_LIST=	PREFIX=${PREFIX} \
63
SUB_LIST=	PREFIX=${PREFIX} \
91
		${PLIST_SUB}
64
		${PLIST_SUB}
92
65
93
USE_PHP=	yes
66
NAGIOSUSER?=	nagios
67
NAGIOSGROUP?=	nagios
68
NAGIOSDIR?=	/var/spool/nagios
94
69
95
.if defined(WITH_EMBEDDED_PERL)
70
NAGIOSUID=	181
71
NAGIOSGID=	${NAGIOSUID}
72
73
NAGIOSWWWDIR?=	www/nagios
74
NAGIOSHTMURL?=	/nagios
75
NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
76
77
USERS=		${NAGIOSUSER}
78
GROUPS=		${NAGIOSGROUP}
79
80
OPTIONS_DEFINE=	EMBEDDED_PERL NANOSLEEP EVENT_BROKER UNHANDLED_HACK
81
EMBEDDED_PERL_DESC=	Enable embedded Perl [requires Perl 5.8.0+]
82
NANOSLEEP_DESC=	Use nanosleep in event timing
83
EVENT_BROKER_DESC=	Enable event broker functionality
84
UNHANDLED_HACK_DESC=	Display passive checks in unhandled queries
85
86
.include <bsd.port.options.mk>
87
88
.if ${PORT_OPTIONS:MEMBEDDED_PERL}
96
USE_PERL5=	yes
89
USE_PERL5=	yes
97
CONFIGURE_ARGS+=--enable-embedded-perl \
90
CONFIGURE_ARGS+=--enable-embedded-perl \
98
		--with-perlcache
91
		--with-perlcache
Lines 101-111 Link Here
101
PLIST_SUB+=	EMBEDDED_PERL="@comment "
94
PLIST_SUB+=	EMBEDDED_PERL="@comment "
102
.endif
95
.endif
103
96
104
.if defined(WITH_NANOSLEEP)
97
.if ${PORT_OPTIONS:MNANOSLEEP}
105
CONFIGURE_ARGS+=--enable-nanosleep
98
CONFIGURE_ARGS+=--enable-nanosleep
106
.endif
99
.endif
107
100
108
.if defined(WITH_EVENT_BROKER)
101
.if ${PORT_OPTIONS:MEVENT_BROKER}
109
CONFIGURE_ARGS+=--enable-event-broker
102
CONFIGURE_ARGS+=--enable-event-broker
110
.else
103
.else
111
CONFIGURE_ARGS+=--disable-event-broker
104
CONFIGURE_ARGS+=--disable-event-broker
Lines 115-121 Link Here
115
	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
108
	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
116
109
117
post-patch:
110
post-patch:
118
.if defined(WITH_UNHANDLED_HACK)
111
.if ${PORT_OPTIONS:MUNHANDLED_HACK}
119
	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
112
	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
120
		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
113
		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
121
.endif
114
.endif
Lines 126-129 Link Here
126
	@${CHOWN} ${NAGIOSUSER}:${WWWGRP} ${NAGIOSDIR}/rw
119
	@${CHOWN} ${NAGIOSUSER}:${WWWGRP} ${NAGIOSDIR}/rw
127
	@${CAT} ${PKGMESSAGE}
120
	@${CAT} ${PKGMESSAGE}
128
121
129
.include <bsd.port.post.mk>
122
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (nagios-3.4.1.tar.gz) = a5c693f9af22410cc17d6da9c0df9bd65c47d787de3f937b5ccbda934131f8c8
1
SHA256 (nagios-3.4.3.tar.gz) = 2d5c0cc56bafb08a71840a6efa349afc1eebb2761fea0d403e1b929e7c801b10
2
SIZE (nagios-3.4.1.tar.gz) = 1782817
2
SIZE (nagios-3.4.3.tar.gz) = 1784746
(-)files/patch-html-main.php (-5 / +5 lines)
Lines 1-10 Link Here
1
--- html/main.php.orig	2012-05-12 09:30:53.000000000 +0930
1
--- html/main.php.orig	2012-12-01 03:28:25.000000000 +1030
2
+++ html/main.php	2012-05-21 21:37:23.000000000 +0930
2
+++ html/main.php	2012-12-28 14:23:47.000000000 +1030
3
@@ -40,35 +40,10 @@
3
@@ -40,35 +40,10 @@
4
 <div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
4
 <div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
5
 <div class="version">Version 3.4.1</div>
5
 <div class="version">Version 3.4.3</div>
6
 <div class="releasedate">May 11, 2012</div>
6
 <div class="releasedate">November 30, 2012</div>
7
-<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.4.1&product=nagioscore" target="_blank">Check for updates</a></div>
7
-<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.4.3&product=nagioscore" target="_blank">Check for updates</a></div>
8
 <!--<div class="whatsnew"><a href="http://go.nagios.com/nagioscore/whatsnew">Read what's new in Nagios Core 3</a></div>-->
8
 <!--<div class="whatsnew"><a href="http://go.nagios.com/nagioscore/whatsnew">Read what's new in Nagios Core 3</a></div>-->
9
 </div>
9
 </div>
10
 
10
 

Return to bug 174762