Index: lang/php72/Makefile =================================================================== --- lang/php72/Makefile +++ lang/php72/Makefile @@ -17,6 +17,7 @@ NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) +# We're not building a module LIB_DEPENDS= libpcre.so:devel/pcre \ libargon2.so:security/libargon2 @@ -62,96 +63,65 @@ DESTDIRNAME= INSTALL_ROOT -.include +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 + +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: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 +.include .if defined(PKGNAMEPREFIX) -USES+= apache:2.2+ +# Section to build mod_php72 +USES+= php apache:2.2+ .include "${PORTSDIR}/Mk/Uses/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 -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif - -.if ${PORT_OPTIONS:MZTS} -CONFIGURE_ARGS+=--enable-maintainer-zts -CONFIGURE_ENV+= pthreads_working="yes" +.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 pre-configure: @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) @@ -171,14 +141,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 +.else # !defined(PKGNAMESUFFIX) .include "${MASTERDIR}/Makefile.ext" -.endif +.endif # !defined(PKGNAMEPREFIX) .include Index: lang/php72/Makefile.ext =================================================================== --- lang/php72/Makefile.ext +++ lang/php72/Makefile.ext @@ -16,7 +16,6 @@ .if ${PHP_MODNAME} == "bcmath" CONFIGURE_ARGS+=--enable-bcmath - PHP_HEADER_DIRS=libbcmath libbcmath/src .endif @@ -34,23 +33,35 @@ .if ${PHP_MODNAME} == "curl" LIB_DEPENDS+= libcurl.so:ftp/curl - CONFIGURE_ARGS+=--with-curl=${LOCALBASE} .endif .if ${PHP_MODNAME} == "dba" -CONFIGURE_ARGS+=--enable-dba - OPTIONS_DEFINE= CDB DB4 GDBM QDBM TOKYO INIFILE FLATFILE OPTIONS_DEFAULT=CDB INIFILE FLATFILE 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 + +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} + +CONFIGURE_ARGS+=--enable-dba PHP_HEADER_DIRS= libcdb libflatfile libinifile .endif @@ -58,7 +69,6 @@ .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 @@ -95,33 +103,43 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png USES+= jpeg - CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ --with-jpeg-dir=${LOCALBASE} \ --with-png-dir=${LOCALBASE} \ --with-zlib-dir=/usr -OPTIONS_DEFINE=TRUETYPE JIS WEBP X11 +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 +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} + +CONFIGURE_ARGS+=--with-gd \ + --with-freetype-dir=${LOCALBASE} \ + --with-jpeg-dir=${LOCALBASE} \ + --with-png-dir=${LOCALBASE} \ + --with-zlib-dir=/usr + PHP_HEADER_DIRS=libgd .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 +150,6 @@ .if ${PHP_MODNAME} == "iconv" CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} - USES+= iconv:translit .endif @@ -140,6 +157,9 @@ OPTIONS_DEFINE= PANDA PANDA_DESC= Uses the forked panda-cclient instead of the original cclient +PANDA_LIB_DEPENDS= libc-client4.so.10:mail/panda-cclient +PANDA_LIB_DEPENDS_OFF= libc-client4.so.9:mail/cclient + CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ --with-pcre-dir=${LOCALBASE} \ --with-imap-ssl=${OPENSSLBASE} @@ -150,7 +170,6 @@ .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} - USES+= firebird .endif @@ -165,44 +184,45 @@ .if ${PHP_MODNAME} == "ldap" CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} - USE_OPENLDAP= yes - . ifdef(WANT_OPENLDAP_SASL) CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE} . endif .endif .if ${PHP_MODNAME} == "mbstring" - -CONFIGURE_ARGS+=--enable-mbstring \ - --with-pcre-dir=${LOCALBASE} - OPTIONS_DEFINE= REGEX OPTIONS_DEFAULT=REGEX - REGEX_DESC= Enable multibyte regex support +REGEX_LIB_DEPENDS= libonig.so:devel/oniguruma +REGEX_REGEX_CONFIGURE_ON= --with-onig=${LOCALBASE} +REGEX_REGEX_CONFIGURE_OFF= --disable-mbregex + +CONFIGURE_ARGS+=--enable-mbstring \ + --with-pcre-dir=${LOCALBASE} + PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls .endif .if ${PHP_MODNAME} == "mysqli" OPTIONS_DEFINE= MYSQLND OPTIONS_DEFAULT=MYSQLND - MYSQLND_DESC= Use MySQL Native Driver + +MYSQLND_CONFIGURE_ON= --with-pdo-mysql=mysqlnd +MYSQLND_CONFIGURE_OFF= --with-mysqli=${LOCALBASE}/bin/mysql_config +MYSQLND_USES_OFF= mysql .endif .if ${PHP_MODNAME} == "odbc" LIB_DEPENDS+= libodbc.so:databases/unixODBC - CONFIGURE_ARGS+=--enable-odbc \ --with-unixODBC=${LOCALBASE} .endif .if ${PHP_MODNAME} == "openssl" CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} - LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USES+= ssl .endif @@ -223,26 +243,25 @@ .endif .if ${PHP_MODNAME} == "pdo_dblib" -CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE} - -USE_PHP= pdo:build - 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 + +CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE} +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_firebird" CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE} - -USES+= firebird +USES+= firebird USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_odbc" LIB_DEPENDS+= libodbc.so:databases/unixODBC CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} - USE_PHP= pdo:build .endif @@ -252,34 +271,34 @@ MYSQLND_DESC= Use MySQL Native Driver +MYSQLND_CONFIGURE_ON= --with-pdo-mysql=mysqlnd +MYSQLND_CONFIGURE_OFF= --with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr +MYSQLND_USES_OFF= mysql + USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_pgsql" USES+= pgsql - CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE} - USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_sqlite" USES+= sqlite CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE} - USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pgsql" USES+= pgsql - CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .endif .if ${PHP_MODNAME} == "phar" CONFIGURE_ARGS+=--enable-phar \ --with-pcre-dir=${LOCALBASE} - USE_PHP= hash:build .endif @@ -289,7 +308,6 @@ .if ${PHP_MODNAME} == "pspell" LIB_DEPENDS+= libaspell.so:textproc/aspell - CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} .endif @@ -300,7 +318,6 @@ .if ${PHP_MODNAME} == "recode" LIB_DEPENDS+= librecode.so:converters/recode - CONFIGURE_ARGS+=--with-recode=${LOCALBASE} .endif @@ -325,18 +342,15 @@ .if ${PHP_MODNAME} == "snmp" CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \ --with-openssl-dir=${OPENSSLBASE} - CONFIGURE_ENV+= ac_cv_buggy_snprint_value="no" - LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl +USES+= ssl .endif .if ${PHP_MODNAME} == "soap" CONFIGURE_ARGS+=--enable-soap \ --with-libxml-dir=${LOCALBASE} - USE_GNOME= libxml2 .endif @@ -346,7 +360,7 @@ .if ${PHP_MODNAME} == "sodium" CONFIGURE_ARGS+= --with-sodium=${LOCALBASE} -LIB_DEPENDS+= libsodium.so:security/libsodium +LIB_DEPENDS+= libsodium.so:security/libsodium .endif .if ${PHP_MODNAME} == "sqlite3" @@ -368,7 +382,6 @@ .if ${PHP_MODNAME} == "tidy" CONFIGURE_ARGS+=--with-tidy=${LOCALBASE} - LIB_DEPENDS+= libtidy.so:www/tidy-lib .endif @@ -379,25 +392,20 @@ .if ${PHP_MODNAME} == "wddx" CONFIGURE_ARGS+=--enable-wddx \ --with-libxml-dir=${LOCALBASE} - USE_GNOME= libxml2 - USE_PHP= xml:build session:build .endif .if ${PHP_MODNAME} == "xml" CONFIGURE_ARGS+=--enable-xml \ --with-libxml-dir=${LOCALBASE} - USE_GNOME= libxml2 .endif .if ${PHP_MODNAME} == "xmlreader" CONFIGURE_ARGS+=--enable-xmlreader \ --with-libxml-dir=${LOCALBASE} - USE_GNOME= libxml2 - USE_PHP= dom:build .endif @@ -405,32 +413,26 @@ CONFIGURE_ARGS+=--with-xmlrpc \ --with-libxml-dir=${LOCALBASE} \ --with-iconv-dir=${LOCALBASE} - USES+= iconv:translit USE_GNOME= libxml2 - PHP_HEADER_DIRS=libxmlrpc - USE_PHP= xml:build .endif .if ${PHP_MODNAME} == "xmlwriter" CONFIGURE_ARGS+=--enable-xmlwriter \ --with-libxml-dir=${LOCALBASE} - USE_GNOME= libxml2 .endif .if ${PHP_MODNAME} == "xsl" CONFIGURE_ARGS+=--with-xsl=${LOCALBASE} - USE_GNOME= libxslt USE_PHP= dom:build xml:build .endif .if ${PHP_MODNAME} == "zip" LIB_DEPENDS+= libzip.so:archivers/libzip - CONFIGURE_ARGS+=--enable-zip \ --with-zlib-dir=/usr \ --with-pcre-dir=${LOCALBASE} \ @@ -441,118 +443,15 @@ 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/oniguruma -CONFIGURE_ARGS+=--with-onig=${LOCALBASE} -. else -CONFIGURE_ARGS+=--disable-mbregex -. endif -.endif - -.if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" +.if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib" 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 @${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml .endif - -.if ${PHP_MODNAME} == "zlib" -post-extract: - @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -.endif