Date: Sat, 30 Jul 2011 02:56:04 GMT From: Ryan Steinmetz <zi@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/159304: [update] net-mgmt/nagios to 3.3.1 Message-ID: <201107300256.p6U2u4vk040314@red.freebsd.org> Resent-Message-ID: <201107300300.p6U30QsQ091230@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159304 >Category: ports >Synopsis: [update] net-mgmt/nagios to 3.3.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jul 30 03:00:26 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ryan Steinmetz >Release: >Organization: Rochester Institute of Technology >Environment: >Description: Update to 3.3.1 >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net-mgmt/nagios/Makefile,v retrieving revision 1.91 diff -u -r1.91 Makefile --- Makefile 4 Dec 2010 07:33:09 -0000 1.91 +++ Makefile 30 Jul 2011 02:37:06 -0000 @@ -6,18 +6,20 @@ # PORTNAME= nagios -PORTVERSION= 3.2.3 +PORTVERSION= 3.3.1 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION} MAINTAINER= jarrod@downtools.com.au COMMENT= Extremely powerful network monitoring system +LICENSE= GPLv2 + LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins USE_ICONV= yes -USE_PERL5_BUILD= yes +USE_PERL5_BUILD=yes USE_AUTOTOOLS= autoconf libltdl USE_RC_SUBR= nagios @@ -41,6 +43,9 @@ NAGIOSHTMURL?= /nagios NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin +USERS= ${NAGIOSUSER} +GROUPS= ${NAGIOSGROUP} + .include <bsd.port.pre.mk> CPPFLAGS= -I${LOCALBASE}/include -fPIC @@ -62,10 +67,7 @@ --with-checkresult-dir=${NAGIOSDIR}/checkresults \ --disable-statuswrl -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LIBS="-L${LOCALBASE}/lib" \ +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ PERL=${PERL} MAKE_JOBS_UNSAFE= yes @@ -111,15 +113,15 @@ CONFIGURE_ARGS+= --disable-event-broker .endif +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + post-patch: .if defined(WITH_UNHANDLED_HACK) @${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \ -e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php .endif -pre-su-install: - @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL - post-install: @${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults ${NAGIOSDIR}/rw @${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net-mgmt/nagios/distinfo,v retrieving revision 1.47 diff -u -r1.47 distinfo --- distinfo 31 Oct 2010 22:40:47 -0000 1.47 +++ distinfo 30 Jul 2011 01:16:06 -0000 @@ -1,2 +1,2 @@ -SHA256 (nagios-3.2.3.tar.gz) = 7ec850a4d1d8d8ee36b06419ac912695e29962641c757cf21301b1befcb23434 -SIZE (nagios-3.2.3.tar.gz) = 3249447 +SHA256 (nagios-3.3.1.tar.gz) = c4e39cd31a8a9ee814df848fd933b8611465f749b48432672aef4ae5849d9652 +SIZE (nagios-3.3.1.tar.gz) = 1714630 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net-mgmt/nagios/pkg-plist,v retrieving revision 1.25 diff -u -r1.25 pkg-plist --- pkg-plist 28 Nov 2009 13:44:45 -0000 1.25 +++ pkg-plist 30 Jul 2011 02:31:55 -0000 @@ -33,7 +33,23 @@ %%NAGIOSWWWDIR%%/cgi-bin/summary.cgi %%NAGIOSWWWDIR%%/cgi-bin/tac.cgi %%NAGIOSWWWDIR%%/cgi-bin/trends.cgi -%%NAGIOSWWWDIR%%/config.inc.php +%%NAGIOSWWWDIR%%/stylesheets/avail.css +%%NAGIOSWWWDIR%%/stylesheets/checksanity.css +%%NAGIOSWWWDIR%%/stylesheets/cmd.css +%%NAGIOSWWWDIR%%/stylesheets/common.css +%%NAGIOSWWWDIR%%/stylesheets/config.css +%%NAGIOSWWWDIR%%/stylesheets/extinfo.css +%%NAGIOSWWWDIR%%/stylesheets/histogram.css +%%NAGIOSWWWDIR%%/stylesheets/history.css +%%NAGIOSWWWDIR%%/stylesheets/ministatus.css +%%NAGIOSWWWDIR%%/stylesheets/notifications.css +%%NAGIOSWWWDIR%%/stylesheets/outages.css +%%NAGIOSWWWDIR%%/stylesheets/showlog.css +%%NAGIOSWWWDIR%%/stylesheets/status.css +%%NAGIOSWWWDIR%%/stylesheets/statusmap.css +%%NAGIOSWWWDIR%%/stylesheets/summary.css +%%NAGIOSWWWDIR%%/stylesheets/tac.css +%%NAGIOSWWWDIR%%/stylesheets/trends.css %%NAGIOSWWWDIR%%/contexthelp/A1.html %%NAGIOSWWWDIR%%/contexthelp/A2.html %%NAGIOSWWWDIR%%/contexthelp/A3.html @@ -97,195 +113,188 @@ %%NAGIOSWWWDIR%%/contexthelp/N5.html %%NAGIOSWWWDIR%%/contexthelp/N6.html %%NAGIOSWWWDIR%%/contexthelp/N7.html -%%NAGIOSWWWDIR%%/docs/about.html -%%NAGIOSWWWDIR%%/docs/activechecks.html -%%NAGIOSWWWDIR%%/docs/adaptive.html -%%NAGIOSWWWDIR%%/docs/addons.html -%%NAGIOSWWWDIR%%/docs/beginners.html -%%NAGIOSWWWDIR%%/docs/cachedchecks.html -%%NAGIOSWWWDIR%%/docs/cgiauth.html -%%NAGIOSWWWDIR%%/docs/cgiincludes.html -%%NAGIOSWWWDIR%%/docs/cgis.html -%%NAGIOSWWWDIR%%/docs/cgisecurity.html -%%NAGIOSWWWDIR%%/docs/checkscheduling.html -%%NAGIOSWWWDIR%%/docs/clusters.html -%%NAGIOSWWWDIR%%/docs/config.html -%%NAGIOSWWWDIR%%/docs/configcgi.html -%%NAGIOSWWWDIR%%/docs/configmain.html -%%NAGIOSWWWDIR%%/docs/configobject.html -%%NAGIOSWWWDIR%%/docs/customobjectvars.html -%%NAGIOSWWWDIR%%/docs/dependencies.html -%%NAGIOSWWWDIR%%/docs/dependencychecks.html -%%NAGIOSWWWDIR%%/docs/distributed.html -%%NAGIOSWWWDIR%%/docs/downtime.html -%%NAGIOSWWWDIR%%/docs/embeddedperl.html -%%NAGIOSWWWDIR%%/docs/epnplugins.html -%%NAGIOSWWWDIR%%/docs/escalations.html -%%NAGIOSWWWDIR%%/docs/eventhandlers.html -%%NAGIOSWWWDIR%%/docs/extcommands.html -%%NAGIOSWWWDIR%%/docs/faststartup.html -%%NAGIOSWWWDIR%%/docs/flapping.html -%%NAGIOSWWWDIR%%/docs/freshness.html -%%NAGIOSWWWDIR%%/docs/funstuff.html -%%NAGIOSWWWDIR%%/docs/hostchecks.html -%%NAGIOSWWWDIR%%/docs/knownissues.html -%%NAGIOSWWWDIR%%/docs/images/activechecks.png -%%NAGIOSWWWDIR%%/docs/images/cachedcheckgraphs.png -%%NAGIOSWWWDIR%%/docs/images/cachedchecks.png -%%NAGIOSWWWDIR%%/docs/images/cachedchecks1.png -%%NAGIOSWWWDIR%%/docs/images/cgi-avail-a.png -%%NAGIOSWWWDIR%%/docs/images/cgi-avail-b.png -%%NAGIOSWWWDIR%%/docs/images/cgi-cmd.png -%%NAGIOSWWWDIR%%/docs/images/cgi-config.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-a.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-b.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-c.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-d.png -%%NAGIOSWWWDIR%%/docs/images/cgi-histogram.png -%%NAGIOSWWWDIR%%/docs/images/cgi-history.png -%%NAGIOSWWWDIR%%/docs/images/cgi-notifications.png -%%NAGIOSWWWDIR%%/docs/images/cgi-outages.png -%%NAGIOSWWWDIR%%/docs/images/cgi-showlog.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-a.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-b.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-c.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-d.png -%%NAGIOSWWWDIR%%/docs/images/cgi-statusmap.png -%%NAGIOSWWWDIR%%/docs/images/cgi-statuswml.png -%%NAGIOSWWWDIR%%/docs/images/cgi-statuswrl.png -%%NAGIOSWWWDIR%%/docs/images/cgi-summary.png -%%NAGIOSWWWDIR%%/docs/images/cgi-tac.png -%%NAGIOSWWWDIR%%/docs/images/cgi-trends.png -%%NAGIOSWWWDIR%%/docs/images/checkmark.png -%%NAGIOSWWWDIR%%/docs/images/checktiming.png -%%NAGIOSWWWDIR%%/docs/images/configoverview.png -%%NAGIOSWWWDIR%%/docs/images/distributed.png -%%NAGIOSWWWDIR%%/docs/images/downtime.png -%%NAGIOSWWWDIR%%/docs/images/epn.png -%%NAGIOSWWWDIR%%/docs/images/eventhandlers.png -%%NAGIOSWWWDIR%%/docs/images/externalcommands.png -%%NAGIOSWWWDIR%%/docs/images/fast-startup.png -%%NAGIOSWWWDIR%%/docs/images/fast-startup1.png -%%NAGIOSWWWDIR%%/docs/images/fast-startup2.png -%%NAGIOSWWWDIR%%/docs/images/freshness.png -%%NAGIOSWWWDIR%%/docs/images/host-dependencies.png -%%NAGIOSWWWDIR%%/docs/images/important.gif -%%NAGIOSWWWDIR%%/docs/images/integrationoverview.png -%%NAGIOSWWWDIR%%/docs/images/interleaved1.png -%%NAGIOSWWWDIR%%/docs/images/interleaved2.png -%%NAGIOSWWWDIR%%/docs/images/interleaved3.png -%%NAGIOSWWWDIR%%/docs/images/logofullsize.png -%%NAGIOSWWWDIR%%/docs/images/monitoring-printers.png -%%NAGIOSWWWDIR%%/docs/images/monitoring-routers.png -%%NAGIOSWWWDIR%%/docs/images/monitoring-windows.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-activehostchecks.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-activelychecked.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-activeservicechecks.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-cachedchecks.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-commandbuffers.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-externalcommands.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-hostperfstats.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-hoststatechange.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-passivechecks.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-passivelychecked.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-serviceperfstats.png -%%NAGIOSWWWDIR%%/docs/images/mrtg-servicestatechange.png -%%NAGIOSWWWDIR%%/docs/images/multiple-templates1.png -%%NAGIOSWWWDIR%%/docs/images/multiple-templates2.png -%%NAGIOSWWWDIR%%/docs/images/nagios.jpg -%%NAGIOSWWWDIR%%/docs/images/nagiosexchange.png -%%NAGIOSWWWDIR%%/docs/images/nagiossupport.png -%%NAGIOSWWWDIR%%/docs/images/ndoutils.png -%%NAGIOSWWWDIR%%/docs/images/network-outage1.png -%%NAGIOSWWWDIR%%/docs/images/network-outage2.png -%%NAGIOSWWWDIR%%/docs/images/noninterleaved1.png -%%NAGIOSWWWDIR%%/docs/images/noninterleaved2.png -%%NAGIOSWWWDIR%%/docs/images/note.gif -%%NAGIOSWWWDIR%%/docs/images/nrpe.png -%%NAGIOSWWWDIR%%/docs/images/nsca.png -%%NAGIOSWWWDIR%%/docs/images/nscpp.png -%%NAGIOSWWWDIR%%/docs/images/objects-commands.png -%%NAGIOSWWWDIR%%/docs/images/objects-contacts.png -%%NAGIOSWWWDIR%%/docs/images/objects-hosts.png -%%NAGIOSWWWDIR%%/docs/images/objects-services.png -%%NAGIOSWWWDIR%%/docs/images/objects-timeperiods.png -%%NAGIOSWWWDIR%%/docs/images/passivechecks.png -%%NAGIOSWWWDIR%%/docs/images/passivehosttranslation.png -%%NAGIOSWWWDIR%%/docs/images/plugins.png -%%NAGIOSWWWDIR%%/docs/images/predictive-dependency-checks.png -%%NAGIOSWWWDIR%%/docs/images/printer.png -%%NAGIOSWWWDIR%%/docs/images/reachability1.png -%%NAGIOSWWWDIR%%/docs/images/reachability2.png -%%NAGIOSWWWDIR%%/docs/images/reachability3.png -%%NAGIOSWWWDIR%%/docs/images/reachability4.png -%%NAGIOSWWWDIR%%/docs/images/redudancy.png -%%NAGIOSWWWDIR%%/docs/images/redundancy.png -%%NAGIOSWWWDIR%%/docs/images/security.png -%%NAGIOSWWWDIR%%/docs/images/security1.png -%%NAGIOSWWWDIR%%/docs/images/security2.png -%%NAGIOSWWWDIR%%/docs/images/security3.png -%%NAGIOSWWWDIR%%/docs/images/seealso.gif -%%NAGIOSWWWDIR%%/docs/images/service-dependencies.png -%%NAGIOSWWWDIR%%/docs/images/statetransitions.png -%%NAGIOSWWWDIR%%/docs/images/statetransitions2.png -%%NAGIOSWWWDIR%%/docs/images/stoprestart.png -%%NAGIOSWWWDIR%%/docs/images/switch.png -%%NAGIOSWWWDIR%%/docs/images/tcpwrappers.png -%%NAGIOSWWWDIR%%/docs/images/tip.gif -%%NAGIOSWWWDIR%%/docs/images/tuning.png -%%NAGIOSWWWDIR%%/docs/images/upto.gif -%%NAGIOSWWWDIR%%/docs/index.html -%%NAGIOSWWWDIR%%/docs/int-snmptrap.html -%%NAGIOSWWWDIR%%/docs/int-tcpwrappers.html -%%NAGIOSWWWDIR%%/docs/integration.html -%%NAGIOSWWWDIR%%/docs/largeinstalltweaks.html -%%NAGIOSWWWDIR%%/docs/macrolist.html -%%NAGIOSWWWDIR%%/docs/macros.html -%%NAGIOSWWWDIR%%/docs/monitoring-linux.html -%%NAGIOSWWWDIR%%/docs/monitoring-netware.html -%%NAGIOSWWWDIR%%/docs/monitoring-printers.html -%%NAGIOSWWWDIR%%/docs/monitoring-publicservices.html -%%NAGIOSWWWDIR%%/docs/monitoring-routers.html -%%NAGIOSWWWDIR%%/docs/monitoring-windows.html -%%NAGIOSWWWDIR%%/docs/mrtggraphs.html -%%NAGIOSWWWDIR%%/docs/nagiostats.html -%%NAGIOSWWWDIR%%/docs/networkreachability.html -%%NAGIOSWWWDIR%%/docs/notifications.html -%%NAGIOSWWWDIR%%/docs/objectdefinitions.html -%%NAGIOSWWWDIR%%/docs/objectinheritance.html -%%NAGIOSWWWDIR%%/docs/objecttricks.html -%%NAGIOSWWWDIR%%/docs/oncallrotation.html -%%NAGIOSWWWDIR%%/docs/passivechecks.html -%%NAGIOSWWWDIR%%/docs/passivestatetranslation.html -%%NAGIOSWWWDIR%%/docs/perfdata.html -%%NAGIOSWWWDIR%%/docs/pluginapi.html -%%NAGIOSWWWDIR%%/docs/plugins.html -%%NAGIOSWWWDIR%%/docs/quickstart-fedora.html -%%NAGIOSWWWDIR%%/docs/quickstart-opensuse.html -%%NAGIOSWWWDIR%%/docs/quickstart-ubuntu.html -%%NAGIOSWWWDIR%%/docs/quickstart.html -%%NAGIOSWWWDIR%%/docs/redundancy.html -%%NAGIOSWWWDIR%%/docs/robots.txt -%%NAGIOSWWWDIR%%/docs/security.html -%%NAGIOSWWWDIR%%/docs/servicechecks.html -%%NAGIOSWWWDIR%%/docs/stalking.html -%%NAGIOSWWWDIR%%/docs/startstop.html -%%NAGIOSWWWDIR%%/docs/statetypes.html -%%NAGIOSWWWDIR%%/docs/timeperiods.html -%%NAGIOSWWWDIR%%/docs/toc.html -%%NAGIOSWWWDIR%%/docs/tuning.html -%%NAGIOSWWWDIR%%/docs/upgrading.html -%%NAGIOSWWWDIR%%/docs/verifyconfig.html -%%NAGIOSWWWDIR%%/docs/volatileservices.html -%%NAGIOSWWWDIR%%/docs/whatsnew.html -%%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png +%%NAGIOSWWWDIR%%/images/logos/nagios.gd2 +%%NAGIOSWWWDIR%%/images/logos/nagios.gif +%%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png +%%NAGIOSWWWDIR%%/images/logos/unknown.gd2 +%%NAGIOSWWWDIR%%/images/logos/unknown.gif +%%NAGIOSWWWDIR%%/images/logos/novell40.gif +%%NAGIOSWWWDIR%%/images/logos/irix.jpg +%%NAGIOSWWWDIR%%/images/logos/aix.png +%%NAGIOSWWWDIR%%/images/logos/beos.png +%%NAGIOSWWWDIR%%/images/logos/stampede.png +%%NAGIOSWWWDIR%%/images/logos/amiga.gd2 +%%NAGIOSWWWDIR%%/images/logos/novell40.png +%%NAGIOSWWWDIR%%/images/logos/next.gif +%%NAGIOSWWWDIR%%/images/logos/switch40.gif +%%NAGIOSWWWDIR%%/images/logos/mainframe.gif +%%NAGIOSWWWDIR%%/images/logos/mainframe.gd2 +%%NAGIOSWWWDIR%%/images/logos/caldera.gif +%%NAGIOSWWWDIR%%/images/logos/slackware.gif +%%NAGIOSWWWDIR%%/images/logos/printer.gd2 +%%NAGIOSWWWDIR%%/images/logos/cat5000.gd2 +%%NAGIOSWWWDIR%%/images/logos/win40.png +%%NAGIOSWWWDIR%%/images/logos/router.gd2 +%%NAGIOSWWWDIR%%/images/logos/beos.jpg +%%NAGIOSWWWDIR%%/images/logos/mandrake.gd2 +%%NAGIOSWWWDIR%%/images/logos/caldera.jpg +%%NAGIOSWWWDIR%%/images/logos/turbolinux.gd2 +%%NAGIOSWWWDIR%%/images/logos/slackware.gd2 +%%NAGIOSWWWDIR%%/images/logos/workstation.gd2 +%%NAGIOSWWWDIR%%/images/logos/switch.gd2 +%%NAGIOSWWWDIR%%/images/logos/internet.gif +%%NAGIOSWWWDIR%%/images/logos/caldera.png +%%NAGIOSWWWDIR%%/images/logos/openbsd.jpg +%%NAGIOSWWWDIR%%/images/logos/signal.png +%%NAGIOSWWWDIR%%/images/logos/desktop-server.gif +%%NAGIOSWWWDIR%%/images/logos/notebook.gd2 +%%NAGIOSWWWDIR%%/images/logos/hpux.jpg +%%NAGIOSWWWDIR%%/images/logos/firewall.gd2 +%%NAGIOSWWWDIR%%/images/logos/unicos.gd2 +%%NAGIOSWWWDIR%%/images/logos/mandrake.jpg +%%NAGIOSWWWDIR%%/images/logos/mac40.gif +%%NAGIOSWWWDIR%%/images/logos/printer.gif +%%NAGIOSWWWDIR%%/images/logos/turbolinux.png +%%NAGIOSWWWDIR%%/images/logos/sun40.gd2 +%%NAGIOSWWWDIR%%/images/logos/station.gd2 +%%NAGIOSWWWDIR%%/images/logos/novell40.jpg +%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gd2 +%%NAGIOSWWWDIR%%/images/logos/aix.gd2 +%%NAGIOSWWWDIR%%/images/logos/freebsd40.png +%%NAGIOSWWWDIR%%/images/logos/rack-server.gd2 +%%NAGIOSWWWDIR%%/images/logos/debian.png +%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gd2 +%%NAGIOSWWWDIR%%/images/logos/router.gif +%%NAGIOSWWWDIR%%/images/logos/workstation.png +%%NAGIOSWWWDIR%%/images/logos/next.png +%%NAGIOSWWWDIR%%/images/logos/unicos.jpg +%%NAGIOSWWWDIR%%/images/logos/notebook.gif +%%NAGIOSWWWDIR%%/images/logos/yellowdog.gd2 +%%NAGIOSWWWDIR%%/images/logos/monitor.png +%%NAGIOSWWWDIR%%/images/logos/satellite.png +%%NAGIOSWWWDIR%%/images/logos/wifi_modem.png +%%NAGIOSWWWDIR%%/images/logos/rack-server.gif +%%NAGIOSWWWDIR%%/images/logos/yellowdog.png +%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gd2 +%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gif +%%NAGIOSWWWDIR%%/images/logos/beos.gif +%%NAGIOSWWWDIR%%/images/logos/mandrake.gif +%%NAGIOSWWWDIR%%/images/logos/san.gif +%%NAGIOSWWWDIR%%/images/logos/globe.png +%%NAGIOSWWWDIR%%/images/logos/debian.jpg +%%NAGIOSWWWDIR%%/images/logos/novell40.gd2 +%%NAGIOSWWWDIR%%/images/logos/ethernet_card.png +%%NAGIOSWWWDIR%%/images/logos/irix.png +%%NAGIOSWWWDIR%%/images/logos/storm.gif +%%NAGIOSWWWDIR%%/images/logos/redhat.png +%%NAGIOSWWWDIR%%/images/logos/apple.png +%%NAGIOSWWWDIR%%/images/logos/storm.png +%%NAGIOSWWWDIR%%/images/logos/freebsd40.gd2 +%%NAGIOSWWWDIR%%/images/logos/internet_device.png +%%NAGIOSWWWDIR%%/images/logos/sun40.png +%%NAGIOSWWWDIR%%/images/logos/wifi.gif +%%NAGIOSWWWDIR%%/images/logos/ng-switch40.jpg +%%NAGIOSWWWDIR%%/images/logos/cat1900.gd2 +%%NAGIOSWWWDIR%%/images/logos/router40.png +%%NAGIOSWWWDIR%%/images/logos/workstation_locked.png +%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.jpg +%%NAGIOSWWWDIR%%/images/logos/router40.jpg +%%NAGIOSWWWDIR%%/images/logos/logo.gd2 +%%NAGIOSWWWDIR%%/images/logos/win40.jpg +%%NAGIOSWWWDIR%%/images/logos/firewall.gif +%%NAGIOSWWWDIR%%/images/logos/hub.gif +%%NAGIOSWWWDIR%%/images/logos/yellowdog.jpg +%%NAGIOSWWWDIR%%/images/logos/debian.gif +%%NAGIOSWWWDIR%%/images/logos/freebsd40.jpg +%%NAGIOSWWWDIR%%/images/logos/linux40.gd2 +%%NAGIOSWWWDIR%%/images/logos/redhat.gd2 +%%NAGIOSWWWDIR%%/images/logos/graph.gif +%%NAGIOSWWWDIR%%/images/logos/san.gd2 +%%NAGIOSWWWDIR%%/images/logos/apple.gd2 +%%NAGIOSWWWDIR%%/images/logos/fax.gd2 +%%NAGIOSWWWDIR%%/images/logos/stampede.gd2 +%%NAGIOSWWWDIR%%/images/logos/amiga.gif +%%NAGIOSWWWDIR%%/images/logos/thin-client.gif +%%NAGIOSWWWDIR%%/images/logos/turbolinux.gif +%%NAGIOSWWWDIR%%/images/logos/ip-pbx.gd2 +%%NAGIOSWWWDIR%%/images/logos/next.jpg +%%NAGIOSWWWDIR%%/images/logos/desktop-server.gd2 +%%NAGIOSWWWDIR%%/images/logos/freebsd40.gif +%%NAGIOSWWWDIR%%/images/logos/fax.gif +%%NAGIOSWWWDIR%%/images/logos/caldera.gd2 +%%NAGIOSWWWDIR%%/images/logos/hub.gd2 +%%NAGIOSWWWDIR%%/images/logos/redhat.gif +%%NAGIOSWWWDIR%%/images/logos/win40.gif +%%NAGIOSWWWDIR%%/images/logos/hpux.png +%%NAGIOSWWWDIR%%/images/logos/bluetooth.png +%%NAGIOSWWWDIR%%/images/logos/mandrake.png +%%NAGIOSWWWDIR%%/images/logos/linux40.jpg +%%NAGIOSWWWDIR%%/images/logos/apple.gif +%%NAGIOSWWWDIR%%/images/logos/sun40.jpg +%%NAGIOSWWWDIR%%/images/logos/slackware.jpg +%%NAGIOSWWWDIR%%/images/logos/aix.gif +%%NAGIOSWWWDIR%%/images/logos/storm.jpg +%%NAGIOSWWWDIR%%/images/logos/debian.gd2 +%%NAGIOSWWWDIR%%/images/logos/stampede.gif +%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gif +%%NAGIOSWWWDIR%%/images/logos/linux40.gif +%%NAGIOSWWWDIR%%/images/logos/hp-printer40.jpg +%%NAGIOSWWWDIR%%/images/logos/sun40.gif +%%NAGIOSWWWDIR%%/images/logos/mac40.gd2 +%%NAGIOSWWWDIR%%/images/logos/irix.gif +%%NAGIOSWWWDIR%%/images/logos/storm.gd2 +%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.png +%%NAGIOSWWWDIR%%/images/logos/ng-switch40.png +%%NAGIOSWWWDIR%%/images/logos/aix.jpg +%%NAGIOSWWWDIR%%/images/logos/hp-printer40.png +%%NAGIOSWWWDIR%%/images/logos/database.gd2 +%%NAGIOSWWWDIR%%/images/logos/redhat.jpg +%%NAGIOSWWWDIR%%/images/logos/internet.gd2 +%%NAGIOSWWWDIR%%/images/logos/turbolinux.jpg +%%NAGIOSWWWDIR%%/images/logos/ip-pbx.gif +%%NAGIOSWWWDIR%%/images/logos/workstation.gif +%%NAGIOSWWWDIR%%/images/logos/sunlogo.gif +%%NAGIOSWWWDIR%%/images/logos/sunlogo.png +%%NAGIOSWWWDIR%%/images/logos/database.gif +%%NAGIOSWWWDIR%%/images/logos/win40.gd2 +%%NAGIOSWWWDIR%%/images/logos/hpux.gif +%%NAGIOSWWWDIR%%/images/logos/mac40.jpg +%%NAGIOSWWWDIR%%/images/logos/unicos.png +%%NAGIOSWWWDIR%%/images/logos/router40.gif +%%NAGIOSWWWDIR%%/images/logos/beos.gd2 +%%NAGIOSWWWDIR%%/images/logos/openbsd.gif +%%NAGIOSWWWDIR%%/images/logos/amiga.png +%%NAGIOSWWWDIR%%/images/logos/switch40.jpg +%%NAGIOSWWWDIR%%/images/logos/mac40.png +%%NAGIOSWWWDIR%%/images/logos/server.png +%%NAGIOSWWWDIR%%/images/logos/switch40.gd2 +%%NAGIOSWWWDIR%%/images/logos/slackware.png +%%NAGIOSWWWDIR%%/images/logos/sunlogo.jpg +%%NAGIOSWWWDIR%%/images/logos/irix.gd2 +%%NAGIOSWWWDIR%%/images/logos/wifi.gd2 +%%NAGIOSWWWDIR%%/images/logos/switch.gif +%%NAGIOSWWWDIR%%/images/logos/yellowdog.gif +%%NAGIOSWWWDIR%%/images/logos/router40.gd2 +%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gif +%%NAGIOSWWWDIR%%/images/logos/linux40.png +%%NAGIOSWWWDIR%%/images/logos/unicos.gif +%%NAGIOSWWWDIR%%/images/logos/switch40.png +%%NAGIOSWWWDIR%%/images/logos/amiga.jpg +%%NAGIOSWWWDIR%%/images/logos/hpux.gd2 +%%NAGIOSWWWDIR%%/images/logos/openbsd.gd2 +%%NAGIOSWWWDIR%%/images/logos/sunlogo.gd2 +%%NAGIOSWWWDIR%%/images/logos/thin-client.gd2 +%%NAGIOSWWWDIR%%/images/logos/webcamera.png +%%NAGIOSWWWDIR%%/images/logos/apple.jpg +%%NAGIOSWWWDIR%%/images/logos/openbsd.png +%%NAGIOSWWWDIR%%/images/logos/cat2900.gd2 +%%NAGIOSWWWDIR%%/images/logos/next.gd2 +%%NAGIOSWWWDIR%%/images/logos/stampede.jpg %%NAGIOSWWWDIR%%/images/ack.gif %%NAGIOSWWWDIR%%/images/action.gif -%%NAGIOSWWWDIR%%/images/command.png %%NAGIOSWWWDIR%%/images/comment.gif %%NAGIOSWWWDIR%%/images/contexthelp1.gif %%NAGIOSWWWDIR%%/images/contexthelp2.gif -%%NAGIOSWWWDIR%%/images/critical.png %%NAGIOSWWWDIR%%/images/delay.gif %%NAGIOSWWWDIR%%/images/delete.gif %%NAGIOSWWWDIR%%/images/detail.gif @@ -295,36 +304,21 @@ %%NAGIOSWWWDIR%%/images/empty.gif %%NAGIOSWWWDIR%%/images/enabled.gif %%NAGIOSWWWDIR%%/images/extinfo.gif -%%NAGIOSWWWDIR%%/images/favicon.ico %%NAGIOSWWWDIR%%/images/flapping.gif -%%NAGIOSWWWDIR%%/images/globe-support-150x150.png %%NAGIOSWWWDIR%%/images/greendot.gif -%%NAGIOSWWWDIR%%/images/histogram.png %%NAGIOSWWWDIR%%/images/history.gif %%NAGIOSWWWDIR%%/images/hostevent.gif -%%NAGIOSWWWDIR%%/images/info.png %%NAGIOSWWWDIR%%/images/left.gif -%%NAGIOSWWWDIR%%/images/logofullsize.png -%%NAGIOSWWWDIR%%/images/logos/nagios.gd2 -%%NAGIOSWWWDIR%%/images/logos/nagios.gif -%%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png -%%NAGIOSWWWDIR%%/images/logos/unknown.gd2 -%%NAGIOSWWWDIR%%/images/logos/unknown.gif -%%NAGIOSWWWDIR%%/images/logrotate.png %%NAGIOSWWWDIR%%/images/ndisabled.gif %%NAGIOSWWWDIR%%/images/noack.gif +%%NAGIOSWWWDIR%%/images/up.gif %%NAGIOSWWWDIR%%/images/notes.gif %%NAGIOSWWWDIR%%/images/notify.gif %%NAGIOSWWWDIR%%/images/orangedot.gif %%NAGIOSWWWDIR%%/images/passiveonly.gif -%%NAGIOSWWWDIR%%/images/recovery.png -%%NAGIOSWWWDIR%%/images/redudancy.png -%%NAGIOSWWWDIR%%/images/redundancy.png %%NAGIOSWWWDIR%%/images/restart.gif %%NAGIOSWWWDIR%%/images/right.gif -%%NAGIOSWWWDIR%%/images/sblogo.png %%NAGIOSWWWDIR%%/images/serviceevent.gif -%%NAGIOSWWWDIR%%/images/sflogo.png %%NAGIOSWWWDIR%%/images/splunk1.gif %%NAGIOSWWWDIR%%/images/splunk2.gif %%NAGIOSWWWDIR%%/images/start.gif @@ -333,44 +327,50 @@ %%NAGIOSWWWDIR%%/images/status3.gif %%NAGIOSWWWDIR%%/images/status4.gif %%NAGIOSWWWDIR%%/images/stop.gif +%%NAGIOSWWWDIR%%/images/trends.gif +%%NAGIOSWWWDIR%%/images/zoom1.gif +%%NAGIOSWWWDIR%%/images/zoom2.gif %%NAGIOSWWWDIR%%/images/tacdisabled.jpg -%%NAGIOSWWWDIR%%/images/tacdisabled.png %%NAGIOSWWWDIR%%/images/tacenabled.jpg +%%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png +%%NAGIOSWWWDIR%%/images/command.png +%%NAGIOSWWWDIR%%/images/info.png +%%NAGIOSWWWDIR%%/images/critical.png +%%NAGIOSWWWDIR%%/images/globe-support-150x150.png +%%NAGIOSWWWDIR%%/images/histogram.png +%%NAGIOSWWWDIR%%/images/logofullsize.png +%%NAGIOSWWWDIR%%/images/logrotate.png +%%NAGIOSWWWDIR%%/images/recovery.png +%%NAGIOSWWWDIR%%/images/redudancy.png +%%NAGIOSWWWDIR%%/images/redundancy.png +%%NAGIOSWWWDIR%%/images/sblogo.png +%%NAGIOSWWWDIR%%/images/sflogo.png +%%NAGIOSWWWDIR%%/images/tacdisabled.png %%NAGIOSWWWDIR%%/images/tacenabled.png %%NAGIOSWWWDIR%%/images/thermcrit.png %%NAGIOSWWWDIR%%/images/thermok.png %%NAGIOSWWWDIR%%/images/thermwarn.png -%%NAGIOSWWWDIR%%/images/trends.gif %%NAGIOSWWWDIR%%/images/trendshost.png %%NAGIOSWWWDIR%%/images/trendssvc.png %%NAGIOSWWWDIR%%/images/unknown.png -%%NAGIOSWWWDIR%%/images/up.gif %%NAGIOSWWWDIR%%/images/warning.png %%NAGIOSWWWDIR%%/images/weblogo1.png -%%NAGIOSWWWDIR%%/images/zoom1.gif -%%NAGIOSWWWDIR%%/images/zoom2.gif +%%NAGIOSWWWDIR%%/images/favicon.ico +%%NAGIOSWWWDIR%%/images/graph.gif +%%NAGIOSWWWDIR%%/images/action-orig.gif +%%NAGIOSWWWDIR%%/images/action-nagios.gif +%%NAGIOSWWWDIR%%/images/action-graph.gif +%%NAGIOSWWWDIR%%/includes/rss/extlib/Snoopy.class.inc +%%NAGIOSWWWDIR%%/includes/rss/rss_cache.inc +%%NAGIOSWWWDIR%%/includes/rss/rss_fetch.inc +%%NAGIOSWWWDIR%%/includes/rss/rss_parse.inc +%%NAGIOSWWWDIR%%/includes/rss/rss_utils.inc %%NAGIOSWWWDIR%%/includes/utils.inc.php +%%NAGIOSWWWDIR%%/robots.txt +%%NAGIOSWWWDIR%%/config.inc.php %%NAGIOSWWWDIR%%/index.php %%NAGIOSWWWDIR%%/main.php -%%NAGIOSWWWDIR%%/robots.txt %%NAGIOSWWWDIR%%/side.php -%%NAGIOSWWWDIR%%/stylesheets/avail.css -%%NAGIOSWWWDIR%%/stylesheets/checksanity.css -%%NAGIOSWWWDIR%%/stylesheets/cmd.css -%%NAGIOSWWWDIR%%/stylesheets/common.css -%%NAGIOSWWWDIR%%/stylesheets/config.css -%%NAGIOSWWWDIR%%/stylesheets/extinfo.css -%%NAGIOSWWWDIR%%/stylesheets/histogram.css -%%NAGIOSWWWDIR%%/stylesheets/history.css -%%NAGIOSWWWDIR%%/stylesheets/ministatus.css -%%NAGIOSWWWDIR%%/stylesheets/notifications.css -%%NAGIOSWWWDIR%%/stylesheets/outages.css -%%NAGIOSWWWDIR%%/stylesheets/showlog.css -%%NAGIOSWWWDIR%%/stylesheets/status.css -%%NAGIOSWWWDIR%%/stylesheets/statusmap.css -%%NAGIOSWWWDIR%%/stylesheets/summary.css -%%NAGIOSWWWDIR%%/stylesheets/tac.css -%%NAGIOSWWWDIR%%/stylesheets/trends.css @dirrmtry etc/nagios/objects @dirrmtry etc/nagios @dirrm %%NAGIOSWWWDIR%%/cgi-bin @@ -379,12 +379,14 @@ @dirrm %%NAGIOSWWWDIR%%/docs @dirrm %%NAGIOSWWWDIR%%/images/logos @dirrm %%NAGIOSWWWDIR%%/images +@dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib +@dirrm %%NAGIOSWWWDIR%%/includes/rss @dirrm %%NAGIOSWWWDIR%%/includes @dirrm %%NAGIOSWWWDIR%%/media @dirrm %%NAGIOSWWWDIR%%/ssi @dirrm %%NAGIOSWWWDIR%%/stylesheets @dirrmtry %%NAGIOSWWWDIR%% -@unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true -@unexec rmdir %%NAGIOSDIR%%/checkresults 2>/dev/null || true -@unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true -@unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true +@dirrmtry %%NAGIOSDIR%%/archives +@dirrmtry %%NAGIOSDIR%%/checkresults +@dirrmtry %%NAGIOSDIR%%/rw +@dirrmtry %%NAGIOSDIR%% Index: files/patch-base-Makefile.in =================================================================== RCS file: files/patch-base-Makefile.in diff -N files/patch-base-Makefile.in --- files/patch-base-Makefile.in 3 Sep 2008 00:30:55 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ ---- base/Makefile.in.orig Wed Jan 24 04:58:34 2007 -+++ base/Makefile.in Fri Jul 20 13:34:45 2007 -@@ -193,9 +193,9 @@ - $(MAKE) install-basic - - install-basic: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) -- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) - - strip-post-install: - $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@ Index: files/patch-base__Makefile.in =================================================================== RCS file: files/patch-base__Makefile.in diff -N files/patch-base__Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-base__Makefile.in 30 Jul 2011 01:38:50 -0000 @@ -0,0 +1,15 @@ +--- ./base/Makefile.in.orig 2011-07-29 21:29:18.000000000 -0400 ++++ ./base/Makefile.in 2011-07-29 21:29:47.000000000 -0400 +@@ -204,9 +204,9 @@ + $(MAKE) install-basic + + install-basic: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) + + strip-post-install: + $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@ Index: files/patch-configure.in =================================================================== RCS file: /home/ncvs/ports/net-mgmt/nagios/files/patch-configure.in,v retrieving revision 1.6 diff -u -r1.6 patch-configure.in --- files/patch-configure.in 18 Apr 2010 08:16:40 -0000 1.6 +++ files/patch-configure.in 30 Jul 2011 01:38:50 -0000 @@ -1,38 +1,14 @@ ---- configure.in.orig 2010-03-09 19:39:59.000000000 +0100 -+++ configure.in 2010-04-07 20:18:58.585012048 +0200 +--- ./configure.in.orig 2011-07-29 21:34:51.000000000 -0400 ++++ ./configure.in 2011-07-29 21:38:47.000000000 -0400 @@ -6,7 +6,6 @@ AC_INIT(base/nagios.c) - AC_CONFIG_HEADER(include/config.h include/snprintf.h include/cgiutils.h) + AC_CONFIG_HEADER(include/config.h include/snprintf.h) -AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios - PKG_VERSION="3.2.1" -@@ -125,7 +124,15 @@ - dnl Test for pthreads support - taken from ICU FreeBSD Port configure script - THREADLIBS="" - have_pthreads="no" -+have_thr="no" - -+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues -+AC_CHECK_LIB(thr,pthread_create) -+if test $ac_cv_lib_thr_pthread_create = yes; then -+ THREADLIBS="-lthr" -+ have_pthreads="yes" -+ have_thr="yes" -+else - dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com> - dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li> - AC_DEFUN([AC_PTHREAD_FREEBSD],[ -@@ -186,6 +193,7 @@ - if test $have_pthreads = "no"; then - AC_PTHREAD_FREEBSD - fi -+fi - - AC_SUBST(THREADLIBS) - -@@ -201,7 +209,7 @@ + PKG_VERSION="3.3.1" +@@ -201,7 +200,7 @@ AC_SUBST(nagios_grp) AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios]) AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios]) @@ -41,13 +17,3 @@ AC_SUBST(INSTALL_OPTS) 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) -@@ -668,6 +676,9 @@ - - AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?]) - PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" -+ if test x$have_thr = xyes; then -+ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`" -+ fi - PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`" - CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`" - USEPERL=yes Index: files/patch-contrib-Makefile.in =================================================================== RCS file: files/patch-contrib-Makefile.in diff -N files/patch-contrib-Makefile.in --- files/patch-contrib-Makefile.in 9 Jan 2006 00:54:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- contrib/Makefile.in.orig Tue Nov 15 12:19:36 2005 -+++ contrib/Makefile.in Wed Dec 28 17:49:25 2005 -@@ -46,10 +46,10 @@ - devclean: distclean - - install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -- for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done -- for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -+ for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done -+ for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done - - ############################################################################## - # rules and dependencies for actual target programs Index: files/patch-contrib__Makefile.in =================================================================== RCS file: files/patch-contrib__Makefile.in diff -N files/patch-contrib__Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-contrib__Makefile.in 30 Jul 2011 01:38:50 -0000 @@ -0,0 +1,17 @@ +--- ./contrib/Makefile.in.orig 2011-07-29 21:31:10.000000000 -0400 ++++ ./contrib/Makefile.in 2011-07-29 21:31:44.000000000 -0400 +@@ -51,10 +51,10 @@ + devclean: distclean + + install: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done +- for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) ++ for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done ++ for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done + + ############################################################################## + # rules and dependencies for actual target programs Index: files/patch-html-Makefile.in =================================================================== RCS file: files/patch-html-Makefile.in diff -N files/patch-html-Makefile.in --- files/patch-html-Makefile.in 28 Nov 2009 13:44:45 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,73 +0,0 @@ ---- html/Makefile.in.orig 2009-06-17 13:27:21.000000000 +0930 -+++ html/Makefile.in 2009-07-06 19:27:38.000000000 +0930 -@@ -33,46 +33,46 @@ - devclean: distclean - - install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi -- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) -- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi -+ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) -+ $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs - # Remove old HTML files (PHP files are used now) - rm -f $(DESTDIR)$(HTMLDIR)/index.html - rm -f $(DESTDIR)$(HTMLDIR)/main.html - rm -f $(DESTDIR)$(HTMLDIR)/side.html - for file in *.php; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done - # for file in media/*.wav; \ --# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done -+# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done - for file in stylesheets/*.css; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done - for file in contexthelp/*.html; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done - for file in docs/*.html; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done - for file in docs/images/*.*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done - for file in images/*.gif; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done - for file in images/*.jpg; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done - for file in images/*.png; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done - for file in images/*.ico; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done - for file in images/logos/*.*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done - for file in includes/*.*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done - - install-unstripped: - $(MAKE) install Index: files/patch-html-docs-configcgi.html =================================================================== RCS file: files/patch-html-docs-configcgi.html diff -N files/patch-html-docs-configcgi.html --- files/patch-html-docs-configcgi.html 28 Nov 2009 13:44:45 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- html/docs/configcgi.html.orig 2009-06-17 17:13:52.000000000 +0200 -+++ html/docs/configcgi.html 2009-11-27 23:16:02.000000000 +0100 -@@ -1250,7 +1250,7 @@ - - <td valign=top>Example:</td> - --<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td> -+<td><font color="red"><strong>ping_syntax=/sbin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td> - - </tr> - Index: files/patch-html__Makefile.in =================================================================== RCS file: files/patch-html__Makefile.in diff -N files/patch-html__Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-html__Makefile.in 30 Jul 2011 02:12:05 -0000 @@ -0,0 +1,84 @@ +--- ./html/Makefile.in.orig 2011-07-29 22:11:21.000000000 -0400 ++++ ./html/Makefile.in 2011-07-29 22:12:01.000000000 -0400 +@@ -33,52 +33,52 @@ + devclean: distclean + + install: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi +- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) +-# $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi ++ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) ++# $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs + # Remove old HTML files (PHP files are used now) + rm -f $(DESTDIR)$(HTMLDIR)/index.html + rm -f $(DESTDIR)$(HTMLDIR)/main.html + rm -f $(DESTDIR)$(HTMLDIR)/side.html + for file in *.php; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done + # for file in media/*.wav; \ +-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done ++# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done + for file in stylesheets/*.css; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done + for file in contexthelp/*.html; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done + # for file in docs/*.html; \ +-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done ++# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done + # for file in docs/images/*.*; \ +-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done ++# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done + for file in images/*.gif; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/*.jpg; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/*.png; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/*.ico; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/logos/*.*; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done + for file in includes/*.*; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done +- for file in includes/rss/*; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done ++ for file in includes/rss/*.*; \ ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done + for file in includes/rss/extlib/*; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done ++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done + + install-unstripped: + $(MAKE) install >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107300256.p6U2u4vk040314>