Index: lang/php71/Makefile =================================================================== --- lang/php71/Makefile +++ lang/php71/Makefile @@ -1,5 +1,4 @@ # Created by: Torsten Zuehlsdorff -# $FreeBSD$ PORTNAME= php71 PORTVERSION= 7.1.9 @@ -13,15 +12,14 @@ LICENSE= PHP301 -USES+= tar:xz cpe +USES+= cpe tar:xz CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= autoconf #NOTE: libtools ends with Version mismatch error -#USES+= autoreconf gmake -#GNU_CONFIGURE= yes +USES+= gmake +USE_AUTOTOOLS= autoconf LIB_DEPENDS= libpcre.so:devel/pcre @@ -65,100 +63,67 @@ DESTDIRNAME= INSTALL_ROOT -.include - -.if ${PORT_OPTIONS:MCLI} -PHP_SAPI+= cli -.else -CONFIGURE_ARGS+=--disable-cli -.endif - -.if ${PORT_OPTIONS:MCGI} -PHP_SAPI+= cgi -.else -CONFIGURE_ARGS+=--disable-cgi -.endif - -.if ${PORT_OPTIONS:MFPM} -PHP_SAPI+= fpm -USE_RC_SUBR+= php-fpm -CONFIGURE_ARGS+=--enable-fpm \ - --with-fpm-user=${WWWOWN} \ - --with-fpm-group=${WWWGRP} -.endif +CGI_VARS= php_sapi+=cgi +CGI_CONFIGURE_OFF= --disable-cgi +CLI_VARS= php_sapi+=cli +CLI_CONFIGURE_OFF= --disable-cli +FPM_VARS= php_sapi+=fpm +FPM_CONFIGURE_ON= --enable-fpm \ + --with-fpm-user=${WWWOWN} \ + --with-fpm-group=${WWWGRP} +FPM_USE= rc_subr=php-fpm .if defined(PKGNAMEPREFIX) -USES+= php +.warning Building prefix ${PKGNAMEPREFIX} +# Build mod_php +USES+= php apache:2.2+ PHP_VER= 71 IGNORE_WITH_PHP= 55 56 70 -USE_APACHE= 22+ -.include "${PORTSDIR}/Mk/bsd.apache.mk" -.if ${PORT_OPTIONS:MAP2FILTER} -CONFIGURE_ARGS+=--with-apxs2filter=${APXS} -.else -CONFIGURE_ARGS+=--with-apxs2=${APXS} -.endif + PLIST= ${PKGDIR}/pkg-plist.mod PKGMESSAGE= ${PKGDIR}/pkg-message.mod MODULENAME= libphp7 SHORTMODNAME= php7 WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" -.endif -.if ${PORT_OPTIONS:MEMBED} -PHP_SAPI+= embed -CONFIGURE_ARGS+=--enable-embed -.endif - -.if ${PORT_OPTIONS:MPHPDBG} -PHP_SAPI+= phpdbg -CONFIGURE_ARGS+=--enable-phpdbg -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-phpdbg-debug -.endif -.endif - -.if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED} -PLIST_SUB+= SAPI_INC="" -.else -PLIST_SUB+= SAPI_INC="@comment " -.endif +AP2FILTER_CONFIGURE_ON= --with-apxs2filter=${APXS} +AP2FILTER_CONFIGURE_OFF= --with-apxs2=${APXS} +.endif # defined(PKGNAMEPREFIX) CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \ lt_cv_path_SED="sed" -.if ${PORT_OPTIONS:MLINKTHR} -LIBS+= -lpthread -.endif +DEBUG_CONFIGURE_ON= --enable-debug +DTRACE_CONFIGURE_ON= --enable-dtrace +EMBED_VARS= php_sapi+=embed +EMBED_CONFIGURE_ON= --enable-embed +IPV6_CONFIGURE_OFF= --disable-ipv6 +LINKTHR_LIBS= -lpthread +PHPDBG_CONFIGURE_ON= --enable-phpdbg +PHPDBG_VARS= php_sapi+=phpdb +ZTS_CONFIGURE_ON= --enable-maintainer-zts +ZTS_CONFIGURE_ENV= pthreads_working="yes" +ZTS_USES= localbase -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif +.include -.if ${PORT_OPTIONS:MZTS} -CONFIGURE_ARGS+=--enable-maintainer-zts -CONFIGURE_ENV+= pthreads_working="yes" -USES= localhost +.if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG} +CONFIGURE_ARGS+= --enable-phpdbg-debug .endif -.if ${PORT_OPTIONS:MDTRACE} -CONFIGURE_ARGS+=--enable-dtrace -PLIST_SUB+= DTRACE="" +.if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED} +PLIST_SUB+= SAPI_INC="" .else -PLIST_SUB+= DTRACE="@comment " -.endif - -.if empty(PORT_OPTIONS:MIPV6) -CONFIGURE_ARGS+=--disable-ipv6 +PLIST_SUB+= SAPI_INC="@comment " .endif post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* -.if ${PORT_OPTIONS:MFPM} + +post-patch-FPM-on: @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ ${WRKSRC}/sapi/fpm/php-fpm.conf.in -.endif # Work around issues with newer (>=2.64) autoconf pre-configure: @@ -182,14 +147,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc -.else +.else # !defined(PKGNAMEPREFIX) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR} -.endif +.endif # !defined(PKGNAMEPREFIX) -.else +.include +.else # !defined(PKGNAMESUFFIX) .include "${MASTERDIR}/Makefile.ext" -.endif -.include +.endif # !defined(PKGNAMESUFFIX) Index: lang/php71/Makefile.ext =================================================================== --- lang/php71/Makefile.ext +++ lang/php71/Makefile.ext @@ -2,10 +2,10 @@ COMMENT= The ${PHP_MODNAME} shared extension for php -USES+= php:ext +USES+= php:ext PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 71 -IGNORE_WITH_PHP= 55 56 70 +IGNORE_WITH_PHP= 56 70 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} @@ -16,7 +16,6 @@ .if ${PHP_MODNAME} == "bcmath" CONFIGURE_ARGS+=--enable-bcmath - PHP_HEADER_DIRS=libbcmath libbcmath/src .endif @@ -34,7 +33,6 @@ .if ${PHP_MODNAME} == "curl" LIB_DEPENDS+= libcurl.so:ftp/curl - CONFIGURE_ARGS+=--with-curl=${LOCALBASE} .endif @@ -46,19 +44,31 @@ CDB_DESC= cdb database support DB4_DESC= Berkeley DB4 support +FLATFILE_DESC= flatfile support GDBM_DESC= GDBM database support +INIFILE_DESC= INI file support QDBM_DESC= QDBM database support TOKYO_DESC= Tokyo Cabinet database support -INIFILE_DESC= INI file support -FLATFILE_DESC= flatfile support PHP_HEADER_DIRS= libcdb libflatfile libinifile + +CDB_CONFIGURE_OFF= --without-cdb +DB4_CONFIGURE_ON= --with-db4=${LOCALBASE} +DB4_USES= bdb +DB4_VARS= with_bdb_highest=yes +FLATFILE_CONFIGURE_OFF= --disable-flatfile +GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm +GDBM_CONFIGURE_ON= --with-gdbm=${LOCALBASE} +MINIFILE_CONFIGURE_OFF= --disable-inifile +QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm +QDBM_CONFIGURE_ON= --with-qdbm=${LOCALBASE} +TOKYO_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet +TOKYO_CONFIGURE_ON= --with-tcadb=${LOCALBASE} .endif .if ${PHP_MODNAME} == "dom" CONFIGURE_ARGS+=--enable-dom \ --with-libxml-dir=${LOCALBASE} - USE_GNOME= libxml2 .endif @@ -74,7 +84,6 @@ .if ${PHP_MODNAME} == "fileinfo" CONFIGURE_ARGS+=--enable-fileinfo \ --with-pcre-dir=${LOCALBASE} - PHP_HEADER_DIRS= libmagic .endif @@ -86,7 +95,6 @@ .if ${PHP_MODNAME} == "ftp" CONFIGURE_ARGS+=--enable-ftp \ --with-openssl-dir=${OPENSSLBASE} - LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USES+= ssl .endif @@ -105,23 +113,28 @@ OPTIONS_DEFINE=TRUETYPE JIS WEBP X11 OPTIONS_DEFAULT=TRUETYPE X11 -TRUETYPE_DESC= Enable TrueType string function JIS_DESC= Enable JIS-mapped Japanese font support -WEBP_DESC= Enable WebP image format support +TRUETYPE_DESC= Enable TrueType string function +WEBP_DESC= Enable WebP image format support X11_DESC= Enable XPM support PHP_HEADER_DIRS=libgd + +JIS_CONFIGURE_ON= --enable-gd-jis-conv +TRUETYPE_CONFIGURE_ON= --enable-gd-native-ttf +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_CONFIGURE_ON= --with-webp-dir=${LOCALBASE} +X11_USE_XORG= xpm +X11_CONFIGURE_ON= --with-xpm-dir=${LOCALBASE} .endif .if ${PHP_MODNAME} == "gettext" CONFIGURE_ARGS+=--with-gettext=${LOCALBASE} - USES+= gettext .endif .if ${PHP_MODNAME} == "gmp" LIB_DEPENDS+= libgmp.so:math/gmp - CONFIGURE_ARGS+=--with-gmp=${LOCALBASE} .endif @@ -132,7 +145,6 @@ .if ${PHP_MODNAME} == "iconv" CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} - USES+= iconv:translit .endif @@ -145,7 +157,10 @@ --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl +USES+= ssl + +PANDA_LIB_DEPENDS= libc-client4.so.10:mail/panda-cclient +PANDA_LIB_DEPENDS_OFF= libc-client4.so.9:mail/cclient .endif .if ${PHP_MODNAME} == "interbase" @@ -174,7 +189,6 @@ .endif .if ${PHP_MODNAME} == "mbstring" - CONFIGURE_ARGS+=--enable-mbstring \ --with-pcre-dir=${LOCALBASE} @@ -184,6 +198,10 @@ REGEX_DESC= Enable multibyte regex support PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls + +REGEX_LIB_DEPENDS= libonig.so:devel/oniguruma6 +REGEX_CONFIGURE_ON= --with-onig=${LOCALBASE} +REGEX_CONFIGURE_OFF= --disable-mbregex .endif .if ${PHP_MODNAME} == "mcrypt" @@ -198,6 +216,10 @@ OPTIONS_DEFAULT=MYSQLND MYSQLND_DESC= Use MySQL Native Driver + +MYSQLND_CONFIGURE_ON= --with-mysqli=mysqlnd +MYSQLND_CONFIGURE_OFF= --with-mysqli=${LOCALBASE}/bin/mysql_config +MYSQLND_USES_OFF= mysql .endif .if ${PHP_MODNAME} == "odbc" @@ -217,7 +239,7 @@ .if ${PHP_MODNAME} == "opcache" # This is needed by Zend extensions, keep before everything. PHP_MOD_PRIO= 10 -CONFIGURE_ARGS+=--enable-opcache +CONFIGURE_ARGS+=--enable-opcache --enable-opcache-file USES+= localbase .endif @@ -237,6 +259,9 @@ OPTIONS_DEFINE= MSSQL MSSQL_DESC= Enable Microsoft SQL Server support + +MSSQL_LIB_DEPENDS= libsybdb.so:databases/freetds +MSSQL_LIB_DEPENDS_OFF= libct.so:databases/freetds .endif .if ${PHP_MODNAME} == "pdo_firebird" @@ -260,6 +285,11 @@ MYSQLND_DESC= Use MySQL Native Driver USE_PHP= pdo:build + +MYSQLND_CONFIGURE_ON= --with-pdo-mysql=mysqlnd +MYSQLND_CONFIGURE_OFF= --with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr +MYSQLND_USES_OFF= mysql .endif .if ${PHP_MODNAME} == "pdo_pgsql" @@ -449,111 +479,11 @@ CONFIGURE_ARGS+=--with-zlib=/usr .endif -.include - -.if ${PHP_MODNAME} == "dba" -. if empty(PORT_OPTIONS:MCDB) -CONFIGURE_ARGS+=--without-cdb -. endif -. if ${PORT_OPTIONS:MDB4} -CONFIGURE_ARGS+=--with-db4=${LOCALBASE} - -USES+= bdb -WITH_BDB_HIGHEST= yes -. endif -. if ${PORT_OPTIONS:MGDBM} -LIB_DEPENDS+= libgdbm.so:databases/gdbm - -CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MQDBM} -LIB_DEPENDS+= libqdbm.so:databases/qdbm - -CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MTOKYO} -LIB_DEPENDS+= libtokyocabinet.so:databases/tokyocabinet - -CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE} -. endif -. if empty(PORT_OPTIONS:MINIFILE) -CONFIGURE_ARGS+=--disable-inifile -. endif -. if empty(PORT_OPTIONS:MFLATFILE) -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" -. if ${PORT_OPTIONS:MTRUETYPE} -CONFIGURE_ARGS+=--enable-gd-native-ttf -. endif -. if ${PORT_OPTIONS:MJIS} -CONFIGURE_ARGS+=--enable-gd-jis-conv -. endif -. if ${PORT_OPTIONS:MWEBP} -LIB_DEPENDS+= libwebp.so:graphics/webp - -CONFIGURE_ARGS+=--with-webp-dir=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MX11} -USE_XORG= xpm - -CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} -. endif -.endif - -.if ${PHP_MODNAME} == "imap" -. if ${PORT_OPTIONS:MPANDA} -LIB_DEPENDS+= libc-client4.so.10:mail/panda-cclient -. else -LIB_DEPENDS+= libc-client4.so.9:mail/cclient -. endif -.endif - -.if ${PHP_MODNAME} == "mbstring" -. if ${PORT_OPTIONS:MREGEX} -LIB_DEPENDS+= libonig.so:devel/oniguruma6 -CONFIGURE_ARGS+=--with-onig=${LOCALBASE} -. else -CONFIGURE_ARGS+=--disable-mbregex -. endif -.endif - .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 .endif -.if ${PHP_MODNAME} == "pdo_dblib" -. if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= libsybdb.so:databases/freetds -. else -LIB_DEPENDS+= libct.so:databases/freetds -. endif -.endif - .if ${PHP_MODNAME} == "xml" post-extract: @${MKDIR} ${WRKSRC}/ext/xml