From d78beb132cdff1572d8b545be1fb09eea396d6ae Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Mon, 25 Apr 2016 16:17:31 +0000 Subject: Move MySQL support from bsd.databases.mk to Uses/mysql.mk. Also, USE_MYSQL can't happen after bsd.port.pre.mk because it is a USES. PR: 208971 Submitted by: mat Exp-run by: antoine With hat: portmgr Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D5951 --- lang/harbour/Makefile | 2 +- lang/php55/Makefile.ext | 68 ++++++++++++++++++++++++------------------------- lang/php56/Makefile.ext | 68 ++++++++++++++++++++++++------------------------- lang/php70/Makefile.ext | 38 +++++++++++++-------------- 4 files changed, 88 insertions(+), 88 deletions(-) (limited to 'lang') diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile index 8ecb7e4749ef..c94d607c6e14 100644 --- a/lang/harbour/Makefile +++ b/lang/harbour/Makefile @@ -90,6 +90,7 @@ MAKE_ENV= HB_ARCHITECTURE=${HB_ARCH} \ PGSQL_USES= pgsql FIREBIRD_USES= firebird +MYSQL_USES= mysql .include @@ -115,7 +116,6 @@ PLIST_SUB+= SQLITE="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes MAKE_ENV+= HB_WITH_MYSQL=nolocal .else MAKE_ENV+= HB_WITH_MYSQL=no diff --git a/lang/php55/Makefile.ext b/lang/php55/Makefile.ext index 69a16f499b15..5845e3d41f1a 100644 --- a/lang/php55/Makefile.ext +++ b/lang/php55/Makefile.ext @@ -499,6 +499,40 @@ CONFIGURE_ARGS+=--disable-flatfile . endif .endif +.if ${PHP_MODNAME} == "mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysql=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr + +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "mysqli" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysqli=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config + +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "pdo_mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd + +USE_PHP+= mysql +. else +CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr + +USES+= mysql +. endif +.endif + .include .if ${PHP_MODNAME} == "gd" @@ -542,27 +576,6 @@ CONFIGURE_ARGS+=--disable-mbregex . endif .endif -.if ${PHP_MODNAME} == "mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "mysqli" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysqli=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config - -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 @@ -576,19 +589,6 @@ LIB_DEPENDS+= libct.so:databases/freetds . endif .endif -.if ${PHP_MODNAME} == "pdo_mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd - -USE_PHP+= mysql -. else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "xml" post-extract: @${MKDIR} ${WRKSRC}/ext/xml diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext index 8ed5295444be..fec5aff98418 100644 --- a/lang/php56/Makefile.ext +++ b/lang/php56/Makefile.ext @@ -502,6 +502,40 @@ CONFIGURE_ARGS+=--disable-flatfile . endif .endif +.if ${PHP_MODNAME} == "mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysql=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr + +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "mysqli" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysqli=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config + +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "pdo_mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd + +USE_PHP+= mysql +. else +CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr + +USES+= mysql +. endif +.endif + .include .if ${PHP_MODNAME} == "gd" @@ -545,27 +579,6 @@ CONFIGURE_ARGS+=--disable-mbregex . endif .endif -.if ${PHP_MODNAME} == "mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "mysqli" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysqli=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config - -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 @@ -579,19 +592,6 @@ LIB_DEPENDS+= libct.so:databases/freetds . endif .endif -.if ${PHP_MODNAME} == "pdo_mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd - -USE_PHP+= mysql -. else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "xml" post-extract: @${MKDIR} ${WRKSRC}/ext/xml diff --git a/lang/php70/Makefile.ext b/lang/php70/Makefile.ext index 88c8d16e5b7e..043949cc8cb8 100644 --- a/lang/php70/Makefile.ext +++ b/lang/php70/Makefile.ext @@ -494,6 +494,25 @@ CONFIGURE_ARGS+=--disable-flatfile . endif .endif +.if ${PHP_MODNAME} == "mysqli" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-mysqli=mysqlnd +. else +CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config +USES+= mysql +. endif +.endif + +.if ${PHP_MODNAME} == "pdo_mysql" +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd +. else +CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr +USES+= mysql +. endif +.endif + .include .if ${PHP_MODNAME} == "gd" @@ -537,25 +556,6 @@ CONFIGURE_ARGS+=--disable-mbregex . endif .endif -.if ${PHP_MODNAME} == "mysqli" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysqli=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "pdo_mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -- cgit class='form'>
path: root/sysutils/rubygem-puppet_forge1
Commit message (Expand)AuthorAgeFilesLines
* Take maintainershipsunpoet2017-05-051-1/+1
* Update to 1.0.6sunpoet2017-01-023-7/+11
* Convert USES=gem:autoplist to USES=gem since autoplist is defaultswills2016-04-281-1/+1
* create USES=gem and update rubygem- ports to use itswills2016-04-281-2/+1
* devel/ruby-gems: Update to 2.6.2swills2016-04-041-6/+6
* Remove ${PORTSDIR}/ from dependencies, categories r, s, t, and u.mat2016-04-011-1/+1