Tue Dec 31 03:28:39 2013 UTC ()
Update 1.9.4

* Switch to 1.9.x branch
* Fix CVE-2013-7106 and CVE-2013-7108

Changelog:
1.9.4 - 13/12/2013

FIXES
* classic ui: fix status output in JSON format not including short and long plugin output properly #5217 - RB
* classic ui: fix possible buffer overflows #5250 - RB
* classic ui: fix Off-by-one memory access in process_cgivars() #5251 - RB

1.9.3 - 07/07/2013

FIXES
* core: fix init script status exit codes on not running daemon and present pid file #4243 - MF

* idoutils: fix workaround on libdbi fetch_next_row() bug applied for postgresql too, causing faulty queries #4367 - MF

1.9.2 - 30/06/2013

FIXES
* core: fix bug with non-ASCII (> 127) illegal macro output characters on char-to-int cast (Jason Young) #4211 - MF
* core: bail early if main config file cannot be read - MF

* classic ui: fixed searching hostgroup results in wrong 'all' view filter urls #4206 - RB
* classic ui: fix URL construction issue in icinga_reload_scroll_position() javascript (Karsten S端hring) #4233 - MF

* idoutils: fix mysql: output/perfdata limits cut escaped string leaving '\' at the end (Yannik Charton) #4196 - MF
* idoutils: bugfixes for socket queue, transactions and libdbi handling #4049 - GB
* idoutils: fix ido2db gradually consumes more and more CPU time with time #4210 - CF
* idoutils: fix wrong clob freeing in eventhandlers #4357 - TD

1.9.1 - 22/05/2013

FIXES
* core: fix objects.cache does not get updated on (re)start, but config verify (Christian Ruppert) #4155 - MF

* classic ui: fixed UNICODE characters in JSON output from getting discarded #4193 - RB

* idoutils: fix segfaults on reload with multiple neb modules of the same binary #4033 - MF

1.9.0 - 07/05/2013

NOTES
* idoutils uses a socket queue and transactions for large object dumps! #3527 #3533
* ido2db.cfg enable_sla is now deprecated! #3450
* icinga.cfg event_profiling_enabled is now deprecated! #4054

ENHANCEMENTS
* core: increase performance with hash comparing hosts/services on config read #3722 - GB
* core: introduce warning level -vv on config verification #3510 - MF
* core: refuse to start if neb modules fail to load (Andreas Ericsson, op5 Team) #3812 - MF
* core: keep logfile open, reducing open/close performance decreases (Andreas Ericsson, op5 Team) #3390 - MF
* core: enhance illegal macro character processing performance (Andreas Ericsson, op5 Team) #3389 - MF
* core: add the notification type by string to debug logs; set CUSTOM=8, STALKING=9 (Andreas Ericsson, op5 Team) #3818 - MF
* core: skip writing status.dat if explicitely set to /dev/null (e.g. when using alternate data retrieval methods like IDOUtils) (Andreas Ericsson, op5 Team) #3819 - MF
* core: avoid writing objects.cache if set to /dev/null (Andreas Ericsson, op5 Team) #3819 - MF
* core: increase performance on host->service relation counter (config reading, flapping) #3820 - MF
* core: fix unable to exclude hostgroups when using nested hostgroups (Alexander Sulfrian) #2619 - MF

* classic ui: increase performance with hash comparing hosts/services to show/filter #3722 - GB
* classic ui: Add "set_expire_ack_by_default" to cgi configuration #3476 - CF
* classic ui: Add "send_ack_notifications" to cgi configuration (TheCry) #3467 - CF
* classic ui: Changed field size for hours to 4 when setting flexible downtime #3484 - RB
* classic ui: Added process status to JSON response #3172 - RB
* classic ui: Added date/time selection to 'log file navigation' #3168 - RB
* classic ui: Added setting focus to main frame on first site load #3202 - RB
* classic ui: Made sort buttons larger #3814 - RB
* classic ui: Made classic ui work standalone #3869 - RB
* classic ui: add 'executed command' to extinfo.cgi linking to command expander #3901 - MF

* idoutils: use transactions for large object dumps #3527 - GB
* idoutils: add socket queue proxy addressing core reload problems #3533 - GB
* idoutils: add more indexes for sla reporting #3649 - MF
* idoutils: Oracle - change output fields to clob #3412 - TD

* install: set --enable-idoutils/event-broker to true as default configure flags #3813 - MF
* install: add lighttp config samples to contrib/lighttp #2253 - RB
* install: add --with-httpd-conf-file to allow specific apache config to be installed #3962 - MF
* install: make install-webconf-auth installs htpasswd.users automatically, allowing default icingaadmin login out-of-the-box #3963 - MF
* install: add 'make classicui-standalone' and 'make install-classicui-standalone' #3963 - MF

* docs: Temporary files should mention temp_file option in icinga.cfg #3748 - WN
* docs: add upgrade/troubleshooting notes about invisible icinga web cronks/modules after upgrade #3939 - WN
* docs: make install-webconf-auth installs htpasswd.user with icingaadmin credentials #3964 - WN
* docs: icinga web 1.9: new menu style (smaller icons) #3944 - MF
* docs: icinga web 1.9: new filtering methods #3947 - MF
* docs: add userpreferences.xml to icinga web configs #3991 - WN
* docs: add web gui comparison to beginners #3907 - WN

FIXES
* core: fix faulty macro cleaning, replacing spaces with pluses where they shouldn't be cleaned #3397 - MF
* core: fix macro escaping logs incorrect warning for $$escapes #3404 - MF
* core: fix wrong escalation notification due to state based escalation range behaviour changes #3441 - MF
* core: change ownership of (debug) log file before dropping privileges (Andreas Ericsson, op5 Team) #3521 - MF
* core: fix keep_unknown_macros still exposes wrong warnings to logs #3725 - MF
* core: fix host_check, last_check == next_check wrong in scheduling queue #2195 - MF
* core: fix triggered downtimes for child hosts are missing after icinga restart (thx Michael Lucka) #3390 - MF
* core: fix services with empty hostgroups aren't processed even if it has host_name specified (allow_empty_hostgroups=1) (thx Viranch Metha) #3736 - MF
* core: revamp USE_LTDL definitions in nebmods (Andreas Ericsson, op5 Team) #3817 - MF
* core: fix checkresult reaper cleanup fails due to relative file path #3937 - MaF
* core: do not export host/servicegroupmembers as environment macros in large installations #3859 - MF
* core: set default permissions to icinga/ido2db binaries to 755 #3902 - GB

* classic ui: fix cmd.cgi does not honor commandpipe location; overwrites from empty environment variable #3418 - MF
* classic ui: fixed Double-listed host dependencies in host extinfo.cgi #3295 - RB
* classic ui: fixed sort_icinga_logfiles_by_name() in readlogs.c fails to take NULL pointers into consideration #3398 - CF
* classic ui: fixed committing acknowledgement cmd negates flags for send_notification and sticky_ack #3329 - RB
* classic ui: fixed backtrack_archives only getting calculated on a daily log rotation basis #3416 - RB
* classic ui: fixed invalid freeing of last_check in 'scheduling queue' for first time checks #3444 - RB
* classic ui: fixed Warning and Unknown States are mixed up in Alert Summary Report #3488 - RB
* classic ui: fixed extinfo.cgi shows localtime(0) instead of "NOT SET" when global notifications are not set to expire #3482 - RB
* classic ui: fixed CGIs generating invalid html code/ json when throwing error #3507 - RB
* classic ui: fixed JSON output is insufficiently escaped #3541 - RB
* classic ui: fixed segfault when reading malformed log entries #3528 - RB
* classic ui: "fixed" Incorrect positioning status popup in statusmap #3861 - RB
* classic ui: fixed possible NULL dereference-bug in summary.c #3740 - RB
* classic ui: fixed Command expansion problem with percentage signs #3929 - RB
* classic ui: cleaned up the jquery-ui includes to allow debian pkg dependencies #3808 - RB
* classic ui: fixed Trigger Time in Scheduled Downtime displaying 01-01-1970 01:00:00 when not triggered #3980 - RB
* classic-ui: fixed host and service names are not allowed to have a '+' included #1843 - RB

* idoutils: fix many memory leaks in ido2db on dbi_result_free and others (thx Klaus Wagner) #3406 - MF
* idoutils: fix ido2db crashes when Oracle queries fail #3324 - GB
* idoutils: fix ORA-1461 writing data to varchar2 exceeding field size limit output, command_arg and commandline data written to Oracle #3324 #3325 - TD
* idoutils: fix unsafe handling of dbi_conn_sequence_last, rewrite last_insert_id/sequence fetching #3408 - MF
* idoutils: fix ido2db does not cleanly exit the client on wrong schema version check in db_hello #3419 - MF
* idoutils: fix FROM_UNIXTIME(NULL) does not work with MySQL 5.0.x #3399 #3466 - CF
* idoutils: fix unknown column contactaddress_id (thx fmbiete) #3483 - MF
* idoutils: fix empty output/perfdata segfaults for mysql string truncate #3516 - MF
* idoutils: unlink leftover socket on startup, if using unix sockets - MF
* idoutils: fix long output data causes wrong data in database #2342 - MF
* idoutils: fix idomod leaks memory on core reload #3749 - GB
* idoutils: add workaround fix for num_rows_affected broken in libdbi/mariadb, returned ids are 0 #3728 - MF

* install: drop unused daemon-init-readhat script (spec uses daemon-init) #3402 - MF
* install: fix broken configure ssl detection for idoutils on ubuntu/debian (Oliver Skibbe) #3413 - MF
* install: fix ido2db initscript uses same chkconfig line as icinga (Dirk G旦tz) #3490 - MF
* install: fix configure does not detect AIX6/7 properly #3895 - MF
* install: fix STATEDIR creation during make install #3869 - MF

* docs: add missing cmd_mod description in cgi params #3438 - MF
* docs: search_string as cgi GET param works also for status.cgi #3451 - MF
* docs: fix typo pqsql -> pgsql #3461 - WN
* docs: recurring downtimes: should tell about dev/experimental state living in contrib/ better #3647 - WN
* docs: middle-clicking on TOC links doesn't open pages in new tab #3561 - WN

* icinga.spec: add idoutils as transitional package (thx Stefan Marx, Michael Gr端ner) #3640 - MF
* icinga.spec: fix double %{logdir}/gui/ definitions in icinga and icinga-gui (thx Ren辿 Koch) #3802 - MF

CHANGES

* ido2db.cfg: enable_sla is now deprecated! #3450
* icinga.cfg: event_profiling_enabled is now deprecated! #4054

* icinga.cfg: enable_state_based_escalation_ranges=0 (disabled if not set) fix for #3441
* icinga.cfg: set status_file=/dev/null to disable its creation #3819
* icinga.cfg: set object_cache_file=/dev/null to disable its creation #3819

* idoutils: use transactions for large object dumps #3527
* idoutils: add socket queue proxy addressing core reload problems #3533

* core: -v param can be used more than once #3510
* core: 'Warning: Host ... has no service associated with it!' now happens only in icinga -vv icinga.cfg #3510
* core: refuse to start if neb modules fail to load #3812
* core: notification type nr CUSTOM=8 and STALKING=9 (reflected in idoutils tables) #3818
* core: using nested hostgroups you can exclude (!) hostgroup_members #2619
* core: host/servicegroupmembers are not exported as environment macros #3859
	** if enable_environment_macros=1
	** and use_large_installation_tweaks=1

* icinga.spec: add idoutils as transitional package #3640

* install: set --enable-idoutils/event-broker to true as default configure flags #3813
* install: add --with-httpd-conf-file to allow specific apache config to be installed #3962
	** this is important when installing standalone classic ui for e.g. Icinga2
* install: make install-webconf-auth installs htpasswd.users, allowing default icingaadmin login out-of-the-box #3963
* install: add --enable-classicui-standalone #3869
	** sets cgi.cfg standalone_installation=1
* install: add 'make classicui-standalone' and 'make install-classicui-standalone' #3963
	** this will install classic ui standalone, if enabled
* install: default permissions for icinga/ido2db binaries are now 755 #3902


(ryoon)
diff -r1.6 -r1.7 pkgsrc/net/icinga-base/Makefile
diff -r1.1 -r1.2 pkgsrc/net/icinga-base/PLIST
diff -r1.1 -r1.2 pkgsrc/net/icinga-base/distinfo
diff -r1.1 -r1.2 pkgsrc/net/icinga-base/patches/patch-Makefile.in
diff -r1.1 -r1.2 pkgsrc/net/icinga-base/patches/patch-base_Makefile.in
diff -r1.1 -r1.2 pkgsrc/net/icinga-base/patches/patch-html_Makefile.in
cvs diff -r1.6 -r1.7 pkgsrc/net/icinga-base/Makefile (expand / switch to unified diff)

--- pkgsrc/net/icinga-base/Makefile 2013/09/04 12:31:26 1.6
+++ pkgsrc/net/icinga-base/Makefile 2013/12/31 03:28:39 1.7
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2013/09/04 12:31:26 obache Exp $ 1# $NetBSD: Makefile,v 1.7 2013/12/31 03:28:39 ryoon Exp $
2# 2#
3 3
4DISTNAME= icinga-1.8.4 4DISTNAME= icinga-1.9.4
5PKGNAME= ${DISTNAME:S/-/-base-/} 5PKGNAME= ${DISTNAME:S/-/-base-/}
6PKGREVISION= 5 
7CATEGORIES= net sysutils 6CATEGORIES= net sysutils
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icinga/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icinga/}
9 8
10MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://www.icinga.org/ 10HOMEPAGE= https://www.icinga.org/
12COMMENT= Enterprise grade open source monitoring system 11COMMENT= Enterprise grade open source monitoring system
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15CONFLICTS= nagios-base-[0-9]* 14CONFLICTS= nagios-base-[0-9]*
16 15
17.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
18.include "../../net/icinga-base/Makefile.common" 17.include "../../net/icinga-base/Makefile.common"
19.include "options.mk" 18.include "options.mk"
@@ -75,18 +74,19 @@ OWN_DIRS_PERMS+=${ICINGADIR}/checkresult @@ -75,18 +74,19 @@ OWN_DIRS_PERMS+=${ICINGADIR}/checkresult
75 74
76SUBST_CLASSES+= files 75SUBST_CLASSES+= files
77SUBST_STAGE.files= post-build 76SUBST_STAGE.files= post-build
78SUBST_FILES.files= icinga.conf.dist 77SUBST_FILES.files= icinga.conf.dist
79SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" 78SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g"
80SUBST_MESSAGE.files= Fixing configuration files. 79SUBST_MESSAGE.files= Fixing configuration files.
81 80
82pre-build: 81pre-build:
83 ${CP} ${FILESDIR}/icinga.conf.dist ${WRKSRC}/icinga.conf.dist 82 ${CP} ${FILESDIR}/icinga.conf.dist ${WRKSRC}/icinga.conf.dist
84 83
85post-install: 84post-install:
86 ${INSTALL_DATA} ${WRKSRC}/icinga.conf.dist ${DESTDIR}/${EGDIR}/icinga.conf 85 ${INSTALL_DATA} ${WRKSRC}/icinga.conf.dist ${DESTDIR}/${EGDIR}/icinga.conf
87 86
 87.include "../../databases/libdbi/buildlink3.mk"
88.include "../../graphics/gd/buildlink3.mk" 88.include "../../graphics/gd/buildlink3.mk"
89.include "../../lang/php/phpversion.mk" 89.include "../../lang/php/phpversion.mk"
90.include "${PHPPKGSRCDIR}/buildlink3.mk" 90.include "${PHPPKGSRCDIR}/buildlink3.mk"
91.include "../../lang/perl5/buildlink3.mk" 91.include "../../lang/perl5/buildlink3.mk"
92.include "../../mk/bsd.pkg.mk" 92.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/icinga-base/PLIST (expand / switch to unified diff)

--- pkgsrc/net/icinga-base/PLIST 2013/03/02 04:08:27 1.1
+++ pkgsrc/net/icinga-base/PLIST 2013/12/31 03:28:39 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2013/03/02 04:08:27 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.2 2013/12/31 03:28:39 ryoon Exp $
2bin/icinga 2bin/icinga
3bin/icingastats 3bin/icingastats
4lib/p1.pl 4lib/p1.pl
5libexec/nagios/cgi-bin/avail.cgi 5libexec/nagios/cgi-bin/avail.cgi
6libexec/nagios/cgi-bin/cmd.cgi 6libexec/nagios/cgi-bin/cmd.cgi
7libexec/nagios/cgi-bin/config.cgi 7libexec/nagios/cgi-bin/config.cgi
8libexec/nagios/cgi-bin/extinfo.cgi 8libexec/nagios/cgi-bin/extinfo.cgi
9libexec/nagios/cgi-bin/histogram.cgi 9libexec/nagios/cgi-bin/histogram.cgi
10libexec/nagios/cgi-bin/history.cgi 10libexec/nagios/cgi-bin/history.cgi
11libexec/nagios/cgi-bin/notifications.cgi 11libexec/nagios/cgi-bin/notifications.cgi
12libexec/nagios/cgi-bin/outages.cgi 12libexec/nagios/cgi-bin/outages.cgi
13libexec/nagios/cgi-bin/showlog.cgi 13libexec/nagios/cgi-bin/showlog.cgi
14libexec/nagios/cgi-bin/status.cgi 14libexec/nagios/cgi-bin/status.cgi
@@ -125,28 +125,26 @@ share/icinga/docs/de/passivechecks.html @@ -125,28 +125,26 @@ share/icinga/docs/de/passivechecks.html
125share/icinga/docs/de/passivestatetranslation.html 125share/icinga/docs/de/passivestatetranslation.html
126share/icinga/docs/de/perfdata.html 126share/icinga/docs/de/perfdata.html
127share/icinga/docs/de/perfgraphs.html 127share/icinga/docs/de/perfgraphs.html
128share/icinga/docs/de/pluginapi.html 128share/icinga/docs/de/pluginapi.html
129share/icinga/docs/de/plugins.html 129share/icinga/docs/de/plugins.html
130share/icinga/docs/de/quickstart-icinga-freebsd.html 130share/icinga/docs/de/quickstart-icinga-freebsd.html
131share/icinga/docs/de/quickstart-icinga.html 131share/icinga/docs/de/quickstart-icinga.html
132share/icinga/docs/de/quickstart-idoutils-freebsd.html 132share/icinga/docs/de/quickstart-idoutils-freebsd.html
133share/icinga/docs/de/quickstart-idoutils.html 133share/icinga/docs/de/quickstart-idoutils.html
134share/icinga/docs/de/quickstart.html 134share/icinga/docs/de/quickstart.html
135share/icinga/docs/de/recurring_downtimes.html 135share/icinga/docs/de/recurring_downtimes.html
136share/icinga/docs/de/redundancy.html 136share/icinga/docs/de/redundancy.html
137share/icinga/docs/de/reporting.html 137share/icinga/docs/de/reporting.html
138share/icinga/docs/de/reporting_1.6.html 
139share/icinga/docs/de/reporting_1.8.html 
140share/icinga/docs/de/security.html 138share/icinga/docs/de/security.html
141share/icinga/docs/de/servicechecks.html 139share/icinga/docs/de/servicechecks.html
142share/icinga/docs/de/stalking.html 140share/icinga/docs/de/stalking.html
143share/icinga/docs/de/startstop.html 141share/icinga/docs/de/startstop.html
144share/icinga/docs/de/statetypes.html 142share/icinga/docs/de/statetypes.html
145share/icinga/docs/de/temp_data.html 143share/icinga/docs/de/temp_data.html
146share/icinga/docs/de/timeperiods.html 144share/icinga/docs/de/timeperiods.html
147share/icinga/docs/de/tuning.html 145share/icinga/docs/de/tuning.html
148share/icinga/docs/de/upgrading.html 146share/icinga/docs/de/upgrading.html
149share/icinga/docs/de/upgrading_icingaweb.html 147share/icinga/docs/de/upgrading_icingaweb.html
150share/icinga/docs/de/upgrading_idoutils.html 148share/icinga/docs/de/upgrading_idoutils.html
151share/icinga/docs/de/verifyconfig.html 149share/icinga/docs/de/verifyconfig.html
152share/icinga/docs/de/volatileservices.html 150share/icinga/docs/de/volatileservices.html
@@ -246,43 +244,90 @@ share/icinga/docs/en/passivechecks.html @@ -246,43 +244,90 @@ share/icinga/docs/en/passivechecks.html
246share/icinga/docs/en/passivestatetranslation.html 244share/icinga/docs/en/passivestatetranslation.html
247share/icinga/docs/en/perfdata.html 245share/icinga/docs/en/perfdata.html
248share/icinga/docs/en/perfgraphs.html 246share/icinga/docs/en/perfgraphs.html
249share/icinga/docs/en/pluginapi.html 247share/icinga/docs/en/pluginapi.html
250share/icinga/docs/en/plugins.html 248share/icinga/docs/en/plugins.html
251share/icinga/docs/en/quickstart-icinga-freebsd.html 249share/icinga/docs/en/quickstart-icinga-freebsd.html
252share/icinga/docs/en/quickstart-icinga.html 250share/icinga/docs/en/quickstart-icinga.html
253share/icinga/docs/en/quickstart-idoutils-freebsd.html 251share/icinga/docs/en/quickstart-idoutils-freebsd.html
254share/icinga/docs/en/quickstart-idoutils.html 252share/icinga/docs/en/quickstart-idoutils.html
255share/icinga/docs/en/quickstart.html 253share/icinga/docs/en/quickstart.html
256share/icinga/docs/en/recurring_downtimes.html 254share/icinga/docs/en/recurring_downtimes.html
257share/icinga/docs/en/redundancy.html 255share/icinga/docs/en/redundancy.html
258share/icinga/docs/en/reporting.html 256share/icinga/docs/en/reporting.html
259share/icinga/docs/en/reporting_1.6.html 
260share/icinga/docs/en/reporting_1.8.html 
261share/icinga/docs/en/security.html 257share/icinga/docs/en/security.html
262share/icinga/docs/en/servicechecks.html 258share/icinga/docs/en/servicechecks.html
263share/icinga/docs/en/stalking.html 259share/icinga/docs/en/stalking.html
264share/icinga/docs/en/startstop.html 260share/icinga/docs/en/startstop.html
265share/icinga/docs/en/statetypes.html 261share/icinga/docs/en/statetypes.html
266share/icinga/docs/en/temp_data.html 262share/icinga/docs/en/temp_data.html
267share/icinga/docs/en/timeperiods.html 263share/icinga/docs/en/timeperiods.html
268share/icinga/docs/en/tuning.html 264share/icinga/docs/en/tuning.html
269share/icinga/docs/en/upgrading.html 265share/icinga/docs/en/upgrading.html
270share/icinga/docs/en/upgrading_icingaweb.html 266share/icinga/docs/en/upgrading_icingaweb.html
271share/icinga/docs/en/upgrading_idoutils.html 267share/icinga/docs/en/upgrading_idoutils.html
272share/icinga/docs/en/verifyconfig.html 268share/icinga/docs/en/verifyconfig.html
273share/icinga/docs/en/volatileservices.html 269share/icinga/docs/en/volatileservices.html
274share/icinga/docs/en/whatsnew.html 270share/icinga/docs/en/whatsnew.html
275share/icinga/docs/images/Architecture_1.5_800px.png 271share/icinga/docs/images/Architecture_1.5_800px.png
 272share/icinga/docs/images/IcingaWeb_BusinessProcess-150x150.png
 273share/icinga/docs/images/IcingaWeb_BusinessProcess.png
 274share/icinga/docs/images/IcingaWeb_Commands-150x150.png
 275share/icinga/docs/images/IcingaWeb_Commands.png
 276share/icinga/docs/images/IcingaWeb_CronkBuilder-150x150.png
 277share/icinga/docs/images/IcingaWeb_CronkBuilder.png
 278share/icinga/docs/images/IcingaWeb_Cronk_Configuration-150x150.png
 279share/icinga/docs/images/IcingaWeb_Cronk_Configuration.png
 280share/icinga/docs/images/IcingaWeb_Cronk_HostFiltered-150x150.png
 281share/icinga/docs/images/IcingaWeb_Downtimes-150x150.png
 282share/icinga/docs/images/IcingaWeb_Downtimes.png
 283share/icinga/docs/images/IcingaWeb_HostStatus_Events-150x150.png
 284share/icinga/docs/images/IcingaWeb_HostStatus_Events.png
 285share/icinga/docs/images/IcingaWeb_Host_filtered-150x150.png
 286share/icinga/docs/images/IcingaWeb_Host_filtered.png
 287share/icinga/docs/images/IcingaWeb_LogViewer-150x150.png
 288share/icinga/docs/images/IcingaWeb_LogViewer.png
 289share/icinga/docs/images/IcingaWeb_OpenProblems-150x150.png
 290share/icinga/docs/images/IcingaWeb_OpenProblems.png
 291share/icinga/docs/images/IcingaWeb_Portal2-150x150.png
 292share/icinga/docs/images/IcingaWeb_Portal2.png
 293share/icinga/docs/images/IcingaWeb_Reporting-150x150.png
 294share/icinga/docs/images/IcingaWeb_Reporting.png
 295share/icinga/docs/images/IcingaWeb_Search-150x150.png
 296share/icinga/docs/images/IcingaWeb_Search.png
 297share/icinga/docs/images/IcingaWeb_StatusMap-150x150.png
 298share/icinga/docs/images/IcingaWeb_StatusMap.png
 299share/icinga/docs/images/IcingaWeb_TacticalOverview-150x150.png
 300share/icinga/docs/images/IcingaWeb_TacticalOverview.png
 301share/icinga/docs/images/IcingaWeb_UserAdmin-150x150.png
 302share/icinga/docs/images/IcingaWeb_UserAdmin.png
 303share/icinga/docs/images/Icinga_Classic_CGIConfig-150x150.png
 304share/icinga/docs/images/Icinga_Classic_CGIConfig.png
 305share/icinga/docs/images/Icinga_Classic_Commands-150x150.png
 306share/icinga/docs/images/Icinga_Classic_Commands.png
 307share/icinga/docs/images/Icinga_Classic_DatePicker-150x150.png
 308share/icinga/docs/images/Icinga_Classic_DatePicker.png
 309share/icinga/docs/images/Icinga_Classic_Downtimes-150x150.png
 310share/icinga/docs/images/Icinga_Classic_Downtimes.png
 311share/icinga/docs/images/Icinga_Classic_HostGroup-150x150.png
 312share/icinga/docs/images/Icinga_Classic_HostGroup.png
 313share/icinga/docs/images/Icinga_Classic_PaginationLogs-150x150.png
 314share/icinga/docs/images/Icinga_Classic_PaginationLogs.png
 315share/icinga/docs/images/Icinga_Classic_ServiceStatus-150x150.png
 316share/icinga/docs/images/Icinga_Classic_ServiceStatus.png
 317share/icinga/docs/images/Icinga_Classic_TacticalOverview-150x150.png
 318share/icinga/docs/images/Icinga_Classic_TacticalOverview.png
 319share/icinga/docs/images/Icinga_Classic_Trending-150x150.png
 320share/icinga/docs/images/Icinga_Classic_Trending.png
276share/icinga/docs/images/MyServiceStatus.png 321share/icinga/docs/images/MyServiceStatus.png
277share/icinga/docs/images/activechecks.png 322share/icinga/docs/images/activechecks.png
278share/icinga/docs/images/cachedcheckgraphs.png 323share/icinga/docs/images/cachedcheckgraphs.png
279share/icinga/docs/images/cachedchecks.png 324share/icinga/docs/images/cachedchecks.png
280share/icinga/docs/images/cachedchecks1.png 325share/icinga/docs/images/cachedchecks1.png
281share/icinga/docs/images/caution.gif 326share/icinga/docs/images/caution.gif
282share/icinga/docs/images/caution.png 327share/icinga/docs/images/caution.png
283share/icinga/docs/images/cgi-avail-a.png 328share/icinga/docs/images/cgi-avail-a.png
284share/icinga/docs/images/cgi-avail-b.png 329share/icinga/docs/images/cgi-avail-b.png
285share/icinga/docs/images/cgi-cmd.png 330share/icinga/docs/images/cgi-cmd.png
286share/icinga/docs/images/cgi-commands.png 331share/icinga/docs/images/cgi-commands.png
287share/icinga/docs/images/cgi-config.png 332share/icinga/docs/images/cgi-config.png
288share/icinga/docs/images/cgi-continue.png 333share/icinga/docs/images/cgi-continue.png
@@ -337,114 +382,130 @@ share/icinga/docs/images/fig6.png @@ -337,114 +382,130 @@ share/icinga/docs/images/fig6.png
337share/icinga/docs/images/fig7.png 382share/icinga/docs/images/fig7.png
338share/icinga/docs/images/fig8.png 383share/icinga/docs/images/fig8.png
339share/icinga/docs/images/fig9.png 384share/icinga/docs/images/fig9.png
340share/icinga/docs/images/flags/de.png 385share/icinga/docs/images/flags/de.png
341share/icinga/docs/images/flags/um_gb.png 386share/icinga/docs/images/flags/um_gb.png
342share/icinga/docs/images/freshness.png 387share/icinga/docs/images/freshness.png
343share/icinga/docs/images/host-dependencies.png 388share/icinga/docs/images/host-dependencies.png
344share/icinga/docs/images/icinga-reporting-datasource-ido-mysql_1.8.png 389share/icinga/docs/images/icinga-reporting-datasource-ido-mysql_1.8.png
345share/icinga/docs/images/icinga-reporting-datasource-ido_1.8.png 390share/icinga/docs/images/icinga-reporting-datasource-ido_1.8.png
346share/icinga/docs/images/icinga-reporting-overview_1.8.png 391share/icinga/docs/images/icinga-reporting-overview_1.8.png
347share/icinga/docs/images/icinga-reporting_1.6.png 392share/icinga/docs/images/icinga-reporting_1.6.png
348share/icinga/docs/images/icinga-web-admin_groups1.png 393share/icinga/docs/images/icinga-web-admin_groups1.png
349share/icinga/docs/images/icinga-web-admin_groups1_1.6.png 394share/icinga/docs/images/icinga-web-admin_groups1_1.6.png
 395share/icinga/docs/images/icinga-web-admin_groups1_1.9.png
350share/icinga/docs/images/icinga-web-admin_groups2.png 396share/icinga/docs/images/icinga-web-admin_groups2.png
351share/icinga/docs/images/icinga-web-admin_groups2_1.6.png 397share/icinga/docs/images/icinga-web-admin_groups2_1.6.png
352share/icinga/docs/images/icinga-web-admin_logs1.png 398share/icinga/docs/images/icinga-web-admin_logs1.png
353share/icinga/docs/images/icinga-web-admin_principals.png 399share/icinga/docs/images/icinga-web-admin_principals.png
354share/icinga/docs/images/icinga-web-admin_tasks.png 400share/icinga/docs/images/icinga-web-admin_tasks.png
355share/icinga/docs/images/icinga-web-admin_users1.png 401share/icinga/docs/images/icinga-web-admin_users1.png
356share/icinga/docs/images/icinga-web-admin_users1_1.6.png 402share/icinga/docs/images/icinga-web-admin_users1_1.6.png
 403share/icinga/docs/images/icinga-web-admin_users1_1.9.png
357share/icinga/docs/images/icinga-web-admin_users2.png 404share/icinga/docs/images/icinga-web-admin_users2.png
358share/icinga/docs/images/icinga-web-admin_users2_1.6.png 405share/icinga/docs/images/icinga-web-admin_users2_1.6.png
359share/icinga/docs/images/icinga-web-commands_hst.png 406share/icinga/docs/images/icinga-web-commands_hst.png
360share/icinga/docs/images/icinga-web-commands_hst_1.3.png 407share/icinga/docs/images/icinga-web-commands_hst_1.3.png
361share/icinga/docs/images/icinga-web-commands_hst_1.5.png 408share/icinga/docs/images/icinga-web-commands_hst_1.5.png
362share/icinga/docs/images/icinga-web-commands_hst_1.6.png 409share/icinga/docs/images/icinga-web-commands_hst_1.6.png
363share/icinga/docs/images/icinga-web-commands_svc.png 410share/icinga/docs/images/icinga-web-commands_svc.png
364share/icinga/docs/images/icinga-web-commands_svc_1.3.png 411share/icinga/docs/images/icinga-web-commands_svc_1.3.png
365share/icinga/docs/images/icinga-web-commands_svc_1.5.png 412share/icinga/docs/images/icinga-web-commands_svc_1.5.png
366share/icinga/docs/images/icinga-web-commands_svc_1.6.png 413share/icinga/docs/images/icinga-web-commands_svc_1.6.png
 414share/icinga/docs/images/icinga-web-cronks-settings_1.9.png
367share/icinga/docs/images/icinga-web-cronks1.png 415share/icinga/docs/images/icinga-web-cronks1.png
368share/icinga/docs/images/icinga-web-cronks1_1.3.png 416share/icinga/docs/images/icinga-web-cronks1_1.3.png
369share/icinga/docs/images/icinga-web-cronks1_1.5.png 417share/icinga/docs/images/icinga-web-cronks1_1.5.png
370share/icinga/docs/images/icinga-web-cronks1_1.6.png 418share/icinga/docs/images/icinga-web-cronks1_1.6.png
371share/icinga/docs/images/icinga-web-cronks1_1.7.png 419share/icinga/docs/images/icinga-web-cronks1_1.7.png
 420share/icinga/docs/images/icinga-web-cronks1_1.9.png
372share/icinga/docs/images/icinga-web-cronks2.png 421share/icinga/docs/images/icinga-web-cronks2.png
373share/icinga/docs/images/icinga-web-cronks2_1.3.png 422share/icinga/docs/images/icinga-web-cronks2_1.3.png
374share/icinga/docs/images/icinga-web-cronks2_1.5.png 423share/icinga/docs/images/icinga-web-cronks2_1.5.png
375share/icinga/docs/images/icinga-web-cronks2_1.6.png 424share/icinga/docs/images/icinga-web-cronks2_1.6.png
376share/icinga/docs/images/icinga-web-cronks2_1.7.png 425share/icinga/docs/images/icinga-web-cronks2_1.7.png
 426share/icinga/docs/images/icinga-web-cronks2_1.9.png
377share/icinga/docs/images/icinga-web-cronks2a.png 427share/icinga/docs/images/icinga-web-cronks2a.png
378share/icinga/docs/images/icinga-web-cronks2a_1.6.png 428share/icinga/docs/images/icinga-web-cronks2a_1.6.png
379share/icinga/docs/images/icinga-web-cronks2a_1.7.png 429share/icinga/docs/images/icinga-web-cronks2a_1.7.png
380share/icinga/docs/images/icinga-web-cronks3.png 430share/icinga/docs/images/icinga-web-cronks3.png
381share/icinga/docs/images/icinga-web-cronks3_1.3.png 431share/icinga/docs/images/icinga-web-cronks3_1.3.png
382share/icinga/docs/images/icinga-web-cronks3_1.5.png 432share/icinga/docs/images/icinga-web-cronks3_1.5.png
383share/icinga/docs/images/icinga-web-cronks3_1.6.png 433share/icinga/docs/images/icinga-web-cronks3_1.6.png
384share/icinga/docs/images/icinga-web-cronks3_1.7.png 434share/icinga/docs/images/icinga-web-cronks3_1.7.png
 435share/icinga/docs/images/icinga-web-cronks3_1.9.png
 436share/icinga/docs/images/icinga-web-cronks4_1.9.png
385share/icinga/docs/images/icinga-web-filter1.png 437share/icinga/docs/images/icinga-web-filter1.png
386share/icinga/docs/images/icinga-web-filter1_1.3.png 438share/icinga/docs/images/icinga-web-filter1_1.3.png
387share/icinga/docs/images/icinga-web-filter1_1.6.png 439share/icinga/docs/images/icinga-web-filter1_1.6.png
 440share/icinga/docs/images/icinga-web-filter1_1.9.png
388share/icinga/docs/images/icinga-web-filter2.png 441share/icinga/docs/images/icinga-web-filter2.png
389share/icinga/docs/images/icinga-web-filter2_1.3.png 442share/icinga/docs/images/icinga-web-filter2_1.3.png
 443share/icinga/docs/images/icinga-web-filter2_1.9.png
390share/icinga/docs/images/icinga-web-filter3.png 444share/icinga/docs/images/icinga-web-filter3.png
 445share/icinga/docs/images/icinga-web-filter3_1.9.png
 446share/icinga/docs/images/icinga-web-filter4_1.9.png
 447share/icinga/docs/images/icinga-web-filter5_1.9.png
 448share/icinga/docs/images/icinga-web-filter6_1.9.png
391share/icinga/docs/images/icinga-web-host-obj.png 449share/icinga/docs/images/icinga-web-host-obj.png
392share/icinga/docs/images/icinga-web-host-obj1.png 450share/icinga/docs/images/icinga-web-host-obj1.png
393share/icinga/docs/images/icinga-web-host_1.5.png 451share/icinga/docs/images/icinga-web-host_1.5.png
394share/icinga/docs/images/icinga-web-host_1.6.png 452share/icinga/docs/images/icinga-web-host_1.6.png
395share/icinga/docs/images/icinga-web-host_1.8.png 453share/icinga/docs/images/icinga-web-host_1.8.png
396share/icinga/docs/images/icinga-web-hostgroup_1.5.png 454share/icinga/docs/images/icinga-web-hostgroup_1.5.png
397share/icinga/docs/images/icinga-web-hostgroup_1.6.png 455share/icinga/docs/images/icinga-web-hostgroup_1.6.png
398share/icinga/docs/images/icinga-web-hostgroup_1.8.png 456share/icinga/docs/images/icinga-web-hostgroup_1.8.png
399share/icinga/docs/images/icinga-web-log.png 457share/icinga/docs/images/icinga-web-log.png
400share/icinga/docs/images/icinga-web-log_1.3.png 458share/icinga/docs/images/icinga-web-log_1.3.png
401share/icinga/docs/images/icinga-web-log_1.6.png 459share/icinga/docs/images/icinga-web-log_1.6.png
402share/icinga/docs/images/icinga-web-login.png 460share/icinga/docs/images/icinga-web-login.png
403share/icinga/docs/images/icinga-web-main_bar.png 461share/icinga/docs/images/icinga-web-main_bar.png
404share/icinga/docs/images/icinga-web-mainscreen1.png 462share/icinga/docs/images/icinga-web-mainscreen1.png
405share/icinga/docs/images/icinga-web-mainscreen1_1.3.png 463share/icinga/docs/images/icinga-web-mainscreen1_1.3.png
406share/icinga/docs/images/icinga-web-mainscreen1_1.5.png 464share/icinga/docs/images/icinga-web-mainscreen1_1.5.png
407share/icinga/docs/images/icinga-web-mainscreen1_1.6.png 465share/icinga/docs/images/icinga-web-mainscreen1_1.6.png
408share/icinga/docs/images/icinga-web-mainscreen_1.8.png 466share/icinga/docs/images/icinga-web-mainscreen_1.8.png
409share/icinga/docs/images/icinga-web-open_problems.png 467share/icinga/docs/images/icinga-web-open_problems.png
410share/icinga/docs/images/icinga-web-overview.png 468share/icinga/docs/images/icinga-web-overview.png
411share/icinga/docs/images/icinga-web-overview_1.3.png 469share/icinga/docs/images/icinga-web-overview_1.3.png
412share/icinga/docs/images/icinga-web-overview_1.5.png 470share/icinga/docs/images/icinga-web-overview_1.5.png
413share/icinga/docs/images/icinga-web-overview_1.6.png 471share/icinga/docs/images/icinga-web-overview_1.6.png
414share/icinga/docs/images/icinga-web-overview_1.7.png 472share/icinga/docs/images/icinga-web-overview_1.7.png
415share/icinga/docs/images/icinga-web-overview_1.8.png 473share/icinga/docs/images/icinga-web-overview_1.8.png
 474share/icinga/docs/images/icinga-web-overview_1.9.png
416share/icinga/docs/images/icinga-web-search1.png 475share/icinga/docs/images/icinga-web-search1.png
417share/icinga/docs/images/icinga-web-search1_1.3.png 476share/icinga/docs/images/icinga-web-search1_1.3.png
418share/icinga/docs/images/icinga-web-search1_1.6.png 477share/icinga/docs/images/icinga-web-search1_1.6.png
419share/icinga/docs/images/icinga-web-search1_1.7.png 478share/icinga/docs/images/icinga-web-search1_1.7.png
420share/icinga/docs/images/icinga-web-settings.png 479share/icinga/docs/images/icinga-web-settings.png
421share/icinga/docs/images/icinga-web-settings_1.5.png 480share/icinga/docs/images/icinga-web-settings_1.5.png
422share/icinga/docs/images/icinga-web-srv_1.5.png 481share/icinga/docs/images/icinga-web-srv_1.5.png
423share/icinga/docs/images/icinga-web-srv_1.6.png 482share/icinga/docs/images/icinga-web-srv_1.6.png
424share/icinga/docs/images/icinga-web-srv_1.8.png 483share/icinga/docs/images/icinga-web-srv_1.8.png
425share/icinga/docs/images/icinga-web-srv_obj.png 484share/icinga/docs/images/icinga-web-srv_obj.png
426share/icinga/docs/images/icinga-web-statuscronk.png 485share/icinga/docs/images/icinga-web-statuscronk.png
427share/icinga/docs/images/icinga-web-statuscronk_1.5.png 486share/icinga/docs/images/icinga-web-statuscronk_1.5.png
428share/icinga/docs/images/icinga-web-statuscronk_1.6.png 487share/icinga/docs/images/icinga-web-statuscronk_1.6.png
429share/icinga/docs/images/icinga-web-tackle1.png 488share/icinga/docs/images/icinga-web-tackle1.png
430share/icinga/docs/images/icinga-web-tackle2.png 489share/icinga/docs/images/icinga-web-tackle2.png
431share/icinga/docs/images/icinga-web-tackle3.png 490share/icinga/docs/images/icinga-web-tackle3.png
432share/icinga/docs/images/icinga-web-tackle4.png 491share/icinga/docs/images/icinga-web-tackle4.png
433share/icinga/docs/images/icinga-web-topmenu1.png 492share/icinga/docs/images/icinga-web-topmenu1.png
434share/icinga/docs/images/icinga-web-topmenu1_1.6.png 493share/icinga/docs/images/icinga-web-topmenu1_1.6.png
435share/icinga/docs/images/icinga-web-topmenu1_1.7.png 494share/icinga/docs/images/icinga-web-topmenu1_1.7.png
436share/icinga/docs/images/icinga-web-topmenu2.png 495share/icinga/docs/images/icinga-web-topmenu2.png
437share/icinga/docs/images/icinga-web-topmenu2_1.3.png 496share/icinga/docs/images/icinga-web-topmenu2_1.3.png
 497share/icinga/docs/images/icinga-web-topmenuadmin1_1.9.png
 498share/icinga/docs/images/icinga-web-user-prefs-logout.png
438share/icinga/docs/images/idoutils.png 499share/icinga/docs/images/idoutils.png
439share/icinga/docs/images/important.gif 500share/icinga/docs/images/important.gif
440share/icinga/docs/images/important.png 501share/icinga/docs/images/important.png
441share/icinga/docs/images/integrationoverview.png 502share/icinga/docs/images/integrationoverview.png
442share/icinga/docs/images/interleaved1.png 503share/icinga/docs/images/interleaved1.png
443share/icinga/docs/images/interleaved2.png 504share/icinga/docs/images/interleaved2.png
444share/icinga/docs/images/interleaved3.png 505share/icinga/docs/images/interleaved3.png
445share/icinga/docs/images/logofullsize.png 506share/icinga/docs/images/logofullsize.png
446share/icinga/docs/images/monitoring-printers.png 507share/icinga/docs/images/monitoring-printers.png
447share/icinga/docs/images/monitoring-routers.png 508share/icinga/docs/images/monitoring-routers.png
448share/icinga/docs/images/monitoring-windows.png 509share/icinga/docs/images/monitoring-windows.png
449share/icinga/docs/images/multiple-templates1.png 510share/icinga/docs/images/multiple-templates1.png
450share/icinga/docs/images/multiple-templates2.png 511share/icinga/docs/images/multiple-templates2.png
@@ -594,52 +655,52 @@ share/icinga/images/tacenabled.png @@ -594,52 +655,52 @@ share/icinga/images/tacenabled.png
594share/icinga/images/thermcrit.png 655share/icinga/images/thermcrit.png
595share/icinga/images/thermok.png 656share/icinga/images/thermok.png
596share/icinga/images/thermwarn.png 657share/icinga/images/thermwarn.png
597share/icinga/images/trends.gif 658share/icinga/images/trends.gif
598share/icinga/images/trendshost.png 659share/icinga/images/trendshost.png
599share/icinga/images/trendssvc.png 660share/icinga/images/trendssvc.png
600share/icinga/images/unknown.png 661share/icinga/images/unknown.png
601share/icinga/images/up.gif 662share/icinga/images/up.gif
602share/icinga/images/warning.png 663share/icinga/images/warning.png
603share/icinga/images/warning_triangle.gif 664share/icinga/images/warning_triangle.gif
604share/icinga/images/zoom1.gif 665share/icinga/images/zoom1.gif
605share/icinga/images/zoom2.gif 666share/icinga/images/zoom2.gif
606share/icinga/index.html 667share/icinga/index.html
607share/icinga/jquery-ui/jquery.ui.core.min.js 668share/icinga/jquery-ui-addon/jquery.ui.timepicker-addon.css
608share/icinga/jquery-ui/jquery.ui.datepicker.min.js 669share/icinga/jquery-ui-addon/jquery.ui.timepicker-addon.min.js
609share/icinga/jquery-ui/jquery.ui.mouse.min.js 670share/icinga/jquery-ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
610share/icinga/jquery-ui/jquery.ui.slider.min.js 671share/icinga/jquery-ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
611share/icinga/jquery-ui/jquery.ui.timepicker-addon.min.js 672share/icinga/jquery-ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
612share/icinga/jquery-ui/jquery.ui.widget.min.js 673share/icinga/jquery-ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
613share/icinga/jquery-ui/theme/images/ui-bg_flat_0_aaaaaa_40x100.png 674share/icinga/jquery-ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png
614share/icinga/jquery-ui/theme/images/ui-bg_flat_75_ffffff_40x100.png 675share/icinga/jquery-ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
615share/icinga/jquery-ui/theme/images/ui-bg_glass_55_fbf9ee_1x400.png 676share/icinga/jquery-ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
616share/icinga/jquery-ui/theme/images/ui-bg_glass_65_ffffff_1x400.png 677share/icinga/jquery-ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
617share/icinga/jquery-ui/theme/images/ui-bg_glass_75_dadada_1x400.png 678share/icinga/jquery-ui/themes/base/images/ui-icons_222222_256x240.png
618share/icinga/jquery-ui/theme/images/ui-bg_glass_75_e6e6e6_1x400.png 679share/icinga/jquery-ui/themes/base/images/ui-icons_2e83ff_256x240.png
619share/icinga/jquery-ui/theme/images/ui-bg_glass_95_fef1ec_1x400.png 680share/icinga/jquery-ui/themes/base/images/ui-icons_454545_256x240.png
620share/icinga/jquery-ui/theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png 681share/icinga/jquery-ui/themes/base/images/ui-icons_888888_256x240.png
621share/icinga/jquery-ui/theme/images/ui-icons_222222_256x240.png 682share/icinga/jquery-ui/themes/base/images/ui-icons_cd0a0a_256x240.png
622share/icinga/jquery-ui/theme/images/ui-icons_2e83ff_256x240.png 683share/icinga/jquery-ui/themes/base/jquery.ui.all.css
623share/icinga/jquery-ui/theme/images/ui-icons_454545_256x240.png 684share/icinga/jquery-ui/themes/base/jquery.ui.base.css
624share/icinga/jquery-ui/theme/images/ui-icons_888888_256x240.png 685share/icinga/jquery-ui/themes/base/jquery.ui.core.css
625share/icinga/jquery-ui/theme/images/ui-icons_cd0a0a_256x240.png 686share/icinga/jquery-ui/themes/base/jquery.ui.datepicker.css
626share/icinga/jquery-ui/theme/jquery.ui.all.css 687share/icinga/jquery-ui/themes/base/jquery.ui.slider.css
627share/icinga/jquery-ui/theme/jquery.ui.base.css 688share/icinga/jquery-ui/themes/base/jquery.ui.theme.css
628share/icinga/jquery-ui/theme/jquery.ui.core.css 689share/icinga/jquery-ui/ui/jquery.ui.core.js
629share/icinga/jquery-ui/theme/jquery.ui.datepicker.css 690share/icinga/jquery-ui/ui/jquery.ui.datepicker.js
630share/icinga/jquery-ui/theme/jquery.ui.slider.css 691share/icinga/jquery-ui/ui/jquery.ui.mouse.js
631share/icinga/jquery-ui/theme/jquery.ui.theme.css 692share/icinga/jquery-ui/ui/jquery.ui.slider.js
632share/icinga/jquery-ui/theme/jquery.ui.timepicker-addon.css 693share/icinga/jquery-ui/ui/jquery.ui.widget.js
633share/icinga/js/checkbox_functions.js 694share/icinga/js/checkbox_functions.js
634share/icinga/js/jquery-1.8.0.min.js 695share/icinga/js/jquery-1.8.0.min.js
635share/icinga/js/jquery.dd.js 696share/icinga/js/jquery.dd.js
636share/icinga/js/menu.js 697share/icinga/js/menu.js
637share/icinga/js/page_refresh.js 698share/icinga/js/page_refresh.js
638share/icinga/js/skinnytip.js 699share/icinga/js/skinnytip.js
639share/icinga/log/.htaccess 700share/icinga/log/.htaccess
640share/icinga/log/index.htm 701share/icinga/log/index.htm
641share/icinga/main.html 702share/icinga/main.html
642share/icinga/menu.html 703share/icinga/menu.html
643share/icinga/robots.txt 704share/icinga/robots.txt
644share/icinga/stylesheets/avail.css 705share/icinga/stylesheets/avail.css
645share/icinga/stylesheets/checksanity.css 706share/icinga/stylesheets/checksanity.css
cvs diff -r1.1 -r1.2 pkgsrc/net/icinga-base/distinfo (expand / switch to unified diff)

--- pkgsrc/net/icinga-base/distinfo 2013/03/02 04:08:27 1.1
+++ pkgsrc/net/icinga-base/distinfo 2013/12/31 03:28:39 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.1 2013/03/02 04:08:27 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2013/12/31 03:28:39 ryoon Exp $
2 2
3SHA1 (icinga-1.8.4.tar.gz) = 19ab6e28b99ce15cbb9e12085cbe6aa404bf1ef1 3SHA1 (icinga-1.9.4.tar.gz) = 4bcfb717d4fac94d16205f976ad54b92a1cf0c52
4RMD160 (icinga-1.8.4.tar.gz) = 3b5b204501d1617e6133c9e123bf6c2a3cd7f0be 4RMD160 (icinga-1.9.4.tar.gz) = f118ef6e3f56764e47fc24304dff03c1a5d766e4
5Size (icinga-1.8.4.tar.gz) = 7459130 bytes 5Size (icinga-1.9.4.tar.gz) = 17082569 bytes
6SHA1 (patch-Makefile.in) = 0d7e50b0f37fea847e652725af0b5d65ec7aa7b2 6SHA1 (patch-Makefile.in) = 0c3ed01f1e8b807710304f6b92011a44d3da0fda
7SHA1 (patch-base_Makefile.in) = f79705b2d5ccf938868cc502cdbe293bb7cf1579 7SHA1 (patch-base_Makefile.in) = 4aa962b3963c084074273255fa6107e2e1a28a7d
8SHA1 (patch-cgi_Makefile.in) = 44ca2f4129c594540ed06a7b3a16f1652591b30f 8SHA1 (patch-cgi_Makefile.in) = 44ca2f4129c594540ed06a7b3a16f1652591b30f
9SHA1 (patch-configure.in) = dec21d0e8d76f681b8839b547bd62c7377d25357 9SHA1 (patch-configure.in) = dec21d0e8d76f681b8839b547bd62c7377d25357
10SHA1 (patch-html_Makefile.in) = 5ad556b42a11c15b947e5901d1429862011d7de7 10SHA1 (patch-html_Makefile.in) = df715a3471ac44e9fcc24ee1a4375cd8a6c5ad05
11SHA1 (patch-module_idoutils_db_scripts_create__mysqldb.sh) = 789b05d620c3e4477fdb54efd649e409c98970a1 11SHA1 (patch-module_idoutils_db_scripts_create__mysqldb.sh) = 789b05d620c3e4477fdb54efd649e409c98970a1
12SHA1 (patch-module_idoutils_db_scripts_create__oracledb.sh) = 92c2958aea1d407b7c9426c1a95b328947526264 12SHA1 (patch-module_idoutils_db_scripts_create__oracledb.sh) = 92c2958aea1d407b7c9426c1a95b328947526264
13SHA1 (patch-module_idoutils_db_scripts_create__pgsqldb.sh) = 7bbbbcec4e3670c99297df8df1b6d795afad64db 13SHA1 (patch-module_idoutils_db_scripts_create__pgsqldb.sh) = 7bbbbcec4e3670c99297df8df1b6d795afad64db
14SHA1 (patch-rc.ido2db.in) = 8d0e751787ed17edd1fcfbfca977ddf90f2eccd9 14SHA1 (patch-rc.ido2db.in) = 8d0e751787ed17edd1fcfbfca977ddf90f2eccd9
cvs diff -r1.1 -r1.2 pkgsrc/net/icinga-base/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/icinga-base/patches/patch-Makefile.in 2013/03/02 04:08:27 1.1
+++ pkgsrc/net/icinga-base/patches/patch-Makefile.in 2013/12/31 03:28:39 1.2
@@ -1,122 +1,138 @@ @@ -1,122 +1,138 @@
1$NetBSD: patch-Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ 1$NetBSD: patch-Makefile.in,v 1.2 2013/12/31 03:28:39 ryoon Exp $
2 2
3--- Makefile.in.orig 2013-01-13 22:18:37.000000000 +0000 3--- Makefile.in.orig 2013-12-13 12:54:34.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -38,7 +38,7 @@ CHECKRESULTDIR=@CHECKRESULTDIR@ 5@@ -38,7 +38,7 @@ CHECKRESULTDIR=@CHECKRESULTDIR@
6 EXTCMDFILEDIR=@EXTCMDFILEDIR@ 6 EXTCMDFILEDIR=@EXTCMDFILEDIR@
7 EVENTHANDLERDIR=@EVENTHANDLERDIR@ 7 EVENTHANDLERDIR=@EVENTHANDLERDIR@
8 P1FILELOC=@P1FILELOC@ 8 P1FILELOC=@P1FILELOC@
9-CFGDIR=@sysconfdir@ 9-CFGDIR=@sysconfdir@
10+CFGDIR=@prefix@/share/examples/icinga 10+CFGDIR=@prefix@/share/examples/icinga
11 BINDIR=@bindir@ 11 BINDIR=@bindir@
12 LIBDIR=@libdir@ 12 LIBDIR=@libdir@
13 CGIDIR=@sbindir@ 13 CGIDIR=@sbindir@
14@@ -368,13 +368,13 @@ install-unstripped: 14@@ -380,14 +380,14 @@ install-unstripped:
15 $(MAKE) install-basic 15 $(MAKE) install-basic
16  16
17 install-basic: 17 install-basic:
 18- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR)
18- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) 19- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
19- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) 20- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
20- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives 21- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
21- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) 22- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
 23+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(STATEDIR)
22+ ${BSD_INSTALL_LIB_DIR} $(DESTDIR)$(LIBEXECDIR) 24+ ${BSD_INSTALL_LIB_DIR} $(DESTDIR)$(LIBEXECDIR)
23+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR) 25+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)
24+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives 26+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives
25+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR) 27+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR)
26 if [ $(INSTALLPERLSTUFF) = yes ]; then \ 28 if [ $(INSTALLPERLSTUFF) = yes ]; then \
27- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(P1FILELOC); \ 29- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(P1FILELOC); \
28- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(P1FILELOC); \ 30- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(P1FILELOC); \
29+ ${BSD_INSTALL_SCRIPT_DIR} $(DESTDIR)$(P1FILELOC); \ 31+ ${BSD_INSTALL_SCRIPT_DIR} $(DESTDIR)$(P1FILELOC); \
30+ ${BSD_INSTALL_SCRIPT} p1.pl $(DESTDIR)$(P1FILELOC); \ 32+ ${BSD_INSTALL_SCRIPT} p1.pl $(DESTDIR)$(P1FILELOC); \
31 fi; 33 fi;
32  34
33 @echo "" 35 @echo ""
34@@ -411,23 +411,23 @@ install-basic: 36@@ -426,27 +426,27 @@ install-basic:
 37 @echo ""
35  38
 39 install-cgiconf:
 40- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
 41- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
 42- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg
 43+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)
 44+ ${BSD_INSTALL_DATA} sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
 45+ ${BSD_INSTALL_DATA} sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg
36  46
37 install-config: 47
 48 install-config: install-cgiconf
38- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) 49- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
39- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects 50- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
40- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d 51- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d
41- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules 52- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
42- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg 53- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg
43- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg 54- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
44- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg 
45- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg 
46- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg 55- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
47- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg 56- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
48- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg 57- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
49- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg 58- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg
50- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg 59- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
51- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg 60- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
52- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg 61- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
53- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg 62- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
54- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg 63- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
55+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR) 64+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)
56+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)/objects 65+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)/objects
57+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)/conf.d 66+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)/conf.d
58+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)/modules 67+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)/modules
59+ ${BSD_INSTALL_DATA} sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg 68+ ${BSD_INSTALL_DATA} sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg
60+ ${BSD_INSTALL_DATA} sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg 69+ ${BSD_INSTALL_DATA} sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
61+ ${BSD_INSTALL_DATA} sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg 
62+ ${BSD_INSTALL_DATA} sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg 
63+ ${BSD_INSTALL_DATA} sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg 70+ ${BSD_INSTALL_DATA} sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
64+ ${BSD_INSTALL_DATA} sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg 71+ ${BSD_INSTALL_DATA} sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
65+ ${BSD_INSTALL_DATA} sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg 72+ ${BSD_INSTALL_DATA} sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
66+ ${BSD_INSTALL_DATA} sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg 73+ ${BSD_INSTALL_DATA} sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg
67+ ${BSD_INSTALL_DATA} sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg 74+ ${BSD_INSTALL_DATA} sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
68+ ${BSD_INSTALL_DATA} sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg 75+ ${BSD_INSTALL_DATA} sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
69+ ${BSD_INSTALL_DATA} sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg 76+ ${BSD_INSTALL_DATA} sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
70+ ${BSD_INSTALL_DATA} sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg 77+ ${BSD_INSTALL_DATA} sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
71+ ${BSD_INSTALL_DATA} sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg 78+ ${BSD_INSTALL_DATA} sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
72  79
73 @echo "" 80 @echo ""
74 @echo "*** Config files installed ***" 81 @echo "*** Config files installed ***"
75@@ -438,14 +438,14 @@ install-config: 82@@ -457,14 +457,14 @@ install-config: install-cgiconf
76 @echo "" 83 @echo ""
77  84
78 install-testconfig: 85 install-testconfig:
79- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/tests 86- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/tests
80+ ${BSD_INSTALL_DATA} $(DESTDIR)$(CFGDIR)/tests 87+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)/tests
81 for file in tests/etc/*.cfg; \ 88 for file in tests/etc/*.cfg; \
82- do $(INSTALL) -b -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(CFGDIR)/tests; done 89- do $(INSTALL) -b -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(CFGDIR)/tests; done
83+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(CFGDIR)/tests; done 90+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(CFGDIR)/tests; done
84  91
85  92
86 install-webconf: 93 install-webconf:
87- $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF) 94- $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
88- $(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf 95- $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)
89+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTTPD_CONF) 96+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTTPD_CONF)
90+ ${BSD_INSTALL_DATA} sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf 97+ ${BSD_INSTALL_DATA} sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)
91  98
92 @echo "" 99 @echo ""
93 @echo "*** Icinga/Apache conf file installed ***" 100 @echo "*** Icinga/Apache conf file installed ***"
94@@ -480,11 +480,11 @@ install-idoutils: 101@@ -472,7 +472,7 @@ install-webconf:
 102
 103 install-webconf-auth:
 104
 105- $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)
 106+ ${BSD_INSTALL_DATA} icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)
 107
 108 @echo ""
 109 @echo "*** Icinga http auth file installed ***"
 110@@ -508,11 +508,11 @@ install-idoutils:
95 install-init: install-daemoninit 111 install-init: install-daemoninit
96  112
97 install-daemoninit: 113 install-daemoninit:
98- $(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR) 114- $(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR)
99- $(INSTALL) -m 755 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/icinga 115- $(INSTALL) -m 755 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/icinga
100+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(INIT_DIR) 116+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(INIT_DIR)
101+ ${BSD_INSTALL_DATA} daemon-init $(DESTDIR)$(INIT_DIR)/icinga 117+ ${BSD_INSTALL_DATA} daemon-init $(DESTDIR)$(INIT_DIR)/icinga
102  118
103 @if [ x$(USE_IDOUTILS) = xyes ]; then \ 119 @if [ x$(USE_IDOUTILS) = xyes ]; then \
104- $(INSTALL) -m 755 $(INIT_OPTS) rc.ido2db $(DESTDIR)$(INIT_DIR)/ido2db ;\ 120- $(INSTALL) -m 755 $(INIT_OPTS) rc.ido2db $(DESTDIR)$(INIT_DIR)/ido2db ;\
105+ ${BSD_INSTALL_SCRIPT} rc.ido2db $(DESTDIR)$(INIT_DIR)/ido2db ;\ 121+ ${BSD_INSTALL_SCRIPT} rc.ido2db $(DESTDIR)$(INIT_DIR)/ido2db ;\
106 fi 122 fi
107  123
108 @echo "" 124 @echo ""
109@@ -493,26 +493,26 @@ install-daemoninit: 125@@ -521,26 +521,26 @@ install-daemoninit:
110  126
111  127
112 install-commandmode: 128 install-commandmode:
113- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR) 129- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
114- chmod g+s $(DESTDIR)$(EXTCMDFILEDIR) 130- chmod g+s $(DESTDIR)$(EXTCMDFILEDIR)
115+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(EXTCMDFILEDIR) 131+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(EXTCMDFILEDIR)
116+ #chmod g+s $(DESTDIR)$(EXTCMDFILEDIR) 132+ #chmod g+s $(DESTDIR)$(EXTCMDFILEDIR)
117  133
118 @echo "" 134 @echo ""
119 @echo "*** External command directory configured ***" 135 @echo "*** External command directory configured ***"
120 @echo "" 136 @echo ""
121  137
122 install-eventhandlers: 138 install-eventhandlers:
@@ -137,27 +153,42 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/03 @@ -137,27 +153,42 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/03
137+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1 153+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1
138+ ${BSD_INSTALL_DATA} contrib/eventhandlers/submit_check_result $(DESTDIR)$(EVENTHANDLERDIR)/submit_check_result 154+ ${BSD_INSTALL_DATA} contrib/eventhandlers/submit_check_result $(DESTDIR)$(EVENTHANDLERDIR)/submit_check_result
139+ ${BSD_INSTALL_DATA} contrib/eventhandlers/disable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/disable_active_service_checks 155+ ${BSD_INSTALL_DATA} contrib/eventhandlers/disable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/disable_active_service_checks
140+ ${BSD_INSTALL_DATA} contrib/eventhandlers/enable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/enable_active_service_checks 156+ ${BSD_INSTALL_DATA} contrib/eventhandlers/enable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/enable_active_service_checks
141+ ${BSD_INSTALL_DATA} contrib/eventhandlers/disable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/disable_notifications 157+ ${BSD_INSTALL_DATA} contrib/eventhandlers/disable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/disable_notifications
142+ ${BSD_INSTALL_DATA} contrib/eventhandlers/enable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/enable_notifications 158+ ${BSD_INSTALL_DATA} contrib/eventhandlers/enable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/enable_notifications
143+ ${BSD_INSTALL_DATA} contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/obsessive_svc_handler 159+ ${BSD_INSTALL_DATA} contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/obsessive_svc_handler
144+ ${BSD_INSTALL_DATA} contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/submit_check_result_via_nsca 160+ ${BSD_INSTALL_DATA} contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/submit_check_result_via_nsca
145+ ${BSD_INSTALL_DATA} contrib/eventhandlers/redundancy-scenario1/handle-master-host-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-host-event 161+ ${BSD_INSTALL_DATA} contrib/eventhandlers/redundancy-scenario1/handle-master-host-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-host-event
146+ ${BSD_INSTALL_DATA} contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-proc-event 162+ ${BSD_INSTALL_DATA} contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-proc-event
147  163
148 @echo "" 164 @echo ""
149 @echo "*** Sample Eventhandlers installed ***" 165 @echo "*** Sample Eventhandlers installed ***"
150@@ -553,19 +553,19 @@ Prototype: 166@@ -550,10 +550,10 @@ install-eventhandlers:
 167 install-classicui-standalone: install-cgis install-html install-cgiconf install-webconf
 168
 169 # make sure we keep all the needed dirs for data
 170- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR)
 171- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
 172- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
 173- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
 174+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(STATEDIR)
 175+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)
 176+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives
 177+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(EXTCMDFILEDIR)
 178
 179 @echo ""
 180 @echo "*** Icinga Classic UI Standalone installed ***"
 181@@ -593,19 +593,19 @@ Prototype:
151 cd sample-config; \ 182 cd sample-config; \
152 for file in *.cfg; \ 183 for file in *.cfg; \
153 do \ 184 do \
154- $(INSTALL) -m 644 $$file $(PACKDIR)/$(CFGDIR)/$$file.$(VERSION); \ 185- $(INSTALL) -m 644 $$file $(PACKDIR)/$(CFGDIR)/$$file.$(VERSION); \
155+ ${BSD_INSTALL_DATA} $$file $(PACKDIR)/$(CFGDIR)/$$file.$(VERSION); \ 186+ ${BSD_INSTALL_DATA} $$file $(PACKDIR)/$(CFGDIR)/$$file.$(VERSION); \
156 done 187 done
157 chmod 640 $(PACKDIR)/$(CFGDIR)/resource.cfg.$(VERSION) 188 chmod 640 $(PACKDIR)/$(CFGDIR)/resource.cfg.$(VERSION)
158 cd sample-config/template-object; \ 189 cd sample-config/template-object; \
159 for file in *.cfg; \ 190 for file in *.cfg; \
160 do \ 191 do \
161- $(INSTALL) -m 644 $$file $(PACKDIR)/$(CFGDIR)/objects/$$file.$(VERSION); \ 192- $(INSTALL) -m 644 $$file $(PACKDIR)/$(CFGDIR)/objects/$$file.$(VERSION); \
162+ ${BSD_INSTALL_DATA} $$file $(PACKDIR)/$(CFGDIR)/objects/$$file.$(VERSION); \ 193+ ${BSD_INSTALL_DATA} $$file $(PACKDIR)/$(CFGDIR)/objects/$$file.$(VERSION); \
163 done 194 done
cvs diff -r1.1 -r1.2 pkgsrc/net/icinga-base/patches/patch-base_Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/icinga-base/patches/patch-base_Makefile.in 2013/03/02 04:08:27 1.1
+++ pkgsrc/net/icinga-base/patches/patch-base_Makefile.in 2013/12/31 03:28:39 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-base_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ 1$NetBSD: patch-base_Makefile.in,v 1.2 2013/12/31 03:28:39 ryoon Exp $
2 2
3--- base/Makefile.in.orig 2013-01-13 22:18:37.000000000 +0000 3--- base/Makefile.in.orig 2013-12-13 12:54:34.000000000 +0000
4+++ base/Makefile.in 4+++ base/Makefile.in
5@@ -207,10 +207,10 @@ install-unstripped: 5@@ -207,10 +207,10 @@ install-unstripped:
6 $(MAKE) install-basic 6 $(MAKE) install-basic
7  7
8 install-basic: 8 install-basic:
9- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) 9- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
10- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) 10- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
11- $(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR) 11- $(INSTALL) -m 755 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
12- $(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR) 12- $(INSTALL) -m 755 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
13+ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(BINDIR) 13+ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(BINDIR)
14+ ${BSD_INSTALL_LIB_DIR} $(DESTDIR)$(LIBDIR) 14+ ${BSD_INSTALL_LIB_DIR} $(DESTDIR)$(LIBDIR)
15+ ${BSD_INSTALL_PROGRAM} @icinga_name@ $(DESTDIR)$(BINDIR) 15+ ${BSD_INSTALL_PROGRAM} @icinga_name@ $(DESTDIR)$(BINDIR)
16+ ${BSD_INSTALL_PROGRAM} @icingastats_name@ $(DESTDIR)$(BINDIR) 16+ ${BSD_INSTALL_PROGRAM} @icingastats_name@ $(DESTDIR)$(BINDIR)
17  17
18 strip-post-install: 18 strip-post-install:
19 $(STRIP) $(DESTDIR)$(BINDIR)/@icinga_name@ 19 $(STRIP) $(DESTDIR)$(BINDIR)/@icinga_name@
cvs diff -r1.1 -r1.2 pkgsrc/net/icinga-base/patches/patch-html_Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/icinga-base/patches/patch-html_Makefile.in 2013/03/02 04:08:27 1.1
+++ pkgsrc/net/icinga-base/patches/patch-html_Makefile.in 2013/12/31 03:28:39 1.2
@@ -1,66 +1,72 @@ @@ -1,66 +1,72 @@
1$NetBSD: patch-html_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ 1$NetBSD: patch-html_Makefile.in,v 1.2 2013/12/31 03:28:39 ryoon Exp $
2 2
3--- html/Makefile.in.orig 2013-01-13 22:18:37.000000000 +0000 3--- html/Makefile.in.orig 2013-12-13 12:54:34.000000000 +0000
4+++ html/Makefile.in 4+++ html/Makefile.in
5@@ -9,7 +9,7 @@ CFGDIR=@sysconfdir@ 5@@ -9,7 +9,7 @@ CFGDIR=@sysconfdir@
6 BINDIR=@bindir@ 6 BINDIR=@bindir@
7 LIBDIR=@libdir@ 7 LIBDIR=@libdir@
8 CGIDIR=@sbindir@ 8 CGIDIR=@sbindir@
9-HTMLDIR=@datarootdir@ 9-HTMLDIR=@datarootdir@
10+HTMLDIR=@datarootdir@/icinga 10+HTMLDIR=@datarootdir@/icinga
11 CGILOGDIR=@CGILOGDIR@ 11 CGILOGDIR=@CGILOGDIR@
12 INSTALL=@INSTALL@ 12 INSTALL=@INSTALL@
13 INSTALL_OPTS=@INSTALL_OPTS@ 13 INSTALL_OPTS=@INSTALL_OPTS@
14@@ -35,71 +35,71 @@ distclean: clean 14@@ -35,76 +35,76 @@ distclean: clean
15 devclean: distclean 15 devclean: distclean
16  16
17 install: 17 install:
18- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) 18- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
19- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media 19- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
20- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets 20- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
21- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs 21- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
22- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/stylesheets 22- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/stylesheets
23- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/js 23- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/js
24- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/en 24- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/en
25- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/de 25- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/de
26- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images 26- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
27- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images/flags 27- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images/flags
28- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images 28- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
29- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos 29- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
30- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui 30- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui
31- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/theme 31- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/themes
32- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/theme/images 32- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base
 33- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base/images
 34- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/ui
 35- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui-addon
33- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js 36- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
34- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi 37- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
35- $(INSTALL) -m 444 $(INSTALL_OPTS) log/.htaccess $(DESTDIR)$(CGILOGDIR) 38- $(INSTALL) -m 444 $(INSTALL_OPTS) log/.htaccess $(DESTDIR)$(CGILOGDIR)
36- $(INSTALL) -m 644 $(INSTALL_OPTS) log/index.htm $(DESTDIR)$(CGILOGDIR) 39- $(INSTALL) -m 644 $(INSTALL_OPTS) log/index.htm $(DESTDIR)$(CGILOGDIR)
37- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) 40- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
38- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs 41- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
39+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR) 42+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)
40+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/media 43+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/media
41+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets 44+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
42+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs 45+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs
43+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/stylesheets 46+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/stylesheets
44+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/js 47+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/js
45+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/en 48+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/en
46+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/de 49+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/de
47+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images 50+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images
48+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images/flags 51+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images/flags
49+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images 52+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
50+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos 53+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
51+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui 54+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui
52+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/theme 55+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/themes
53+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/theme/images 56+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base
 57+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base/images
 58+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/ui
 59+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui-addon
54+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/js 60+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/js
55+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/ssi 61+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/ssi
56+ ${BSD_INSTALL_DATA} log/.htaccess $(DESTDIR)$(CGILOGDIR) 62+ ${BSD_INSTALL_DATA} log/.htaccess $(DESTDIR)$(CGILOGDIR)
57+ ${BSD_INSTALL_DATA} log/index.htm $(DESTDIR)$(CGILOGDIR) 63+ ${BSD_INSTALL_DATA} log/index.htm $(DESTDIR)$(CGILOGDIR)
58+ ${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR) 64+ ${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR)
59+ ${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs 65+ ${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
60 for file in *.html; \ 66 for file in *.html; \
61- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done 67- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
62+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR); done 68+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR); done
63 for file in stylesheets/*.css; \ 69 for file in stylesheets/*.css; \
64- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done 70- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
65+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done 71+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
66 for file in docs/*.html; \ 72 for file in docs/*.html; \
@@ -89,40 +95,42 @@ $NetBSD: patch-html_Makefile.in,v 1.1 20 @@ -89,40 +95,42 @@ $NetBSD: patch-html_Makefile.in,v 1.1 20
89+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done 95+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
90 for file in images/*.jpg; \ 96 for file in images/*.jpg; \
91- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done 97- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
92+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done 98+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
93 for file in images/*.gif; \ 99 for file in images/*.gif; \
94- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done 100- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
95+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done 101+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
96 for file in images/*.ico; \ 102 for file in images/*.ico; \
97- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done 103- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
98+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done 104+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
99 for file in images/logos/*.*; \ 105 for file in images/logos/*.*; \
100- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done 106- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
101+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done 107+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
102 for file in jquery-ui/*.js; \ 108 for file in jquery-ui/ui/*.js; \
103- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui; done 109- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/ui; done
104+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui; done 110+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/ui; done
105 for file in jquery-ui/theme/*.css; \ 111 for file in jquery-ui/themes/base/*.css; \
106- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/theme; done 112- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base; done
107+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/theme; done 113+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base; done
108 for file in jquery-ui/theme/images/*.png; \ 114 for file in jquery-ui/themes/base/images/*.png; \
109- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/theme/images; done 115- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base/images; done
110+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/theme/images; done 116+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base/images; done
 117 for file in jquery-ui-addon/*.*; \
 118- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui-addon; done
 119+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui-addon; done
111 for file in js/*.js; \ 120 for file in js/*.js; \
112- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done 121- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
113+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/js; done 122+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/js; done
114  123
115 install-dev-docu: 124 install-dev-docu:
116- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/doxygen 125- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/doxygen
117- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/doxygen/html 126- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/doxygen/html
118+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/doxygen 127+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/doxygen
119+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/doxygen/html 128+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/doxygen/html
120 #for file in doxygen/*.*; \ 129 #for file in doxygen/*.*; \
121- #do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/doxygen; done 130 #do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/doxygen; done
122+ #do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/doxygen; done 
123 for file in doxygen/html/*.*; \ 131 for file in doxygen/html/*.*; \
124- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/doxygen/html; done 132- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/doxygen/html; done
125+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/doxygen/html; done 133+ do ${BSD_INSTALL_DATA_DIR} $$file $(DESTDIR)$(HTMLDIR)/doxygen/html; done
126  134
127 install-unstripped: 135 install-unstripped:
128 $(MAKE) install 136 $(MAKE) install