summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2016-09-11 17:00:31 +0000
committertaca <taca@pkgsrc.org>2016-09-11 17:00:31 +0000
commit2a80eb58399f45112321561ec2d2cc2d1af21b52 (patch)
treeab9a2c4bf7d8cfd4c4f48ee825fa61dd878c8f5b
parent9481bc0f614fdcbb2bde164da49d50fa52d41ee3 (diff)
downloadpkgsrc-2a80eb58399f45112321561ec2d2cc2d1af21b52.tar.gz
Remove php55 pacakge from pkgsrc since it is EOL on 21 Jul 2016.
-rw-r--r--lang/php55/DESCR7
-rw-r--r--lang/php55/MESSAGE11
-rw-r--r--lang/php55/Makefile69
-rw-r--r--lang/php55/Makefile.common20
-rw-r--r--lang/php55/Makefile.php94
-rw-r--r--lang/php55/PLIST263
-rw-r--r--lang/php55/buildlink3.mk15
-rw-r--r--lang/php55/distinfo30
-rw-r--r--lang/php55/patches/patch-acinclude.m413
-rw-r--r--lang/php55/patches/patch-aclocal.m422
-rw-r--r--lang/php55/patches/patch-build_libtool.m422
-rw-r--r--lang/php55/patches/patch-configure146
-rw-r--r--lang/php55/patches/patch-ext_gd_config.m460
-rw-r--r--lang/php55/patches/patch-ext_imap_config.m428
-rw-r--r--lang/php55/patches/patch-ext_mssql_php__mssql.c22
-rw-r--r--lang/php55/patches/patch-ext_opcache_config.m415
-rw-r--r--lang/php55/patches/patch-ext_pdo__mysql_config.m413
-rw-r--r--lang/php55/patches/patch-ext_pdo_config.m425
-rw-r--r--lang/php55/patches/patch-ext_phar_Makefile.frag13
-rw-r--r--lang/php55/patches/patch-ext_phar_phar_phar.php10
-rw-r--r--lang/php55/patches/patch-ext_recode_recode.c22
-rw-r--r--lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c15
-rw-r--r--lang/php55/patches/patch-ext_standard_basic__functions.c15
-rw-r--r--lang/php55/patches/patch-ext_standard_php__dns.h23
-rw-r--r--lang/php55/patches/patch-makedist13
-rw-r--r--lang/php55/patches/patch-php.ini-development33
-rw-r--r--lang/php55/patches/patch-php.ini-production33
-rw-r--r--lang/php55/patches/patch-run-tests.php12
-rw-r--r--lang/php55/patches/patch-sapi_cgi_Makefile.frag16
-rw-r--r--lang/php55/patches/patch-sapi_fpm_fpm_events_port.c47
-rw-r--r--lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c15
-rw-r--r--lang/php55/patches/patch-sapi_fpm_php-fpm.conf.in16
32 files changed, 0 insertions, 1158 deletions
diff --git a/lang/php55/DESCR b/lang/php55/DESCR
deleted file mode 100644
index cf1fb0d7814..00000000000
--- a/lang/php55/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-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/php55/MESSAGE b/lang/php55/MESSAGE
deleted file mode 100644
index 68af4068ea1..00000000000
--- a/lang/php55/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2013/07/29 16:41:02 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/php55/Makefile b/lang/php55/Makefile
deleted file mode 100644
index 333dae55f65..00000000000
--- a/lang/php55/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2016/06/24 15:23:00 taca Exp $
-
-#
-# We can't omit PKGNAME here to handle PKG_OPTIONS.
-#
-PKGNAME= php-${PHP_VERSION}
-CATEGORIES= lang
-
-HOMEPAGE= http://www.php.net/
-COMMENT= PHP Hypertext Preprocessor version 5.5
-LICENSE= php
-
-TEST_TARGET= test
-
-USE_TOOLS+= gmake lex pkg-config
-LIBTOOL_OVERRIDE= # empty
-PHP_CHECK_INSTALLED= No
-
-PHP_VERSIONS_ACCEPTED= 55
-
-.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}
-
-# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
-# and lacks the zone memory allocator
-.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
-CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
-.endif
-
-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= 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
-
-.include "../../mk/compiler.mk"
-
-.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "clang"
-CONFIGURE_ARGS+= --disable-libgcc
-.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/php55/Makefile.common b/lang/php55/Makefile.common
deleted file mode 100644
index 7da1b4e711e..00000000000
--- a/lang/php55/Makefile.common
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2015/03/16 00:26:31 taca Exp $
-# used by lang/php55/Makefile.php
-# used by lang/php/ext.mk
-# used by meta-pkgs/php55-extensions/Makefile
-
-PHP_VERSION_REQD= 55
-
-.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/php55/Makefile.php b/lang/php55/Makefile.php
deleted file mode 100644
index a9044b13e5b..00000000000
--- a/lang/php55/Makefile.php
+++ /dev/null
@@ -1,94 +0,0 @@
-# $NetBSD: Makefile.php,v 1.4 2014/06/13 14:13:20 fhajny Exp $
-# used by lang/php55/Makefile
-# used by www/ap-php/Makefile
-# used by www/php-fpm/Makefile
-
-.include "../../lang/php55/Makefile.common"
-
-DISTINFO_FILE= ${.CURDIR}/../../lang/php55/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/php55/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/php55/PLIST b/lang/php55/PLIST
deleted file mode 100644
index 4610a0463f4..00000000000
--- a/lang/php55/PLIST
+++ /dev/null
@@ -1,263 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2015/02/19 13:35:24 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_virtual_cwd.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_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_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_types.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/mysql_float_to_double.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/mysqlnd/php_mysqlnd_config.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/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_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 include/php/include
-@pkgdir ${PHPEXTDIR}
diff --git a/lang/php55/buildlink3.mk b/lang/php55/buildlink3.mk
deleted file mode 100644
index de0dad9363b..00000000000
--- a/lang/php55/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/07/29 16:41:02 taca Exp $
-
-BUILDLINK_TREE+= php
-
-.if !defined(PHP_BUILDLINK3_MK)
-PHP_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.php+= php>=5.5.0<5.6
-BUILDLINK_ABI_DEPENDS.php+= php>=5.5.0<5.6
-BUILDLINK_PKGSRCDIR.php?= ../../lang/php55
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.endif # PHP_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -php
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
deleted file mode 100644
index 7fde82f6f00..00000000000
--- a/lang/php55/distinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: distinfo,v 1.57 2016/08/13 17:34:41 taca Exp $
-
-SHA1 (php-5.5.38.tar.bz2) = ac79d48510e4bfe8f376d009e3ecb5b734bbc3a1
-RMD160 (php-5.5.38.tar.bz2) = 2f1f0ff08c963975c6a624ecc83432cf48be3b39
-SHA512 (php-5.5.38.tar.bz2) = dd9e578013023cc8e9ab86ef129bf414682bca318c83816ff2f15be5f81863475737b48508d78542d4fe9dc7e31418bd9c0188b2d72745f069322f3ca4da9560
-Size (php-5.5.38.tar.bz2) = 13701262 bytes
-SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
-SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
-SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2
-SHA1 (patch-configure) = e81731b426b31656de72a4e4b3ad341b5ac34f82
-SHA1 (patch-ext_gd_config.m4) = 2ded986b3a6faea38298e1385d14446e04c88bd2
-SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
-SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
-SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
-SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
-SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
-SHA1 (patch-ext_phar_Makefile.frag) = f465bb5acd4bb87bb403baa98b61ac707800fd30
-SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
-SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
-SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
-SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
-SHA1 (patch-ext_standard_php__dns.h) = 61028fffaae8d9e590cfed7dab0bcb53eb689f96
-SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937
-SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8
-SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be
-SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
-SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9
-SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3
-SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = c5bcf5ffb5f5f63d975c9563c4ba77c850534702
-SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
diff --git a/lang/php55/patches/patch-acinclude.m4 b/lang/php55/patches/patch-acinclude.m4
deleted file mode 100644
index 21a00786913..00000000000
--- a/lang/php55/patches/patch-acinclude.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-acinclude.m4,v 1.2 2013/08/17 13:15:21 taca Exp $
-
---- acinclude.m4.orig 2013-08-15 20:42:04.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/php55/patches/patch-aclocal.m4 b/lang/php55/patches/patch-aclocal.m4
deleted file mode 100644
index 7546bbb8729..00000000000
--- a/lang/php55/patches/patch-aclocal.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aclocal.m4,v 1.2 2014/07/26 00:11:55 taca Exp $
-
---- aclocal.m4.orig 2014-07-23 09:08:13.000000000 +0000
-+++ aclocal.m4
-@@ -4553,7 +4553,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
-@@ -6170,7 +6170,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/php55/patches/patch-build_libtool.m4 b/lang/php55/patches/patch-build_libtool.m4
deleted file mode 100644
index fc81fd48b18..00000000000
--- a/lang/php55/patches/patch-build_libtool.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-build_libtool.m4,v 1.2 2014/07/26 00:11:55 taca Exp $
-
---- build/libtool.m4.orig 2014-07-23 09:00:58.000000000 +0000
-+++ build/libtool.m4
-@@ -1539,7 +1539,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
-@@ -3156,7 +3156,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/php55/patches/patch-configure b/lang/php55/patches/patch-configure
deleted file mode 100644
index 274c5207401..00000000000
--- a/lang/php55/patches/patch-configure
+++ /dev/null
@@ -1,146 +0,0 @@
-$NetBSD: patch-configure,v 1.8 2014/07/26 00:11:55 taca Exp $
-
---- configure.orig 2014-07-23 09:08:17.000000000 +0000
-+++ configure
-@@ -8321,27 +8321,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; }
-
-@@ -9145,27 +9124,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; }
-
-@@ -23604,7 +23562,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
-@@ -25754,7 +25712,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'`
-@@ -36811,7 +36769,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
-@@ -48213,7 +48171,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
-@@ -65189,7 +65147,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
-
-@@ -104582,12 +104540,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
-@@ -108353,7 +108306,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
-@@ -110433,7 +110386,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
- ;;
-@@ -111986,7 +111939,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/php55/patches/patch-ext_gd_config.m4 b/lang/php55/patches/patch-ext_gd_config.m4
deleted file mode 100644
index d39f6c9ecca..00000000000
--- a/lang/php55/patches/patch-ext_gd_config.m4
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ext_gd_config.m4,v 1.3 2016/08/13 17:34:41 taca Exp $
-
---- ext/gd/config.m4.orig 2016-07-20 08:41:48.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
- ])
-@@ -249,7 +237,9 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
- PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
- PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp, [AC_DEFINE(HAVE_GD_WEBP, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
- PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
-- PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
-+ if test "$PHP_XPM_DIR" != "no"; then
-+ PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
-+ fi
- PHP_CHECK_LIBRARY(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_FREETYPE, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
- ])
-
diff --git a/lang/php55/patches/patch-ext_imap_config.m4 b/lang/php55/patches/patch-ext_imap_config.m4
deleted file mode 100644
index 8a038d469a4..00000000000
--- a/lang/php55/patches/patch-ext_imap_config.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ext_imap_config.m4,v 1.1 2013/07/29 16:41:02 taca Exp $
-
---- ext/imap/config.m4.orig 2012-05-03 17:10:43.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/php55/patches/patch-ext_mssql_php__mssql.c b/lang/php55/patches/patch-ext_mssql_php__mssql.c
deleted file mode 100644
index 1183c750fc7..00000000000
--- a/lang/php55/patches/patch-ext_mssql_php__mssql.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ext_mssql_php__mssql.c,v 1.2 2013/08/17 13:15:21 taca Exp $
-
---- ext/mssql/php_mssql.c.orig 2013-08-15 20:42:04.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/php55/patches/patch-ext_opcache_config.m4 b/lang/php55/patches/patch-ext_opcache_config.m4
deleted file mode 100644
index b852da614c0..00000000000
--- a/lang/php55/patches/patch-ext_opcache_config.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_opcache_config.m4,v 1.1 2013/10/18 15:49:07 taca Exp $
-
-Avoid use "==" in test(1).
-
---- ext/opcache/config.m4.orig 2013-10-15 13:49:47.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/php55/patches/patch-ext_pdo__mysql_config.m4 b/lang/php55/patches/patch-ext_pdo__mysql_config.m4
deleted file mode 100644
index 705f007615d..00000000000
--- a/lang/php55/patches/patch-ext_pdo__mysql_config.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ext_pdo__mysql_config.m4,v 1.1 2013/07/29 16:41:02 taca Exp $
-
---- ext/pdo_mysql/config.m4.orig 2012-05-03 17:10:43.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/php55/patches/patch-ext_pdo_config.m4 b/lang/php55/patches/patch-ext_pdo_config.m4
deleted file mode 100644
index 2589e484fb2..00000000000
--- a/lang/php55/patches/patch-ext_pdo_config.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ext_pdo_config.m4,v 1.1 2013/07/29 16:41:02 taca Exp $
-
---- ext/pdo/config.m4.orig 2012-05-03 17:10:43.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/php55/patches/patch-ext_phar_Makefile.frag b/lang/php55/patches/patch-ext_phar_Makefile.frag
deleted file mode 100644
index e97ce0d88eb..00000000000
--- a/lang/php55/patches/patch-ext_phar_Makefile.frag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ext_phar_Makefile.frag,v 1.3 2015/06/12 00:44:32 taca Exp $
-
---- ext/phar/Makefile.frag.orig 2015-06-10 12:26:49.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
diff --git a/lang/php55/patches/patch-ext_phar_phar_phar.php b/lang/php55/patches/patch-ext_phar_phar_phar.php
deleted file mode 100644
index 32c5fb48934..00000000000
--- a/lang/php55/patches/patch-ext_phar_phar_phar.php
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ext_phar_phar_phar.php,v 1.1 2013/07/29 16:41:02 taca Exp $
-
---- ext/phar/phar/phar.php.orig 2012-05-03 17:10:43.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/php55/patches/patch-ext_recode_recode.c b/lang/php55/patches/patch-ext_recode_recode.c
deleted file mode 100644
index 598d7ec307b..00000000000
--- a/lang/php55/patches/patch-ext_recode_recode.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ext_recode_recode.c,v 1.1 2016/07/24 13:38:54 jdolecek Exp $
-
-program_name is expected variable, is required by recode 3.5 and recode 3.6 to actually work.
-
-The config.m4 test for it is broken at least for some platforms - it only tests if program without it compiles, but on Solaris and MacOS/Darwin at least it only fails when run.
-
---- ext/recode/recode.c.orig 2016-07-24 13:07:47.000000000 +0000
-+++ ext/recode/recode.c
-@@ -29,11 +29,8 @@
-
- #if HAVE_LIBRECODE
-
--/* For recode 3.5 */
--#if HAVE_BROKEN_RECODE
--extern char *program_name;
--char *program_name = "php";
--#endif
-+extern const char *program_name;
-+const char *program_name = "php";
-
- #ifdef HAVE_STDBOOL_H
- # include <stdbool.h>
diff --git a/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c b/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c
deleted file mode 100644
index 6d6e465b0bb..00000000000
--- a/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.2 2014/05/01 15:52:33 taca Exp $
-
-Don't redefine _XOPEN_SOURCE, it is already set from php.
-
---- ext/sqlite3/libsqlite/sqlite3.c.orig 2014-04-29 08:04:30.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/php55/patches/patch-ext_standard_basic__functions.c b/lang/php55/patches/patch-ext_standard_basic__functions.c
deleted file mode 100644
index 670ad4d0dab..00000000000
--- a/lang/php55/patches/patch-ext_standard_basic__functions.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_standard_basic__functions.c,v 1.2 2013/08/17 13:15:21 taca Exp $
-
-Work around VAX FP lack of INF
-
---- ext/standard/basic_functions.c.orig 2013-08-15 20:42:04.000000000 +0000
-+++ ext/standard/basic_functions.c
-@@ -3519,7 +3519,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/php55/patches/patch-ext_standard_php__dns.h b/lang/php55/patches/patch-ext_standard_php__dns.h
deleted file mode 100644
index e78bbb41a0e..00000000000
--- a/lang/php55/patches/patch-ext_standard_php__dns.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ext_standard_php__dns.h,v 1.2 2016/05/02 13:06:21 taca Exp $
-
-Fix memory leak.
-
---- ext/standard/php_dns.h.orig 2016-04-27 12:00:31.000000000 +0000
-+++ ext/standard/php_dns.h
-@@ -32,9 +32,15 @@
- #elif defined(HAVE_RES_NSEARCH)
- #define php_dns_search(res, dname, class, type, answer, anslen) \
- res_nsearch(res, dname, class, type, answer, anslen);
-+#ifdef __GLIBC__
- #define php_dns_free_handle(res) \
-- res_nclose(res); \
-+ res_nclose(res); \
-+ php_dns_free_res(*res)
-+#else
-+#define php_dns_free_handle(res) \
-+ res_ndestroy(res); \
- php_dns_free_res(*res)
-+#endif
-
- #elif defined(HAVE_RES_SEARCH)
- #define php_dns_search(res, dname, class, type, answer, anslen) \
diff --git a/lang/php55/patches/patch-makedist b/lang/php55/patches/patch-makedist
deleted file mode 100644
index fbb16410cd9..00000000000
--- a/lang/php55/patches/patch-makedist
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-makedist,v 1.2 2014/02/07 15:35:05 taca Exp $
-
---- makedist.orig 2014-02-05 10:00:36.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/php55/patches/patch-php.ini-development b/lang/php55/patches/patch-php.ini-development
deleted file mode 100644
index a3e9e068466..00000000000
--- a/lang/php55/patches/patch-php.ini-development
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-php.ini-development,v 1.4 2014/04/04 03:05:00 taca Exp $
-
---- php.ini-development.orig 2014-04-01 12:32:03.000000000 +0000
-+++ php.ini-development
-@@ -693,7 +693,7 @@ default_mimetype = "text/html"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -714,8 +714,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"
-@@ -788,7 +788,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/php55/patches/patch-php.ini-production b/lang/php55/patches/patch-php.ini-production
deleted file mode 100644
index 3d9f2c6f7b2..00000000000
--- a/lang/php55/patches/patch-php.ini-production
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-php.ini-production,v 1.4 2014/04/04 03:05:00 taca Exp $
-
---- php.ini-production.orig 2014-04-01 12:32:03.000000000 +0000
-+++ php.ini-production
-@@ -693,7 +693,7 @@ default_mimetype = "text/html"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -714,8 +714,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"
-@@ -788,7 +788,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/php55/patches/patch-run-tests.php b/lang/php55/patches/patch-run-tests.php
deleted file mode 100644
index 36117e6510f..00000000000
--- a/lang/php55/patches/patch-run-tests.php
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-run-tests.php,v 1.1 2013/07/29 16:41:02 taca Exp $
-
-Use proper shbang line.
-
---- run-tests.php.orig 2012-05-03 17:10:43.000000000 +0000
-+++ run-tests.php
-@@ -1,4 +1,4 @@
--#!/usr/bin/env php
-+#!@PREFIX@/bin/php
- <?php
- /*
- +----------------------------------------------------------------------+
diff --git a/lang/php55/patches/patch-sapi_cgi_Makefile.frag b/lang/php55/patches/patch-sapi_cgi_Makefile.frag
deleted file mode 100644
index 7c9d98a4e6c..00000000000
--- a/lang/php55/patches/patch-sapi_cgi_Makefile.frag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.2 2013/08/17 13:15:21 taca Exp $
-
---- sapi/cgi/Makefile.frag.orig 2013-08-15 20:42:04.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/php55/patches/patch-sapi_fpm_fpm_events_port.c b/lang/php55/patches/patch-sapi_fpm_fpm_events_port.c
deleted file mode 100644
index b1a5f1ff202..00000000000
--- a/lang/php55/patches/patch-sapi_fpm_fpm_events_port.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.1 2014/06/13 14:09:34 fhajny 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 2013-09-18 05:48:57.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/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c b/lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c
deleted file mode 100644
index 45d4276aa91..00000000000
--- a/lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-sapi_fpm_fpm_fpm__sockets.c,v 1.2 2015/03/19 08:12:50 he Exp $
-
-Treat NetBSD the same as FreeBSD wrt. tcp_info struct field usage.
-
---- ./sapi/fpm/fpm/fpm_sockets.c.orig 2014-09-17 07:03:27.000000000 +0000
-+++ ./sapi/fpm/fpm/fpm_sockets.c
-@@ -405,7 +405,7 @@ int fpm_socket_get_listening_queue(int s
- zlog(ZLOG_SYSERROR, "failed to retrieve TCP_INFO for socket");
- return -1;
- }
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- if (info.__tcpi_sacked == 0) {
- return -1;
- }
diff --git a/lang/php55/patches/patch-sapi_fpm_php-fpm.conf.in b/lang/php55/patches/patch-sapi_fpm_php-fpm.conf.in
deleted file mode 100644
index edf68a0d51d..00000000000
--- a/lang/php55/patches/patch-sapi_fpm_php-fpm.conf.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.1 2013/07/29 16:41:02 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 2013-01-16 07:10:30.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