head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.56
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.54
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.52
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.50
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.48
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.46
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.44
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.42
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.40
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.38
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.36
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.34
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.32
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.30
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.28
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.26
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.24
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.22
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.20
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.18
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.16
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.14
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.12
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.10
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.6
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.8
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.4
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.2
	pkgsrc-2019Q2-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2019.04.29.16.09.05;	author hauke;	state Exp;
branches;
next	;
commitid	0VtNE4bzquaqcglB;


desc
@@


1.1
log
@Completing the upgrade to Cacti v1.2.3.

Funny enough, the previous commit coincided with my own work on a
package upgrade. It brought a few bits and bobs I had been missing,
and my work closes a few of its gaps.

In detail:

INSTALL - set CACTI_USER and APACHE_GROUP properly

MESSAGES - mention newer PHPs' php.d, while updating the extension list
           mention <https://github.com/Cacti/cacti/issues/2621> setup problem

Makefile - add mandatory dependencies: php-{json,zlib,mbstring,posix}
           add patched files to 'paths' substitution

files/httpd-cacti.conf - convert to Apache 2.4 ACL syntax

patches/ - comments, CACTI_LOGDIR substitution

Minor touch-ups everywhere - I am sure there is more to do.

The result pkglints, builds, installs, configures (taking the above
#2621 into account), and runs.
@
text
@$NetBSD$

Make log directory configurable by package variable

--- lib/functions.php.orig	2019-03-30 23:40:23.000000000 +0000
+++ lib/functions.php
@@@@ -832,7 +832,7 @@@@ function cacti_log_file() {
 	global $config;
 	$logfile        = read_config_option('path_cactilog');
 	if ($logfile == '') {
-		$logfile = $config['base_path'] . '/log/cacti.log';
+		$logfile = '@@CACTI_LOGDIR@@' . '/cacti.log';
 	}
 	$config['log_path'] = $logfile;
 	return $logfile;
@