Date: Thu, 1 May 2014 13:10:27 GMT From: Olli Hauer <ohauer@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: rea@FreeBSD.org Subject: ports/189197: [patch] net-mgmt/pnp update to 0.6.21, add stage support Message-ID: <201405011310.s41DARl9043448@freefall.freebsd.org> Resent-Message-ID: <201405011320.s41DK0W2048013@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189197
>Category: ports
>Synopsis: [patch] net-mgmt/pnp update to 0.6.21, add stage support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 01 13:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Olli Hauer
>Release:
>Organization:
>Environment:
>Description:
- update to 0.6.21
- add stage support
- sort pkg-plist (closer match to new `make makeplist')
- add NAGIOSDIR to PLIST_SUB (support nagios/icinga)
>How-To-Repeat:
>Fix:
--- pnp-0.21.diff begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 352744)
+++ Makefile (working copy)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pnp
-PORTVERSION= 0.6.18
-PORTREVISION= 1
+PORTVERSION= 0.6.21
CATEGORIES= net-mgmt
MASTER_SITES= SF
MASTER_SITE_SUBDIR=pnp4nagios/PNP-0.6
@@ -19,21 +18,18 @@
nagios:${PORTSDIR}/net-mgmt/nagios
MAKE_JOBS_UNSAFE= yes
-USES= perl5
+USES= perl5 dos2unix
OPTIONS_DEFINE= PDF
OPTIONS_DEFAULT= PDF
PDF_DESC= Use built-in fpdf library to produce PDF views
-NO_STAGE= yes
.include <bsd.port.options.mk>
USE_PHP= gd iconv json pcre simplexml sockets xml zlib
WANT_PHP_WEB= yes
USE_RC_SUBR= npcd
-MAN8= npcd.8
-USE_DOS2UNIX= yes
DOS2UNIX_REGEX= '.*\.\(php\|js\|txt\)$$'
NAGIOSDIR?= /var/spool/nagios
@@ -68,6 +64,7 @@
MAKE_ARGS= INSTALL_OPTS=
INSTALL_TARGET= install install-config
+PLIST_SUB+= NAGIOSDIR=${NAGIOSDIR}
SUB_FILES= pkg-install \
pkg-deinstall \
pkg-message
@@ -82,6 +79,7 @@
.else
PNP_USE_FPDF= 0
.endif
+
post-patch:
@${REINPLACE_CMD} \
-e's|^\$$conf\['\''use_fpdf'\''\] = [[:digit:]];|$$conf['\''use_fpdf'\''] = ${PNP_USE_FPDF};|' \
@@ -89,14 +87,9 @@
-e's|/usr/local/check_mk/|/usr/local/share/check_mk/|g' \
-e's|/usr/local/nagios/var/rw/live|/${NAGIOSDIR}/rw/live|' \
"${WRKSRC}/sample-config/pnp/config.php.in"
+ @${LN} -fs ../en_US/dwnld.html ${WRKSRC}/share/pnp/documents/de_DE/dwnld.html
-pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
post-install:
-.for m in ${MAN8}
- ${INSTALL_MAN} ${WRKSRC}/man/${m} ${MAN8PREFIX}/man/man8/${m}
-.endfor
- @${CAT} ${PKGMESSAGE}
+ ${INSTALL_MAN} ${WRKSRC}/man/npcd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo (revision 352744)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (pnp4nagios-0.6.18.tar.gz) = 51e385204c346cf9427ffb964f74df21a05f21dd99a95a15a520b645b6ec579e
-SIZE (pnp4nagios-0.6.18.tar.gz) = 3021603
+SHA256 (pnp4nagios-0.6.21.tar.gz) = bb5d36a7cc49dcbcfcb424d437dc3739baa647816cffc610fb621216c4f5992a
+SIZE (pnp4nagios-0.6.21.tar.gz) = 2917588
Index: files/patch-scripts-Makefile.in
===================================================================
--- files/patch-scripts-Makefile.in (revision 352744)
+++ files/patch-scripts-Makefile.in (working copy)
@@ -9,8 +9,8 @@
$(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd
$(INSTALL) -m 755 $(INIT_OPTS) rc.pnp_gearman_worker $(DESTDIR)$(INIT_DIR)/pnp_gearman_worker
-@@ -39,9 +39,9 @@
- $(INSTALL) -m 755 $(INSTALL_OPTS) rrd_convert.pl $(DESTDIR)$(LIBEXECDIR)
+@@ -42,9 +42,9 @@
+ $(INSTALL) -m 755 $(INSTALL_OPTS) rrd_modify.pl $(DESTDIR)$(LIBEXECDIR)
install:
- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR)
Index: pkg-plist
===================================================================
--- pkg-plist (revision 352744)
+++ pkg-plist (working copy)
@@ -1,3 +1,4 @@
+bin/npcd
%%ETCDIR%%/background.pdf-sample
%%ETCDIR%%/check_commands/check_all_local_disks.cfg-sample
%%ETCDIR%%/check_commands/check_nrpe.cfg-sample
@@ -12,6 +13,266 @@
%%ETCDIR%%/pnp4nagios_release
%%ETCDIR%%/process_perfdata.cfg-sample
%%ETCDIR%%/rra.cfg-sample
+lib/kohana/system/config/cache.php
+lib/kohana/system/config/cache_memcache.php
+lib/kohana/system/config/cache_sqlite.php
+lib/kohana/system/config/cache_xcache.php
+lib/kohana/system/config/captcha.php
+lib/kohana/system/config/cookie.php
+lib/kohana/system/config/credit_cards.php
+lib/kohana/system/config/database.php
+lib/kohana/system/config/email.php
+lib/kohana/system/config/encryption.php
+lib/kohana/system/config/http.php
+lib/kohana/system/config/image.php
+lib/kohana/system/config/inflector.php
+lib/kohana/system/config/locale.php
+lib/kohana/system/config/mimes.php
+lib/kohana/system/config/pagination.php
+lib/kohana/system/config/profiler.php
+lib/kohana/system/config/routes.php
+lib/kohana/system/config/session.php
+lib/kohana/system/config/sql_types.php
+lib/kohana/system/config/upload.php
+lib/kohana/system/config/user_agents.php
+lib/kohana/system/config/view.php
+lib/kohana/system/controllers/captcha.php
+lib/kohana/system/controllers/template.php
+lib/kohana/system/core/Benchmark.php
+lib/kohana/system/core/Bootstrap.php
+lib/kohana/system/core/Event.php
+lib/kohana/system/core/Kohana.php
+lib/kohana/system/core/utf8.php
+lib/kohana/system/core/utf8/from_unicode.php
+lib/kohana/system/core/utf8/ltrim.php
+lib/kohana/system/core/utf8/ord.php
+lib/kohana/system/core/utf8/rtrim.php
+lib/kohana/system/core/utf8/str_ireplace.php
+lib/kohana/system/core/utf8/str_pad.php
+lib/kohana/system/core/utf8/str_split.php
+lib/kohana/system/core/utf8/strcasecmp.php
+lib/kohana/system/core/utf8/strcspn.php
+lib/kohana/system/core/utf8/stristr.php
+lib/kohana/system/core/utf8/strlen.php
+lib/kohana/system/core/utf8/strpos.php
+lib/kohana/system/core/utf8/strrev.php
+lib/kohana/system/core/utf8/strrpos.php
+lib/kohana/system/core/utf8/strspn.php
+lib/kohana/system/core/utf8/strtolower.php
+lib/kohana/system/core/utf8/strtoupper.php
+lib/kohana/system/core/utf8/substr.php
+lib/kohana/system/core/utf8/substr_replace.php
+lib/kohana/system/core/utf8/to_unicode.php
+lib/kohana/system/core/utf8/transliterate_to_ascii.php
+lib/kohana/system/core/utf8/trim.php
+lib/kohana/system/core/utf8/ucfirst.php
+lib/kohana/system/core/utf8/ucwords.php
+lib/kohana/system/fonts/DejaVuSerif.ttf
+lib/kohana/system/fonts/LICENSE
+lib/kohana/system/helpers/arr.php
+lib/kohana/system/helpers/cookie.php
+lib/kohana/system/helpers/date.php
+lib/kohana/system/helpers/download.php
+lib/kohana/system/helpers/email.php
+lib/kohana/system/helpers/expires.php
+lib/kohana/system/helpers/feed.php
+lib/kohana/system/helpers/file.php
+lib/kohana/system/helpers/form.php
+lib/kohana/system/helpers/format.php
+lib/kohana/system/helpers/html.php
+lib/kohana/system/helpers/inflector.php
+lib/kohana/system/helpers/num.php
+lib/kohana/system/helpers/remote.php
+lib/kohana/system/helpers/request.php
+lib/kohana/system/helpers/security.php
+lib/kohana/system/helpers/text.php
+lib/kohana/system/helpers/upload.php
+lib/kohana/system/helpers/url.php
+lib/kohana/system/helpers/valid.php
+lib/kohana/system/i18n/de_DE/cache.php
+lib/kohana/system/i18n/de_DE/calendar.php
+lib/kohana/system/i18n/de_DE/captcha.php
+lib/kohana/system/i18n/de_DE/core.php
+lib/kohana/system/i18n/de_DE/database.php
+lib/kohana/system/i18n/de_DE/encrypt.php
+lib/kohana/system/i18n/de_DE/errors.php
+lib/kohana/system/i18n/de_DE/event.php
+lib/kohana/system/i18n/de_DE/image.php
+lib/kohana/system/i18n/de_DE/orm.php
+lib/kohana/system/i18n/de_DE/pagination.php
+lib/kohana/system/i18n/de_DE/profiler.php
+lib/kohana/system/i18n/de_DE/session.php
+lib/kohana/system/i18n/de_DE/swift.php
+lib/kohana/system/i18n/de_DE/upload.php
+lib/kohana/system/i18n/de_DE/validation.php
+lib/kohana/system/i18n/en_US/cache.php
+lib/kohana/system/i18n/en_US/calendar.php
+lib/kohana/system/i18n/en_US/captcha.php
+lib/kohana/system/i18n/en_US/core.php
+lib/kohana/system/i18n/en_US/database.php
+lib/kohana/system/i18n/en_US/encrypt.php
+lib/kohana/system/i18n/en_US/errors.php
+lib/kohana/system/i18n/en_US/event.php
+lib/kohana/system/i18n/en_US/image.php
+lib/kohana/system/i18n/en_US/orm.php
+lib/kohana/system/i18n/en_US/pagination.php
+lib/kohana/system/i18n/en_US/profiler.php
+lib/kohana/system/i18n/en_US/session.php
+lib/kohana/system/i18n/en_US/swift.php
+lib/kohana/system/i18n/en_US/upload.php
+lib/kohana/system/i18n/en_US/validation.php
+lib/kohana/system/i18n/es_ES/cache.php
+lib/kohana/system/i18n/es_ES/calendar.php
+lib/kohana/system/i18n/es_ES/captcha.php
+lib/kohana/system/i18n/es_ES/core.php
+lib/kohana/system/i18n/es_ES/database.php
+lib/kohana/system/i18n/es_ES/encrypt.php
+lib/kohana/system/i18n/es_ES/errors.php
+lib/kohana/system/i18n/es_ES/event.php
+lib/kohana/system/i18n/es_ES/image.php
+lib/kohana/system/i18n/es_ES/orm.php
+lib/kohana/system/i18n/es_ES/pagination.php
+lib/kohana/system/i18n/es_ES/profiler.php
+lib/kohana/system/i18n/es_ES/session.php
+lib/kohana/system/i18n/es_ES/swift.php
+lib/kohana/system/i18n/es_ES/upload.php
+lib/kohana/system/i18n/es_ES/validation.php
+lib/kohana/system/i18n/fr_FR/cache.php
+lib/kohana/system/i18n/fr_FR/calendar.php
+lib/kohana/system/i18n/fr_FR/captcha.php
+lib/kohana/system/i18n/fr_FR/core.php
+lib/kohana/system/i18n/fr_FR/database.php
+lib/kohana/system/i18n/fr_FR/encrypt.php
+lib/kohana/system/i18n/fr_FR/errors.php
+lib/kohana/system/i18n/fr_FR/event.php
+lib/kohana/system/i18n/fr_FR/image.php
+lib/kohana/system/i18n/fr_FR/orm.php
+lib/kohana/system/i18n/fr_FR/pagination.php
+lib/kohana/system/i18n/fr_FR/profiler.php
+lib/kohana/system/i18n/fr_FR/session.php
+lib/kohana/system/i18n/fr_FR/swift.php
+lib/kohana/system/i18n/fr_FR/upload.php
+lib/kohana/system/i18n/fr_FR/validation.php
+lib/kohana/system/i18n/it_IT/cache.php
+lib/kohana/system/i18n/it_IT/calendar.php
+lib/kohana/system/i18n/it_IT/captcha.php
+lib/kohana/system/i18n/it_IT/core.php
+lib/kohana/system/i18n/it_IT/database.php
+lib/kohana/system/i18n/it_IT/encrypt.php
+lib/kohana/system/i18n/it_IT/errors.php
+lib/kohana/system/i18n/it_IT/event.php
+lib/kohana/system/i18n/it_IT/image.php
+lib/kohana/system/i18n/it_IT/orm.php
+lib/kohana/system/i18n/it_IT/pagination.php
+lib/kohana/system/i18n/it_IT/profiler.php
+lib/kohana/system/i18n/it_IT/session.php
+lib/kohana/system/i18n/it_IT/swift.php
+lib/kohana/system/i18n/it_IT/upload.php
+lib/kohana/system/i18n/it_IT/validation.php
+lib/kohana/system/i18n/nl_NL/cache.php
+lib/kohana/system/i18n/nl_NL/calendar.php
+lib/kohana/system/i18n/nl_NL/captcha.php
+lib/kohana/system/i18n/nl_NL/core.php
+lib/kohana/system/i18n/nl_NL/database.php
+lib/kohana/system/i18n/nl_NL/encrypt.php
+lib/kohana/system/i18n/nl_NL/errors.php
+lib/kohana/system/i18n/nl_NL/event.php
+lib/kohana/system/i18n/nl_NL/image.php
+lib/kohana/system/i18n/nl_NL/orm.php
+lib/kohana/system/i18n/nl_NL/pagination.php
+lib/kohana/system/i18n/nl_NL/profiler.php
+lib/kohana/system/i18n/nl_NL/session.php
+lib/kohana/system/i18n/nl_NL/swift.php
+lib/kohana/system/i18n/nl_NL/upload.php
+lib/kohana/system/i18n/nl_NL/validation.php
+lib/kohana/system/i18n/ru_RU/cache.php
+lib/kohana/system/i18n/ru_RU/calendar.php
+lib/kohana/system/i18n/ru_RU/captcha.php
+lib/kohana/system/i18n/ru_RU/core.php
+lib/kohana/system/i18n/ru_RU/database.php
+lib/kohana/system/i18n/ru_RU/encrypt.php
+lib/kohana/system/i18n/ru_RU/errors.php
+lib/kohana/system/i18n/ru_RU/event.php
+lib/kohana/system/i18n/ru_RU/image.php
+lib/kohana/system/i18n/ru_RU/orm.php
+lib/kohana/system/i18n/ru_RU/pagination.php
+lib/kohana/system/i18n/ru_RU/profiler.php
+lib/kohana/system/i18n/ru_RU/session.php
+lib/kohana/system/i18n/ru_RU/swift.php
+lib/kohana/system/i18n/ru_RU/upload.php
+lib/kohana/system/i18n/ru_RU/validation.php
+lib/kohana/system/libraries/Cache.php
+lib/kohana/system/libraries/Calendar.php
+lib/kohana/system/libraries/Calendar_Event.php
+lib/kohana/system/libraries/Captcha.php
+lib/kohana/system/libraries/Controller.php
+lib/kohana/system/libraries/Database.php
+lib/kohana/system/libraries/Database_Expression.php
+lib/kohana/system/libraries/Encrypt.php
+lib/kohana/system/libraries/Event_Observer.php
+lib/kohana/system/libraries/Event_Subject.php
+lib/kohana/system/libraries/Image.php
+lib/kohana/system/libraries/Input.php
+lib/kohana/system/libraries/Model.php
+lib/kohana/system/libraries/ORM.php
+lib/kohana/system/libraries/ORM_Iterator.php
+lib/kohana/system/libraries/ORM_Tree.php
+lib/kohana/system/libraries/ORM_Versioned.php
+lib/kohana/system/libraries/Pagination.php
+lib/kohana/system/libraries/Profiler.php
+lib/kohana/system/libraries/Profiler_Table.php
+lib/kohana/system/libraries/Router.php
+lib/kohana/system/libraries/Session.php
+lib/kohana/system/libraries/Tagcloud.php
+lib/kohana/system/libraries/URI.php
+lib/kohana/system/libraries/Validation.php
+lib/kohana/system/libraries/View.php
+lib/kohana/system/libraries/drivers/Cache.php
+lib/kohana/system/libraries/drivers/Cache/Apc.php
+lib/kohana/system/libraries/drivers/Cache/Eaccelerator.php
+lib/kohana/system/libraries/drivers/Cache/File.php
+lib/kohana/system/libraries/drivers/Cache/Memcache.php
+lib/kohana/system/libraries/drivers/Cache/Sqlite.php
+lib/kohana/system/libraries/drivers/Cache/Xcache.php
+lib/kohana/system/libraries/drivers/Captcha.php
+lib/kohana/system/libraries/drivers/Captcha/Alpha.php
+lib/kohana/system/libraries/drivers/Captcha/Basic.php
+lib/kohana/system/libraries/drivers/Captcha/Black.php
+lib/kohana/system/libraries/drivers/Captcha/Math.php
+lib/kohana/system/libraries/drivers/Captcha/Riddle.php
+lib/kohana/system/libraries/drivers/Captcha/Word.php
+lib/kohana/system/libraries/drivers/Database.php
+lib/kohana/system/libraries/drivers/Database/Mssql.php
+lib/kohana/system/libraries/drivers/Database/Mysql.php
+lib/kohana/system/libraries/drivers/Database/Mysqli.php
+lib/kohana/system/libraries/drivers/Database/Pdosqlite.php
+lib/kohana/system/libraries/drivers/Database/Pgsql.php
+lib/kohana/system/libraries/drivers/Image.php
+lib/kohana/system/libraries/drivers/Image/GD.php
+lib/kohana/system/libraries/drivers/Image/GraphicsMagick.php
+lib/kohana/system/libraries/drivers/Image/ImageMagick.php
+lib/kohana/system/libraries/drivers/Session.php
+lib/kohana/system/libraries/drivers/Session/Cache.php
+lib/kohana/system/libraries/drivers/Session/Cookie.php
+lib/kohana/system/libraries/drivers/Session/Database.php
+lib/kohana/system/views/kohana/template.php
+lib/kohana/system/views/kohana_calendar.php
+lib/kohana/system/views/kohana_error_disabled.php
+lib/kohana/system/views/kohana_error_page.php
+lib/kohana/system/views/kohana_errors.css
+lib/kohana/system/views/kohana_profiler.php
+lib/kohana/system/views/kohana_profiler_table.css
+lib/kohana/system/views/kohana_profiler_table.php
+lib/kohana/system/views/pagination/classic.php
+lib/kohana/system/views/pagination/digg.php
+lib/kohana/system/views/pagination/extended.php
+lib/kohana/system/views/pagination/punbb.php
+lib/npcdmod.o
+libexec/check_pnp_rrds.pl
+libexec/process_perfdata.pl
+libexec/rrd_convert.pl
+libexec/rrd_modify.pl
+man/man8/npcd.8.gz
%%WWWDIR%%/application/config/config.php
%%WWWDIR%%/application/config/locale.php
%%WWWDIR%%/application/config/routes.php
@@ -222,16 +483,16 @@
%%WWWDIR%%/media/css/border-h.gif
%%WWWDIR%%/media/css/border-v.gif
%%WWWDIR%%/media/css/common.css
+%%WWWDIR%%/media/css/images/ajax-loader.png
+%%WWWDIR%%/media/css/images/icon-search-black.png
+%%WWWDIR%%/media/css/images/icons-18-black.png
+%%WWWDIR%%/media/css/images/icons-18-white.png
+%%WWWDIR%%/media/css/images/icons-36-black.png
+%%WWWDIR%%/media/css/images/icons-36-white.png
%%WWWDIR%%/media/css/imgareaselect-default.css
%%WWWDIR%%/media/css/jquery.mobile.min.css
%%WWWDIR%%/media/css/mobile.css
%%WWWDIR%%/media/css/shadow.png
-%%WWWDIR%%/media/css/images/icons-36-black.png
-%%WWWDIR%%/media/css/images/ajax-loader.png
-%%WWWDIR%%/media/css/images/icons-18-black.png
-%%WWWDIR%%/media/css/images/icons-36-white.png
-%%WWWDIR%%/media/css/images/icons-18-white.png
-%%WWWDIR%%/media/css/images/icon-search-black.png
%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_flat_0_aaaaaa_40x100.png
%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_flat_75_ffffff_40x100.png
%%WWWDIR%%/media/css/ui-lightness/images/ui-bg_glass_55_fbf9ee_1x400.png
@@ -248,16 +509,18 @@
%%WWWDIR%%/media/css/ui-lightness/jquery-ui.css
%%WWWDIR%%/media/css/ui-multisite/images/contentframe_background.jpg
%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_0_aaaaaa_40x100.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_75_709aa5_40x100.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_75_6da1b8_40x100.png
%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_55_fbf9ee_1x400.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_65_709aa5_1x400.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_75_709aa5_1x400.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_highlight-soft_75_8eaeb8_1x100.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_65_88b9ce_1x400.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_75_6da1b8_1x400.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_75_94cde6_1x400.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_highlight-soft_75_274554_1x100.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_highlight-soft_75_6da1b8_1x100.png
%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_inset-soft_95_fef1ec_1x100.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_000000_256x240.png
%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_222222_256x240.png
%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_2e83ff_256x240.png
%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_454545_256x240.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_888888_256x240.png
%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_cd0a0a_256x240.png
%%WWWDIR%%/media/css/ui-multisite/jquery-ui.css
%%WWWDIR%%/media/css/ui-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
@@ -318,8 +581,8 @@
%%WWWDIR%%/media/images/xml.png
%%WWWDIR%%/media/images/zoom.png
%%WWWDIR%%/media/js/jquery-min.js
+%%WWWDIR%%/media/js/jquery-ui-timepicker-addon.js
%%WWWDIR%%/media/js/jquery-ui.min.js
-%%WWWDIR%%/media/js/jquery-ui-timepicker-addon.js
%%WWWDIR%%/media/js/jquery.cluetip.js
%%WWWDIR%%/media/js/jquery.imgareaselect.min.js
%%WWWDIR%%/media/js/jquery.mobile.min.js
@@ -393,335 +656,81 @@
%%WWWDIR%%/templates.special/advanced_loop.php-sample
%%WWWDIR%%/templates.special/loop.php-sample
%%WWWDIR%%/templates.special/static.php-sample
-bin/npcd
-lib/kohana/system/config/cache.php
-lib/kohana/system/config/cache_memcache.php
-lib/kohana/system/config/cache_sqlite.php
-lib/kohana/system/config/cache_xcache.php
-lib/kohana/system/config/captcha.php
-lib/kohana/system/config/cookie.php
-lib/kohana/system/config/credit_cards.php
-lib/kohana/system/config/database.php
-lib/kohana/system/config/email.php
-lib/kohana/system/config/encryption.php
-lib/kohana/system/config/http.php
-lib/kohana/system/config/image.php
-lib/kohana/system/config/inflector.php
-lib/kohana/system/config/locale.php
-lib/kohana/system/config/mimes.php
-lib/kohana/system/config/pagination.php
-lib/kohana/system/config/profiler.php
-lib/kohana/system/config/routes.php
-lib/kohana/system/config/session.php
-lib/kohana/system/config/sql_types.php
-lib/kohana/system/config/upload.php
-lib/kohana/system/config/user_agents.php
-lib/kohana/system/config/view.php
-lib/kohana/system/controllers/captcha.php
-lib/kohana/system/controllers/template.php
-lib/kohana/system/core/Benchmark.php
-lib/kohana/system/core/Bootstrap.php
-lib/kohana/system/core/Event.php
-lib/kohana/system/core/Kohana.php
-lib/kohana/system/core/utf8.php
-lib/kohana/system/core/utf8/from_unicode.php
-lib/kohana/system/core/utf8/ltrim.php
-lib/kohana/system/core/utf8/ord.php
-lib/kohana/system/core/utf8/rtrim.php
-lib/kohana/system/core/utf8/str_ireplace.php
-lib/kohana/system/core/utf8/str_pad.php
-lib/kohana/system/core/utf8/str_split.php
-lib/kohana/system/core/utf8/strcasecmp.php
-lib/kohana/system/core/utf8/strcspn.php
-lib/kohana/system/core/utf8/stristr.php
-lib/kohana/system/core/utf8/strlen.php
-lib/kohana/system/core/utf8/strpos.php
-lib/kohana/system/core/utf8/strrev.php
-lib/kohana/system/core/utf8/strrpos.php
-lib/kohana/system/core/utf8/strspn.php
-lib/kohana/system/core/utf8/strtolower.php
-lib/kohana/system/core/utf8/strtoupper.php
-lib/kohana/system/core/utf8/substr.php
-lib/kohana/system/core/utf8/substr_replace.php
-lib/kohana/system/core/utf8/to_unicode.php
-lib/kohana/system/core/utf8/transliterate_to_ascii.php
-lib/kohana/system/core/utf8/trim.php
-lib/kohana/system/core/utf8/ucfirst.php
-lib/kohana/system/core/utf8/ucwords.php
-lib/kohana/system/fonts/DejaVuSerif.ttf
-lib/kohana/system/fonts/LICENSE
-lib/kohana/system/helpers/arr.php
-lib/kohana/system/helpers/cookie.php
-lib/kohana/system/helpers/date.php
-lib/kohana/system/helpers/download.php
-lib/kohana/system/helpers/email.php
-lib/kohana/system/helpers/expires.php
-lib/kohana/system/helpers/feed.php
-lib/kohana/system/helpers/file.php
-lib/kohana/system/helpers/form.php
-lib/kohana/system/helpers/format.php
-lib/kohana/system/helpers/html.php
-lib/kohana/system/helpers/inflector.php
-lib/kohana/system/helpers/num.php
-lib/kohana/system/helpers/remote.php
-lib/kohana/system/helpers/request.php
-lib/kohana/system/helpers/security.php
-lib/kohana/system/helpers/text.php
-lib/kohana/system/helpers/upload.php
-lib/kohana/system/helpers/url.php
-lib/kohana/system/helpers/valid.php
-lib/kohana/system/i18n/de_DE/cache.php
-lib/kohana/system/i18n/de_DE/calendar.php
-lib/kohana/system/i18n/de_DE/captcha.php
-lib/kohana/system/i18n/de_DE/core.php
-lib/kohana/system/i18n/de_DE/database.php
-lib/kohana/system/i18n/de_DE/encrypt.php
-lib/kohana/system/i18n/de_DE/errors.php
-lib/kohana/system/i18n/de_DE/event.php
-lib/kohana/system/i18n/de_DE/image.php
-lib/kohana/system/i18n/de_DE/orm.php
-lib/kohana/system/i18n/de_DE/pagination.php
-lib/kohana/system/i18n/de_DE/profiler.php
-lib/kohana/system/i18n/de_DE/session.php
-lib/kohana/system/i18n/de_DE/swift.php
-lib/kohana/system/i18n/de_DE/upload.php
-lib/kohana/system/i18n/de_DE/validation.php
-lib/kohana/system/i18n/en_US/cache.php
-lib/kohana/system/i18n/en_US/calendar.php
-lib/kohana/system/i18n/en_US/captcha.php
-lib/kohana/system/i18n/en_US/core.php
-lib/kohana/system/i18n/en_US/database.php
-lib/kohana/system/i18n/en_US/encrypt.php
-lib/kohana/system/i18n/en_US/errors.php
-lib/kohana/system/i18n/en_US/event.php
-lib/kohana/system/i18n/en_US/image.php
-lib/kohana/system/i18n/en_US/orm.php
-lib/kohana/system/i18n/en_US/pagination.php
-lib/kohana/system/i18n/en_US/profiler.php
-lib/kohana/system/i18n/en_US/session.php
-lib/kohana/system/i18n/en_US/swift.php
-lib/kohana/system/i18n/en_US/upload.php
-lib/kohana/system/i18n/en_US/validation.php
-lib/kohana/system/i18n/es_ES/cache.php
-lib/kohana/system/i18n/es_ES/calendar.php
-lib/kohana/system/i18n/es_ES/captcha.php
-lib/kohana/system/i18n/es_ES/core.php
-lib/kohana/system/i18n/es_ES/database.php
-lib/kohana/system/i18n/es_ES/encrypt.php
-lib/kohana/system/i18n/es_ES/errors.php
-lib/kohana/system/i18n/es_ES/event.php
-lib/kohana/system/i18n/es_ES/image.php
-lib/kohana/system/i18n/es_ES/orm.php
-lib/kohana/system/i18n/es_ES/pagination.php
-lib/kohana/system/i18n/es_ES/profiler.php
-lib/kohana/system/i18n/es_ES/session.php
-lib/kohana/system/i18n/es_ES/swift.php
-lib/kohana/system/i18n/es_ES/upload.php
-lib/kohana/system/i18n/es_ES/validation.php
-lib/kohana/system/i18n/fr_FR/cache.php
-lib/kohana/system/i18n/fr_FR/calendar.php
-lib/kohana/system/i18n/fr_FR/captcha.php
-lib/kohana/system/i18n/fr_FR/core.php
-lib/kohana/system/i18n/fr_FR/database.php
-lib/kohana/system/i18n/fr_FR/encrypt.php
-lib/kohana/system/i18n/fr_FR/errors.php
-lib/kohana/system/i18n/fr_FR/event.php
-lib/kohana/system/i18n/fr_FR/image.php
-lib/kohana/system/i18n/fr_FR/orm.php
-lib/kohana/system/i18n/fr_FR/pagination.php
-lib/kohana/system/i18n/fr_FR/profiler.php
-lib/kohana/system/i18n/fr_FR/session.php
-lib/kohana/system/i18n/fr_FR/swift.php
-lib/kohana/system/i18n/fr_FR/upload.php
-lib/kohana/system/i18n/fr_FR/validation.php
-lib/kohana/system/i18n/it_IT/cache.php
-lib/kohana/system/i18n/it_IT/calendar.php
-lib/kohana/system/i18n/it_IT/captcha.php
-lib/kohana/system/i18n/it_IT/core.php
-lib/kohana/system/i18n/it_IT/database.php
-lib/kohana/system/i18n/it_IT/encrypt.php
-lib/kohana/system/i18n/it_IT/errors.php
-lib/kohana/system/i18n/it_IT/event.php
-lib/kohana/system/i18n/it_IT/image.php
-lib/kohana/system/i18n/it_IT/orm.php
-lib/kohana/system/i18n/it_IT/pagination.php
-lib/kohana/system/i18n/it_IT/profiler.php
-lib/kohana/system/i18n/it_IT/session.php
-lib/kohana/system/i18n/it_IT/swift.php
-lib/kohana/system/i18n/it_IT/upload.php
-lib/kohana/system/i18n/it_IT/validation.php
-lib/kohana/system/i18n/nl_NL/cache.php
-lib/kohana/system/i18n/nl_NL/calendar.php
-lib/kohana/system/i18n/nl_NL/captcha.php
-lib/kohana/system/i18n/nl_NL/core.php
-lib/kohana/system/i18n/nl_NL/database.php
-lib/kohana/system/i18n/nl_NL/encrypt.php
-lib/kohana/system/i18n/nl_NL/errors.php
-lib/kohana/system/i18n/nl_NL/event.php
-lib/kohana/system/i18n/nl_NL/image.php
-lib/kohana/system/i18n/nl_NL/orm.php
-lib/kohana/system/i18n/nl_NL/pagination.php
-lib/kohana/system/i18n/nl_NL/profiler.php
-lib/kohana/system/i18n/nl_NL/session.php
-lib/kohana/system/i18n/nl_NL/swift.php
-lib/kohana/system/i18n/nl_NL/upload.php
-lib/kohana/system/i18n/nl_NL/validation.php
-lib/kohana/system/i18n/ru_RU/cache.php
-lib/kohana/system/i18n/ru_RU/calendar.php
-lib/kohana/system/i18n/ru_RU/captcha.php
-lib/kohana/system/i18n/ru_RU/core.php
-lib/kohana/system/i18n/ru_RU/database.php
-lib/kohana/system/i18n/ru_RU/encrypt.php
-lib/kohana/system/i18n/ru_RU/errors.php
-lib/kohana/system/i18n/ru_RU/event.php
-lib/kohana/system/i18n/ru_RU/image.php
-lib/kohana/system/i18n/ru_RU/orm.php
-lib/kohana/system/i18n/ru_RU/pagination.php
-lib/kohana/system/i18n/ru_RU/profiler.php
-lib/kohana/system/i18n/ru_RU/session.php
-lib/kohana/system/i18n/ru_RU/swift.php
-lib/kohana/system/i18n/ru_RU/upload.php
-lib/kohana/system/i18n/ru_RU/validation.php
-lib/kohana/system/libraries/Cache.php
-lib/kohana/system/libraries/Calendar.php
-lib/kohana/system/libraries/Calendar_Event.php
-lib/kohana/system/libraries/Captcha.php
-lib/kohana/system/libraries/Controller.php
-lib/kohana/system/libraries/Database.php
-lib/kohana/system/libraries/Database_Expression.php
-lib/kohana/system/libraries/Encrypt.php
-lib/kohana/system/libraries/Event_Observer.php
-lib/kohana/system/libraries/Event_Subject.php
-lib/kohana/system/libraries/Image.php
-lib/kohana/system/libraries/Input.php
-lib/kohana/system/libraries/Model.php
-lib/kohana/system/libraries/ORM.php
-lib/kohana/system/libraries/ORM_Iterator.php
-lib/kohana/system/libraries/ORM_Tree.php
-lib/kohana/system/libraries/ORM_Versioned.php
-lib/kohana/system/libraries/Pagination.php
-lib/kohana/system/libraries/Profiler.php
-lib/kohana/system/libraries/Profiler_Table.php
-lib/kohana/system/libraries/Router.php
-lib/kohana/system/libraries/Session.php
-lib/kohana/system/libraries/Tagcloud.php
-lib/kohana/system/libraries/URI.php
-lib/kohana/system/libraries/Validation.php
-lib/kohana/system/libraries/View.php
-lib/kohana/system/libraries/drivers/Cache.php
-lib/kohana/system/libraries/drivers/Cache/Apc.php
-lib/kohana/system/libraries/drivers/Cache/Eaccelerator.php
-lib/kohana/system/libraries/drivers/Cache/File.php
-lib/kohana/system/libraries/drivers/Cache/Memcache.php
-lib/kohana/system/libraries/drivers/Cache/Sqlite.php
-lib/kohana/system/libraries/drivers/Cache/Xcache.php
-lib/kohana/system/libraries/drivers/Captcha.php
-lib/kohana/system/libraries/drivers/Captcha/Alpha.php
-lib/kohana/system/libraries/drivers/Captcha/Basic.php
-lib/kohana/system/libraries/drivers/Captcha/Black.php
-lib/kohana/system/libraries/drivers/Captcha/Math.php
-lib/kohana/system/libraries/drivers/Captcha/Riddle.php
-lib/kohana/system/libraries/drivers/Captcha/Word.php
-lib/kohana/system/libraries/drivers/Database.php
-lib/kohana/system/libraries/drivers/Database/Mssql.php
-lib/kohana/system/libraries/drivers/Database/Mysql.php
-lib/kohana/system/libraries/drivers/Database/Mysqli.php
-lib/kohana/system/libraries/drivers/Database/Pdosqlite.php
-lib/kohana/system/libraries/drivers/Database/Pgsql.php
-lib/kohana/system/libraries/drivers/Image.php
-lib/kohana/system/libraries/drivers/Image/GD.php
-lib/kohana/system/libraries/drivers/Image/GraphicsMagick.php
-lib/kohana/system/libraries/drivers/Image/ImageMagick.php
-lib/kohana/system/libraries/drivers/Session.php
-lib/kohana/system/libraries/drivers/Session/Cache.php
-lib/kohana/system/libraries/drivers/Session/Cookie.php
-lib/kohana/system/libraries/drivers/Session/Database.php
-lib/kohana/system/views/kohana/template.php
-lib/kohana/system/views/kohana_calendar.php
-lib/kohana/system/views/kohana_error_disabled.php
-lib/kohana/system/views/kohana_error_page.php
-lib/kohana/system/views/kohana_errors.css
-lib/kohana/system/views/kohana_profiler.php
-lib/kohana/system/views/kohana_profiler_table.css
-lib/kohana/system/views/kohana_profiler_table.php
-lib/kohana/system/views/pagination/classic.php
-lib/kohana/system/views/pagination/digg.php
-lib/kohana/system/views/pagination/extended.php
-lib/kohana/system/views/pagination/punbb.php
-lib/npcdmod.o
-libexec/check_pnp_rrds.pl
-libexec/process_perfdata.pl
-libexec/rrd_convert.pl
-libexec/rrd_modify.pl
-@dirrm %%WWWDIR%%/media/js
-@dirrm %%WWWDIR%%/media/images
-@dirrm %%WWWDIR%%/media/css/ui-smoothness/images
-@dirrm %%WWWDIR%%/media/css/ui-smoothness
-@dirrm %%WWWDIR%%/media/css/ui-redmond/images
-@dirrm %%WWWDIR%%/media/css/ui-redmond
-@dirrm %%WWWDIR%%/media/css/ui-multisite/images
-@dirrm %%WWWDIR%%/media/css/ui-multisite
-@dirrm %%WWWDIR%%/media/css/ui-lightness/images
-@dirrm %%WWWDIR%%/media/css/ui-lightness
-@dirrm %%WWWDIR%%/media/css/images
-@dirrm %%WWWDIR%%/media/css
-@dirrm %%WWWDIR%%/media
+@dirrmtry %%ETCDIR%%/check_commands
+@dirrmtry %%ETCDIR%%/config.d
+@dirrmtry %%ETCDIR%%/pages
+@dirrmtry %%ETCDIR%%
+@dirrm lib/kohana/system/config
+@dirrm lib/kohana/system/controllers
+@dirrm lib/kohana/system/core/utf8
+@dirrm lib/kohana/system/core
+@dirrm lib/kohana/system/fonts
+@dirrm lib/kohana/system/helpers
+@dirrm lib/kohana/system/i18n/de_DE
+@dirrm lib/kohana/system/i18n/en_US
+@dirrm lib/kohana/system/i18n/es_ES
+@dirrm lib/kohana/system/i18n/fr_FR
+@dirrm lib/kohana/system/i18n/it_IT
+@dirrm lib/kohana/system/i18n/nl_NL
+@dirrm lib/kohana/system/i18n/ru_RU
+@dirrm lib/kohana/system/i18n
+@dirrm lib/kohana/system/libraries/drivers/Cache
+@dirrm lib/kohana/system/libraries/drivers/Captcha
+@dirrm lib/kohana/system/libraries/drivers/Database
+@dirrm lib/kohana/system/libraries/drivers/Image
+@dirrm lib/kohana/system/libraries/drivers/Session
+@dirrm lib/kohana/system/libraries/drivers
+@dirrm lib/kohana/system/libraries
+@dirrm lib/kohana/system/views/kohana
+@dirrm lib/kohana/system/views/pagination
+@dirrm lib/kohana/system/views
+@dirrm lib/kohana/system
+@dirrm lib/kohana
+@dirrm %%WWWDIR%%/application/cache
+@dirrm %%WWWDIR%%/application/config
+@dirrm %%WWWDIR%%/application/controllers
+@dirrm %%WWWDIR%%/application/helpers
+@dirrm %%WWWDIR%%/application/hooks
+@dirrm %%WWWDIR%%/application/i18n/de_DE
+@dirrm %%WWWDIR%%/application/i18n/en_US
+@dirrm %%WWWDIR%%/application/i18n/es_ES
+@dirrm %%WWWDIR%%/application/i18n/fr_FR
+@dirrm %%WWWDIR%%/application/i18n/ru_RU
+@dirrm %%WWWDIR%%/application/i18n
+@dirrm %%WWWDIR%%/application/lib
+@dirrm %%WWWDIR%%/application/models
+@dirrm %%WWWDIR%%/application/vendor/fpdf/filters
+@dirrm %%WWWDIR%%/application/vendor/fpdf/font
+@dirrm %%WWWDIR%%/application/vendor/fpdf
+@dirrm %%WWWDIR%%/application/vendor
+@dirrm %%WWWDIR%%/application/views
+@dirrm %%WWWDIR%%/application
@dirrm %%WWWDIR%%/documents/_media
@dirrm %%WWWDIR%%/documents/de_DE
@dirrm %%WWWDIR%%/documents/en_US
@dirrm %%WWWDIR%%/documents/images/smileys
@dirrm %%WWWDIR%%/documents/images
@dirrm %%WWWDIR%%/documents
-@dirrm %%WWWDIR%%/application/views
-@dirrm %%WWWDIR%%/application/vendor/fpdf/font
-@dirrm %%WWWDIR%%/application/vendor/fpdf/filters
-@dirrm %%WWWDIR%%/application/vendor/fpdf
-@dirrm %%WWWDIR%%/application/vendor
-@dirrm %%WWWDIR%%/application/models
-@dirrm %%WWWDIR%%/application/lib
-@dirrm %%WWWDIR%%/application/i18n/ru_RU
-@dirrm %%WWWDIR%%/application/i18n/fr_FR
-@dirrm %%WWWDIR%%/application/i18n/es_ES
-@dirrm %%WWWDIR%%/application/i18n/en_US
-@dirrm %%WWWDIR%%/application/i18n/de_DE
-@dirrm %%WWWDIR%%/application/i18n
-@dirrm %%WWWDIR%%/application/hooks
-@dirrm %%WWWDIR%%/application/helpers
-@dirrm %%WWWDIR%%/application/controllers
-@dirrm %%WWWDIR%%/application/config
-@dirrm %%WWWDIR%%/application/cache
-@dirrm %%WWWDIR%%/application
+@dirrm %%WWWDIR%%/media/css/images
+@dirrm %%WWWDIR%%/media/css/ui-lightness/images
+@dirrm %%WWWDIR%%/media/css/ui-lightness
+@dirrm %%WWWDIR%%/media/css/ui-multisite/images
+@dirrm %%WWWDIR%%/media/css/ui-multisite
+@dirrm %%WWWDIR%%/media/css/ui-redmond/images
+@dirrm %%WWWDIR%%/media/css/ui-redmond
+@dirrm %%WWWDIR%%/media/css/ui-smoothness/images
+@dirrm %%WWWDIR%%/media/css/ui-smoothness
+@dirrm %%WWWDIR%%/media/css
+@dirrm %%WWWDIR%%/media/images
+@dirrm %%WWWDIR%%/media/js
+@dirrm %%WWWDIR%%/media
@dirrmtry %%WWWDIR%%/templates
@dirrm %%WWWDIR%%/templates.dist
@dirrm %%WWWDIR%%/templates.special
@dirrmtry %%WWWDIR%%
-@dirrm lib/kohana/system/views/pagination
-@dirrm lib/kohana/system/views/kohana
-@dirrm lib/kohana/system/views
-@dirrm lib/kohana/system/libraries/drivers/Session
-@dirrm lib/kohana/system/libraries/drivers/Image
-@dirrm lib/kohana/system/libraries/drivers/Database
-@dirrm lib/kohana/system/libraries/drivers/Captcha
-@dirrm lib/kohana/system/libraries/drivers/Cache
-@dirrm lib/kohana/system/libraries/drivers
-@dirrm lib/kohana/system/libraries
-@dirrm lib/kohana/system/i18n/ru_RU
-@dirrm lib/kohana/system/i18n/nl_NL
-@dirrm lib/kohana/system/i18n/it_IT
-@dirrm lib/kohana/system/i18n/fr_FR
-@dirrm lib/kohana/system/i18n/es_ES
-@dirrm lib/kohana/system/i18n/en_US
-@dirrm lib/kohana/system/i18n/de_DE
-@dirrm lib/kohana/system/i18n
-@dirrm lib/kohana/system/helpers
-@dirrm lib/kohana/system/fonts
-@dirrm lib/kohana/system/core/utf8
-@dirrm lib/kohana/system/core
-@dirrm lib/kohana/system/controllers
-@dirrm lib/kohana/system/config
-@dirrm lib/kohana/system
-@dirrm lib/kohana
-@dirrmtry %%ETCDIR%%/config.d
-@dirrmtry %%ETCDIR%%/check_commands
-@dirrmtry %%ETCDIR%%/pages
-@dirrmtry %%ETCDIR%%
+@unexec rmdir "/var/log/kohana" >/dev/null 2>&1 || :
+@unexec rmdir "/var/log/stats" >/dev/null 2>&1 || :
+@unexec rmdir "%%NAGIOSDIR%%/pnp/perfspool" >/dev/null 2>&1 || :
+@unexec rmdir "%%NAGIOSDIR%%/pnp/rrd" >/dev/null 2>&1 || :
+@unexec rmdir "%%NAGIOSDIR%%/pnp" >/dev/null 2>&1 || :
+@unexec rmdir "%%NAGIOSDIR%%" >/dev/null 2>&1 || :
--- pnp-0.21.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405011310.s41DARl9043448>