From owner-svn-ports-head@freebsd.org Sun Apr 8 12:20:00 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F939F9F6D4; Sun, 8 Apr 2018 12:20:00 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CB04C80B41; Sun, 8 Apr 2018 12:19:59 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5DE07B28; Sun, 8 Apr 2018 12:19:59 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w38CJxhT067459; Sun, 8 Apr 2018 12:19:59 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w38CJwI0067450; Sun, 8 Apr 2018 12:19:58 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201804081219.w38CJwI0067450@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 8 Apr 2018 12:19:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466796 - in head/net-mgmt: hawk klg nagiosql nedi ocsinventory-ng pandorafms_console phpip zabbix2-frontend X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/net-mgmt: hawk klg nagiosql nedi ocsinventory-ng pandorafms_console phpip zabbix2-frontend X-SVN-Commit-Revision: 466796 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2018 12:20:00 -0000 Author: brnrd Date: Sun Apr 8 12:19:58 2018 New Revision: 466796 URL: https://svnweb.freebsd.org/changeset/ports/466796 Log: category net-mgmt: Convert to USES=php Approved by: infrastructure modernization blanket Modified: head/net-mgmt/hawk/Makefile head/net-mgmt/klg/Makefile head/net-mgmt/nagiosql/Makefile head/net-mgmt/nedi/Makefile head/net-mgmt/ocsinventory-ng/Makefile head/net-mgmt/pandorafms_console/Makefile head/net-mgmt/phpip/Makefile head/net-mgmt/zabbix2-frontend/Makefile Modified: head/net-mgmt/hawk/Makefile ============================================================================== --- head/net-mgmt/hawk/Makefile Sun Apr 8 12:12:24 2018 (r466795) +++ head/net-mgmt/hawk/Makefile Sun Apr 8 12:19:58 2018 (r466796) @@ -16,10 +16,8 @@ RUN_DEPENDS= p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask p5-DBI>=0:databases/p5-DBI \ p5-DBD-mysql>=0:databases/p5-DBD-mysql -USES= perl5 -USE_MYSQL= server +USES= mysql:server php:mod perl5 USE_PHP= mysql -WANT_PHP_MOD= yes IGNORE_WITH_PHP= 70 71 NO_BUILD= yes Modified: head/net-mgmt/klg/Makefile ============================================================================== --- head/net-mgmt/klg/Makefile Sun Apr 8 12:12:24 2018 (r466795) +++ head/net-mgmt/klg/Makefile Sun Apr 8 12:19:58 2018 (r466796) @@ -11,10 +11,8 @@ COMMENT= PHP-based looking glass for Cisco, Juniper an LICENSE= BSD3CLAUSE -USES= tar:txz php -USE_MYSQL= yes +USES= mysql tar:txz php:web USE_PHP= mysql pcre sockets xml -WANT_PHP_WEB= yes NO_ARCH= yes NO_BUILD= yes PKGMESSAGE= ${WRKDIR}/pkg-message Modified: head/net-mgmt/nagiosql/Makefile ============================================================================== --- head/net-mgmt/nagiosql/Makefile Sun Apr 8 12:12:24 2018 (r466795) +++ head/net-mgmt/nagiosql/Makefile Sun Apr 8 12:19:58 2018 (r466796) @@ -18,9 +18,8 @@ RUN_DEPENDS= nagios:net-mgmt/nagios \ ${PEARDIR}/HTML/Template/IT.php:devel/pear-HTML_Template_IT@${PHP_FLAVOR} USE_MYSQL= yes -USES= cpe gettext tar:bzip2 +USES= cpe gettext php:web tar:bzip2 USE_PHP= mysql filter gettext session simplexml -WANT_PHP_WEB= yes USERS?= nagios GROUPS?= nagios Modified: head/net-mgmt/nedi/Makefile ============================================================================== --- head/net-mgmt/nedi/Makefile Sun Apr 8 12:12:24 2018 (r466795) +++ head/net-mgmt/nedi/Makefile Sun Apr 8 12:19:58 2018 (r466796) @@ -17,14 +17,13 @@ RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \ p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \ p5-DBI>=0:databases/p5-DBI -USES= perl5 shebangfix tar:tgz +USES= php:web perl5 shebangfix tar:tgz SHEBANG_FILES= *.pl html/inc/Devsend.pl WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes NO_ARCH= yes USE_PHP= session snmp mysql -WANT_PHP_WEB= yes SUB_FILES= pkg-message PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} Modified: head/net-mgmt/ocsinventory-ng/Makefile ============================================================================== --- head/net-mgmt/ocsinventory-ng/Makefile Sun Apr 8 12:12:24 2018 (r466795) +++ head/net-mgmt/ocsinventory-ng/Makefile Sun Apr 8 12:19:58 2018 (r466796) @@ -21,8 +21,7 @@ RUN_DEPENDS= p5-XML-Simple>=0:textproc/p5-XML-Simple \ p5-SOAP-Lite>=0:net/p5-SOAP-Lite \ p5-XML-Entities>=0:textproc/p5-XML-Entities -USES= apache:run,2.2+ mysql perl5 -WANT_PHP_WEB= yes +USES= apache:run,2.2+ mysql perl5 php:web USE_PHP= mysql pcre zlib session xml gd zip openssl mbstring NO_ARCH= yes NO_BUILD= yes Modified: head/net-mgmt/pandorafms_console/Makefile ============================================================================== --- head/net-mgmt/pandorafms_console/Makefile Sun Apr 8 12:12:24 2018 (r466795) +++ head/net-mgmt/pandorafms_console/Makefile Sun Apr 8 12:19:58 2018 (r466796) @@ -12,7 +12,7 @@ LICENSE_FILE= ${PANDORA_LICENSE_FILE} RUN_DEPENDS= ${LOCALBASE}/bin/twopi:graphics/graphviz -USES= apache:run,2.2+ shebangfix +USES= apache:run,2.2+ php:web shebangfix SHEBANG_FILES= include/languages/extract_newlines.sh \ include/languages/util-all \ include/languages/util-bzr-update \ @@ -29,7 +29,6 @@ PGSQL_DESC= Use PostgreSQL backend (experimental) USE_PHP= curl filter gd gettext hash json ldap mbstring mysql \ snmp session xml zip zlib -WANT_PHP_WEB= yes SUB_FILES+= pandora_console.conf pkg-message newsyslog.conf SUB_LIST+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} Modified: head/net-mgmt/phpip/Makefile ============================================================================== --- head/net-mgmt/phpip/Makefile Sun Apr 8 12:12:24 2018 (r466795) +++ head/net-mgmt/phpip/Makefile Sun Apr 8 12:19:58 2018 (r466796) @@ -17,8 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING SNAPSHOT= 200611081420 NO_BUILD= yes USE_PHP= mysql -USES= dos2unix -WANT_PHP_WEB= yes +USES= dos2unix php:web IGNORE_WITH_PHP= 70 71 Modified: head/net-mgmt/zabbix2-frontend/Makefile ============================================================================== --- head/net-mgmt/zabbix2-frontend/Makefile Sun Apr 8 12:12:24 2018 (r466795) +++ head/net-mgmt/zabbix2-frontend/Makefile Sun Apr 8 12:19:58 2018 (r466796) @@ -14,7 +14,7 @@ PLIST= ${PKGDIR}/pkg-plist.frontend USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap -WANT_PHP_WEB= yes +USES= php:web OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI @@ -22,23 +22,12 @@ MYSQLI_DESC= MySQLI backend MYSQL_VARS= IGNORE_WITH_PHP+=70 -.include +MYSQL_USE= PHP=mysql +MYSQLI_USE= PHP=mysqli +PGSQL_USE= PHP=pgsql +SQLITE_USE= PHP=sqlite3 -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql -.endif - -.if ${PORT_OPTIONS:MMYSQLI} -USE_PHP+= mysqli -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_PHP+= sqlite3 -.endif +.include .if ${PORT_OPTIONS:MORACLE} ZABBIX_REQUIRE=