Date: Sun, 11 Mar 2018 18:36:16 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464193 - in head: databases/gnatsweb4 deskutils/simplegroupware devel/gitblit devel/pushmi finance/sql-ledger lang/php56 lang/php70 lang/php71 lang/php72 mail/dspam mail/p5-qpsmtpd net... Message-ID: <201803111836.w2BIaG1C017977@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Mar 11 18:36:16 2018 New Revision: 464193 URL: https://svnweb.freebsd.org/changeset/ports/464193 Log: Migrate USE_APACHE to USES= apache - Following migration of Mk/bsd.apache.mk to Mk/Uses/apache.mk With hat: apache Modified: head/databases/gnatsweb4/Makefile head/deskutils/simplegroupware/Makefile head/devel/gitblit/Makefile head/devel/pushmi/Makefile head/finance/sql-ledger/Makefile head/lang/php56/Makefile head/lang/php70/Makefile head/lang/php71/Makefile head/lang/php72/Makefile head/mail/dspam/Makefile head/mail/p5-qpsmtpd/Makefile head/net-mgmt/observium/Makefile head/net-mgmt/ocsinventory-ng/Makefile head/net-mgmt/pandorafms_console/Makefile head/net/p5-Apache2-SOAP/Makefile head/net/prosearch/Makefile head/ports-mgmt/tinderbox/Makefile head/security/maia/Makefile head/security/openscep/Makefile head/security/phpdeadlock/Makefile head/www/mod_jk/Makefile head/www/p5-Apache-DBI/Makefile Modified: head/databases/gnatsweb4/Makefile ============================================================================== --- head/databases/gnatsweb4/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/databases/gnatsweb4/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -15,9 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= p5-MIME-Base64>=0:converters/p5-MIME-Base64 -USE_APACHE_RUN= 22+ - -USES= perl5 shebangfix +USES= apache:run,2.2+ perl5 shebangfix SHEBANG_FILES= gnatsweb.pl USE_PERL5= run NO_BUILD= yes Modified: head/deskutils/simplegroupware/Makefile ============================================================================== --- head/deskutils/simplegroupware/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/deskutils/simplegroupware/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Simple Groupware is an open source enterprise application NO_BUILD= yes -USE_APACHE_RUN= 22+ +USES= apache:run,2.2+ USE_MYSQL= yes USE_PHP= mysql Modified: head/devel/gitblit/Makefile ============================================================================== --- head/devel/gitblit/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/devel/gitblit/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -44,7 +44,7 @@ REDIS_RUN_DEPENDS= redis-server:databases/redis .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE_RUN= 22+ +USES= apache:run,2.2+ .elif ${PORT_OPTIONS:MLIGHTTPD} RUN_DEPENDS+= lighttpd:www/lighttpd .elif ${PORT_OPTIONS:MHIAWATHA} Modified: head/devel/pushmi/Makefile ============================================================================== --- head/devel/pushmi/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/devel/pushmi/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -26,8 +26,7 @@ BUILD_DEPENDS:= ${RUN_DEPENDS} \ p5-Test-Output>=0:devel/p5-Test-Output \ ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 -USES= perl5 +USES= apache:2.2+ perl5 USE_PERL5= configure -USE_APACHE= 22+ .include <bsd.port.mk> Modified: head/finance/sql-ledger/Makefile ============================================================================== --- head/finance/sql-ledger/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/finance/sql-ledger/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -17,10 +17,9 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= pkg-message sql-ledger-httpd.conf -USES= perl5 pgsql shebangfix +USES= apache:run,2.2+ perl5 pgsql shebangfix SHEBANG_FILES= *.pl locale/*/*.pl bin/*/*.pl NO_ARCH= yes -USE_APACHE_RUN= 22+ ROOT_DIRS= SL bin css doc images js locale spool sql templates users ROOT_FILES= VERSION favicon.ico index.html menu.ini Modified: head/lang/php56/Makefile ============================================================================== --- head/lang/php56/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/lang/php56/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -85,7 +85,7 @@ CONFIGURE_ARGS+=--enable-fpm \ .endif .if defined(PKGNAMEPREFIX) -USE_APACHE= 22+ +USES+= apache:2.2+ .include "${PORTSDIR}/Mk/Uses/apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} Modified: head/lang/php70/Makefile ============================================================================== --- head/lang/php70/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/lang/php70/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -91,7 +91,7 @@ CONFIGURE_ARGS+=--enable-fpm \ .endif .if defined(PKGNAMEPREFIX) -USE_APACHE= 22+ +USES+= apache:2.2+ .include "${PORTSDIR}/Mk/Uses/apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} Modified: head/lang/php71/Makefile ============================================================================== --- head/lang/php71/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/lang/php71/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -92,7 +92,7 @@ CONFIGURE_ARGS+=--enable-fpm \ .endif .if defined(PKGNAMEPREFIX) -USE_APACHE= 22+ +USES+= apache:2.2+ .include "${PORTSDIR}/Mk/Uses/apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} Modified: head/lang/php72/Makefile ============================================================================== --- head/lang/php72/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/lang/php72/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -85,7 +85,7 @@ CONFIGURE_ARGS+=--enable-fpm \ .endif .if defined(PKGNAMEPREFIX) -USE_APACHE= 22+ +USES+= apache:2.2+ .include "${PORTSDIR}/Mk/Uses/apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} Modified: head/mail/dspam/Makefile ============================================================================== --- head/mail/dspam/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/mail/dspam/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -397,7 +397,7 @@ CONFIGURE_ARGS+= --with-dspam-mode=${DSPAM_MODE} . if ${PORT_OPTIONS:MLIGHTTPD} RUN_DEPENDS+= ${LOCALBASE}/sbin/lighttpd:www/lighttpd . else -USE_APACHE_RUN= 22+ +USES+= apache:2.2+ . endif LIB_DEPENDS+= libgd.so:graphics/gd RUN_DEPENDS+= p5-GD>=0:graphics/p5-GD Modified: head/mail/p5-qpsmtpd/Makefile ============================================================================== --- head/mail/p5-qpsmtpd/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/mail/p5-qpsmtpd/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -27,7 +27,7 @@ GH_ACCOUNT= smtpd .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMODPERL} -USE_APACHE_RUN= 22+ +USES+= apache:run,2.2+ RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 .endif Modified: head/net-mgmt/observium/Makefile ============================================================================== --- head/net-mgmt/observium/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/net-mgmt/observium/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -76,7 +76,7 @@ PORTDOCS= INSTALL README VERSION PORTEXAMPLES= snmp.conf.example snmpd.conf.example .if ${PORT_OPTIONS:MAPACHEMOD} -USE_APACHE_RUN= 22+ +USES+= apache:run,2.2+ .endif .if !defined(PACKAGE_BUILDING) USES+= php:mod Modified: head/net-mgmt/ocsinventory-ng/Makefile ============================================================================== --- head/net-mgmt/ocsinventory-ng/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/net-mgmt/ocsinventory-ng/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -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= mysql perl5 -USE_APACHE_RUN= 22+ +USES= apache:run,2.2+ mysql perl5 WANT_PHP_WEB= yes USE_PHP= mysql pcre zlib session xml gd zip openssl mbstring NO_ARCH= yes Modified: head/net-mgmt/pandorafms_console/Makefile ============================================================================== --- head/net-mgmt/pandorafms_console/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/net-mgmt/pandorafms_console/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -12,7 +12,7 @@ LICENSE_FILE= ${PANDORA_LICENSE_FILE} RUN_DEPENDS= ${LOCALBASE}/bin/twopi:graphics/graphviz -USES= shebangfix +USES= apache:run,2.2+ shebangfix SHEBANG_FILES= include/languages/extract_newlines.sh \ include/languages/util-all \ include/languages/util-bzr-update \ @@ -30,7 +30,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 -USE_APACHE_RUN= 22+ SUB_FILES+= pandora_console.conf pkg-message newsyslog.conf SUB_LIST+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} Modified: head/net/p5-Apache2-SOAP/Makefile ============================================================================== --- head/net/p5-Apache2-SOAP/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/net/p5-Apache2-SOAP/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -15,8 +15,7 @@ BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www p5-SOAP-Lite>=0:net/p5-SOAP-Lite RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= perl5 +USES= apache:2.2+ perl5 USE_PERL5= configure -USE_APACHE= 22+ .include <bsd.port.mk> Modified: head/net/prosearch/Makefile ============================================================================== --- head/net/prosearch/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/net/prosearch/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -65,7 +65,7 @@ RUN_DEPENDS+= rsync:net/rsync .endif .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE_RUN= 22+ +USES+= apache:run,2.2+ .endif .if ${PORT_OPTIONS:MNGINX} Modified: head/ports-mgmt/tinderbox/Makefile ============================================================================== --- head/ports-mgmt/tinderbox/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/ports-mgmt/tinderbox/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -80,7 +80,7 @@ RUN_DEPENDS+= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite .endif .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE_RUN= 22+ +USES+= apache:run,2.2+ .elif ${PORT_OPTIONS:MLIGHTTPD} RUN_DEPENDS+= lighttpd:www/lighttpd .elif ${PORT_OPTIONS:MHIAWATHA} Modified: head/security/maia/Makefile ============================================================================== --- head/security/maia/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/security/maia/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -100,7 +100,7 @@ USE_RC_SUBR+= maiad # setting USE_ variables. C'est la vie. .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE_RUN= 22+ +USES+= apache:run,2.2+ .endif .if ${PORT_OPTIONS:MWEBHOST} Modified: head/security/openscep/Makefile ============================================================================== --- head/security/openscep/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/security/openscep/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -12,9 +12,8 @@ COMMENT= Open source scep server CONFLICTS_INSTALL= nss-3.* -USES= gmake libtool ssl +USES= apache:2.2+ gmake libtool ssl USE_OPENLDAP= yes -USE_APACHE= 22+ GNU_CONFIGURE= yes USE_LDCONFIG= yes Modified: head/security/phpdeadlock/Makefile ============================================================================== --- head/security/phpdeadlock/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/security/phpdeadlock/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -19,8 +19,7 @@ DLURL?= ${PORTNAME} DLDIR= www/${DLURL} PORTDOCS= CHANGES.txt COPYING.txt UPGRADE.txt -USES= dos2unix -USE_APACHE_RUN= 22+ +USES= apache:run,2.2+ dos2unix USE_PHP= mysql session ctype pcre NO_BUILD= yes NO_ARCH= yes Modified: head/www/mod_jk/Makefile ============================================================================== --- head/www/mod_jk/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/www/mod_jk/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -12,8 +12,7 @@ DISTNAME= tomcat-connectors-${PORTVERSION}-src MAINTAINER?= girgen@FreeBSD.org COMMENT?= Apache JK module for connecting to Tomcat using AJP1X -USES= gmake -USE_APACHE?= 22+ +USES= apache:2.2+ gmake APACHE_VER= 2.0 GNU_CONFIGURE= yes Modified: head/www/p5-Apache-DBI/Makefile ============================================================================== --- head/www/p5-Apache-DBI/Makefile Sun Mar 11 18:26:53 2018 (r464192) +++ head/www/p5-Apache-DBI/Makefile Sun Mar 11 18:36:16 2018 (r464193) @@ -20,8 +20,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} CONFLICTS= p5-Apache-DBI-mp[12]* -USES= perl5 +USES= apache:2.2+ perl5 USE_PERL5= configure -USE_APACHE?= 22+ .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803111836.w2BIaG1C017977>