Index: head/net-mgmt/cacti/Makefile =================================================================== --- head/net-mgmt/cacti/Makefile (revision 490476) +++ head/net-mgmt/cacti/Makefile (revision 490477) @@ -1,68 +1,73 @@ # $FreeBSD$ PORTNAME= cacti PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ MAINTAINER= freebsd-ports@dan.me.uk COMMENT= Web-driven graphing interface for RRDTool LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rrdtool:databases/rrdtool USES= cpe mysql php:web shebangfix USE_PHP= ctype filter gd gettext gmp hash json ldap mbstring openssl pcre pdo pdo_mysql posix session simplexml sockets snmp xml zlib NO_ARCH= yes NO_BUILD= yes SUB_FILES= pkg-message SHEBANG_FILES= scripts/3com_cable_modem.pl \ scripts/diskfree.pl \ scripts/linux_memory.pl \ scripts/loadavg.pl \ scripts/loadavg_multi.pl \ scripts/ping.pl \ scripts/query_unix_partitions.pl \ scripts/unix_processes.pl \ scripts/unix_tcp_connections.pl \ scripts/unix_users.pl \ scripts/weatherbug.pl \ scripts/webhits.pl CACTIDIR?= share/cacti CACTIUSER?= cacti CACTIGROUP?= cacti USERS?= ${CACTIUSER} GROUPS?= ${CACTIGROUP} PLIST_SUB+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ CACTIGROUP=${CACTIGROUP} SUB_LIST+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ CACTIGROUP=${CACTIGROUP} CONFLICTS_INSTALL= cacti88 + +OPTIONS_DEFINE= SNMPBIN +OPTIONS_DEFAULT= SNMPBIN +SNMPBIN_DESC= Force use of SNMP binary instead of phpXX-snmp functions +SNMPBIN_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_snmp.php post-patch: @${FIND} ${WRKSRC} -name \*.orig -delete; \ ${MV} ${WRKSRC}/include/config.php ${WRKSRC}/include/config.php.sample ${RM} -r ${WRKSRC}/log ${WRKSRC}/rra do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${CACTIDIR} ${MKDIR} ${STAGEDIR}/var/log/cacti ${MKDIR} ${STAGEDIR}/var/db/cacti/rra ${MKDIR} ${STAGEDIR}/var/db/cacti/scripts ${CP} -R ${WRKSRC}/* ${STAGEDIR}/${PREFIX}/${CACTIDIR} if [ -f ${PREFIX}/${CACTIDIR}/include/db-settings.php ]; then \ ${ECHO_CMD} "======================================================================="; \ ${ECHO_CMD} "WARNING! You have to move DB settings from"; \ ${ECHO_CMD} "${PREFIX}/${CACTIDIR}/include/db-settings.php file to"; \ ${ECHO_CMD} "${PREFIX}/${CACTIDIR}/include/config.php and remove db-settings.php"; \ fi .include Index: head/net-mgmt/cacti/files/extra-patch-lib_snmp.php =================================================================== --- head/net-mgmt/cacti/files/extra-patch-lib_snmp.php (nonexistent) +++ head/net-mgmt/cacti/files/extra-patch-lib_snmp.php (revision 490477) @@ -0,0 +1,12 @@ +--- lib/snmp.php.orig 2019-01-14 19:28:50 UTC ++++ lib/snmp.php +@@ -870,6 +870,9 @@ function snmp_escape_string($string) { + function snmp_get_method($type = 'walk', $version = 1, $context = '', $engineid = '', + $value_output_format = SNMP_STRING_OUTPUT_GUESS) { + ++ /* override PHP SNMP calls and use the binary instead, fixes some broken graph issues */ ++ return SNMP_METHOD_BINARY; ++ + if ($value_output_format == SNMP_STRING_OUTPUT_HEX) { + return SNMP_METHOD_BINARY; + } elseif ($version == 3 && $context != '') { Property changes on: head/net-mgmt/cacti/files/extra-patch-lib_snmp.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property