From owner-svn-ports-all@FreeBSD.ORG Thu Dec 26 13:17:26 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5C5DE9C; Thu, 26 Dec 2013 13:17:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B29731F9C; Thu, 26 Dec 2013 13:17:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDHQZN092017; Thu, 26 Dec 2013 13:17:26 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDHQHH092014; Thu, 26 Dec 2013 13:17:26 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261317.rBQDHQHH092014@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:17:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337511 - branches/2014Q1/net-mgmt/nagios X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Dec 2013 13:17:26 -0000 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 - -.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 + 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 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