Index: head/lang/php56/Makefile =================================================================== --- head/lang/php56/Makefile (revision 487168) +++ head/lang/php56/Makefile (revision 487169) @@ -1,206 +1,206 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.38 +PORTVERSION= 5.6.39 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 DEPRECATED= Security Support ends on 31 Dec 2018 EXPIRATION_DATE=2019-01-01 USES+= tar:xz cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) LIB_DEPENDS= libpcre.so:devel/pcre GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-layout=GNU \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --with-zlib-dir=/usr \ --program-prefix="" -USES+= autoreconf:build +USES+= autoreconf:build gnome USE_GNOME= libxml2 # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug DTRACE_DESC= Enable DTrace support MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php55-5* php70-* php71-* php72-* php73-* +CONFLICTS= php70-* php71-* php72-* php73-* DESTDIRNAME= INSTALL_ROOT .include PATCH_DIST_STRIP= -p1 PATCH_SITES+= LOCAL/ale .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-5.5.x-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail .endif .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 .if defined(PKGNAMEPREFIX) USES+= 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= libphp5 SHORTMODNAME= php5 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 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" CONFIGURE_ARGS+=--with-regex=php .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" CONFIGURE_ARGS+=--with-regex=system .endif .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" CONFIGURE_ARGS+=--with-zend-vm=CALL .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" CONFIGURE_ARGS+=--with-zend-vm=SWITCH .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ ac_cv_pthreads_cflags="" \ ac_cv_decimal_fp_supported="no" \ pthreads_working="yes" \ 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 .endif .if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else PLIST_SUB+= DTRACE="@comment " .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* .if ${PORT_OPTIONS:MFPM} @${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) .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=56" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf @${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf @${SH} ${WRKSRC}/scripts/php-config --extension-dir | sed -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc .else do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .endif .else .include "${MASTERDIR}/Makefile.ext" .endif .include Index: head/lang/php56/Makefile.ext =================================================================== --- head/lang/php56/Makefile.ext (revision 487168) +++ head/lang/php56/Makefile.ext (revision 487169) @@ -1,597 +1,598 @@ COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 56 IGNORE_WITH_PHP= 71 72 73 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} PATCHDIR= ${.CURDIR}/files PLIST= ${NONEXISTENT} EXTRACT_AFTER_ARGS?= ${EXTSUBDIR} .if ${PHP_MODNAME} == "bcmath" CONFIGURE_ARGS+=--enable-bcmath PHP_HEADER_DIRS=libbcmath libbcmath/src .endif .if ${PHP_MODNAME} == "bz2" CONFIGURE_ARGS+=--with-bz2=/usr .endif .if ${PHP_MODNAME} == "calendar" CONFIGURE_ARGS+=--enable-calendar .endif .if ${PHP_MODNAME} == "ctype" CONFIGURE_ARGS+=--enable-ctype .endif .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 GDBM_DESC= GDBM database 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 .endif .if ${PHP_MODNAME} == "dom" CONFIGURE_ARGS+=--enable-dom \ --with-libxml-dir=${LOCALBASE} USE_GNOME= libxml2 .endif .if ${PHP_MODNAME} == "enchant" LIB_DEPENDS+= libenchant.so:textproc/enchant CONFIGURE_ARGS+=--with-enchant=${LOCALBASE} .endif .if ${PHP_MODNAME} == "exif" CONFIGURE_ARGS+=--enable-exif .endif .if ${PHP_MODNAME} == "fileinfo" CONFIGURE_ARGS+=--enable-fileinfo \ --with-pcre-dir=${LOCALBASE} PHP_HEADER_DIRS= libmagic .endif .if ${PHP_MODNAME} == "filter" CONFIGURE_ARGS+=--enable-filter \ --with-pcre-dir=${LOCALBASE} .endif .if ${PHP_MODNAME} == "ftp" CONFIGURE_ARGS+=--enable-ftp \ --with-openssl-dir=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USES+= ssl .endif .if ${PHP_MODNAME} == "gd" 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= T1LIB TRUETYPE JIS X11 VPX OPTIONS_DEFAULT=T1LIB TRUETYPE X11 T1LIB_DESC= Include T1lib support TRUETYPE_DESC= Enable TrueType string function JIS_DESC= Enable JIS-mapped Japanese font support X11_DESC= Enable XPM support VPX_DESC= Enable VP8 codec support 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 .if ${PHP_MODNAME} == "hash" CONFIGURE_ARGS+=--enable-hash \ --with-mhash .endif .if ${PHP_MODNAME} == "iconv" CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" OPTIONS_DEFINE= PANDA PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ --with-pcre-dir=${LOCALBASE} \ --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USES+= ssl .endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} USES+= firebird .endif .if ${PHP_MODNAME} == "json" CONFIGURE_ARGS+=--enable-json .endif .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 PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls .endif .if ${PHP_MODNAME} == "mcrypt" LIB_DEPENDS+= libltdl.so:devel/libltdl \ libmcrypt.so:security/libmcrypt CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} .endif .if ${PHP_MODNAME} == "mssql" LIB_DEPENDS+= libsybdb.so:databases/freetds CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} .endif .if ${PHP_MODNAME} == "mysql" OPTIONS_DEFINE= MYSQLND OPTIONS_DEFAULT=MYSQLND MYSQLND_DESC= Use MySQL Native Driver .endif .if ${PHP_MODNAME} == "mysqli" OPTIONS_DEFINE= MYSQLND OPTIONS_DEFAULT=MYSQLND MYSQLND_DESC= Use MySQL Native Driver .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 .if ${PHP_MODNAME} == "opcache" # This is needed by Zend extensions, keep before everything. PHP_MOD_PRIO= 10 CONFIGURE_ARGS+=--enable-opcache .endif .if ${PHP_MODNAME} == "pcntl" CONFIGURE_ARGS+=--enable-pcntl .endif .if ${PHP_MODNAME} == "pdo" CONFIGURE_ARGS+=--enable-pdo .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 .endif .if ${PHP_MODNAME} == "pdo_firebird" CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE} USE_PHP= pdo:build USES+= firebird .endif .if ${PHP_MODNAME} == "pdo_mysql" OPTIONS_DEFINE= MYSQLND OPTIONS_DEFAULT=MYSQLND MYSQLND_DESC= Use MySQL Native Driver 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 .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 .if ${PHP_MODNAME} == "posix" CONFIGURE_ARGS+=--enable-posix .endif .if ${PHP_MODNAME} == "pspell" LIB_DEPENDS+= libaspell.so:textproc/aspell CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} .endif .if ${PHP_MODNAME} == "readline" CONFIGURE_ARGS+=--with-readline=/usr USES+= readline .endif .if ${PHP_MODNAME} == "recode" LIB_DEPENDS+= librecode.so:converters/recode CONFIGURE_ARGS+=--with-recode=${LOCALBASE} +MPHP_MOD_PRIO= 18 .endif .if ${PHP_MODNAME} == "session" CONFIGURE_ARGS+=--enable-session PHP_MOD_PRIO= 18 .endif .if ${PHP_MODNAME} == "shmop" CONFIGURE_ARGS+=--enable-shmop .endif .if ${PHP_MODNAME} == "simplexml" CONFIGURE_ARGS+=--enable-simplexml \ --with-pcre-dir=${LOCALBASE} \ --with-libxml-dir=${LOCALBASE} USES+= pkgconfig USE_GNOME= libxml2 .endif .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 .endif .if ${PHP_MODNAME} == "soap" CONFIGURE_ARGS+=--enable-soap \ --with-libxml-dir=${LOCALBASE} USE_GNOME= libxml2 .endif .if ${PHP_MODNAME} == "sockets" CONFIGURE_ARGS+=--enable-sockets .endif .if ${PHP_MODNAME} == "sqlite3" USES+= sqlite CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE} .endif .if ${PHP_MODNAME} == "sybase_ct" LIB_DEPENDS+= libct.so:databases/freetds CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE} .endif .if ${PHP_MODNAME} == "sysvmsg" CONFIGURE_ARGS+=--enable-sysvmsg .endif .if ${PHP_MODNAME} == "sysvsem" CONFIGURE_ARGS+=--enable-sysvsem .endif .if ${PHP_MODNAME} == "sysvshm" CONFIGURE_ARGS+=--enable-sysvshm .endif .if ${PHP_MODNAME} == "tidy" CONFIGURE_ARGS+=--with-tidy=${LOCALBASE} LIB_DEPENDS+= libtidy.so:www/tidy-lib .endif .if ${PHP_MODNAME} == "tokenizer" CONFIGURE_ARGS+=--enable-tokenizer .endif .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 .if ${PHP_MODNAME} == "xmlrpc" 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} \ --with-libzip=${LOCALBASE} .endif .if ${PHP_MODNAME} == "zlib" 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} == "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} == "openssl" && ${SSL_DEFAULT:Mopenssl111} BROKEN= Does not build with openssl111 .endif .if ${PHP_MODNAME} == "gd" . if ${PORT_OPTIONS:MT1LIB} LIB_DEPENDS+= libt1.so:devel/t1lib CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE} . endif . 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:MX11} USE_XORG= x11 xpm CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} . endif . if ${PORT_OPTIONS:MVPX} LIB_DEPENDS+= libvpx.so:multimedia/libvpx CONFIGURE_ARGS+=--with-vpx-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" 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 Index: head/lang/php56/distinfo =================================================================== --- head/lang/php56/distinfo (revision 487168) +++ head/lang/php56/distinfo (revision 487169) @@ -1,5 +1,5 @@ -TIMESTAMP = 1537790285 -SHA256 (php-5.6.38.tar.xz) = c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e -SIZE (php-5.6.38.tar.xz) = 12467408 +TIMESTAMP = 1544448187 +SHA256 (php-5.6.39.tar.xz) = 8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10 +SIZE (php-5.6.39.tar.xz) = 12467096 SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed SIZE (php-5.5.x-mail-header.patch) = 4426 Index: head/mail/php56-imap/Makefile =================================================================== --- head/mail/php56-imap/Makefile (revision 487168) +++ head/mail/php56-imap/Makefile (revision 487169) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ CATEGORIES= mail -PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php56 PKGNAMESUFFIX= -imap .include "${MASTERDIR}/Makefile" Index: head/mail/php56-imap/files/patch-php__imap.c =================================================================== --- head/mail/php56-imap/files/patch-php__imap.c (revision 487168) +++ head/mail/php56-imap/files/patch-php__imap.c (nonexistent) @@ -1,40 +0,0 @@ ---- php_imap.c.orig 2018-09-11 22:12:36 UTC -+++ php_imap.c -@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] - }; - /* }}} */ - -+ -+/* {{{ PHP_INI -+ */ -+PHP_INI_BEGIN() -+STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) -+PHP_INI_END() -+/* }}} */ -+ -+ - /* {{{ imap_module_entry - */ - zend_module_entry imap_module_entry = { -@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) - { - unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; - -+ REGISTER_INI_ENTRIES(); -+ - #ifndef PHP_WIN32 - mail_link(&unixdriver); /* link in the unix driver */ - mail_link(&mhdriver); /* link in the mh driver */ -@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) - GC_TEXTS texts - */ - -+ if (!IMAPG(enable_rsh)) { -+ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ -+ mail_parameters (NIL, SET_RSHTIMEOUT, 0); -+ mail_parameters (NIL, SET_SSHTIMEOUT, 0); -+ } -+ - le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); - return SUCCESS; - } Property changes on: head/mail/php56-imap/files/patch-php__imap.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/php56-imap/files/patch-php__imap.h =================================================================== --- head/mail/php56-imap/files/patch-php__imap.h (revision 487168) +++ head/mail/php56-imap/files/patch-php__imap.h (nonexistent) @@ -1,10 +0,0 @@ ---- php_imap.h.orig 2018-09-11 22:12:36 UTC -+++ php_imap.h -@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) - #endif - /* php_stream for php_mail_gets() */ - php_stream *gets_stream; -+ zend_bool enable_rsh; - ZEND_END_MODULE_GLOBALS(imap) - - #ifdef ZTS Property changes on: head/mail/php56-imap/files/patch-php__imap.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/php56-snmp/files/patch-config.m4 =================================================================== --- head/net-mgmt/php56-snmp/files/patch-config.m4 (nonexistent) +++ head/net-mgmt/php56-snmp/files/patch-config.m4 (revision 487169) @@ -0,0 +1,10 @@ +--- config.m4.orig 2018-08-31 12:19:23 UTC ++++ config.m4 +@@ -18,7 +18,6 @@ if test "$PHP_SNMP" != "no"; then + + if test -x "$SNMP_CONFIG"; then + SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs` +- SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`" + SNMP_PREFIX=`$SNMP_CONFIG --prefix` + snmp_full_version=`$SNMP_CONFIG --version` + ac_IFS=$IFS Property changes on: head/net-mgmt/php56-snmp/files/patch-config.m4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/php56-openssl/Makefile =================================================================== --- head/security/php56-openssl/Makefile (revision 487168) +++ head/security/php56-openssl/Makefile (revision 487169) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ CATEGORIES= security MASTERDIR= ${.CURDIR}/../../lang/php56 -PORTREVISION= 1 PKGNAMESUFFIX= -openssl .include "${MASTERDIR}/Makefile"