diff options
| author | taca <taca@pkgsrc.org> | 2014-11-24 15:37:08 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2014-11-24 15:37:08 +0000 |
| commit | c0940109cc2eecc698069e3376fe25f6dbc0e058 (patch) | |
| tree | 815fd83fe728fd15402e2830d8001aac24ee6d9d /lang | |
| parent | 8085b4fad23f4e2e87cc12d5ad573461bdefa603 (diff) | |
| download | pkgsrc-c0940109cc2eecc698069e3376fe25f6dbc0e058.tar.gz | |
Add php56, PHP version 5.6.3.
THe main features of PHP 5.6:
* Constant scalar expressions.
* Variadic functions and argument unpacking using the ... operator.
* Exponentiation using the ** operator.
* Function and constant importing with the use keyword.
* phpdbg as an interactive integrated debugger SAPI.
* php://input is now reusable, and $HTTP_RAW_POST_DATA is deprecated.
* GMP objects now support operator overloading.
* File uploads larger than 2 gigabytes in size are now accepted.
Please refer for difference from oldre release:http://php.net/migration56.
Diffstat (limited to 'lang')
29 files changed, 1085 insertions, 0 deletions
diff --git a/lang/php56/DESCR b/lang/php56/DESCR new file mode 100644 index 00000000000..cf1fb0d7814 --- /dev/null +++ b/lang/php56/DESCR @@ -0,0 +1,7 @@ +PHP is an HTML-embedded scripting language. It is modular, with +some object-oriented features. Much of its syntax is borrowed from +C, Java and Perl with a couple of unique PHP-specific features +thrown in. The language is designed to allow web developers to +write dynamically generated pages quickly. + +This package provides PHP version 5.5.x. diff --git a/lang/php56/MESSAGE b/lang/php56/MESSAGE new file mode 100644 index 00000000000..518ab7f54bd --- /dev/null +++ b/lang/php56/MESSAGE @@ -0,0 +1,11 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2014/11/24 15:37:08 taca Exp $ + +To process PHP scripts, you will need a PHP-enabled HTTP server. You may +either configure the HTTP server to use the PHP CGI binary located in + + ${CGIDIR}/php + +or you may install a PHP module for your HTTP server, e.g. www/ap-php. + +=========================================================================== diff --git a/lang/php56/Makefile b/lang/php56/Makefile new file mode 100644 index 00000000000..edd731fd422 --- /dev/null +++ b/lang/php56/Makefile @@ -0,0 +1,62 @@ +# $NetBSD: Makefile,v 1.1 2014/11/24 15:37:08 taca Exp $ + +# +# We can't omit PKGNAME here to handle PKG_OPTIONS. +# +PKGNAME= php-${PHP_BASE_VERS} +CATEGORIES= lang + +HOMEPAGE= http://www.php.net/ +COMMENT= PHP Hypertext Preprocessor version 5.6 +LICENSE= php + +TEST_TARGET= test + +USE_TOOLS+= gmake lex pkg-config +LIBTOOL_OVERRIDE= # empty +PHP_CHECK_INSTALLED= No + +PHP_VERSIONS_ACCEPTED= 56 + +.include "Makefile.php" + +CGIDIR= ${PREFIX}/libexec/cgi-bin +EGDIR= ${PREFIX}/share/examples/php +MESSAGE_SUBST+= CGIDIR=${CGIDIR} + +CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} +MAKE_ENV+= INSTALL_ROOT=${DESTDIR} + +CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini +PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" + +SUBST_CLASSES+= path +SUBST_MESSAGE.path= Fixing common paths. +SUBST_STAGE.path= pre-configure +SUBST_FILES.path= configure ext/phar/phar/phar.php +SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php +SUBST_FILES.path+= sapi/cgi/Makefile.frag +SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' +SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' + +INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php + +# Make sure modules can link correctly +.if ${OPSYS} == "Darwin" +INSTALL_UNSTRIPPED= yes +.endif + +post-extract: + cd ${WRKSRC} && \ + ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \; + +post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php + ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 + ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php + cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ + ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php + +.include "../../mk/bsd.pkg.mk" diff --git a/lang/php56/Makefile.common b/lang/php56/Makefile.common new file mode 100644 index 00000000000..598aa9bda9e --- /dev/null +++ b/lang/php56/Makefile.common @@ -0,0 +1,21 @@ +# $NetBSD: Makefile.common,v 1.1 2014/11/24 15:37:08 taca Exp $ +# used by lang/php56/Makefile.php +# used by lang/php/ext.mk +# used by meta-pkgs/php56-extensions/Makefile + +PHP_VERSION_REQD= 56 +PHP_BASE_VERS= ${PHP56_VERSION} + +.include "../../lang/php/common.mk" + +CATEGORIES+= www +MAINTAINER?= pkgsrc-users@NetBSD.org + +# needed due to (broken?) configure checks in php-xmlrpc and php5-dom +CONFIGURE_ENV+= PHP_LIBXML_SHARED="1" + +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +# configure test gets confused by wrappers dropping -R /usr/lib +CONFIGURE_ARGS+= php_cv_cc_dashr=no +.endif diff --git a/lang/php56/Makefile.php b/lang/php56/Makefile.php new file mode 100644 index 00000000000..91d8f168e97 --- /dev/null +++ b/lang/php56/Makefile.php @@ -0,0 +1,94 @@ +# $NetBSD: Makefile.php,v 1.1 2014/11/24 15:37:08 taca Exp $ +# used by lang/php56/Makefile +# used by www/ap-php/Makefile +# used by www/php-fpm/Makefile + +.include "../../lang/php56/Makefile.common" + +DISTINFO_FILE= ${.CURDIR}/../../lang/php56/distinfo +PATCHDIR= ${.CURDIR}/../../lang/php56/patches + +USE_LIBTOOL= YES +USE_LANGUAGES= c c++ +GNU_CONFIGURE= YES +BUILD_DEFS+= VARBASE +PLIST_VARS+= dtrace + +CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" + +.include "../../mk/bsd.prefs.mk" + +CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE} + +CONFIGURE_ARGS+= --with-regex=system + +CONFIGURE_ARGS+= --without-mysql +CONFIGURE_ARGS+= --without-iconv +CONFIGURE_ARGS+= --without-pear +#CONFIGURE_ARGS+= --without-intl + +CONFIGURE_ARGS+= --disable-posix +CONFIGURE_ARGS+= --disable-dom +CONFIGURE_ARGS+= --disable-opcache +CONFIGURE_ARGS+= --disable-pdo +CONFIGURE_ARGS+= --disable-json + +CONFIGURE_ARGS+= --enable-cgi +CONFIGURE_ARGS+= --enable-mysqlnd +CONFIGURE_ARGS+= --enable-xml +CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} +.include "../../textproc/libxml2/buildlink3.mk" + +PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} +PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline +PKG_SUGGESTED_OPTIONS+= inet6 ssl + +.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" +PKG_SUPPORTED_OPTIONS+= dtrace +.endif + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 +.endif + +.if !empty(PKG_OPTIONS:Mssl) +. include "../../security/openssl/buildlink3.mk" +. if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --with-openssl=yes +LIBS.SunOS+= -lcrypto +. else +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} +. endif +.else +CONFIGURE_ARGS+= --without-openssl +.endif + +.if !empty(PKG_OPTIONS:Mmaintainer-zts) +CONFIGURE_ARGS+= --enable-maintainer-zts +.endif + +.if !empty(PKG_OPTIONS:Mreadline) +USE_GNU_READLINE= yes +.include "../../devel/readline/buildlink3.mk" +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} +.else +CONFIGURE_ARGS+= --without-readline +.endif + +.if !empty(PKG_OPTIONS:Mdtrace) +PLIST.dtrace= yes +CONFIGURE_ARGS+= --enable-dtrace + +# See https://bugs.php.net/bug.php?id=61268 +INSTALL_MAKE_FLAGS+= -r +.endif + +DL_AUTO_VARS= yes +.include "../../mk/dlopen.buildlink3.mk" diff --git a/lang/php56/PLIST b/lang/php56/PLIST new file mode 100644 index 00000000000..74897edc836 --- /dev/null +++ b/lang/php56/PLIST @@ -0,0 +1,263 @@ +@comment $NetBSD: PLIST,v 1.1 2014/11/24 15:37:08 taca Exp $ +bin/phar +bin/phar.phar +bin/php +bin/php-config +bin/phpize +include/php/TSRM/TSRM.h +include/php/TSRM/readdir.h +include/php/TSRM/tsrm_config.h +include/php/TSRM/tsrm_config.w32.h +include/php/TSRM/tsrm_config_common.h +include/php/TSRM/tsrm_nw.h +include/php/TSRM/tsrm_strtok_r.h +include/php/TSRM/tsrm_win32.h +include/php/Zend/zend.h +include/php/Zend/zend_API.h +include/php/Zend/zend_alloc.h +include/php/Zend/zend_ast.h +include/php/Zend/zend_build.h +include/php/Zend/zend_builtin_functions.h +include/php/Zend/zend_closures.h +include/php/Zend/zend_compile.h +include/php/Zend/zend_config.h +include/php/Zend/zend_config.nw.h +include/php/Zend/zend_config.w32.h +include/php/Zend/zend_constants.h +include/php/Zend/zend_dtrace.h +${PLIST.dtrace}include/php/Zend/zend_dtrace_gen.h +include/php/Zend/zend_dynamic_array.h +include/php/Zend/zend_errors.h +include/php/Zend/zend_exceptions.h +include/php/Zend/zend_execute.h +include/php/Zend/zend_extensions.h +include/php/Zend/zend_float.h +include/php/Zend/zend_gc.h +include/php/Zend/zend_generators.h +include/php/Zend/zend_globals.h +include/php/Zend/zend_globals_macros.h +include/php/Zend/zend_hash.h +include/php/Zend/zend_highlight.h +include/php/Zend/zend_indent.h +include/php/Zend/zend_ini.h +include/php/Zend/zend_ini_parser.h +include/php/Zend/zend_ini_scanner.h +include/php/Zend/zend_ini_scanner_defs.h +include/php/Zend/zend_interfaces.h +include/php/Zend/zend_istdiostream.h +include/php/Zend/zend_iterators.h +include/php/Zend/zend_language_parser.h +include/php/Zend/zend_language_scanner.h +include/php/Zend/zend_language_scanner_defs.h +include/php/Zend/zend_list.h +include/php/Zend/zend_llist.h +include/php/Zend/zend_modules.h +include/php/Zend/zend_multibyte.h +include/php/Zend/zend_multiply.h +include/php/Zend/zend_object_handlers.h +include/php/Zend/zend_objects.h +include/php/Zend/zend_objects_API.h +include/php/Zend/zend_operators.h +include/php/Zend/zend_ptr_stack.h +include/php/Zend/zend_qsort.h +include/php/Zend/zend_signal.h +include/php/Zend/zend_stack.h +include/php/Zend/zend_static_allocator.h +include/php/Zend/zend_stream.h +include/php/Zend/zend_string.h +include/php/Zend/zend_strtod.h +include/php/Zend/zend_ts_hash.h +include/php/Zend/zend_types.h +include/php/Zend/zend_variables.h +include/php/Zend/zend_virtual_cwd.h +include/php/Zend/zend_vm.h +include/php/Zend/zend_vm_def.h +include/php/Zend/zend_vm_execute.h +include/php/Zend/zend_vm_opcodes.h +include/php/ext/date/lib/timelib.h +include/php/ext/date/lib/timelib_config.h +include/php/ext/date/lib/timelib_structs.h +include/php/ext/date/php_date.h +include/php/ext/ereg/php_ereg.h +include/php/ext/ereg/php_regex.h +include/php/ext/filter/php_filter.h +include/php/ext/hash/php_hash.h +include/php/ext/hash/php_hash_adler32.h +include/php/ext/hash/php_hash_crc32.h +include/php/ext/hash/php_hash_fnv.h +include/php/ext/hash/php_hash_gost.h +include/php/ext/hash/php_hash_haval.h +include/php/ext/hash/php_hash_joaat.h +include/php/ext/hash/php_hash_md.h +include/php/ext/hash/php_hash_ripemd.h +include/php/ext/hash/php_hash_sha.h +include/php/ext/hash/php_hash_snefru.h +include/php/ext/hash/php_hash_tiger.h +include/php/ext/hash/php_hash_whirlpool.h +include/php/ext/libxml/php_libxml.h +include/php/ext/mysqlnd/config-win.h +include/php/ext/mysqlnd/mysqlnd.h +include/php/ext/mysqlnd/mysqlnd_alloc.h +include/php/ext/mysqlnd/mysqlnd_block_alloc.h +include/php/ext/mysqlnd/mysqlnd_charset.h +include/php/ext/mysqlnd/mysqlnd_debug.h +include/php/ext/mysqlnd/mysqlnd_enum_n_def.h +include/php/ext/mysqlnd/mysqlnd_ext_plugin.h +include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h +include/php/ext/mysqlnd/mysqlnd_net.h +include/php/ext/mysqlnd/mysqlnd_portability.h +include/php/ext/mysqlnd/mysqlnd_priv.h +include/php/ext/mysqlnd/mysqlnd_result.h +include/php/ext/mysqlnd/mysqlnd_result_meta.h +include/php/ext/mysqlnd/mysqlnd_reverse_api.h +include/php/ext/mysqlnd/mysqlnd_statistics.h +include/php/ext/mysqlnd/mysqlnd_structs.h +include/php/ext/mysqlnd/mysqlnd_wireprotocol.h +include/php/ext/mysqlnd/php_mysqlnd.h +include/php/ext/pcre/pcrelib/config.h +include/php/ext/pcre/pcrelib/pcre.h +include/php/ext/pcre/pcrelib/pcre_internal.h +include/php/ext/pcre/pcrelib/pcreposix.h +include/php/ext/pcre/pcrelib/ucp.h +include/php/ext/pcre/php_pcre.h +include/php/ext/phar/php_phar.h +include/php/ext/session/mod_files.h +include/php/ext/session/mod_user.h +include/php/ext/session/php_session.h +include/php/ext/simplexml/php_simplexml.h +include/php/ext/simplexml/php_simplexml_exports.h +include/php/ext/spl/php_spl.h +include/php/ext/spl/spl_array.h +include/php/ext/spl/spl_directory.h +include/php/ext/spl/spl_dllist.h +include/php/ext/spl/spl_engine.h +include/php/ext/spl/spl_exceptions.h +include/php/ext/spl/spl_fixedarray.h +include/php/ext/spl/spl_functions.h +include/php/ext/spl/spl_heap.h +include/php/ext/spl/spl_iterators.h +include/php/ext/spl/spl_observer.h +include/php/ext/standard/base64.h +include/php/ext/standard/basic_functions.h +include/php/ext/standard/crc32.h +include/php/ext/standard/credits.h +include/php/ext/standard/credits_ext.h +include/php/ext/standard/credits_sapi.h +include/php/ext/standard/crypt_blowfish.h +include/php/ext/standard/crypt_freesec.h +include/php/ext/standard/css.h +include/php/ext/standard/cyr_convert.h +include/php/ext/standard/datetime.h +include/php/ext/standard/dl.h +include/php/ext/standard/exec.h +include/php/ext/standard/file.h +include/php/ext/standard/flock_compat.h +include/php/ext/standard/fsock.h +include/php/ext/standard/head.h +include/php/ext/standard/html.h +include/php/ext/standard/html_tables.h +include/php/ext/standard/info.h +include/php/ext/standard/md5.h +include/php/ext/standard/microtime.h +include/php/ext/standard/pack.h +include/php/ext/standard/pageinfo.h +include/php/ext/standard/php_array.h +include/php/ext/standard/php_assert.h +include/php/ext/standard/php_browscap.h +include/php/ext/standard/php_crypt.h +include/php/ext/standard/php_crypt_r.h +include/php/ext/standard/php_dir.h +include/php/ext/standard/php_dns.h +include/php/ext/standard/php_ext_syslog.h +include/php/ext/standard/php_filestat.h +include/php/ext/standard/php_fopen_wrappers.h +include/php/ext/standard/php_ftok.h +include/php/ext/standard/php_http.h +include/php/ext/standard/php_image.h +include/php/ext/standard/php_incomplete_class.h +include/php/ext/standard/php_iptc.h +include/php/ext/standard/php_lcg.h +include/php/ext/standard/php_link.h +include/php/ext/standard/php_mail.h +include/php/ext/standard/php_math.h +include/php/ext/standard/php_metaphone.h +include/php/ext/standard/php_password.h +include/php/ext/standard/php_rand.h +include/php/ext/standard/php_smart_str.h +include/php/ext/standard/php_smart_str_public.h +include/php/ext/standard/php_standard.h +include/php/ext/standard/php_string.h +include/php/ext/standard/php_type.h +include/php/ext/standard/php_uuencode.h +include/php/ext/standard/php_var.h +include/php/ext/standard/php_versioning.h +include/php/ext/standard/proc_open.h +include/php/ext/standard/quot_print.h +include/php/ext/standard/scanf.h +include/php/ext/standard/sha1.h +include/php/ext/standard/streamsfuncs.h +include/php/ext/standard/uniqid.h +include/php/ext/standard/url.h +include/php/ext/standard/url_scanner_ex.h +include/php/ext/standard/winver.h +include/php/ext/xml/expat_compat.h +include/php/ext/xml/php_xml.h +include/php/main/SAPI.h +include/php/main/build-defs.h +include/php/main/fopen_wrappers.h +include/php/main/php.h +include/php/main/php_compat.h +include/php/main/php_config.h +include/php/main/php_content_types.h +include/php/main/php_getopt.h +include/php/main/php_globals.h +include/php/main/php_ini.h +include/php/main/php_main.h +include/php/main/php_memory_streams.h +include/php/main/php_network.h +include/php/main/php_open_temporary_file.h +include/php/main/php_output.h +include/php/main/php_reentrancy.h +include/php/main/php_scandir.h +include/php/main/php_stdint.h +include/php/main/php_streams.h +include/php/main/php_syslog.h +include/php/main/php_ticks.h +include/php/main/php_variables.h +include/php/main/php_version.h +include/php/main/rfc1867.h +include/php/main/snprintf.h +include/php/main/spprintf.h +include/php/main/streams/php_stream_context.h +include/php/main/streams/php_stream_filter_api.h +include/php/main/streams/php_stream_glob_wrapper.h +include/php/main/streams/php_stream_mmap.h +include/php/main/streams/php_stream_plain_wrapper.h +include/php/main/streams/php_stream_transport.h +include/php/main/streams/php_stream_userspace.h +include/php/main/streams/php_streams_int.h +include/php/main/win32_internal_function_disabled.h +include/php/main/win95nt.h +include/php/sapi/cli/cli.h +lib/php/build/Makefile.global +lib/php/build/acinclude.m4 +lib/php/build/config.guess +lib/php/build/config.sub +lib/php/build/libtool.m4 +lib/php/build/ltmain.sh +lib/php/build/mkdep.awk +lib/php/build/phpize.m4 +lib/php/build/run-tests.php +lib/php/build/scan_makefile_in.awk +lib/php/build/shtool +libexec/cgi-bin/php +man/man1/phar.1 +man/man1/phar.phar.1 +man/man1/php-cgi.1 +man/man1/php-config.1 +man/man1/php.1 +man/man1/phpize.1 +share/examples/php/php.ini-development +share/examples/php/php.ini-production +share/php/php.gif +@pkgdir ${PHPEXTDIR} diff --git a/lang/php56/buildlink3.mk b/lang/php56/buildlink3.mk new file mode 100644 index 00000000000..8e979cb01df --- /dev/null +++ b/lang/php56/buildlink3.mk @@ -0,0 +1,15 @@ +# $NetBSD: buildlink3.mk,v 1.1 2014/11/24 15:37:08 taca Exp $ + +BUILDLINK_TREE+= php + +.if !defined(PHP_BUILDLINK3_MK) +PHP_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.php+= php>=5.6.0<5.7 +BUILDLINK_ABI_DEPENDS.php+= php>=5.6.0<5.7 +BUILDLINK_PKGSRCDIR.php?= ../../lang/php56 + +.include "../../textproc/libxml2/buildlink3.mk" +.endif # PHP_BUILDLINK3_MK + +BUILDLINK_TREE+= -php diff --git a/lang/php56/distinfo b/lang/php56/distinfo new file mode 100644 index 00000000000..72b6f4335c4 --- /dev/null +++ b/lang/php56/distinfo @@ -0,0 +1,26 @@ +$NetBSD: distinfo,v 1.1 2014/11/24 15:37:08 taca Exp $ + +SHA1 (php-5.6.3.tar.bz2) = 05cb83b781b5a1259ee7ba4eda4b6fa48a58ffec +RMD160 (php-5.6.3.tar.bz2) = 0c45c57d8e7c04f27ebfb5469ef214c33abd1ab6 +Size (php-5.6.3.tar.bz2) = 13461539 bytes +SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8 +SHA1 (patch-aclocal.m4) = 49117c42e03bd3ed57d967d33ba543f936013b4f +SHA1 (patch-build_libtool.m4) = f459cda09cbdad9780568d271091fb17bbc5d965 +SHA1 (patch-configure) = d3d44c814deb0264fd4fc41908c2ff31fde00b0d +SHA1 (patch-ext_gd_config.m4) = 4b44853250eb4a638af4c663e618307ff25d2cbd +SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 +SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c +SHA1 (patch-ext_opcache_config.m4) = 031db201f68a120615561a5abd3e84aff58b523d +SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 +SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 +SHA1 (patch-ext_phar_Makefile.frag) = 9a076d46332dc6a28d225c7b71c2f01e2819636d +SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 +SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b77a4710a39a037738a89a55a60e37b48c5a1f3d +SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 +SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419 +SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f +SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d +SHA1 (patch-run-tests.php) = 3b682267825a87f501a9f3dbd526dca2be9f2807 +SHA1 (patch-sapi_cgi_Makefile.frag) = 0bdf3e3e5f658ee834671307d7fb7ad36d41d48f +SHA1 (patch-sapi_fpm_fpm_events_port.c) = e68f6307869d39364087c18ebf19e86e07d9c82a +SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 7c75d8dd9515ef4bca4bdf7c9155fd60f9fbf354 diff --git a/lang/php56/patches/patch-acinclude.m4 b/lang/php56/patches/patch-acinclude.m4 new file mode 100644 index 00000000000..29dc9c6edcf --- /dev/null +++ b/lang/php56/patches/patch-acinclude.m4 @@ -0,0 +1,13 @@ +$NetBSD: patch-acinclude.m4,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- acinclude.m4.orig 2014-11-12 13:52:21.000000000 +0000 ++++ acinclude.m4 +@@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ + if test "$found_openssl" = "no"; then + + if test "$PHP_OPENSSL_DIR" = "yes"; then +- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" ++ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" + fi + + for i in $PHP_OPENSSL_DIR; do diff --git a/lang/php56/patches/patch-aclocal.m4 b/lang/php56/patches/patch-aclocal.m4 new file mode 100644 index 00000000000..50beb6f9ccf --- /dev/null +++ b/lang/php56/patches/patch-aclocal.m4 @@ -0,0 +1,22 @@ +$NetBSD: patch-aclocal.m4,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- aclocal.m4.orig 2014-11-13 10:07:22.000000000 +0000 ++++ aclocal.m4 +@@ -4578,7 +4578,7 @@ freebsd* | dragonfly*) + objformat=`/usr/bin/objformat` + else + case $host_os in +- freebsd[[123]]*) objformat=aout ;; ++ freebsd[[123]]|freebsd[[123]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi +@@ -6195,7 +6195,7 @@ case $host_os in + ;; + esac + ;; +- freebsd[[12]]*) ++ freebsd[[12]]|freebsd[[12]].*) + # C++ shared libraries reported to be fairly broken before switch to ELF + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; diff --git a/lang/php56/patches/patch-build_libtool.m4 b/lang/php56/patches/patch-build_libtool.m4 new file mode 100644 index 00000000000..dcc6059dda7 --- /dev/null +++ b/lang/php56/patches/patch-build_libtool.m4 @@ -0,0 +1,22 @@ +$NetBSD: patch-build_libtool.m4,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- build/libtool.m4.orig 2014-11-12 13:52:21.000000000 +0000 ++++ build/libtool.m4 +@@ -1545,7 +1545,7 @@ freebsd* | dragonfly*) + objformat=`/usr/bin/objformat` + else + case $host_os in +- freebsd[[123]]*) objformat=aout ;; ++ freebsd[[123]]|freebsd[[123]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi +@@ -3162,7 +3162,7 @@ case $host_os in + ;; + esac + ;; +- freebsd[[12]]*) ++ freebsd[[12]]|freebsd[[12]].*) + # C++ shared libraries reported to be fairly broken before switch to ELF + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; diff --git a/lang/php56/patches/patch-configure b/lang/php56/patches/patch-configure new file mode 100644 index 00000000000..0b201a4fea9 --- /dev/null +++ b/lang/php56/patches/patch-configure @@ -0,0 +1,146 @@ +$NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- configure.orig 2014-11-13 10:07:25.000000000 +0000 ++++ configure +@@ -8310,27 +8310,6 @@ EOF + ;; + esac + +- if test "$APACHE_VERSION" -lt 2004001; then +- APXS_MPM=`$APXS -q MPM_NAME` +- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then +- +- enable_maintainer_zts=yes +- if test "$pthreads_working" != "yes"; then +- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 +- fi +- +- fi +- else +- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` +- if test -n "$APACHE_THREADED_MPM"; then +- +- enable_maintainer_zts=yes +- if test "$pthreads_working" != "yes"; then +- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 +- fi +- +- fi +- fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +@@ -9134,27 +9113,6 @@ EOF + ;; + esac + +- if test "$APACHE_VERSION" -lt 2004001; then +- APXS_MPM=`$APXS -q MPM_NAME` +- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then +- +- enable_maintainer_zts=yes +- if test "$pthreads_working" != "yes"; then +- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 +- fi +- +- fi +- else +- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` +- if test -n "$APACHE_THREADED_MPM"; then +- +- enable_maintainer_zts=yes +- if test "$pthreads_working" != "yes"; then +- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 +- fi +- +- fi +- fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +@@ -24596,7 +24554,7 @@ fi + if test "$found_openssl" = "no"; then + + if test "$PHP_OPENSSL_DIR" = "yes"; then +- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" ++ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" + fi + + for i in $PHP_OPENSSL_DIR; do +@@ -26751,7 +26709,7 @@ $as_echo "yes" >&6; } + PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" + + +- for header_file in ext/sqlite3/libsqlite/sqlite3.h; do ++ for header_file; do + + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` +@@ -37864,7 +37822,7 @@ fi + if test "$found_openssl" = "no"; then + + if test "$PHP_OPENSSL_DIR" = "yes"; then +- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" ++ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" + fi + + for i in $PHP_OPENSSL_DIR; do +@@ -49266,7 +49224,7 @@ fi + if test "$found_openssl" = "no"; then + + if test "$PHP_OPENSSL_DIR" = "yes"; then +- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" ++ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" + fi + + for i in $PHP_OPENSSL_DIR; do +@@ -66188,7 +66146,7 @@ rm -f core *.core core.conftest.* gmon.o + fi + + +-if test "$flock_type" == "unknown"; then ++if test "$flock_type" = "unknown"; then + as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5 + fi + +@@ -106720,12 +106678,7 @@ old_CC=$CC + if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then + CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" + INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" +- cat >meta_ccld<<EOF +-#! /bin/sh +-exec $CC $ac_cv_pthreads_cflags \$@ +-EOF +- CC="$abs_builddir/meta_ccld" +- chmod +x meta_ccld ++ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" + fi + + if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then +@@ -110497,7 +110450,7 @@ freebsd* | dragonfly*) + objformat=`/usr/bin/objformat` + else + case $host_os in +- freebsd[123]*) objformat=aout ;; ++ freebsd[123]|freebsd[123].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi +@@ -112577,7 +112530,7 @@ if test -z "$aix_libpath"; then aix_libp + ;; + esac + ;; +- freebsd[12]*) ++ freebsd[12]|freebsd[12].*) + # C++ shared libraries reported to be fairly broken before switch to ELF + ld_shlibs_CXX=no + ;; +@@ -114130,7 +114083,7 @@ freebsd* | dragonfly*) + objformat=`/usr/bin/objformat` + else + case $host_os in +- freebsd[123]*) objformat=aout ;; ++ freebsd[123]|freebsd[123].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi diff --git a/lang/php56/patches/patch-ext_gd_config.m4 b/lang/php56/patches/patch-ext_gd_config.m4 new file mode 100644 index 00000000000..098b41f37b5 --- /dev/null +++ b/lang/php56/patches/patch-ext_gd_config.m4 @@ -0,0 +1,49 @@ +$NetBSD: patch-ext_gd_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- ext/gd/config.m4.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/gd/config.m4 +@@ -49,18 +49,7 @@ dnl Checks for the configure options + dnl + + AC_DEFUN([PHP_GD_ZLIB],[ +- if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then +- if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then +- PHP_ZLIB_DIR="$PHP_ZLIB_DIR" +- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" +- elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then +- PHP_ZLIB_DIR="$PHP_ZLIB_DIR" +- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" +- else +- AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"]) +- fi +- else +- for i in /usr/local /usr; do ++ for i in "$PHP_ZLIB_DIR" /usr/local /usr; do + if test -f "$i/include/zlib/zlib.h"; then + PHP_ZLIB_DIR="$i" + PHP_ZLIB_INCDIR="$i/include/zlib" +@@ -69,7 +58,6 @@ AC_DEFUN([PHP_GD_ZLIB],[ + PHP_ZLIB_INCDIR="$i/include" + fi + done +- fi + ]) + + AC_DEFUN([PHP_GD_VPX],[ +@@ -138,13 +126,13 @@ AC_DEFUN([PHP_GD_PNG],[ + AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>]) + fi + +- PHP_CHECK_LIBRARY(png,png_write_image, ++ PHP_CHECK_LIBRARY(png16,png_write_image, + [ + PHP_ADD_INCLUDE($GD_PNG_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(png16, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) + ],[ +- AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) ++ AC_MSG_ERROR([Problem with libpng16.(a|so) or libz.(a|so). Please check config.log for more information.]) + ],[ + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR + ]) diff --git a/lang/php56/patches/patch-ext_imap_config.m4 b/lang/php56/patches/patch-ext_imap_config.m4 new file mode 100644 index 00000000000..c8f33b6742b --- /dev/null +++ b/lang/php56/patches/patch-ext_imap_config.m4 @@ -0,0 +1,28 @@ +$NetBSD: patch-ext_imap_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- ext/imap/config.m4.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/imap/config.m4 +@@ -48,6 +48,14 @@ AC_DEFUN([PHP_IMAP_TEST_BUILD], [ + ]) + ]) + ++dsl Must be before --with-kerberos, affects the check ++PHP_ARG_WITH(imap-linkage,use IMAP c-client linkage, ++[ --with-imap-linkage Use IMAP c-client linkage to determine supported items.]) ++ ++if test "$PHP_IMAP_LINKAGE" != "no"; then ++ AC_DEFINE(HAVE_IMAP_LINKAGE, 1, [ ]) ++fi ++ + AC_DEFUN([PHP_IMAP_KRB_CHK], [ + if test "$PHP_KERBEROS" != "no"; then + PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD, +@@ -59,7 +67,7 @@ AC_DEFUN([PHP_IMAP_KRB_CHK], [ + Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr ) + ]) + ]) +- else ++ elif test "$PHP_IMAP_LINKAGE" != "yes"; then + AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ + AC_MSG_ERROR([This c-client library is built with Kerberos support. + diff --git a/lang/php56/patches/patch-ext_mssql_php__mssql.c b/lang/php56/patches/patch-ext_mssql_php__mssql.c new file mode 100644 index 00000000000..8aad6f71a2a --- /dev/null +++ b/lang/php56/patches/patch-ext_mssql_php__mssql.c @@ -0,0 +1,22 @@ +$NetBSD: patch-ext_mssql_php__mssql.c,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- ext/mssql/php_mssql.c.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/mssql/php_mssql.c +@@ -769,7 +769,7 @@ static void php_mssql_do_connect(INTERNA + dbfreelogin(mssql.login); + RETURN_FALSE; + } +- link = (int) index_ptr->ptr; ++ link = (int)(long) index_ptr->ptr; + ptr = zend_list_find(link,&type); /* check if the link is still there */ + if (ptr && (type==le_link || type==le_plink)) { + zend_list_addref(link); +@@ -1122,7 +1122,7 @@ static void php_mssql_get_column_content + } + + res_length = 19; +- spprintf(&res_buf, 0, "%d-%02d-%02d %02d:%02d:%02d" , dateinfo.year, dateinfo.month, dateinfo.day, dateinfo.hour, dateinfo.minute, dateinfo.second); ++ spprintf((char **)&res_buf, 0, "%d-%02d-%02d %02d:%02d:%02d" , dateinfo.year, dateinfo.month, dateinfo.day, dateinfo.hour, dateinfo.minute, dateinfo.second); + } + + ZVAL_STRINGL(result, res_buf, res_length, 0); diff --git a/lang/php56/patches/patch-ext_opcache_config.m4 b/lang/php56/patches/patch-ext_opcache_config.m4 new file mode 100644 index 00000000000..ebfe712861b --- /dev/null +++ b/lang/php56/patches/patch-ext_opcache_config.m4 @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_opcache_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $ + +Avoid use "==" in test(1). + +--- ext/opcache/config.m4.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/opcache/config.m4 +@@ -359,7 +359,7 @@ AC_TRY_RUN([ + AC_MSG_RESULT("yes") + ], AC_MSG_RESULT("no") ) + +-if test "$flock_type" == "unknown"; then ++if test "$flock_type" = "unknown"; then + AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) + fi + diff --git a/lang/php56/patches/patch-ext_pdo__mysql_config.m4 b/lang/php56/patches/patch-ext_pdo__mysql_config.m4 new file mode 100644 index 00000000000..344dc6d3078 --- /dev/null +++ b/lang/php56/patches/patch-ext_pdo__mysql_config.m4 @@ -0,0 +1,13 @@ +$NetBSD: patch-ext_pdo__mysql_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- ext/pdo_mysql/config.m4.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/pdo_mysql/config.m4 +@@ -144,7 +144,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then + fi + + dnl fix after renaming to pdo_mysql +- PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_cv_inc_path -I) ++ PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared) + ifdef([PHP_ADD_EXTENSION_DEP], + [ + PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo) diff --git a/lang/php56/patches/patch-ext_pdo_config.m4 b/lang/php56/patches/patch-ext_pdo_config.m4 new file mode 100644 index 00000000000..2365031450f --- /dev/null +++ b/lang/php56/patches/patch-ext_pdo_config.m4 @@ -0,0 +1,25 @@ +$NetBSD: patch-ext_pdo_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- ext/pdo/config.m4.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/pdo/config.m4 +@@ -37,20 +37,6 @@ if test "$PHP_PDO" != "no"; then + + PHP_PDO_PEAR_CHECK + +- if test "$ext_shared" = "yes" ; then +- case $host_alias in +- *darwin*) +- AC_MSG_ERROR([ +-Due to the way that loadable modules work on OSX/Darwin, you need to +-compile the PDO package statically into the PHP core. +- +-Please follow the instructions at: http://netevil.org/node.php?nid=202 +-for more detail on this issue. +- ]) +- ext_shared=no +- ;; +- esac +- fi + PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared) + ifdef([PHP_ADD_EXTENSION_DEP], + [ diff --git a/lang/php56/patches/patch-ext_phar_Makefile.frag b/lang/php56/patches/patch-ext_phar_Makefile.frag new file mode 100644 index 00000000000..5843ef54640 --- /dev/null +++ b/lang/php56/patches/patch-ext_phar_Makefile.frag @@ -0,0 +1,22 @@ +$NetBSD: patch-ext_phar_Makefile.frag,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- ext/phar/Makefile.frag.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/phar/Makefile.frag +@@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \ + else \ + $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ + fi;` +-PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` ++PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` + + $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc + -@test -d $(builddir)/phar || mkdir $(builddir)/phar +@@ -39,7 +39,7 @@ install-pharcmd: pharcmd + -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) + $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) + -@rm -f $(INSTALL_ROOT)$(bindir)/phar +- $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar ++ $(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar + @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 + @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1 + @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1 diff --git a/lang/php56/patches/patch-ext_phar_phar_phar.php b/lang/php56/patches/patch-ext_phar_phar_phar.php new file mode 100644 index 00000000000..26a3768e5b2 --- /dev/null +++ b/lang/php56/patches/patch-ext_phar_phar_phar.php @@ -0,0 +1,10 @@ +$NetBSD: patch-ext_phar_phar_phar.php,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- ext/phar/phar/phar.php.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/phar/phar/phar.php +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/php ++#!@PREFIX@/bin/php + <?php + + /** @file phar.php diff --git a/lang/php56/patches/patch-ext_sqlite3_libsqlite_sqlite3.c b/lang/php56/patches/patch-ext_sqlite3_libsqlite_sqlite3.c new file mode 100644 index 00000000000..ca73899c33d --- /dev/null +++ b/lang/php56/patches/patch-ext_sqlite3_libsqlite_sqlite3.c @@ -0,0 +1,14 @@ +$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.1 2014/11/24 15:37:08 taca Exp $$ +Don't redefine _XOPEN_SOURCE, it is already set from php. + +--- ext/sqlite3/libsqlite/sqlite3.c.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/sqlite3/libsqlite/sqlite3.c +@@ -7867,7 +7867,7 @@ struct sqlite3_rtree_geometry { + ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit + ** it. + */ +-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) ++#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__sun) + # define _XOPEN_SOURCE 600 + #endif + diff --git a/lang/php56/patches/patch-ext_standard_basic__functions.c b/lang/php56/patches/patch-ext_standard_basic__functions.c new file mode 100644 index 00000000000..6bc67dd864c --- /dev/null +++ b/lang/php56/patches/patch-ext_standard_basic__functions.c @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_standard_basic__functions.c,v 1.1 2014/11/24 15:37:08 taca Exp $ + +Work around VAX FP lack of INF + +--- ext/standard/basic_functions.c.orig 2014-11-12 13:52:21.000000000 +0000 ++++ ext/standard/basic_functions.c +@@ -3489,7 +3489,7 @@ PHPAPI double php_get_nan(void) /* {{{ * + + PHPAPI double php_get_inf(void) /* {{{ */ + { +-#if HAVE_HUGE_VAL_INF ++#if defined(HAVE_HUGE_VAL_INF) || defined(__vax__) + return HUGE_VAL; + #elif defined(__i386__) || defined(_X86_) || defined(ALPHA) || defined(_ALPHA) || defined(__alpha) + double val = 0.0; diff --git a/lang/php56/patches/patch-makedist b/lang/php56/patches/patch-makedist new file mode 100644 index 00000000000..824af686fc7 --- /dev/null +++ b/lang/php56/patches/patch-makedist @@ -0,0 +1,13 @@ +$NetBSD: patch-makedist,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- makedist.orig 2014-11-12 13:52:21.000000000 +0000 ++++ makedist +@@ -35,7 +35,7 @@ if test "${1}" = "1" -a "${2}" -lt "28"; + fi + IFS="$old_IFS" + +-if test "x$PHPROOT" == "x"; then ++if test "x$PHPROOT" = "x"; then + PHPROOT=git@git.php.net:php-src.git; + fi + diff --git a/lang/php56/patches/patch-php.ini-development b/lang/php56/patches/patch-php.ini-development new file mode 100644 index 00000000000..c0ca665406f --- /dev/null +++ b/lang/php56/patches/patch-php.ini-development @@ -0,0 +1,33 @@ +$NetBSD: patch-php.ini-development,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- php.ini-development.orig 2014-11-12 13:52:21.000000000 +0000 ++++ php.ini-development +@@ -711,7 +711,7 @@ default_charset = "UTF-8" + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:@PREFIX@/lib/php" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -732,8 +732,8 @@ doc_root = + ; http://php.net/user-dir + user_dir = + +-; Directory in which the loadable extensions (modules) reside. +-; http://php.net/extension-dir ++; Directory in which the loadable extensions (modules) reside. If not ++; defined, then use the extension directory specified at compile-time. + ; extension_dir = "./" + ; On windows: + ; extension_dir = "ext" +@@ -806,7 +806,7 @@ file_uploads = On + ; Temporary directory for HTTP uploaded files (will use system default if not + ; specified). + ; http://php.net/upload-tmp-dir +-;upload_tmp_dir = ++upload_tmp_dir = /tmp + + ; Maximum allowed size for uploaded files. + ; http://php.net/upload-max-filesize diff --git a/lang/php56/patches/patch-php.ini-production b/lang/php56/patches/patch-php.ini-production new file mode 100644 index 00000000000..139be680054 --- /dev/null +++ b/lang/php56/patches/patch-php.ini-production @@ -0,0 +1,33 @@ +$NetBSD: patch-php.ini-production,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- php.ini-production.orig 2014-11-12 13:52:21.000000000 +0000 ++++ php.ini-production +@@ -709,7 +709,7 @@ default_charset = "UTF-8" + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:@PREFIX@/lib/php" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -730,8 +730,8 @@ doc_root = + ; http://php.net/user-dir + user_dir = + +-; Directory in which the loadable extensions (modules) reside. +-; http://php.net/extension-dir ++; Directory in which the loadable extensions (modules) reside. If not ++; defined, then use the extension directory specified at compile-time. + ; extension_dir = "./" + ; On windows: + ; extension_dir = "ext" +@@ -804,7 +804,7 @@ file_uploads = On + ; Temporary directory for HTTP uploaded files (will use system default if not + ; specified). + ; http://php.net/upload-tmp-dir +-;upload_tmp_dir = ++upload_tmp_dir = /tmp + + ; Maximum allowed size for uploaded files. + ; http://php.net/upload-max-filesize diff --git a/lang/php56/patches/patch-run-tests.php b/lang/php56/patches/patch-run-tests.php new file mode 100644 index 00000000000..fce284ca591 --- /dev/null +++ b/lang/php56/patches/patch-run-tests.php @@ -0,0 +1,12 @@ +$NetBSD: patch-run-tests.php,v 1.1 2014/11/24 15:37:08 taca Exp $ + +Use proper shbang line. + +--- run-tests.php.orig 2014-11-12 13:52:21.000000000 +0000 ++++ run-tests.php +@@ -1,4 +1,4 @@ +-#!/usr/bin/env php ++#!@PREFIX@/bin/php + <?php + /* + +----------------------------------------------------------------------+ diff --git a/lang/php56/patches/patch-sapi_cgi_Makefile.frag b/lang/php56/patches/patch-sapi_cgi_Makefile.frag new file mode 100644 index 00000000000..e556ada054a --- /dev/null +++ b/lang/php56/patches/patch-sapi_cgi_Makefile.frag @@ -0,0 +1,16 @@ +$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.1 2014/11/24 15:37:08 taca Exp $ + +--- sapi/cgi/Makefile.frag.orig 2014-11-12 13:52:21.000000000 +0000 ++++ sapi/cgi/Makefile.frag +@@ -4,9 +4,9 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P + $(BUILD_CGI) + + install-cgi: $(SAPI_CGI_PATH) +- @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" ++ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)@CGIDIR@/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) +- @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) ++ @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)@CGIDIR@/$(program_prefix)php$(program_suffix)$(EXEEXT) + @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 + @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 diff --git a/lang/php56/patches/patch-sapi_fpm_fpm_events_port.c b/lang/php56/patches/patch-sapi_fpm_fpm_events_port.c new file mode 100644 index 00000000000..d6a15468e1b --- /dev/null +++ b/lang/php56/patches/patch-sapi_fpm_fpm_events_port.c @@ -0,0 +1,47 @@ +$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.1 2014/11/24 15:37:08 taca Exp $ + +Fix code to make FPM intercept signals properly even with pipes (via catch_workers_output=yes). +See https://bugs.php.net/bug.php?id=65800. +--- sapi/fpm/fpm/events/port.c.orig 2014-11-12 13:52:21.000000000 +0000 ++++ sapi/fpm/fpm/events/port.c +@@ -124,6 +124,7 @@ static int fpm_event_port_wait(struct fp + t.tv_nsec = (timeout % 1000) * 1000 * 1000; + + /* wait for inconming event or timeout. We want at least one event or timeout */ ++again: + nget = 1; + ret = port_getn(pfd, events, nevents, &nget, &t); + if (ret < 0) { +@@ -133,17 +134,31 @@ static int fpm_event_port_wait(struct fp + zlog(ZLOG_WARNING, "poll() returns %d", errno); + return -1; + } ++ ++ if (errno == EINTR) ++ goto again; ++ ++ return 0; + } + + for (i = 0; i < nget; i++) { ++ struct fpm_event_s *ev; + + /* do we have a ptr to the event ? */ + if (!events[i].portev_user) { + continue; + } + ++ ev = (struct fpm_event_s *)events[i].portev_user; ++ ++ if (port_associate(pfd, PORT_SOURCE_FD, ++ ev->fd, POLLIN, (void *)ev) < 0) { ++ zlog(ZLOG_ERROR, "port: unable to add the event"); ++ return -1; ++ } ++ + /* fire the event */ +- fpm_event_fire((struct fpm_event_s *)events[i].portev_user); ++ fpm_event_fire(ev); + + /* sanity check */ + if (fpm_globals.parent_pid != getpid()) { diff --git a/lang/php56/patches/patch-sapi_fpm_php-fpm.conf.in b/lang/php56/patches/patch-sapi_fpm_php-fpm.conf.in new file mode 100644 index 00000000000..e6b82f8da98 --- /dev/null +++ b/lang/php56/patches/patch-sapi_fpm_php-fpm.conf.in @@ -0,0 +1,16 @@ +$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.1 2014/11/24 15:37:08 taca Exp $ + +Uncomment the pid parameter so the pidfile is created and rc.d script +can really start / stop php-fpm + +--- sapi/fpm/php-fpm.conf.in.orig 2014-11-12 13:52:21.000000000 +0000 ++++ sapi/fpm/php-fpm.conf.in +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm.pid + + ; Error log file + ; If it's set to "syslog", log is sent to syslogd instead of being written |