diff -ruN net-mgmt/cacti.orig/Makefile net-mgmt/cacti/Makefile --- net-mgmt/cacti.orig/Makefile 2016-05-28 21:09:26.000000000 +0100 +++ net-mgmt/cacti/Makefile 2017-02-07 19:11:15.707870000 +0000 @@ -1,7 +1,7 @@ # $FreeBSD: head/net-mgmt/cacti/Makefile 416066 2016-05-28 20:09:26Z pi $ PORTNAME= cacti -PORTVERSION= 0.8.8h${PATCHLEVEL} +PORTVERSION= 1.0.1 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ @@ -14,9 +14,8 @@ RUN_DEPENDS= rrdtool:databases/rrdtool -USES= cpe mysql shebangfix -USE_PHP= mysqli pcre session sockets snmp xml -WANT_PHP_WEB= yes +USES= cpe mysql php:web shebangfix +USE_PHP= ctype filter gd gmp hash json ldap mbstring openssl pcre pdo pdo_mysql posix session simplexml sockets snmp xml zlib NO_ARCH= yes NO_BUILD= yes PKGMESSAGE= ${WRKDIR}/pkg-message diff -ruN net-mgmt/cacti.orig/distinfo net-mgmt/cacti/distinfo --- net-mgmt/cacti.orig/distinfo 2016-05-28 21:09:26.000000000 +0100 +++ net-mgmt/cacti/distinfo 2017-02-07 19:11:42.869756000 +0000 @@ -1,2 +1,3 @@ -SHA256 (cacti-0.8.8h.tar.gz) = 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600 -SIZE (cacti-0.8.8h.tar.gz) = 2585226 +TIMESTAMP = 1486494702 +SHA256 (cacti-1.0.1.tar.gz) = cc36b83653cecd2be0a4a239927dcdaafeb81e7fd7ad6f97c664edcb7fb07628 +SIZE (cacti-1.0.1.tar.gz) = 7230227 diff -ruN net-mgmt/cacti.orig/files/patch-include__global.php net-mgmt/cacti/files/patch-include__global.php --- net-mgmt/cacti.orig/files/patch-include__global.php 2015-04-24 04:07:55.000000000 +0100 +++ net-mgmt/cacti/files/patch-include__global.php 2017-02-04 14:13:07.687302000 +0000 @@ -1,11 +1,11 @@ ---- include/global.php.bak 2015-03-12 03:07:05.768314249 -0700 -+++ include/global.php 2015-03-12 03:08:04.171320391 -0700 -@@ -113,7 +113,7 @@ - $config["library_path"] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__)); +--- include/global.php.orig 2017-02-04 14:12:12.747287000 +0000 ++++ include/global.php 2017-02-04 14:12:32.931726000 +0000 +@@ -126,7 +126,7 @@ + $config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__)); } - $config["include_path"] = dirname(__FILE__); --$config["rra_path"] = $config["base_path"] . '/rra'; -+$config["rra_path"] = '/var/db/cacti/rra'; + $config['include_path'] = dirname(__FILE__); +-$config['rra_path'] = $config['base_path'] . '/rra'; ++$config['rra_path'] = '/var/db/cacti/rra'; - /* colors */ - $colors["dark_outline"] = "454E53"; + /* for multiple pollers, we need to know this location */ + if (!isset($scripts_path)) { diff -ruN net-mgmt/cacti.orig/files/patch-include__global_settings.php net-mgmt/cacti/files/patch-include__global_settings.php --- net-mgmt/cacti.orig/files/patch-include__global_settings.php 2015-04-24 04:07:55.000000000 +0100 +++ net-mgmt/cacti/files/patch-include__global_settings.php 2017-02-04 14:20:40.761203000 +0000 @@ -1,11 +1,14 @@ ---- include/global_settings.php.bak 2015-03-12 03:08:59.333297709 -0700 -+++ include/global_settings.php 2015-03-12 03:10:47.532302704 -0700 -@@ -96,7 +96,7 @@ +--- include/global_settings.php.orig 2017-02-04 14:13:42.140386000 +0000 ++++ include/global_settings.php 2017-02-04 14:20:35.592474000 +0000 +@@ -135,9 +135,9 @@ ), - "path_cactilog" => array( - "friendly_name" => "Cacti Log File Path", -- "description" => "The path to your Cacti log file (if blank, defaults to /log/cacti.log)", -+ "description" => "The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)", - "method" => "filepath", - "default" => $config["base_path"] . "/log/cacti.log", - "max_length" => "255" + 'path_cactilog' => array( + 'friendly_name' => __('Cacti Log Path'), +- 'description' => __('The path to your Cacti log file (if blank, defaults to /log/cacti.log)'), ++ 'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'), + 'method' => 'filepath', +- 'default' => $config['base_path'] . '/log/cacti.log', ++ 'default' => '/var/log/cacti/log', + 'max_length' => '255' + ), + 'logrotate_enabled' => array( diff -ruN net-mgmt/cacti.orig/files/patch-install__functions.php net-mgmt/cacti/files/patch-install__functions.php --- net-mgmt/cacti.orig/files/patch-install__functions.php 1970-01-01 01:00:00.000000000 +0100 +++ net-mgmt/cacti/files/patch-install__functions.php 2017-02-04 14:21:54.288659000 +0000 @@ -0,0 +1,11 @@ +--- install/functions.php.orig 2017-02-04 14:21:02.093580000 +0000 ++++ install/functions.php 2017-02-04 14:21:31.615575000 +0000 +@@ -365,7 +365,7 @@ + if (config_value_exists('path_cactilog')) { + $input['path_cactilog']['default'] = read_config_option('path_cactilog'); + } else { +- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log'; ++ $input['path_cactilog']['default'] = '/var/log/cacti/log'; + } + + /* Theme */ diff -ruN net-mgmt/cacti.orig/files/patch-install__index.php net-mgmt/cacti/files/patch-install__index.php --- net-mgmt/cacti.orig/files/patch-install__index.php 2016-05-28 21:09:26.000000000 +0100 +++ net-mgmt/cacti/files/patch-install__index.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ ---- install/index.php.orig 2016-05-28 10:54:08.124059773 +0100 -+++ install/index.php 2016-05-28 10:54:34.252057818 +0100 -@@ -63,7 +63,7 @@ - } - - function verify_php_extensions() { -- $extensions = array("session", "sockets", "mysql", "xml"); -+ $extensions = array("session", "sockets", "mysqli", "xml"); - $ok = true; - $missing_extension = "

Error

-

The following PHP extensions are missing: