Bug 185187 - [PATCH] net-mgmt/nagios: Convert to staging and fix www config.
[PATCH] net-mgmt/nagios: Convert to staging and fix www config.
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Dmitry Sivachenko
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-12-25 20:00 UTC by Mathieu Arnold
Modified: 2013-12-26 13:20 UTC (History)
0 users

See Also:


Attachments
nagios-3.5.1.patch (2.75 KB, patch)
2013-12-25 20:00 UTC, Mathieu Arnold
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mathieu Arnold freebsd_committer 2013-12-25 20:00:00 UTC
- Don't overwrite config.inc.php, it can be modified
- Convert to staging
- Use new LIB_DEPENDS

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
Comment 1 Edwin Groothuis freebsd_committer 2013-12-25 20:00:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->demon

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter freebsd_committer 2013-12-26 11:44:28 UTC
Author: demon
Date: Thu Dec 26 11:44:20 2013
New Revision: 337483
URL: http://svnweb.freebsd.org/changeset/ports/337483

Log:
  Do not overwrite config.inc.php;
  Convert to staging;
  Use new LIB_DEPENDS format.
  
  PR:		185187
  Submitted by:	mat

Modified:
  head/net-mgmt/nagios/Makefile
  head/net-mgmt/nagios/pkg-plist

Modified: head/net-mgmt/nagios/Makefile
==============================================================================
--- head/net-mgmt/nagios/Makefile	Thu Dec 26 11:42:03 2013	(r337482)
+++ head/net-mgmt/nagios/Makefile	Thu Dec 26 11:44:20 2013	(r337483)
@@ -11,10 +11,10 @@ COMMENT=	Extremely powerful network moni
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
-USES=		iconv perl5
+USES=		iconv perl5 uidfix
 USE_PERL5=	build
 USE_AUTOTOOLS=	autoconf libltdl
 USE_PHP=	yes
@@ -83,41 +83,27 @@ NANOSLEEP_DESC=		Use nanosleep in event 
 EVENT_BROKER_DESC=	Enable event broker functionality
 UNHANDLED_HACK_DESC=	Display passive checks in unhandled queries
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEMBEDDED_PERL}
-USE_PERL5+=	run
-CONFIGURE_ARGS+=--enable-embedded-perl \
-		--with-perlcache
-PLIST_SUB+=	EMBEDDED_PERL=""
-.else
-PLIST_SUB+=	EMBEDDED_PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNANOSLEEP}
-CONFIGURE_ARGS+=--enable-nanosleep
-.endif
+OPTIONS_SUB=
 
-.if ${PORT_OPTIONS:MEVENT_BROKER}
-CONFIGURE_ARGS+=--enable-event-broker
-.else
-CONFIGURE_ARGS+=--disable-event-broker
-.endif
+EMBEDDED_PERL_USE=	perl5=run
+EMBEDDED_PERL_CONFIGURE_ENABLE=	embedded-perl
+EMBEDDED_PERL_CONFIGURE_WITH=	perlcache
+NANOSLEEP_CONFIGURE_ENABLE=	nanosleep
+EVENT_BROKER_CONFIGURE_ENABLE=	event-broker
 
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
 
+.include <bsd.port.options.mk>
+
 post-patch:
+	@${REINPLACE_CMD} -e '/^INSTALL_OPTS=/d' `${FIND} ${WRKSRC} -name Makefile.in`
 .if ${PORT_OPTIONS:MUNHANDLED_HACK}
 	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
 		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
 .endif
 
 post-install:
-	@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults ${NAGIOSDIR}/rw
-	@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults
-	@${CHOWN} ${NAGIOSUSER}:${WWWGRP} ${NAGIOSDIR}/rw
-	@${CAT} ${PKGMESSAGE}
+	@${MV} ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php.sample
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/nagios/pkg-plist
==============================================================================
--- head/net-mgmt/nagios/pkg-plist	Thu Dec 26 11:42:03 2013	(r337482)
+++ head/net-mgmt/nagios/pkg-plist	Thu Dec 26 11:44:20 2013	(r337483)
@@ -33,7 +33,9 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/cgi-bin/summary.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/tac.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/trends.cgi
-%%NAGIOSWWWDIR%%/config.inc.php
+@unexec if cmp -s %D/%%NAGIOSWWWDIR%%/config.inc.php.sample %D/%%NAGIOSWWWDIR%%/config.inc.php; then rm -f %D/%%NAGIOSWWWDIR%%/config.inc.php; fi
+%%NAGIOSWWWDIR%%/config.inc.php.sample
+@exec if [ ! -f %D/%%NAGIOSWWWDIR%%/config.inc.php ] ; then cp -p %D/%F %B/config.inc.php; fi
 %%NAGIOSWWWDIR%%/contexthelp/A1.html
 %%NAGIOSWWWDIR%%/contexthelp/A2.html
 %%NAGIOSWWWDIR%%/contexthelp/A3.html
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Dmitry Sivachenko freebsd_committer 2013-12-26 11:44:41 UTC
State Changed
From-To: open->closed

Patch committed, thank you.
Comment 4 dfilter freebsd_committer 2013-12-26 13:17:34 UTC
Author: mat
Date: Thu Dec 26 13:17:26 2013
New Revision: 337511
URL: http://svnweb.freebsd.org/changeset/ports/337511

Log:
  MFH: r337483
  
  Do not overwrite config.inc.php;
  Convert to staging;
  Use new LIB_DEPENDS format.
  
  PR:		185187
  Submitted by:	mat
  
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/net-mgmt/nagios/Makefile
  branches/2014Q1/net-mgmt/nagios/pkg-plist
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net-mgmt/nagios/Makefile
==============================================================================
--- branches/2014Q1/net-mgmt/nagios/Makefile	Thu Dec 26 13:17:15 2013	(r337510)
+++ branches/2014Q1/net-mgmt/nagios/Makefile	Thu Dec 26 13:17:26 2013	(r337511)
@@ -11,10 +11,10 @@ COMMENT=	Extremely powerful network moni
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
-USES=		iconv perl5
+USES=		iconv perl5 uidfix
 USE_PERL5=	build
 USE_AUTOTOOLS=	autoconf libltdl
 USE_PHP=	yes
@@ -83,41 +83,27 @@ NANOSLEEP_DESC=		Use nanosleep in event 
 EVENT_BROKER_DESC=	Enable event broker functionality
 UNHANDLED_HACK_DESC=	Display passive checks in unhandled queries
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEMBEDDED_PERL}
-USE_PERL5+=	run
-CONFIGURE_ARGS+=--enable-embedded-perl \
-		--with-perlcache
-PLIST_SUB+=	EMBEDDED_PERL=""
-.else
-PLIST_SUB+=	EMBEDDED_PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNANOSLEEP}
-CONFIGURE_ARGS+=--enable-nanosleep
-.endif
+OPTIONS_SUB=
 
-.if ${PORT_OPTIONS:MEVENT_BROKER}
-CONFIGURE_ARGS+=--enable-event-broker
-.else
-CONFIGURE_ARGS+=--disable-event-broker
-.endif
+EMBEDDED_PERL_USE=	perl5=run
+EMBEDDED_PERL_CONFIGURE_ENABLE=	embedded-perl
+EMBEDDED_PERL_CONFIGURE_WITH=	perlcache
+NANOSLEEP_CONFIGURE_ENABLE=	nanosleep
+EVENT_BROKER_CONFIGURE_ENABLE=	event-broker
 
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
 
+.include <bsd.port.options.mk>
+
 post-patch:
+	@${REINPLACE_CMD} -e '/^INSTALL_OPTS=/d' `${FIND} ${WRKSRC} -name Makefile.in`
 .if ${PORT_OPTIONS:MUNHANDLED_HACK}
 	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
 		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
 .endif
 
 post-install:
-	@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults ${NAGIOSDIR}/rw
-	@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults
-	@${CHOWN} ${NAGIOSUSER}:${WWWGRP} ${NAGIOSDIR}/rw
-	@${CAT} ${PKGMESSAGE}
+	@${MV} ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php.sample
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/net-mgmt/nagios/pkg-plist
==============================================================================
--- branches/2014Q1/net-mgmt/nagios/pkg-plist	Thu Dec 26 13:17:15 2013	(r337510)
+++ branches/2014Q1/net-mgmt/nagios/pkg-plist	Thu Dec 26 13:17:26 2013	(r337511)
@@ -33,7 +33,9 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/cgi-bin/summary.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/tac.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/trends.cgi
-%%NAGIOSWWWDIR%%/config.inc.php
+@unexec if cmp -s %D/%%NAGIOSWWWDIR%%/config.inc.php.sample %D/%%NAGIOSWWWDIR%%/config.inc.php; then rm -f %D/%%NAGIOSWWWDIR%%/config.inc.php; fi
+%%NAGIOSWWWDIR%%/config.inc.php.sample
+@exec if [ ! -f %D/%%NAGIOSWWWDIR%%/config.inc.php ] ; then cp -p %D/%F %B/config.inc.php; fi
 %%NAGIOSWWWDIR%%/contexthelp/A1.html
 %%NAGIOSWWWDIR%%/contexthelp/A2.html
 %%NAGIOSWWWDIR%%/contexthelp/A3.html
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"