Date: Sat, 10 Nov 2018 05:05:53 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484572 - head/net-mgmt/nagiosql Message-ID: <201811100505.wAA55rqf063193@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sat Nov 10 05:05:53 2018 New Revision: 484572 URL: https://svnweb.freebsd.org/changeset/ports/484572 Log: net-mgmt/nagiosql: Update to 3.4.0 PR: 231671 Submitted by: Helmut Ritter <freebsd-ports@charlieroot.de> Approved by: maintainer timeout (chris@smartt.com, >2 weeks) Modified: head/net-mgmt/nagiosql/Makefile (contents, props changed) head/net-mgmt/nagiosql/distinfo (contents, props changed) head/net-mgmt/nagiosql/pkg-plist (contents, props changed) Modified: head/net-mgmt/nagiosql/Makefile ============================================================================== --- head/net-mgmt/nagiosql/Makefile Sat Nov 10 04:19:24 2018 (r484571) +++ head/net-mgmt/nagiosql/Makefile Sat Nov 10 05:05:53 2018 (r484572) @@ -2,26 +2,19 @@ # $FreeBSD$ PORTNAME= nagiosql -PORTVERSION= 3.2.0 -PORTREVISION= 2 +PORTVERSION= 3.4.0 CATEGORIES= net-mgmt www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NagiosQL%20${PORTVERSION}/ -DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g} -DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}_SP2 MAINTAINER= chris@smartt.com COMMENT= Web based administration tool for Nagios LICENSE= GPLv2 -IGNORE_WITH_PHP= 70 71 72 73 - RUN_DEPENDS= nagios:net-mgmt/nagios \ ${PEARDIR}/HTML/Template/IT.php:devel/pear-HTML_Template_IT@${PHP_FLAVOR} -USE_MYSQL= yes -USES= cpe gettext php:web tar:bzip2 -USE_PHP= mysql filter gettext session simplexml +USES= cpe gettext mysql tar:bzip2 php:filter,gettext,mysql,session,simplexml,web USERS?= nagios GROUPS?= nagios @@ -29,7 +22,7 @@ NAGIOSUSER?= nagios NO_BUILD= yes NO_ARCH= yes -WRKSRC= ${WRKDIR}/${PORTNAME}32 +WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= pkg-message PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NAGIOSUSER=${NAGIOSUSER} @@ -53,10 +46,10 @@ post-patch: -e "s|nagiosql/etc/|${ETCDIR}/|" \ -e "s|\>/etc/nagiosql|\>${ETCDIR}|g" \ -e "s|\>/etc/nagios/|\>${LOCALBASE}/etc/nagios/|g" \ - ${WRKSRC}/install/sql/nagiosQL_v32_db_mysql.sql + ${WRKSRC}-${PORTVERSION}/install/sql/nagiosQL_v32_db_mysql.sql ${REINPLACE_CMD} -e "s|\"/etc/|\"${LOCALBASE}/etc/|" \ - ${WRKSRC}/install/install.php + ${WRKSRC}-${PORTVERSION}/install/install.php do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} @@ -68,6 +61,6 @@ do-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/backup/hosts @${MKDIR} ${STAGEDIR}${ETCDIR}/backup/services @${MKDIR} ${STAGEDIR}${ETCDIR}/backup/ssh - (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! ( -name *\.orig -o -name *\.bak )") + (cd ${WRKSRC}-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! ( -name *\.orig -o -name *\.bak )") .include <bsd.port.mk> Modified: head/net-mgmt/nagiosql/distinfo ============================================================================== --- head/net-mgmt/nagiosql/distinfo Sat Nov 10 04:19:24 2018 (r484571) +++ head/net-mgmt/nagiosql/distinfo Sat Nov 10 05:05:53 2018 (r484572) @@ -1,2 +1,3 @@ -SHA256 (nagiosql/3.2.0_SP2/nagiosql_320.tar.bz2) = 32a019ec6b13342257787d83839c5913f87534d840e96ebde8d663e656833d4d -SIZE (nagiosql/3.2.0_SP2/nagiosql_320.tar.bz2) = 996713 +TIMESTAMP = 1539089848 +SHA256 (nagiosql-3.4.0.tar.bz2) = b03a8ef59785cf52ec9cce152c49198a7ae2ac14c54120740d53df834156d403 +SIZE (nagiosql-3.4.0.tar.bz2) = 1032592 Modified: head/net-mgmt/nagiosql/pkg-plist ============================================================================== --- head/net-mgmt/nagiosql/pkg-plist Sat Nov 10 04:19:24 2018 (r484571) +++ head/net-mgmt/nagiosql/pkg-plist Sat Nov 10 05:05:53 2018 (r484572) @@ -107,22 +107,24 @@ %%WWWDIR%%/doc/INSTALLATION_deDE.txt %%WWWDIR%%/doc/INSTALLATION_enGB.txt %%WWWDIR%%/doc/LICENSE -%%WWWDIR%%/doc/LIZENZ %%WWWDIR%%/doc/README_SSH_KEY %%WWWDIR%%/favicon.ico +%%WWWDIR%%/functions/Autoloader.php +%%WWWDIR%%/functions/MysqliDbClass.php +%%WWWDIR%%/functions/NagConfigClass.php +%%WWWDIR%%/functions/NagContentClass.php +%%WWWDIR%%/functions/NagDataClass.php +%%WWWDIR%%/functions/NagImportClass.php +%%WWWDIR%%/functions/NagVisualClass.php %%WWWDIR%%/functions/common.js -%%WWWDIR%%/functions/config_class.php -%%WWWDIR%%/functions/content_class.php -%%WWWDIR%%/functions/data_class.php -%%WWWDIR%%/functions/import_class.php -%%WWWDIR%%/functions/mysql_class.php -%%WWWDIR%%/functions/nag_class.php %%WWWDIR%%/functions/prepend_adm.php %%WWWDIR%%/functions/prepend_content.php %%WWWDIR%%/functions/prepend_scripting.php %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/langs/en.js %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/license.txt %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js +%%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/safari/blank.htm +%%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/safari/editor_plugin.js %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js @@ -225,6 +227,7 @@ %%WWWDIR%%/functions/yui/build/datatable/assets/skins/sam/dt-arrow-dn.png %%WWWDIR%%/functions/yui/build/datatable/assets/skins/sam/dt-arrow-up.png %%WWWDIR%%/functions/yui/build/datatable/datatable-min.js +%%WWWDIR%%/functions/yui/build/element/element-beta-min.js %%WWWDIR%%/functions/yui/build/element/element-min.js %%WWWDIR%%/functions/yui/build/event-delegate/event-delegate-min.js %%WWWDIR%%/functions/yui/build/fonts/fonts-min.css @@ -268,8 +271,8 @@ %%WWWDIR%%/images/write.gif %%WWWDIR%%/index.php %%WWWDIR%%/install/css/install.css +%%WWWDIR%%/install/functions/NagInstallClass.php %%WWWDIR%%/install/functions/initial_settings.php -%%WWWDIR%%/install/functions/install_class.php %%WWWDIR%%/install/functions/prepend_install.php %%WWWDIR%%/install/images/background.png %%WWWDIR%%/install/images/body_background.png @@ -302,6 +305,7 @@ %%WWWDIR%%/install/install.php %%WWWDIR%%/install/sql/import_nagios_sample.sql %%WWWDIR%%/install/sql/nagiosQL_v32_db_mysql.sql +%%WWWDIR%%/install/sql/nagiosQL_v34_db_mysql.sql %%WWWDIR%%/install/sql/update_300_301.sql %%WWWDIR%%/install/sql/update_300_310.sql %%WWWDIR%%/install/sql/update_301_302.sql @@ -311,14 +315,15 @@ %%WWWDIR%%/install/sql/update_310_311.sql %%WWWDIR%%/install/sql/update_310_320.sql %%WWWDIR%%/install/sql/update_311_320.sql +%%WWWDIR%%/install/sql/update_320_340.sql %%WWWDIR%%/install/step1.php %%WWWDIR%%/install/step2.php %%WWWDIR%%/install/step3.php -%%WWWDIR%%/install/templates/index.tpl.htm -%%WWWDIR%%/install/templates/install.tpl.htm -%%WWWDIR%%/install/templates/step1.tpl.htm -%%WWWDIR%%/install/templates/step2.tpl.htm -%%WWWDIR%%/install/templates/step3.tpl.htm +%%WWWDIR%%/install/templates/index.htm.tpl +%%WWWDIR%%/install/templates/install.htm.tpl +%%WWWDIR%%/install/templates/step1.htm.tpl +%%WWWDIR%%/install/templates/step2.htm.tpl +%%WWWDIR%%/install/templates/step3.htm.tpl %%WWWDIR%%/libraries/pear/HTML/Template/IT.php %%WWWDIR%%/libraries/pear/HTML/Template/ITX.php %%WWWDIR%%/libraries/pear/HTML/Template/IT_Error.php @@ -328,38 +333,43 @@ %%WWWDIR%%/libraries/pear/PEAR5.php %%WWWDIR%%/libraries/pear/index.html %%WWWDIR%%/scripts/do_config.php -%%WWWDIR%%/templates/admin/admin_master.tpl.htm -%%WWWDIR%%/templates/admin/checkcommands.tpl.htm -%%WWWDIR%%/templates/admin/configtargets.tpl.htm -%%WWWDIR%%/templates/admin/contactgroups.tpl.htm -%%WWWDIR%%/templates/admin/contacts.tpl.htm -%%WWWDIR%%/templates/admin/contacttemplates.tpl.htm -%%WWWDIR%%/templates/admin/datadomain.tpl.htm -%%WWWDIR%%/templates/admin/delbackup.tpl.htm -%%WWWDIR%%/templates/admin/domain.tpl.htm -%%WWWDIR%%/templates/admin/group.tpl.htm -%%WWWDIR%%/templates/admin/helpedit.tpl.htm -%%WWWDIR%%/templates/admin/hostdependencies.tpl.htm -%%WWWDIR%%/templates/admin/hostescalations.tpl.htm -%%WWWDIR%%/templates/admin/hostextinfo.tpl.htm -%%WWWDIR%%/templates/admin/hostgroups.tpl.htm -%%WWWDIR%%/templates/admin/hosts.tpl.htm -%%WWWDIR%%/templates/admin/hosttemplates.tpl.htm -%%WWWDIR%%/templates/admin/import.tpl.htm -%%WWWDIR%%/templates/admin/mainpages.tpl.htm -%%WWWDIR%%/templates/admin/mutdialog.tpl.htm -%%WWWDIR%%/templates/admin/nagioscfg.tpl.htm -%%WWWDIR%%/templates/admin/servicedependencies.tpl.htm -%%WWWDIR%%/templates/admin/serviceescalations.tpl.htm -%%WWWDIR%%/templates/admin/serviceextinfo.tpl.htm -%%WWWDIR%%/templates/admin/servicegroups.tpl.htm -%%WWWDIR%%/templates/admin/services.tpl.htm -%%WWWDIR%%/templates/admin/servicetemplates.tpl.htm -%%WWWDIR%%/templates/admin/settings.tpl.htm -%%WWWDIR%%/templates/admin/support.tpl.htm -%%WWWDIR%%/templates/admin/timeperiods.tpl.htm -%%WWWDIR%%/templates/admin/user.tpl.htm -%%WWWDIR%%/templates/admin/verify.tpl.htm +%%WWWDIR%%/templates/admin/checkcommands.htm.tpl +%%WWWDIR%%/templates/admin/configtargets.htm.tpl +%%WWWDIR%%/templates/admin/contactgroups.htm.tpl +%%WWWDIR%%/templates/admin/contacts.htm.tpl +%%WWWDIR%%/templates/admin/contacttemplates.htm.tpl +%%WWWDIR%%/templates/admin/datadomain.htm.tpl +%%WWWDIR%%/templates/admin/datalist.htm.tpl +%%WWWDIR%%/templates/admin/datalist_common.htm.tpl +%%WWWDIR%%/templates/admin/datalist_hosts.htm.tpl +%%WWWDIR%%/templates/admin/datalist_services.htm.tpl +%%WWWDIR%%/templates/admin/delbackup.htm.tpl +%%WWWDIR%%/templates/admin/group.htm.tpl +%%WWWDIR%%/templates/admin/helpedit.htm.tpl +%%WWWDIR%%/templates/admin/hostdependencies.htm.tpl +%%WWWDIR%%/templates/admin/hostescalations.htm.tpl +%%WWWDIR%%/templates/admin/hostextinfo.htm.tpl +%%WWWDIR%%/templates/admin/hostgroups.htm.tpl +%%WWWDIR%%/templates/admin/hosts.htm.tpl +%%WWWDIR%%/templates/admin/hosttemplates.htm.tpl +%%WWWDIR%%/templates/admin/import.htm.tpl +%%WWWDIR%%/templates/admin/logbook.htm.tpl +%%WWWDIR%%/templates/admin/mainpages.htm.tpl +%%WWWDIR%%/templates/admin/menuaccess.htm.tpl +%%WWWDIR%%/templates/admin/mutdialog.htm.tpl +%%WWWDIR%%/templates/admin/nagioscfg.htm.tpl +%%WWWDIR%%/templates/admin/password.htm.tpl +%%WWWDIR%%/templates/admin/servicedependencies.htm.tpl +%%WWWDIR%%/templates/admin/serviceescalations.htm.tpl +%%WWWDIR%%/templates/admin/serviceextinfo.htm.tpl +%%WWWDIR%%/templates/admin/servicegroups.htm.tpl +%%WWWDIR%%/templates/admin/services.htm.tpl +%%WWWDIR%%/templates/admin/servicetemplates.htm.tpl +%%WWWDIR%%/templates/admin/settings.htm.tpl +%%WWWDIR%%/templates/admin/support.htm.tpl +%%WWWDIR%%/templates/admin/timeperiods.htm.tpl +%%WWWDIR%%/templates/admin/user.htm.tpl +%%WWWDIR%%/templates/admin/verify.htm.tpl %%WWWDIR%%/templates/files/commands.tpl.dat %%WWWDIR%%/templates/files/contactgroups.tpl.dat %%WWWDIR%%/templates/files/contacts.tpl.dat @@ -377,20 +387,11 @@ %%WWWDIR%%/templates/files/services.tpl.dat %%WWWDIR%%/templates/files/servicetemplates.tpl.dat %%WWWDIR%%/templates/files/timeperiods.tpl.dat -%%WWWDIR%%/templates/index.tpl.htm -%%WWWDIR%%/templates/main.tpl.htm -@dir(%%WWWOWN%%,%%WWWGRP%%) %%WWWDIR%%/config -@mode 750 -@owner %%WWWOWN%% -@group %%NAGIOSUSER%% -@dir %%ETCDIR%%/ssh -@dir %%ETCDIR%%/services -@dir %%ETCDIR%%/hosts -@dir %%ETCDIR%%/backup/ssh -@dir %%ETCDIR%%/backup/services +%%WWWDIR%%/templates/index.htm.tpl +%%WWWDIR%%/templates/main.htm.tpl @dir %%ETCDIR%%/backup/hosts -@dir %%ETCDIR%%/backup -@dir %%ETCDIR%% -@mode -@owner -@group +@dir %%ETCDIR%%/backup/services +@dir %%ETCDIR%%/backup/ssh +@dir %%ETCDIR%%/hosts +@dir %%ETCDIR%%/services +@dir %%ETCDIR%%/ssh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811100505.wAA55rqf063193>