Date: Wed, 16 Nov 2016 15:23:48 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426242 - in head/net-mgmt/observium: . files Message-ID: <201611161523.uAGFNmen003056@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Wed Nov 16 15:23:47 2016 New Revision: 426242 URL: https://svnweb.freebsd.org/changeset/ports/426242 Log: net-mgmt/observium: Fix shebang in poller-wrapper.py While here, modernize port Modified: head/net-mgmt/observium/Makefile head/net-mgmt/observium/files/patch-poller-wrapper.py Modified: head/net-mgmt/observium/Makefile ============================================================================== --- head/net-mgmt/observium/Makefile Wed Nov 16 14:52:53 2016 (r426241) +++ head/net-mgmt/observium/Makefile Wed Nov 16 15:23:47 2016 (r426242) @@ -3,7 +3,7 @@ PORTNAME= observium PORTVERSION= 0.16.10.8128 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest @@ -16,7 +16,7 @@ LICENSE= GPLv3 WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python shebangfix +USES= php:cli python shebangfix SHEBANG_FILES= mibs/process.pl \ scripts/agent-local/areca-hw \ scripts/agent-local/asterisk \ @@ -51,10 +51,10 @@ SHEBANG_FILES= mibs/process.pl \ scripts/removespikes.php \ scripts/removespikes.pl \ scripts/rename-mibs.pl \ - scripts/rrdtoolx.py + scripts/rrdtoolx.py \ + poller-wrapper.py USE_PHP= ctype filter gd iconv json mcrypt mysql mysqli posix session snmp tokenizer xml zlib -WANT_PHP_CLI= yes IGNORE_WITH_PHP= 70 NO_BUILD= yes @@ -102,17 +102,17 @@ PORTDOCS= INSTALL README PORTEXAMPLES= snmp.conf.example snmpd.conf.example .if ${PORT_OPTIONS:MAPACHEMOD} && !defined(PACKAGE_BUILDING) -WANT_PHP_MOD= yes +USES+= php:mod USE_APACHE_RUN= 22+ .else # Package builder doesn't create php5 with module -WANT_PHP_WEB= yes +USES+= php:web .endif .if ${PORT_OPTIONS:MMYSQLD} -USE_MYSQL= server +USES+= mysql:server .else -USE_MYSQL= client +USES+= mysql:client .endif post-patch: Modified: head/net-mgmt/observium/files/patch-poller-wrapper.py ============================================================================== --- head/net-mgmt/observium/files/patch-poller-wrapper.py Wed Nov 16 14:52:53 2016 (r426241) +++ head/net-mgmt/observium/files/patch-poller-wrapper.py Wed Nov 16 15:23:47 2016 (r426242) @@ -1,11 +1,5 @@ --- poller-wrapper.py.orig 2014-11-04 16:14:27 UTC +++ poller-wrapper.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! %%LOCALBASE%%/bin/python - """ - poller-wrapper A small tool which wraps around the Observium poller - and tries to guide the polling process with a more modern @@ -38,6 +38,8 @@ except: print "threading, Queue, sys, subprocess, time, os, json" sys.exit(2)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611161523.uAGFNmen003056>