diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-12-31 03:28:39 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-12-31 03:28:39 +0000 |
| commit | af10d66c8e8f1f1a8e68c1536100d21642f196d0 (patch) | |
| tree | 946d1a1afe662ccaf8a62f6f7e06ca4dafe93674 /net/icinga-base | |
| parent | bed37970d47c5e6c37fe0dd98d90a7608be8f021 (diff) | |
| download | pkgsrc-af10d66c8e8f1f1a8e68c1536100d21642f196d0.tar.gz | |
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
Diffstat (limited to 'net/icinga-base')
| -rw-r--r-- | net/icinga-base/Makefile | 6 | ||||
| -rw-r--r-- | net/icinga-base/PLIST | 123 | ||||
| -rw-r--r-- | net/icinga-base/distinfo | 14 | ||||
| -rw-r--r-- | net/icinga-base/patches/patch-Makefile.in | 63 | ||||
| -rw-r--r-- | net/icinga-base/patches/patch-base_Makefile.in | 8 | ||||
| -rw-r--r-- | net/icinga-base/patches/patch-html_Makefile.in | 46 |
6 files changed, 180 insertions, 80 deletions
diff --git a/net/icinga-base/Makefile b/net/icinga-base/Makefile index 8a9028841f1..b738971d4a8 100644 --- a/net/icinga-base/Makefile +++ b/net/icinga-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2013/09/04 12:31:26 obache Exp $ +# $NetBSD: Makefile,v 1.7 2013/12/31 03:28:39 ryoon Exp $ # -DISTNAME= icinga-1.8.4 +DISTNAME= icinga-1.9.4 PKGNAME= ${DISTNAME:S/-/-base-/} -PKGREVISION= 5 CATEGORIES= net sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icinga/} @@ -85,6 +84,7 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/icinga.conf.dist ${DESTDIR}/${EGDIR}/icinga.conf +.include "../../databases/libdbi/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" .include "../../lang/php/phpversion.mk" .include "${PHPPKGSRCDIR}/buildlink3.mk" diff --git a/net/icinga-base/PLIST b/net/icinga-base/PLIST index b32d2cf596a..6880daa047b 100644 --- a/net/icinga-base/PLIST +++ b/net/icinga-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2013/03/02 04:08:27 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2013/12/31 03:28:39 ryoon Exp $ bin/icinga bin/icingastats lib/p1.pl @@ -135,8 +135,6 @@ share/icinga/docs/de/quickstart.html share/icinga/docs/de/recurring_downtimes.html share/icinga/docs/de/redundancy.html share/icinga/docs/de/reporting.html -share/icinga/docs/de/reporting_1.6.html -share/icinga/docs/de/reporting_1.8.html share/icinga/docs/de/security.html share/icinga/docs/de/servicechecks.html share/icinga/docs/de/stalking.html @@ -256,8 +254,6 @@ share/icinga/docs/en/quickstart.html share/icinga/docs/en/recurring_downtimes.html share/icinga/docs/en/redundancy.html share/icinga/docs/en/reporting.html -share/icinga/docs/en/reporting_1.6.html -share/icinga/docs/en/reporting_1.8.html share/icinga/docs/en/security.html share/icinga/docs/en/servicechecks.html share/icinga/docs/en/stalking.html @@ -273,6 +269,55 @@ share/icinga/docs/en/verifyconfig.html share/icinga/docs/en/volatileservices.html share/icinga/docs/en/whatsnew.html share/icinga/docs/images/Architecture_1.5_800px.png +share/icinga/docs/images/IcingaWeb_BusinessProcess-150x150.png +share/icinga/docs/images/IcingaWeb_BusinessProcess.png +share/icinga/docs/images/IcingaWeb_Commands-150x150.png +share/icinga/docs/images/IcingaWeb_Commands.png +share/icinga/docs/images/IcingaWeb_CronkBuilder-150x150.png +share/icinga/docs/images/IcingaWeb_CronkBuilder.png +share/icinga/docs/images/IcingaWeb_Cronk_Configuration-150x150.png +share/icinga/docs/images/IcingaWeb_Cronk_Configuration.png +share/icinga/docs/images/IcingaWeb_Cronk_HostFiltered-150x150.png +share/icinga/docs/images/IcingaWeb_Downtimes-150x150.png +share/icinga/docs/images/IcingaWeb_Downtimes.png +share/icinga/docs/images/IcingaWeb_HostStatus_Events-150x150.png +share/icinga/docs/images/IcingaWeb_HostStatus_Events.png +share/icinga/docs/images/IcingaWeb_Host_filtered-150x150.png +share/icinga/docs/images/IcingaWeb_Host_filtered.png +share/icinga/docs/images/IcingaWeb_LogViewer-150x150.png +share/icinga/docs/images/IcingaWeb_LogViewer.png +share/icinga/docs/images/IcingaWeb_OpenProblems-150x150.png +share/icinga/docs/images/IcingaWeb_OpenProblems.png +share/icinga/docs/images/IcingaWeb_Portal2-150x150.png +share/icinga/docs/images/IcingaWeb_Portal2.png +share/icinga/docs/images/IcingaWeb_Reporting-150x150.png +share/icinga/docs/images/IcingaWeb_Reporting.png +share/icinga/docs/images/IcingaWeb_Search-150x150.png +share/icinga/docs/images/IcingaWeb_Search.png +share/icinga/docs/images/IcingaWeb_StatusMap-150x150.png +share/icinga/docs/images/IcingaWeb_StatusMap.png +share/icinga/docs/images/IcingaWeb_TacticalOverview-150x150.png +share/icinga/docs/images/IcingaWeb_TacticalOverview.png +share/icinga/docs/images/IcingaWeb_UserAdmin-150x150.png +share/icinga/docs/images/IcingaWeb_UserAdmin.png +share/icinga/docs/images/Icinga_Classic_CGIConfig-150x150.png +share/icinga/docs/images/Icinga_Classic_CGIConfig.png +share/icinga/docs/images/Icinga_Classic_Commands-150x150.png +share/icinga/docs/images/Icinga_Classic_Commands.png +share/icinga/docs/images/Icinga_Classic_DatePicker-150x150.png +share/icinga/docs/images/Icinga_Classic_DatePicker.png +share/icinga/docs/images/Icinga_Classic_Downtimes-150x150.png +share/icinga/docs/images/Icinga_Classic_Downtimes.png +share/icinga/docs/images/Icinga_Classic_HostGroup-150x150.png +share/icinga/docs/images/Icinga_Classic_HostGroup.png +share/icinga/docs/images/Icinga_Classic_PaginationLogs-150x150.png +share/icinga/docs/images/Icinga_Classic_PaginationLogs.png +share/icinga/docs/images/Icinga_Classic_ServiceStatus-150x150.png +share/icinga/docs/images/Icinga_Classic_ServiceStatus.png +share/icinga/docs/images/Icinga_Classic_TacticalOverview-150x150.png +share/icinga/docs/images/Icinga_Classic_TacticalOverview.png +share/icinga/docs/images/Icinga_Classic_Trending-150x150.png +share/icinga/docs/images/Icinga_Classic_Trending.png share/icinga/docs/images/MyServiceStatus.png share/icinga/docs/images/activechecks.png share/icinga/docs/images/cachedcheckgraphs.png @@ -347,6 +392,7 @@ share/icinga/docs/images/icinga-reporting-overview_1.8.png share/icinga/docs/images/icinga-reporting_1.6.png share/icinga/docs/images/icinga-web-admin_groups1.png share/icinga/docs/images/icinga-web-admin_groups1_1.6.png +share/icinga/docs/images/icinga-web-admin_groups1_1.9.png share/icinga/docs/images/icinga-web-admin_groups2.png share/icinga/docs/images/icinga-web-admin_groups2_1.6.png share/icinga/docs/images/icinga-web-admin_logs1.png @@ -354,6 +400,7 @@ share/icinga/docs/images/icinga-web-admin_principals.png share/icinga/docs/images/icinga-web-admin_tasks.png share/icinga/docs/images/icinga-web-admin_users1.png share/icinga/docs/images/icinga-web-admin_users1_1.6.png +share/icinga/docs/images/icinga-web-admin_users1_1.9.png share/icinga/docs/images/icinga-web-admin_users2.png share/icinga/docs/images/icinga-web-admin_users2_1.6.png share/icinga/docs/images/icinga-web-commands_hst.png @@ -364,16 +411,19 @@ share/icinga/docs/images/icinga-web-commands_svc.png share/icinga/docs/images/icinga-web-commands_svc_1.3.png share/icinga/docs/images/icinga-web-commands_svc_1.5.png share/icinga/docs/images/icinga-web-commands_svc_1.6.png +share/icinga/docs/images/icinga-web-cronks-settings_1.9.png share/icinga/docs/images/icinga-web-cronks1.png share/icinga/docs/images/icinga-web-cronks1_1.3.png share/icinga/docs/images/icinga-web-cronks1_1.5.png share/icinga/docs/images/icinga-web-cronks1_1.6.png share/icinga/docs/images/icinga-web-cronks1_1.7.png +share/icinga/docs/images/icinga-web-cronks1_1.9.png share/icinga/docs/images/icinga-web-cronks2.png share/icinga/docs/images/icinga-web-cronks2_1.3.png share/icinga/docs/images/icinga-web-cronks2_1.5.png share/icinga/docs/images/icinga-web-cronks2_1.6.png share/icinga/docs/images/icinga-web-cronks2_1.7.png +share/icinga/docs/images/icinga-web-cronks2_1.9.png share/icinga/docs/images/icinga-web-cronks2a.png share/icinga/docs/images/icinga-web-cronks2a_1.6.png share/icinga/docs/images/icinga-web-cronks2a_1.7.png @@ -382,12 +432,20 @@ share/icinga/docs/images/icinga-web-cronks3_1.3.png share/icinga/docs/images/icinga-web-cronks3_1.5.png share/icinga/docs/images/icinga-web-cronks3_1.6.png share/icinga/docs/images/icinga-web-cronks3_1.7.png +share/icinga/docs/images/icinga-web-cronks3_1.9.png +share/icinga/docs/images/icinga-web-cronks4_1.9.png share/icinga/docs/images/icinga-web-filter1.png share/icinga/docs/images/icinga-web-filter1_1.3.png share/icinga/docs/images/icinga-web-filter1_1.6.png +share/icinga/docs/images/icinga-web-filter1_1.9.png share/icinga/docs/images/icinga-web-filter2.png share/icinga/docs/images/icinga-web-filter2_1.3.png +share/icinga/docs/images/icinga-web-filter2_1.9.png share/icinga/docs/images/icinga-web-filter3.png +share/icinga/docs/images/icinga-web-filter3_1.9.png +share/icinga/docs/images/icinga-web-filter4_1.9.png +share/icinga/docs/images/icinga-web-filter5_1.9.png +share/icinga/docs/images/icinga-web-filter6_1.9.png share/icinga/docs/images/icinga-web-host-obj.png share/icinga/docs/images/icinga-web-host-obj1.png share/icinga/docs/images/icinga-web-host_1.5.png @@ -413,6 +471,7 @@ share/icinga/docs/images/icinga-web-overview_1.5.png share/icinga/docs/images/icinga-web-overview_1.6.png share/icinga/docs/images/icinga-web-overview_1.7.png share/icinga/docs/images/icinga-web-overview_1.8.png +share/icinga/docs/images/icinga-web-overview_1.9.png share/icinga/docs/images/icinga-web-search1.png share/icinga/docs/images/icinga-web-search1_1.3.png share/icinga/docs/images/icinga-web-search1_1.6.png @@ -435,6 +494,8 @@ share/icinga/docs/images/icinga-web-topmenu1_1.6.png share/icinga/docs/images/icinga-web-topmenu1_1.7.png share/icinga/docs/images/icinga-web-topmenu2.png share/icinga/docs/images/icinga-web-topmenu2_1.3.png +share/icinga/docs/images/icinga-web-topmenuadmin1_1.9.png +share/icinga/docs/images/icinga-web-user-prefs-logout.png share/icinga/docs/images/idoutils.png share/icinga/docs/images/important.gif share/icinga/docs/images/important.png @@ -604,32 +665,32 @@ share/icinga/images/warning_triangle.gif share/icinga/images/zoom1.gif share/icinga/images/zoom2.gif share/icinga/index.html -share/icinga/jquery-ui/jquery.ui.core.min.js -share/icinga/jquery-ui/jquery.ui.datepicker.min.js -share/icinga/jquery-ui/jquery.ui.mouse.min.js -share/icinga/jquery-ui/jquery.ui.slider.min.js -share/icinga/jquery-ui/jquery.ui.timepicker-addon.min.js -share/icinga/jquery-ui/jquery.ui.widget.min.js -share/icinga/jquery-ui/theme/images/ui-bg_flat_0_aaaaaa_40x100.png -share/icinga/jquery-ui/theme/images/ui-bg_flat_75_ffffff_40x100.png -share/icinga/jquery-ui/theme/images/ui-bg_glass_55_fbf9ee_1x400.png -share/icinga/jquery-ui/theme/images/ui-bg_glass_65_ffffff_1x400.png -share/icinga/jquery-ui/theme/images/ui-bg_glass_75_dadada_1x400.png -share/icinga/jquery-ui/theme/images/ui-bg_glass_75_e6e6e6_1x400.png -share/icinga/jquery-ui/theme/images/ui-bg_glass_95_fef1ec_1x400.png -share/icinga/jquery-ui/theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png -share/icinga/jquery-ui/theme/images/ui-icons_222222_256x240.png -share/icinga/jquery-ui/theme/images/ui-icons_2e83ff_256x240.png -share/icinga/jquery-ui/theme/images/ui-icons_454545_256x240.png -share/icinga/jquery-ui/theme/images/ui-icons_888888_256x240.png -share/icinga/jquery-ui/theme/images/ui-icons_cd0a0a_256x240.png -share/icinga/jquery-ui/theme/jquery.ui.all.css -share/icinga/jquery-ui/theme/jquery.ui.base.css -share/icinga/jquery-ui/theme/jquery.ui.core.css -share/icinga/jquery-ui/theme/jquery.ui.datepicker.css -share/icinga/jquery-ui/theme/jquery.ui.slider.css -share/icinga/jquery-ui/theme/jquery.ui.theme.css -share/icinga/jquery-ui/theme/jquery.ui.timepicker-addon.css +share/icinga/jquery-ui-addon/jquery.ui.timepicker-addon.css +share/icinga/jquery-ui-addon/jquery.ui.timepicker-addon.min.js +share/icinga/jquery-ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png +share/icinga/jquery-ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png +share/icinga/jquery-ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png +share/icinga/jquery-ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png +share/icinga/jquery-ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png +share/icinga/jquery-ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png +share/icinga/jquery-ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png +share/icinga/jquery-ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png +share/icinga/jquery-ui/themes/base/images/ui-icons_222222_256x240.png +share/icinga/jquery-ui/themes/base/images/ui-icons_2e83ff_256x240.png +share/icinga/jquery-ui/themes/base/images/ui-icons_454545_256x240.png +share/icinga/jquery-ui/themes/base/images/ui-icons_888888_256x240.png +share/icinga/jquery-ui/themes/base/images/ui-icons_cd0a0a_256x240.png +share/icinga/jquery-ui/themes/base/jquery.ui.all.css +share/icinga/jquery-ui/themes/base/jquery.ui.base.css +share/icinga/jquery-ui/themes/base/jquery.ui.core.css +share/icinga/jquery-ui/themes/base/jquery.ui.datepicker.css +share/icinga/jquery-ui/themes/base/jquery.ui.slider.css +share/icinga/jquery-ui/themes/base/jquery.ui.theme.css +share/icinga/jquery-ui/ui/jquery.ui.core.js +share/icinga/jquery-ui/ui/jquery.ui.datepicker.js +share/icinga/jquery-ui/ui/jquery.ui.mouse.js +share/icinga/jquery-ui/ui/jquery.ui.slider.js +share/icinga/jquery-ui/ui/jquery.ui.widget.js share/icinga/js/checkbox_functions.js share/icinga/js/jquery-1.8.0.min.js share/icinga/js/jquery.dd.js diff --git a/net/icinga-base/distinfo b/net/icinga-base/distinfo index 58828f1853d..b0bfa3d3a75 100644 --- a/net/icinga-base/distinfo +++ b/net/icinga-base/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.1 2013/03/02 04:08:27 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2013/12/31 03:28:39 ryoon Exp $ -SHA1 (icinga-1.8.4.tar.gz) = 19ab6e28b99ce15cbb9e12085cbe6aa404bf1ef1 -RMD160 (icinga-1.8.4.tar.gz) = 3b5b204501d1617e6133c9e123bf6c2a3cd7f0be -Size (icinga-1.8.4.tar.gz) = 7459130 bytes -SHA1 (patch-Makefile.in) = 0d7e50b0f37fea847e652725af0b5d65ec7aa7b2 -SHA1 (patch-base_Makefile.in) = f79705b2d5ccf938868cc502cdbe293bb7cf1579 +SHA1 (icinga-1.9.4.tar.gz) = 4bcfb717d4fac94d16205f976ad54b92a1cf0c52 +RMD160 (icinga-1.9.4.tar.gz) = f118ef6e3f56764e47fc24304dff03c1a5d766e4 +Size (icinga-1.9.4.tar.gz) = 17082569 bytes +SHA1 (patch-Makefile.in) = 0c3ed01f1e8b807710304f6b92011a44d3da0fda +SHA1 (patch-base_Makefile.in) = 4aa962b3963c084074273255fa6107e2e1a28a7d SHA1 (patch-cgi_Makefile.in) = 44ca2f4129c594540ed06a7b3a16f1652591b30f SHA1 (patch-configure.in) = dec21d0e8d76f681b8839b547bd62c7377d25357 -SHA1 (patch-html_Makefile.in) = 5ad556b42a11c15b947e5901d1429862011d7de7 +SHA1 (patch-html_Makefile.in) = df715a3471ac44e9fcc24ee1a4375cd8a6c5ad05 SHA1 (patch-module_idoutils_db_scripts_create__mysqldb.sh) = 789b05d620c3e4477fdb54efd649e409c98970a1 SHA1 (patch-module_idoutils_db_scripts_create__oracledb.sh) = 92c2958aea1d407b7c9426c1a95b328947526264 SHA1 (patch-module_idoutils_db_scripts_create__pgsqldb.sh) = 7bbbbcec4e3670c99297df8df1b6d795afad64db diff --git a/net/icinga-base/patches/patch-Makefile.in b/net/icinga-base/patches/patch-Makefile.in index 8f7ce69a84f..e9630be364b 100644 --- a/net/icinga-base/patches/patch-Makefile.in +++ b/net/icinga-base/patches/patch-Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ +$NetBSD: patch-Makefile.in,v 1.2 2013/12/31 03:28:39 ryoon Exp $ ---- Makefile.in.orig 2013-01-13 22:18:37.000000000 +0000 +--- Makefile.in.orig 2013-12-13 12:54:34.000000000 +0000 +++ Makefile.in @@ -38,7 +38,7 @@ CHECKRESULTDIR=@CHECKRESULTDIR@ EXTCMDFILEDIR=@EXTCMDFILEDIR@ @@ -11,14 +11,16 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ BINDIR=@bindir@ LIBDIR=@libdir@ CGIDIR=@sbindir@ -@@ -368,13 +368,13 @@ install-unstripped: +@@ -380,14 +380,14 @@ install-unstripped: $(MAKE) install-basic install-basic: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(STATEDIR) + ${BSD_INSTALL_LIB_DIR} $(DESTDIR)$(LIBEXECDIR) + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR) + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives @@ -31,18 +33,25 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ fi; @echo "" -@@ -411,23 +411,23 @@ install-basic: +@@ -426,27 +426,27 @@ install-basic: + @echo "" + install-cgiconf: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) +- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg +- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR) ++ ${BSD_INSTALL_DATA} sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg ++ ${BSD_INSTALL_DATA} sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg - install-config: + + install-config: install-cgiconf - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg - $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg -- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg -- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg @@ -58,8 +67,6 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)/modules + ${BSD_INSTALL_DATA} sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg + ${BSD_INSTALL_DATA} sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg -+ ${BSD_INSTALL_DATA} sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg -+ ${BSD_INSTALL_DATA} sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg + ${BSD_INSTALL_DATA} sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg + ${BSD_INSTALL_DATA} sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg + ${BSD_INSTALL_DATA} sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg @@ -72,12 +79,12 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ @echo "" @echo "*** Config files installed ***" -@@ -438,14 +438,14 @@ install-config: +@@ -457,14 +457,14 @@ install-config: install-cgiconf @echo "" install-testconfig: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/tests -+ ${BSD_INSTALL_DATA} $(DESTDIR)$(CFGDIR)/tests ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CFGDIR)/tests for file in tests/etc/*.cfg; \ - do $(INSTALL) -b -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(CFGDIR)/tests; done + do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(CFGDIR)/tests; done @@ -85,13 +92,22 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ install-webconf: - $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF) -- $(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf +- $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE) + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTTPD_CONF) -+ ${BSD_INSTALL_DATA} sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf ++ ${BSD_INSTALL_DATA} sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE) @echo "" @echo "*** Icinga/Apache conf file installed ***" -@@ -480,11 +480,11 @@ install-idoutils: +@@ -472,7 +472,7 @@ install-webconf: + + install-webconf-auth: + +- $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE) ++ ${BSD_INSTALL_DATA} icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE) + + @echo "" + @echo "*** Icinga http auth file installed ***" +@@ -508,11 +508,11 @@ install-idoutils: install-init: install-daemoninit install-daemoninit: @@ -106,7 +122,7 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ fi @echo "" -@@ -493,26 +493,26 @@ install-daemoninit: +@@ -521,26 +521,26 @@ install-daemoninit: install-commandmode: @@ -147,7 +163,22 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ @echo "" @echo "*** Sample Eventhandlers installed ***" -@@ -553,19 +553,19 @@ Prototype: +@@ -550,10 +550,10 @@ install-eventhandlers: + install-classicui-standalone: install-cgis install-html install-cgiconf install-webconf + + # make sure we keep all the needed dirs for data +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives +- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR) ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(STATEDIR) ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR) ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(EXTCMDFILEDIR) + + @echo "" + @echo "*** Icinga Classic UI Standalone installed ***" +@@ -593,19 +593,19 @@ Prototype: cd sample-config; \ for file in *.cfg; \ do \ diff --git a/net/icinga-base/patches/patch-base_Makefile.in b/net/icinga-base/patches/patch-base_Makefile.in index caab2b3a394..c0ac68a3ebc 100644 --- a/net/icinga-base/patches/patch-base_Makefile.in +++ b/net/icinga-base/patches/patch-base_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-base_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ +$NetBSD: patch-base_Makefile.in,v 1.2 2013/12/31 03:28:39 ryoon Exp $ ---- base/Makefile.in.orig 2013-01-13 22:18:37.000000000 +0000 +--- base/Makefile.in.orig 2013-12-13 12:54:34.000000000 +0000 +++ base/Makefile.in @@ -207,10 +207,10 @@ install-unstripped: $(MAKE) install-basic @@ -8,8 +8,8 @@ $NetBSD: patch-base_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ install-basic: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) -- $(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR) -- $(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR) + ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(BINDIR) + ${BSD_INSTALL_LIB_DIR} $(DESTDIR)$(LIBDIR) + ${BSD_INSTALL_PROGRAM} @icinga_name@ $(DESTDIR)$(BINDIR) diff --git a/net/icinga-base/patches/patch-html_Makefile.in b/net/icinga-base/patches/patch-html_Makefile.in index 530506fa683..dc4f401cf7d 100644 --- a/net/icinga-base/patches/patch-html_Makefile.in +++ b/net/icinga-base/patches/patch-html_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-html_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ +$NetBSD: patch-html_Makefile.in,v 1.2 2013/12/31 03:28:39 ryoon Exp $ ---- html/Makefile.in.orig 2013-01-13 22:18:37.000000000 +0000 +--- html/Makefile.in.orig 2013-12-13 12:54:34.000000000 +0000 +++ html/Makefile.in @@ -9,7 +9,7 @@ CFGDIR=@sysconfdir@ BINDIR=@bindir@ @@ -11,7 +11,7 @@ $NetBSD: patch-html_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ CGILOGDIR=@CGILOGDIR@ INSTALL=@INSTALL@ INSTALL_OPTS=@INSTALL_OPTS@ -@@ -35,71 +35,71 @@ distclean: clean +@@ -35,76 +35,76 @@ distclean: clean devclean: distclean install: @@ -28,8 +28,11 @@ $NetBSD: patch-html_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ - $(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)/jquery-ui -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/theme -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/theme/images +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/themes +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base/images +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui/ui +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/jquery-ui-addon - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi - $(INSTALL) -m 444 $(INSTALL_OPTS) log/.htaccess $(DESTDIR)$(CGILOGDIR) @@ -49,8 +52,11 @@ $NetBSD: patch-html_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/theme -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/theme/images ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/themes ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base/images ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui/ui ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/jquery-ui-addon + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/js + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/ssi + ${BSD_INSTALL_DATA} log/.htaccess $(DESTDIR)$(CGILOGDIR) @@ -99,15 +105,18 @@ $NetBSD: patch-html_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ for file in images/logos/*.*; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done + do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done - for file in jquery-ui/*.js; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui; done - for file in jquery-ui/theme/*.css; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/theme; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/theme; done - for file in jquery-ui/theme/images/*.png; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/theme/images; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/theme/images; done + for file in jquery-ui/ui/*.js; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/ui; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/ui; done + for file in jquery-ui/themes/base/*.css; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base; done + for file in jquery-ui/themes/base/images/*.png; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base/images; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base/images; done + for file in jquery-ui-addon/*.*; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/jquery-ui-addon; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/jquery-ui-addon; done for file in js/*.js; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done + do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/js; done @@ -118,11 +127,10 @@ $NetBSD: patch-html_Makefile.in,v 1.1 2013/03/02 04:08:27 ryoon Exp $ + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/doxygen + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/doxygen/html #for file in doxygen/*.*; \ -- #do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/doxygen; done -+ #do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/doxygen; done + #do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/doxygen; done for file in doxygen/html/*.*; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/doxygen/html; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/doxygen/html; done ++ do ${BSD_INSTALL_DATA_DIR} $$file $(DESTDIR)$(HTMLDIR)/doxygen/html; done install-unstripped: $(MAKE) install |