Date: Sun, 21 Jul 2013 22:06:56 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323419 - in head/lang/hiphop-php: . files Message-ID: <201307212206.r6LM6urC010223@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Sun Jul 21 22:06:56 2013 New Revision: 323419 URL: http://svnweb.freebsd.org/changeset/ports/323419 Log: Unbreak lang/hiphop-php and update to 2.1 Some functionality issues still need fixing (sqlite3) Added: head/lang/hiphop-php/files/patch-CMake-FindLibDwarf.cmake (contents, props changed) head/lang/hiphop-php/files/patch-hphp-runtime-base-program_functions.cpp (contents, props changed) head/lang/hiphop-php/files/patch-hphp-runtime-ext-ext_hotprofiler.cpp (contents, props changed) head/lang/hiphop-php/files/patch-hphp-runtime-ext-ext_posix.cpp (contents, props changed) head/lang/hiphop-php/files/patch-hphp-runtime-vm-debug-dwarf.cpp (contents, props changed) head/lang/hiphop-php/files/patch-hphp-runtime-vm-jit-translator-x64.cpp (contents, props changed) head/lang/hiphop-php/files/patch-hphp-third_party-folly-folly-FileUtil.cpp (contents, props changed) head/lang/hiphop-php/files/patch-hphp-util-compatibility.cpp (contents, props changed) head/lang/hiphop-php/files/patch-hphp-util-compatibility.h (contents, props changed) Deleted: head/lang/hiphop-php/files/extra-patch-gettext head/lang/hiphop-php/files/hphp.in head/lang/hiphop-php/files/patch-CMake-FindCClient.cmake head/lang/hiphop-php/files/patch-src-runtime-base-preg.cpp Modified: head/lang/hiphop-php/Makefile head/lang/hiphop-php/distinfo head/lang/hiphop-php/files/patch-CMake-HPHPFindLibs.cmake (contents, props changed) head/lang/hiphop-php/files/patch-CMake-HPHPSetup.cmake (contents, props changed) head/lang/hiphop-php/pkg-plist Modified: head/lang/hiphop-php/Makefile ============================================================================== --- head/lang/hiphop-php/Makefile Sun Jul 21 21:51:06 2013 (r323418) +++ head/lang/hiphop-php/Makefile Sun Jul 21 22:06:56 2013 (r323419) @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= hiphop-php -PORTVERSION= 0.0.20120716 -PORTREVISION= 7 +PORTVERSION= 2.1 CATEGORIES= lang devel www -MASTER_SITES= https://github.com/facebook/hiphop-php/tarball/${GITVERSION}/:main \ +MASTER_SITES= https://github.com/facebook/hiphop-php/archive/:main \ http://unicode.org/Public/UNIDATA/:unidata \ http://unicode.org/Public/MAPPINGS/ISO8859/:mappings -DIST_SUBDIR= hiphop-php -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +DISTNAME= HPHP-${PORTVERSION} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= http://cpp.in/dev/ @@ -25,14 +24,14 @@ LICENSE_FILE_UNICODE= ${FILESDIR}/LICENS LICENSE_FILE_ZEND200= ${WRKSRC}/LICENSE.ZEND LICENSE_PERMS_UNICODE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_ZEND200= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_DISTFILES_PHP301= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +LICENSE_DISTFILES_PHP301= ${DISTNAME}${EXTRACT_SUFX} LICENSE_DISTFILES_UNICODE= EastAsianWidth.txt \ 8859-1.TXT 8859-2.TXT 8859-3.TXT 8859-4.TXT 8859-5.TXT \ 8859-6.TXT 8859-7.TXT 8859-8.TXT 8859-9.TXT 8859-10.TXT \ 8859-11.TXT 8859-13.TXT 8859-14.TXT 8859-15.TXT 8859-16.TXT -LICENSE_DISTFILES_ZEND200= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +LICENSE_DISTFILES_ZEND200= ${DISTNAME}${EXTRACT_SUFX} -BROKEN= Does not build with recent boost +#BROKEN= Does not build with recent boost LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu \ boost_thread:${PORTSDIR}/devel/boost-libs \ @@ -44,23 +43,25 @@ LIB_DEPENDS= icudata:${PORTSDIR}/devel/i pcre:${PORTSDIR}/devel/pcre \ expat:${PORTSDIR}/textproc/expat2 \ memcached:${PORTSDIR}/databases/libmemcached \ - c-client4:${PORTSDIR}/mail/cclient - -OPTIONS_DEFINE= NLS -NLS_DESC= Depend on gettext (required if binutils have NLS) + c-client4:${PORTSDIR}/mail/cclient \ + unwind:${PORTSDIR}/devel/libunwind \ + glog:${PORTSDIR}/devel/glog _EXTDIR= share/hiphop-php/ext BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison \ flex:${PORTSDIR}/textproc/flex \ re2c:${PORTSDIR}/devel/re2c \ + bash:${PORTSDIR}/shells/bash \ ${LOCALBASE}/${_EXTDIR}/lib/libevent.a:${PORTSDIR}/devel/libevent-hiphop \ - ${LOCALBASE}/${_EXTDIR}/lib/libcurl.a:${PORTSDIR}/ftp/curl-hiphop + ${LOCALBASE}/${_EXTDIR}/lib/libcurl.a:${PORTSDIR}/ftp/curl-hiphop \ + ${LOCALBASE}/lib/libdwarf.a:${PORTSDIR}/devel/libdwarf RUN_DEPENDS+= ${LOCALBASE}/${_EXTDIR}/lib/libevent.a:${PORTSDIR}/devel/libevent-hiphop \ - ${LOCALBASE}/${_EXTDIR}/lib/libcurl.a:${PORTSDIR}/ftp/curl-hiphop + ${LOCALBASE}/${_EXTDIR}/lib/libcurl.a:${PORTSDIR}/ftp/curl-hiphop \ + ${LOCALBASE}/lib/libdwarf.a:${PORTSDIR}/devel/libdwarf -WRKSRC= ${WRKDIR}/facebook-hiphop-php-${GITVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-HPHP-${PORTVERSION} MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes @@ -69,7 +70,7 @@ USE_MYSQL= yes USE_GNOME= libxml2 USE_OPENSSL= yes USE_OPENLDAP= yes -USE_GCC= 4.4+ +USE_GCC= yes GITVERSION= 96532ec FETCH_ARGS= -pRr @@ -78,7 +79,7 @@ CUSTOM_ENV= HPHP_HOME=${WRKSRC} \ HPHP_LIB=${WRKSRC}/bin \ CMAKE_PREFIX_PATH=${WRKDIR}/libs -DISTFILES+= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main \ +DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}:main \ EastAsianWidth.txt:unidata \ 8859-1.TXT:mappings \ 8859-2.TXT:mappings \ @@ -96,67 +97,46 @@ DISTFILES+= ${PORTNAME}-${PORTVERSION}${ 8859-15.TXT:mappings \ 8859-16.TXT:mappings -PATCHFILES+= hphp-freebsd-20120214.patch \ - hphp-libmemcached-1.0.patch - -SUB_LIST+= CC="${CC}" \ - CPP="${CPP}" \ - CXX="${CXX}" \ - HPHP_HOME="${DATADIR}" \ - HPHP="${DATADIR}/bin/hphp" - -SUB_FILES+= hphp - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gettext -.endif - .include <bsd.port.pre.mk> -_CFLAGS= ${CFLAGS} -_CXXFLAGS= -rpath=${_GCC_RUNTIME} ${CXXFLAGS} -_LDFLAGS= ${LDFLAGS} +_CFLAGS= ${CFLAGS} -DHAVE_POSIX_FALLOCATE=1 +_CXXFLAGS= -Wl,-rpath=${_GCC_RUNTIME} ${CXXFLAGS} -D_GLIBCXX_USE_C99 -DHAVE_POSIX_FALLOCATE=1 CONFIGURE_ENV+= ${CUSTOM_ENV} MAKE_ENV+= ${CUSTOM_ENV} post-extract: @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/EastAsianWidth.txt \ - ${WRKSRC}/src/third_party/libmbfl/mbfl/ + ${WRKSRC}/hphp/third_party/libmbfl/mbfl/ .for i in 1 2 3 4 5 6 7 8 9 10 11 13 14 15 16 @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/8859-${i}.TXT \ - ${WRKSRC}/src/third_party/libmbfl/filters/ + ${WRKSRC}/hphp/third_party/libmbfl/filters/ .endfor post-patch: @${REINPLACE_CMD} -e 's|-levent|${WRKSRC}/libs/lib/libevent.a|g' \ - ${WRKSRC}/src/third_party/libafdt/configure - @${REINPLACE_CMD} -e 's|-L$$(LIB_DIR)|${_LDFLAGS} -L$$(LIB_DIR)|g' \ - ${WRKSRC}/src/rules.mk + ${WRKSRC}/hphp/third_party/libafdt/configure + @${REINPLACE_CMD} -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,g' \ + ${WRKSRC}/hphp/util/parser/test/run_verify_parse.sh \ + ${WRKSRC}/hphp/util/generate_buildinfo.sh \ + ${WRKSRC}/hphp/tools/timeout.sh @${REINPLACE_CMD} \ - -e 's|%%CURL_LIB%%|${LOCALBASE}/${_EXTDIR}/lib/libcurl.a|g' \ + -e 's|%%CURL_LIB%%|${LOCALBASE}/${_EXTDIR}/lib/libcurl.a /usr/lib/libgssapi.a|g' \ -e 's|%%LIBEVENT_LIB%%|${LOCALBASE}/${_EXTDIR}/lib/libevent.a|g' \ -e 's|%%CURL_INCLUDE_DIR%%|${LOCALBASE}/${_EXTDIR}/include|g' \ -e 's|%%LIBEVENT_INCLUDE_DIR%%|${LOCALBASE}/${_EXTDIR}/include|g' \ ${WRKSRC}/CMake/HPHPFindLibs.cmake + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/CMake/FindLibDwarf.cmake \ + ${WRKSRC}/CMake/FindLibElf.cmake @${REINPLACE_CMD} -e 's|%%CFLAGS%%|${_CFLAGS}|g' \ -e 's|%%CXXFLAGS%%|${_CXXFLAGS}|g' \ ${WRKSRC}/CMake/HPHPSetup.cmake - @${REINPLACE_CMD} -e 's|LICENSE.PHP|src/version|g' \ - ${WRKSRC}/bin/CMakeLists.base.txt do-install: - @${MKDIR} ${DATADIR}/bin ${DATADIR}/src - @${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} {} \; - @${FIND} ${WRKSRC} -type f -name '*.bak' -exec ${RM} {} \; - @${CP} -R ${WRKSRC}/CMake ${WRKSRC}/bin ${DATADIR} - @${CP} -R ${WRKSRC}/src/runtime ${WRKSRC}/src/system \ - ${WRKSRC}/src/util ${DATADIR}/src - @${INSTALL_DATA} ${WRKSRC}/src/version ${DATADIR}/src/version - @${INSTALL_PROGRAM} ${WRKSRC}/src/hphp/hphp ${DATADIR}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/src/hphpi/hphpi ${PREFIX}/bin/hphpi - @${INSTALL_SCRIPT} ${WRKDIR}/hphp ${PREFIX}/bin/hphp + ${INSTALL_PROGRAM} ${WRKSRC}/hphp/hhvm/hhvm ${LOCALBASE}/bin/ + ${MKDIR} ${DATADIR}/bin + ${INSTALL_DATA} ${WRKSRC}/bin/systemlib.php ${DATADIR}/bin/ + ${CP} ${WRKSRC}/bin/*.a ${DATADIR}/bin/ .include <bsd.port.post.mk> Modified: head/lang/hiphop-php/distinfo ============================================================================== --- head/lang/hiphop-php/distinfo Sun Jul 21 21:51:06 2013 (r323418) +++ head/lang/hiphop-php/distinfo Sun Jul 21 22:06:56 2013 (r323419) @@ -1,38 +1,36 @@ -SHA256 (hiphop-php/hiphop-php-0.0.20120716.tar.gz) = 7234854e91ce3955ac195534f2ee863f85843fa5fe400eb68abd126a7ddd9689 -SIZE (hiphop-php/hiphop-php-0.0.20120716.tar.gz) = 8460604 -SHA256 (hiphop-php/EastAsianWidth.txt) = d591c24b702c1b025b58ca6168746f713b657c6e252c268f52cb07758f428067 -SIZE (hiphop-php/EastAsianWidth.txt) = 884136 -SHA256 (hiphop-php/8859-1.TXT) = 884eb5ae5aa74867c7b2c93a40b9460920e26731dfafa58f783e9d568fc79055 -SIZE (hiphop-php/8859-1.TXT) = 10592 -SHA256 (hiphop-php/8859-2.TXT) = 5c81eca66455c5b36853c8a66495f58636643f6ddb261083d877a7f2a48287b7 -SIZE (hiphop-php/8859-2.TXT) = 10816 -SHA256 (hiphop-php/8859-3.TXT) = a7906a91ec3a4ac7f10ec7e25966d36d98fb720f401d595de5f9f06ab1f2b2a7 -SIZE (hiphop-php/8859-3.TXT) = 10498 -SHA256 (hiphop-php/8859-4.TXT) = 5bb8f1fa3fdf6df88ee3d1a17f58bdf5e336f6b665d58ea04bf7bd7bdbf259dc -SIZE (hiphop-php/8859-4.TXT) = 10792 -SHA256 (hiphop-php/8859-5.TXT) = c1244fabad6e9b7a8053da89448c42388bbe93681742e01e74f7a22b7f08e3ed -SIZE (hiphop-php/8859-5.TXT) = 10427 -SHA256 (hiphop-php/8859-6.TXT) = a2917a1017ecb3c82fc44cd57365dbda0788f7cc1e8da94d8175f6600cf03548 -SIZE (hiphop-php/8859-6.TXT) = 8308 -SHA256 (hiphop-php/8859-7.TXT) = 7b8d7ce8242993556958a5f95529d9d71181e6a08a070d037f157a22a77716a9 -SIZE (hiphop-php/8859-7.TXT) = 10582 -SHA256 (hiphop-php/8859-8.TXT) = 4bea5cf4b048e3b7ccf704ea153edcf77d2a4c627dd8710f8f7e037afb62a171 -SIZE (hiphop-php/8859-8.TXT) = 8553 -SHA256 (hiphop-php/8859-9.TXT) = 976d48dfff033c7bfedd08bc61d26f0a5fefb4c3f48f8735f454e100cf40294c -SIZE (hiphop-php/8859-9.TXT) = 10628 -SHA256 (hiphop-php/8859-10.TXT) = 13339ad725052723ff6aac91ceef1a120a3231c4fac647e0b63d5565efdd2a53 -SIZE (hiphop-php/8859-10.TXT) = 10989 -SHA256 (hiphop-php/8859-11.TXT) = a742830aea98cbd27e5ecf811277d0c68e1e7be5a29cf7b98719474cc9cd458a -SIZE (hiphop-php/8859-11.TXT) = 9730 -SHA256 (hiphop-php/8859-13.TXT) = 6e07d8120d8225f0556c9c7f477c7d4392141290c3ae7f6a81c3926c34c0e52c -SIZE (hiphop-php/8859-13.TXT) = 10588 -SHA256 (hiphop-php/8859-14.TXT) = 3426e4b6b5b644920110ddd7d6404cd41b361eec966cfcb6cd135e1439f7719b -SIZE (hiphop-php/8859-14.TXT) = 11021 -SHA256 (hiphop-php/8859-15.TXT) = 0e94e2789e46c7a1e7e453735947e5e593fed2ded6eef659a5282dfc413ff59f -SIZE (hiphop-php/8859-15.TXT) = 10601 -SHA256 (hiphop-php/8859-16.TXT) = f6abb360ffac4700d51bb84c753b088d0f7d49bdc6bc482c458b2c3ef2725a54 -SIZE (hiphop-php/8859-16.TXT) = 10886 -SHA256 (hiphop-php/hphp-freebsd-20120214.patch) = 8b201a72d8164c1c139909c050c89b970ac9d33a05fd69454815bc48c8e1d96e -SIZE (hiphop-php/hphp-freebsd-20120214.patch) = 12331 -SHA256 (hiphop-php/hphp-libmemcached-1.0.patch) = 2ce5159d9208abff4eddf52fef0f1a84ad27eecb169d7309dae8867bd4cac0da -SIZE (hiphop-php/hphp-libmemcached-1.0.patch) = 1504 +SHA256 (HPHP-2.1.tar.gz) = 7d8ecfe9c84a4824b3d26b674305df19c07caa90325d38eb8d092386ca175ec6 +SIZE (HPHP-2.1.tar.gz) = 10209944 +SHA256 (EastAsianWidth.txt) = 8461529935463876182ca12c1d7d7a0a1111ae3b3e2a9a660fc66551e690fe83 +SIZE (EastAsianWidth.txt) = 884163 +SHA256 (8859-1.TXT) = 884eb5ae5aa74867c7b2c93a40b9460920e26731dfafa58f783e9d568fc79055 +SIZE (8859-1.TXT) = 10592 +SHA256 (8859-2.TXT) = 5c81eca66455c5b36853c8a66495f58636643f6ddb261083d877a7f2a48287b7 +SIZE (8859-2.TXT) = 10816 +SHA256 (8859-3.TXT) = a7906a91ec3a4ac7f10ec7e25966d36d98fb720f401d595de5f9f06ab1f2b2a7 +SIZE (8859-3.TXT) = 10498 +SHA256 (8859-4.TXT) = 5bb8f1fa3fdf6df88ee3d1a17f58bdf5e336f6b665d58ea04bf7bd7bdbf259dc +SIZE (8859-4.TXT) = 10792 +SHA256 (8859-5.TXT) = c1244fabad6e9b7a8053da89448c42388bbe93681742e01e74f7a22b7f08e3ed +SIZE (8859-5.TXT) = 10427 +SHA256 (8859-6.TXT) = a2917a1017ecb3c82fc44cd57365dbda0788f7cc1e8da94d8175f6600cf03548 +SIZE (8859-6.TXT) = 8308 +SHA256 (8859-7.TXT) = 7b8d7ce8242993556958a5f95529d9d71181e6a08a070d037f157a22a77716a9 +SIZE (8859-7.TXT) = 10582 +SHA256 (8859-8.TXT) = 4bea5cf4b048e3b7ccf704ea153edcf77d2a4c627dd8710f8f7e037afb62a171 +SIZE (8859-8.TXT) = 8553 +SHA256 (8859-9.TXT) = 976d48dfff033c7bfedd08bc61d26f0a5fefb4c3f48f8735f454e100cf40294c +SIZE (8859-9.TXT) = 10628 +SHA256 (8859-10.TXT) = 13339ad725052723ff6aac91ceef1a120a3231c4fac647e0b63d5565efdd2a53 +SIZE (8859-10.TXT) = 10989 +SHA256 (8859-11.TXT) = a742830aea98cbd27e5ecf811277d0c68e1e7be5a29cf7b98719474cc9cd458a +SIZE (8859-11.TXT) = 9730 +SHA256 (8859-13.TXT) = 6e07d8120d8225f0556c9c7f477c7d4392141290c3ae7f6a81c3926c34c0e52c +SIZE (8859-13.TXT) = 10588 +SHA256 (8859-14.TXT) = 3426e4b6b5b644920110ddd7d6404cd41b361eec966cfcb6cd135e1439f7719b +SIZE (8859-14.TXT) = 11021 +SHA256 (8859-15.TXT) = 0e94e2789e46c7a1e7e453735947e5e593fed2ded6eef659a5282dfc413ff59f +SIZE (8859-15.TXT) = 10601 +SHA256 (8859-16.TXT) = f6abb360ffac4700d51bb84c753b088d0f7d49bdc6bc482c458b2c3ef2725a54 +SIZE (8859-16.TXT) = 10886 +SHA256 (hphp-libmemcached-1.0.patch) = 2ce5159d9208abff4eddf52fef0f1a84ad27eecb169d7309dae8867bd4cac0da +SIZE (hphp-libmemcached-1.0.patch) = 1504 Added: head/lang/hiphop-php/files/patch-CMake-FindLibDwarf.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/patch-CMake-FindLibDwarf.cmake Sun Jul 21 22:06:56 2013 (r323419) @@ -0,0 +1,36 @@ +--- CMake/FindLibDwarf.cmake.orig 2013-07-12 20:00:55.000000000 +0200 ++++ CMake/FindLibDwarf.cmake 2013-07-21 16:31:25.292419225 +0200 +@@ -16,31 +16,8 @@ + set (LibDwarf_FIND_QUIETLY TRUE) + endif (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS) + +-find_path (DWARF_INCLUDE_DIR +- NAMES +- dwarf.h +- PATHS +- /usr/include +- /usr/include/libdwarf +- /usr/local/include +- /opt/local/include +- /sw/include +- ENV CPATH) # PATH and INCLUDE will also work +- +-if (DWARF_INCLUDE_DIR) +- set (LIBDWARF_INCLUDE_DIRS ${DWARF_INCLUDE_DIR}) +-endif () +- +-find_library (LIBDWARF_LIBRARIES +- NAMES +- dwarf +- PATHS +- /usr/lib +- /usr/local/lib +- /opt/local/lib +- /sw/lib +- ENV LIBRARY_PATH # PATH and LIB will also work +- ENV LD_LIBRARY_PATH) ++set (LIBDWARF_INCLUDE_DIRS %%LOCALBASE%%/include) ++set (LIBDWARF_LIBRARIES %%LOCALBASE%%/lib/libdwarf.a) + include (FindPackageHandleStandardArgs) + + Modified: head/lang/hiphop-php/files/patch-CMake-HPHPFindLibs.cmake ============================================================================== --- head/lang/hiphop-php/files/patch-CMake-HPHPFindLibs.cmake Sun Jul 21 21:51:06 2013 (r323418) +++ head/lang/hiphop-php/files/patch-CMake-HPHPFindLibs.cmake Sun Jul 21 22:06:56 2013 (r323419) @@ -1,6 +1,6 @@ ---- CMake/HPHPFindLibs.cmake.orig 2012-07-13 14:44:33.729505429 +0200 -+++ CMake/HPHPFindLibs.cmake 2012-07-13 14:45:03.602507878 +0200 -@@ -17,6 +17,16 @@ +--- CMake/HPHPFindLibs.cmake.orig 2013-07-12 20:00:55.000000000 +0200 ++++ CMake/HPHPFindLibs.cmake 2013-07-21 20:48:54.447418294 +0200 +@@ -17,6 +17,18 @@ include(CheckFunctionExists) @@ -13,11 +13,13 @@ +set(CURL_LIBRARIES %%CURL_LIB%%) +set(CURL_INCLUDE_DIR %%CURL_INCLUDE_DIR%%) +include_directories(${CURL_INCLUDE_DIR}) ++add_definitions("-DHAVE_CURL_MULTI_SELECT") ++add_definitions("-DHAVE_CURL_MULTI_WAIT") + # boost checks - - find_package(Boost 1.37.0 COMPONENTS system;program_options;filesystem REQUIRED) -@@ -51,21 +61,6 @@ + find_package(Boost 1.48.0 COMPONENTS system program_options filesystem regex REQUIRED) + include_directories(${Boost_INCLUDE_DIRS}) +@@ -73,21 +85,6 @@ find_package(PCRE REQUIRED) include_directories(${PCRE_INCLUDE_DIRS}) @@ -39,8 +41,8 @@ # GD checks find_package(GD REQUIRED) -@@ -76,21 +71,6 @@ - # nothing for now +@@ -104,21 +101,6 @@ + add_definitions(-DHAVE_LIBXED) endif() -# CURL checks @@ -48,16 +50,39 @@ -include_directories(${CURL_INCLUDE_DIR}) - -set(CMAKE_REQUIRED_LIBRARIES "${CURL_LIBRARIES}") --CHECK_FUNCTION_EXISTS("curl_multi_select" HAVE_CUSTOM_CURL) --if (NOT HAVE_CUSTOM_CURL) -- unset(HAVE_CUSTOM_CURL CACHE) -- unset(CURL_INCLUDE_DIR CACHE) -- unset(CURL_LIBRARIES CACHE) -- unset(CURL_FOUND CACHE) -- message(FATAL_ERROR "Custom libcurl is required with the HipHop patch") --endif () +-CHECK_FUNCTION_EXISTS("curl_multi_select" HAVE_CURL_MULTI_SELECT) +-CHECK_FUNCTION_EXISTS("curl_multi_wait" HAVE_CURL_MULTI_WAIT) +-if (HAVE_CURL_MULTI_SELECT) +- add_definitions("-DHAVE_CURL_MULTI_SELECT") +-endif() +-if (HAVE_CURL_MULTI_WAIT) +- add_definitions("-DHAVE_CURL_MULTI_WAIT") +-endif() -set(CMAKE_REQUIRED_LIBRARIES) - # LibXML2 checks find_package(LibXml2 REQUIRED) include_directories(${LIBXML2_INCLUDE_DIR}) +@@ -328,9 +310,14 @@ + + if (FREEBSD) + FIND_LIBRARY (EXECINFO_LIB execinfo) ++ FIND_LIBRARY (GETTEXT_LIB intl) ++ + if (NOT EXECINFO_LIB) + message(FATAL_ERROR "You need to install libexecinfo") + endif() ++ if (NOT GETTEXT_LIB) ++ message(FATAL_ERROR "You need to install gettext (libintl)") ++ endif() + endif() + + if (APPLE) +@@ -396,6 +383,7 @@ + + if (FREEBSD) + target_link_libraries(${target} ${EXECINFO_LIB}) ++ target_link_libraries(${target} ${GETTEXT_LIB}) + endif() + + if (APPLE) Modified: head/lang/hiphop-php/files/patch-CMake-HPHPSetup.cmake ============================================================================== --- head/lang/hiphop-php/files/patch-CMake-HPHPSetup.cmake Sun Jul 21 21:51:06 2013 (r323418) +++ head/lang/hiphop-php/files/patch-CMake-HPHPSetup.cmake Sun Jul 21 22:06:56 2013 (r323419) @@ -1,13 +1,13 @@ ---- CMake/HPHPSetup.cmake.orig 2012-07-13 12:37:46.091528166 +0200 -+++ CMake/HPHPSetup.cmake 2012-07-13 12:38:38.308521628 +0200 -@@ -113,8 +113,8 @@ +--- CMake/HPHPSetup.cmake.orig 2013-07-12 20:00:55.000000000 +0200 ++++ CMake/HPHPSetup.cmake 2013-07-21 11:03:57.285458378 +0200 +@@ -133,8 +133,8 @@ set(CMAKE_C_FLAGS "-no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -w") - set(CMAKE_CXX_FLAGS "-no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -fno-omit-frame-pointer -ftemplate-depth-60 -Wall -Woverloaded-virtual -Wno-deprecated -w1 -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names") + set(CMAKE_CXX_FLAGS "-no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -fno-omit-frame-pointer -ftemplate-depth-120 -Wall -Woverloaded-virtual -Wno-deprecated -w1 -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names") else() - set(CMAKE_C_FLAGS "-w") -- set(CMAKE_CXX_FLAGS "-fno-gcse -fno-omit-frame-pointer -ftemplate-depth-60 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-parentheses -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names") -+ set(CMAKE_C_FLAGS "-w %%CFLAGS%%") -+ set(CMAKE_CXX_FLAGS "-fno-gcse -fno-omit-frame-pointer -ftemplate-depth-60 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-parentheses -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names %%CXXFLAGS%%") +- set(CMAKE_CXX_FLAGS "-fno-gcse -fno-omit-frame-pointer -ftemplate-depth-120 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names -Wno-error=array-bounds -Wno-error=switch -std=gnu++0x -Werror=format-security -Wno-unused-result -Wno-sign-compare") ++ set(CMAKE_C_FLAGS "%%CFLAGS%%") ++ set(CMAKE_CXX_FLAGS "-fno-gcse -fno-omit-frame-pointer -ftemplate-depth-120 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names -Wno-error=array-bounds -Wno-error=switch -std=gnu++0x -Werror=format-security -Wno-unused-result -Wno-sign-compare %%CXXFLAGS%%") endif() IF(CMAKE_COMPILER_IS_GNUCC) Added: head/lang/hiphop-php/files/patch-hphp-runtime-base-program_functions.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/patch-hphp-runtime-base-program_functions.cpp Sun Jul 21 22:06:56 2013 (r323419) @@ -0,0 +1,16 @@ +--- hphp/runtime/base/program_functions.cpp.orig 2013-07-21 12:37:28.901704505 +0200 ++++ hphp/runtime/base/program_functions.cpp 2013-07-21 12:37:50.729630002 +0200 +@@ -1290,10 +1290,10 @@ + + void hphp_process_init() { + pthread_attr_t attr; +-#ifndef __APPLE__ +- pthread_getattr_np(pthread_self(), &attr); +-#else ++#if defined(__APPLE__) || defined(__FreeBSD__) + pthread_attr_init(&attr); ++#else ++ pthread_getattr_np(pthread_self(), &attr); + #endif + Util::init_stack_limits(&attr); + pthread_attr_destroy(&attr); Added: head/lang/hiphop-php/files/patch-hphp-runtime-ext-ext_hotprofiler.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/patch-hphp-runtime-ext-ext_hotprofiler.cpp Sun Jul 21 22:06:56 2013 (r323419) @@ -0,0 +1,10 @@ +--- hphp/runtime/ext/ext_hotprofiler.cpp.orig 2013-07-21 13:34:10.135485647 +0200 ++++ hphp/runtime/ext/ext_hotprofiler.cpp 2013-07-21 13:35:02.222657875 +0200 +@@ -28,6 +28,7 @@ + + #ifdef __FreeBSD__ + # include <sys/resource.h> ++# include <sys/param.h> + # include <sys/cpuset.h> + # define cpu_set_t cpuset_t + # define SET_AFFINITY(pid, size, mask) \ Added: head/lang/hiphop-php/files/patch-hphp-runtime-ext-ext_posix.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/patch-hphp-runtime-ext-ext_posix.cpp Sun Jul 21 22:06:56 2013 (r323419) @@ -0,0 +1,10 @@ +--- hphp/runtime/ext/ext_posix.cpp.orig 2013-07-21 13:35:52.420426882 +0200 ++++ hphp/runtime/ext/ext_posix.cpp 2013-07-21 13:36:48.030517355 +0200 +@@ -20,6 +20,7 @@ + #include <sys/times.h> + #include <sys/utsname.h> + #include <sys/types.h> ++#include <sys/param.h> + #include <sys/time.h> + #include <pwd.h> + #include <memory> Added: head/lang/hiphop-php/files/patch-hphp-runtime-vm-debug-dwarf.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/patch-hphp-runtime-vm-debug-dwarf.cpp Sun Jul 21 22:06:56 2013 (r323419) @@ -0,0 +1,47 @@ +--- hphp/runtime/vm/debug/dwarf.cpp.orig 2013-07-21 17:25:47.751427347 +0200 ++++ hphp/runtime/vm/debug/dwarf.cpp 2013-07-21 17:27:13.024430533 +0200 +@@ -17,7 +17,7 @@ + + #include <stdio.h> + #include "debug.h" +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include "hphp/runtime/vm/debug/elfwriter.h" + #endif + #include "hphp/runtime/vm/debug/gdb-jit.h" +@@ -36,7 +36,7 @@ + int g_dwarfCallback(char *name, int size, Dwarf_Unsigned type, + Dwarf_Unsigned flags, Dwarf_Unsigned link, Dwarf_Unsigned info, + Dwarf_Unsigned *sect_name_index, Dwarf_Ptr handle, int *error) { +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + ElfWriter *e = reinterpret_cast<ElfWriter *>(handle); + return e->dwarfCallback(name, size, type, flags, link, info); + #else +@@ -221,7 +221,7 @@ + m_dwarfChunks[j] = nullptr; + } + m_dwarfChunks[i] = chunk; +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + // register compacted chunk with gdb + ElfWriter e = ElfWriter(chunk); + #endif +@@ -291,7 +291,7 @@ + f->m_chunk = chunk; + } + +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + if (f->m_chunk->m_functions.size() >= RuntimeOption::EvalGdbSyncChunks) { + ElfWriter e = ElfWriter(f->m_chunk); + } +@@ -306,7 +306,7 @@ + for (i = 0; i < m_dwarfChunks.size(); i++) { + if (m_dwarfChunks[i] && !m_dwarfChunks[i]->isSynced()) { + unregister_gdb_chunk(m_dwarfChunks[i]); +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + ElfWriter e = ElfWriter(m_dwarfChunks[i]); + #endif + } Added: head/lang/hiphop-php/files/patch-hphp-runtime-vm-jit-translator-x64.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/patch-hphp-runtime-vm-jit-translator-x64.cpp Sun Jul 21 22:06:56 2013 (r323419) @@ -0,0 +1,10 @@ +--- hphp/runtime/vm/jit/translator-x64.cpp.orig 2013-07-21 13:57:07.101533182 +0200 ++++ hphp/runtime/vm/jit/translator-x64.cpp 2013-07-21 13:57:26.025419037 +0200 +@@ -31,6 +31,7 @@ + + #ifdef __FreeBSD__ + #define RIP_REGISTER(v) (v).mc_rip ++#include <sys/ucontext.h> + #elif defined(__APPLE__) + #define RIP_REGISTER(v) (v)->__ss.__rip + #elif defined(__x86_64__) Added: head/lang/hiphop-php/files/patch-hphp-third_party-folly-folly-FileUtil.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/patch-hphp-third_party-folly-folly-FileUtil.cpp Sun Jul 21 22:06:56 2013 (r323419) @@ -0,0 +1,18 @@ +--- hphp/third_party/folly/folly/FileUtil.cpp.orig 2013-07-21 12:17:10.950456554 +0200 ++++ hphp/third_party/folly/folly/FileUtil.cpp 2013-07-21 12:17:51.135882548 +0200 +@@ -53,10 +53,12 @@ + } + + int fdatasyncNoInt(int fd) { +-#ifndef __APPLE__ +- return wrapNoInt(fdatasync, fd); +-#else ++#if defined(__APPLE__) + return wrapNoInt(fcntl, fd, F_FULLFSYNC); ++#elif defined(__FreeBSD__) ++ return wrapNoInt(fsync, fd); ++#else ++ return wrapNoInt(fdatasync, fd); + #endif + } + Added: head/lang/hiphop-php/files/patch-hphp-util-compatibility.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/patch-hphp-util-compatibility.cpp Sun Jul 21 22:06:56 2013 (r323419) @@ -0,0 +1,11 @@ +--- hphp/util/compatibility.cpp.orig 2013-07-21 12:48:24.829495815 +0200 ++++ hphp/util/compatibility.cpp 2013-07-21 12:48:45.364579480 +0200 +@@ -20,7 +20,7 @@ + namespace HPHP { + /////////////////////////////////////////////////////////////////////////////// + +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__FreeBSD__) + char *strndup(const char* str, size_t len) { + size_t str_len = strlen(str); + if (len < str_len) { Added: head/lang/hiphop-php/files/patch-hphp-util-compatibility.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/hiphop-php/files/patch-hphp-util-compatibility.h Sun Jul 21 22:06:56 2013 (r323419) @@ -0,0 +1,11 @@ +--- hphp/util/compatibility.h.orig 2013-07-21 12:48:18.383655924 +0200 ++++ hphp/util/compatibility.h 2013-07-21 12:48:34.993417921 +0200 +@@ -24,7 +24,7 @@ + + #define PHP_DIR_SEPARATOR '/' + +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__FreeBSD__) + char *strndup(const char* str, size_t len); + int dprintf(int fd, const char *format, ...) ATTRIBUTE_PRINTF(2,3); + typedef int clockid_t; Modified: head/lang/hiphop-php/pkg-plist ============================================================================== --- head/lang/hiphop-php/pkg-plist Sun Jul 21 21:51:06 2013 (r323418) +++ head/lang/hiphop-php/pkg-plist Sun Jul 21 22:06:56 2013 (r323419) @@ -1,1349 +1,15 @@ -bin/hphp -bin/hphpi -%%DATADIR%%/CMake/FindBISON.cmake -%%DATADIR%%/CMake/FindBoost.cmake -%%DATADIR%%/CMake/FindCClient.cmake -%%DATADIR%%/CMake/FindFLEX.cmake -%%DATADIR%%/CMake/FindGD.cmake -%%DATADIR%%/CMake/FindICU.cmake -%%DATADIR%%/CMake/FindLdap.cmake -%%DATADIR%%/CMake/FindLibAfdt.cmake -%%DATADIR%%/CMake/FindLibCh.cmake -%%DATADIR%%/CMake/FindLibEvent.cmake -%%DATADIR%%/CMake/FindLibmemcached.cmake -%%DATADIR%%/CMake/FindLibpam.cmake -%%DATADIR%%/CMake/FindMcrypt.cmake -%%DATADIR%%/CMake/FindMySQL.cmake -%%DATADIR%%/CMake/FindNcurses.cmake -%%DATADIR%%/CMake/FindONIGURUMA.cmake -%%DATADIR%%/CMake/FindPCRE.cmake -%%DATADIR%%/CMake/FindReadline.cmake -%%DATADIR%%/CMake/FindTBB.cmake -%%DATADIR%%/CMake/HPHPFindLibs.cmake -%%DATADIR%%/CMake/HPHPFunctions.cmake -%%DATADIR%%/CMake/HPHPSetup.cmake -%%DATADIR%%/CMake/Options.cmake -%%DATADIR%%/bin/CMakeLists.base.txt -%%DATADIR%%/bin/apc_sample_serializer.php -%%DATADIR%%/bin/crutch.php -%%DATADIR%%/bin/distcc_timer.php -%%DATADIR%%/bin/droptables.sql -%%DATADIR%%/bin/exe_profile.php -%%DATADIR%%/bin/ext_injection.php -%%DATADIR%%/bin/gen_constants.php -%%DATADIR%%/bin/hdf.el -%%DATADIR%%/bin/hphp +bin/hhvm %%DATADIR%%/bin/libafdt.a +%%DATADIR%%/bin/libdouble-conversion.a +%%DATADIR%%/bin/libext_hhvm.a +%%DATADIR%%/bin/libfolly.a %%DATADIR%%/bin/libhphp_analysis.a %%DATADIR%%/bin/libhphp_runtime.a +%%DATADIR%%/bin/libhphp_system.a +%%DATADIR%%/bin/liblz4.a %%DATADIR%%/bin/libmbfl.a %%DATADIR%%/bin/libsqlite3.a %%DATADIR%%/bin/libtimelib.a -%%DATADIR%%/bin/libxhp.a -%%DATADIR%%/bin/license.php -%%DATADIR%%/bin/mime.hdf -%%DATADIR%%/bin/php53.constants.php -%%DATADIR%%/bin/ppp.php -%%DATADIR%%/bin/report_mutex.php -%%DATADIR%%/bin/report_sizes.php -%%DATADIR%%/bin/run.mk -%%DATADIR%%/bin/run.sh -%%DATADIR%%/bin/schema.sql -%%DATADIR%%/bin/time_build.php -%%DATADIR%%/bin/valgrind.suppression -%%DATADIR%%/src/runtime/Makefile -%%DATADIR%%/src/runtime/base/Makefile -%%DATADIR%%/src/runtime/base/array/arg_array.cpp -%%DATADIR%%/src/runtime/base/array/arg_array.h -%%DATADIR%%/src/runtime/base/array/array_data.cpp -%%DATADIR%%/src/runtime/base/array/array_data.h -%%DATADIR%%/src/runtime/base/array/array_init.cpp -%%DATADIR%%/src/runtime/base/array/array_init.h -%%DATADIR%%/src/runtime/base/array/array_iterator.cpp -%%DATADIR%%/src/runtime/base/array/array_iterator.h -%%DATADIR%%/src/runtime/base/array/array_util.cpp -%%DATADIR%%/src/runtime/base/array/array_util.h -%%DATADIR%%/src/runtime/base/array/hphp_array.cpp -%%DATADIR%%/src/runtime/base/array/hphp_array.h -%%DATADIR%%/src/runtime/base/array/small_array.cpp -%%DATADIR%%/src/runtime/base/array/small_array.h -%%DATADIR%%/src/runtime/base/array/zend_array.cpp -%%DATADIR%%/src/runtime/base/array/zend_array.h -%%DATADIR%%/src/runtime/base/base_includes.h -%%DATADIR%%/src/runtime/base/binary_operations.h -%%DATADIR%%/src/runtime/base/builtin_functions.cpp -%%DATADIR%%/src/runtime/base/builtin_functions.h -%%DATADIR%%/src/runtime/base/class_info.cpp -%%DATADIR%%/src/runtime/base/class_info.h -%%DATADIR%%/src/runtime/base/comparisons.cpp -%%DATADIR%%/src/runtime/base/comparisons.h -%%DATADIR%%/src/runtime/base/complex_types.h -%%DATADIR%%/src/runtime/base/debug/backtrace.cpp -%%DATADIR%%/src/runtime/base/debug/backtrace.h -%%DATADIR%%/src/runtime/base/debuggable.cpp -%%DATADIR%%/src/runtime/base/debuggable.h -%%DATADIR%%/src/runtime/base/dynamic_object_data.cpp -%%DATADIR%%/src/runtime/base/dynamic_object_data.h -%%DATADIR%%/src/runtime/base/execution_context.cpp -%%DATADIR%%/src/runtime/base/execution_context.h -%%DATADIR%%/src/runtime/base/externals.h -%%DATADIR%%/src/runtime/base/fiber_async_func.cpp -%%DATADIR%%/src/runtime/base/fiber_async_func.h -%%DATADIR%%/src/runtime/base/fiber_reference_map.cpp -%%DATADIR%%/src/runtime/base/fiber_reference_map.h -%%DATADIR%%/src/runtime/base/fiber_safe.cpp -%%DATADIR%%/src/runtime/base/fiber_safe.h -%%DATADIR%%/src/runtime/base/file/bzip2_file.cpp -%%DATADIR%%/src/runtime/base/file/bzip2_file.h -%%DATADIR%%/src/runtime/base/file/file.cpp -%%DATADIR%%/src/runtime/base/file/file.h -%%DATADIR%%/src/runtime/base/file/mem_file.cpp -%%DATADIR%%/src/runtime/base/file/mem_file.h -%%DATADIR%%/src/runtime/base/file/output_file.cpp -%%DATADIR%%/src/runtime/base/file/output_file.h -%%DATADIR%%/src/runtime/base/file/pipe.cpp -%%DATADIR%%/src/runtime/base/file/pipe.h -%%DATADIR%%/src/runtime/base/file/plain_file.cpp -%%DATADIR%%/src/runtime/base/file/plain_file.h -%%DATADIR%%/src/runtime/base/file/socket.cpp -%%DATADIR%%/src/runtime/base/file/socket.h -%%DATADIR%%/src/runtime/base/file/ssl_socket.cpp -%%DATADIR%%/src/runtime/base/file/ssl_socket.h -%%DATADIR%%/src/runtime/base/file/temp_file.cpp -%%DATADIR%%/src/runtime/base/file/temp_file.h -%%DATADIR%%/src/runtime/base/file/url_file.cpp -%%DATADIR%%/src/runtime/base/file/url_file.h -%%DATADIR%%/src/runtime/base/file/zip_file.cpp -%%DATADIR%%/src/runtime/base/file/zip_file.h -%%DATADIR%%/src/runtime/base/frame_injection.cpp -%%DATADIR%%/src/runtime/base/frame_injection.h -%%DATADIR%%/src/runtime/base/global_array_wrapper.cpp -%%DATADIR%%/src/runtime/base/global_array_wrapper.h -%%DATADIR%%/src/runtime/base/hphp.h -%%DATADIR%%/src/runtime/base/hphp_ffi.cpp -%%DATADIR%%/src/runtime/base/hphp_ffi.h -%%DATADIR%%/src/runtime/base/hphp_system.cpp -%%DATADIR%%/src/runtime/base/hphp_system.h -%%DATADIR%%/src/runtime/base/hphp_value.h -%%DATADIR%%/src/runtime/base/ini_setting.cpp -%%DATADIR%%/src/runtime/base/ini_setting.h -%%DATADIR%%/src/runtime/base/intercept.cpp -%%DATADIR%%/src/runtime/base/intercept.h -%%DATADIR%%/src/runtime/base/list_assignment.cpp -%%DATADIR%%/src/runtime/base/list_assignment.h -%%DATADIR%%/src/runtime/base/macros.h -%%DATADIR%%/src/runtime/base/memory/leak_detectable.cpp -%%DATADIR%%/src/runtime/base/memory/leak_detectable.h -%%DATADIR%%/src/runtime/base/memory/linear_allocator.cpp -%%DATADIR%%/src/runtime/base/memory/linear_allocator.h -%%DATADIR%%/src/runtime/base/memory/memory_manager.cpp -%%DATADIR%%/src/runtime/base/memory/memory_manager.h -%%DATADIR%%/src/runtime/base/memory/smart_allocator.core.inc -%%DATADIR%%/src/runtime/base/memory/smart_allocator.cpp -%%DATADIR%%/src/runtime/base/memory/smart_allocator.h -%%DATADIR%%/src/runtime/base/memory/smart_allocator.inc_gen -%%DATADIR%%/src/runtime/base/memory/sweepable.cpp -%%DATADIR%%/src/runtime/base/memory/sweepable.h -%%DATADIR%%/src/runtime/base/memory/unsafe_pointer.cpp -%%DATADIR%%/src/runtime/base/memory/unsafe_pointer.h -%%DATADIR%%/src/runtime/base/object_data.cpp -%%DATADIR%%/src/runtime/base/object_data.h -%%DATADIR%%/src/runtime/base/preg.cpp -%%DATADIR%%/src/runtime/base/preg.h -%%DATADIR%%/src/runtime/base/program_functions.cpp -%%DATADIR%%/src/runtime/base/program_functions.h -%%DATADIR%%/src/runtime/base/resource_data.cpp -%%DATADIR%%/src/runtime/base/resource_data.h -%%DATADIR%%/src/runtime/base/rtti_info.cpp -%%DATADIR%%/src/runtime/base/rtti_info.h -%%DATADIR%%/src/runtime/base/runtime_error.cpp -%%DATADIR%%/src/runtime/base/runtime_error.h -%%DATADIR%%/src/runtime/base/runtime_option.cpp -%%DATADIR%%/src/runtime/base/runtime_option.h -%%DATADIR%%/src/runtime/base/server/access_log.cpp -%%DATADIR%%/src/runtime/base/server/access_log.h -%%DATADIR%%/src/runtime/base/server/admin_request_handler.cpp -%%DATADIR%%/src/runtime/base/server/admin_request_handler.h -%%DATADIR%%/src/runtime/base/server/dynamic_content_cache.cpp -%%DATADIR%%/src/runtime/base/server/dynamic_content_cache.h -%%DATADIR%%/src/runtime/base/server/files_match.cpp -%%DATADIR%%/src/runtime/base/server/files_match.h -%%DATADIR%%/src/runtime/base/server/http_protocol.cpp -%%DATADIR%%/src/runtime/base/server/http_protocol.h -%%DATADIR%%/src/runtime/base/server/http_request_handler.cpp -%%DATADIR%%/src/runtime/base/server/http_request_handler.h -%%DATADIR%%/src/runtime/base/server/http_server.cpp -%%DATADIR%%/src/runtime/base/server/http_server.h -%%DATADIR%%/src/runtime/base/server/ip_block_map.cpp -%%DATADIR%%/src/runtime/base/server/ip_block_map.h -%%DATADIR%%/src/runtime/base/server/libevent_server.cpp -%%DATADIR%%/src/runtime/base/server/libevent_server.h -%%DATADIR%%/src/runtime/base/server/libevent_server_with_fd.cpp -%%DATADIR%%/src/runtime/base/server/libevent_server_with_fd.h -%%DATADIR%%/src/runtime/base/server/libevent_server_with_takeover.cpp -%%DATADIR%%/src/runtime/base/server/libevent_server_with_takeover.h -%%DATADIR%%/src/runtime/base/server/libevent_transport.cpp -%%DATADIR%%/src/runtime/base/server/libevent_transport.h -%%DATADIR%%/src/runtime/base/server/pagelet_server.cpp -%%DATADIR%%/src/runtime/base/server/pagelet_server.h -%%DATADIR%%/src/runtime/base/server/replay_transport.cpp -%%DATADIR%%/src/runtime/base/server/replay_transport.h -%%DATADIR%%/src/runtime/base/server/request_uri.cpp -%%DATADIR%%/src/runtime/base/server/request_uri.h -%%DATADIR%%/src/runtime/base/server/rpc_request_handler.cpp -%%DATADIR%%/src/runtime/base/server/rpc_request_handler.h -%%DATADIR%%/src/runtime/base/server/satellite_server.cpp -%%DATADIR%%/src/runtime/base/server/satellite_server.h -%%DATADIR%%/src/runtime/base/server/server.cpp -%%DATADIR%%/src/runtime/base/server/server.h -%%DATADIR%%/src/runtime/base/server/server_note.cpp -%%DATADIR%%/src/runtime/base/server/server_note.h -%%DATADIR%%/src/runtime/base/server/server_stats.cpp -%%DATADIR%%/src/runtime/base/server/server_stats.h -%%DATADIR%%/src/runtime/base/server/service_thread.cpp -%%DATADIR%%/src/runtime/base/server/service_thread.h -%%DATADIR%%/src/runtime/base/server/source_root_info.cpp -%%DATADIR%%/src/runtime/base/server/source_root_info.h -%%DATADIR%%/src/runtime/base/server/static_content_cache.cpp -%%DATADIR%%/src/runtime/base/server/static_content_cache.h -%%DATADIR%%/src/runtime/base/server/transport.cpp -%%DATADIR%%/src/runtime/base/server/transport.h -%%DATADIR%%/src/runtime/base/server/upload.cpp -%%DATADIR%%/src/runtime/base/server/upload.h -%%DATADIR%%/src/runtime/base/server/virtual_host.cpp -%%DATADIR%%/src/runtime/base/server/virtual_host.h -%%DATADIR%%/src/runtime/base/server/xbox_server.cpp -%%DATADIR%%/src/runtime/base/server/xbox_server.h -%%DATADIR%%/src/runtime/base/shared/concurrent_shared_store.cpp -%%DATADIR%%/src/runtime/base/shared/concurrent_shared_store.h -%%DATADIR%%/src/runtime/base/shared/immutable_map.cpp -%%DATADIR%%/src/runtime/base/shared/immutable_map.h -%%DATADIR%%/src/runtime/base/shared/immutable_obj.cpp -%%DATADIR%%/src/runtime/base/shared/immutable_obj.h -%%DATADIR%%/src/runtime/base/shared/shared_map.cpp -%%DATADIR%%/src/runtime/base/shared/shared_map.h -%%DATADIR%%/src/runtime/base/shared/shared_store.cpp -%%DATADIR%%/src/runtime/base/shared/shared_store.h -%%DATADIR%%/src/runtime/base/shared/shared_store_base.cpp -%%DATADIR%%/src/runtime/base/shared/shared_store_base.h -%%DATADIR%%/src/runtime/base/shared/shared_store_stats.cpp -%%DATADIR%%/src/runtime/base/shared/shared_store_stats.h -%%DATADIR%%/src/runtime/base/shared/shared_string.cpp -%%DATADIR%%/src/runtime/base/shared/shared_string.h -%%DATADIR%%/src/runtime/base/shared/shared_variant.cpp -%%DATADIR%%/src/runtime/base/shared/shared_variant.h -%%DATADIR%%/src/runtime/base/source_info.cpp -%%DATADIR%%/src/runtime/base/source_info.h -%%DATADIR%%/src/runtime/base/string_data.cpp -%%DATADIR%%/src/runtime/base/string_data.h -%%DATADIR%%/src/runtime/base/string_offset.cpp -%%DATADIR%%/src/runtime/base/string_offset.h -%%DATADIR%%/src/runtime/base/string_util.cpp -%%DATADIR%%/src/runtime/base/string_util.h -%%DATADIR%%/src/runtime/base/taint/README -%%DATADIR%%/src/runtime/base/taint/taint_data.cpp -%%DATADIR%%/src/runtime/base/taint/taint_data.h -%%DATADIR%%/src/runtime/base/taint/taint_helper.cpp -%%DATADIR%%/src/runtime/base/taint/taint_helper.h -%%DATADIR%%/src/runtime/base/taint/taint_observer.cpp -%%DATADIR%%/src/runtime/base/taint/taint_observer.h -%%DATADIR%%/src/runtime/base/taint/taint_trace.cpp -%%DATADIR%%/src/runtime/base/taint/taint_trace.h -%%DATADIR%%/src/runtime/base/taint/taint_trace_node.h -%%DATADIR%%/src/runtime/base/taint/taint_warning.cpp -%%DATADIR%%/src/runtime/base/taint/taint_warning.h -%%DATADIR%%/src/runtime/base/thread_info.cpp -%%DATADIR%%/src/runtime/base/thread_init_fini.cpp -%%DATADIR%%/src/runtime/base/thread_init_fini.h -%%DATADIR%%/src/runtime/base/time/datetime.cpp -%%DATADIR%%/src/runtime/base/time/datetime.h -%%DATADIR%%/src/runtime/base/time/timestamp.cpp -%%DATADIR%%/src/runtime/base/time/timestamp.h -%%DATADIR%%/src/runtime/base/time/timezone.cpp -%%DATADIR%%/src/runtime/base/time/timezone.h -%%DATADIR%%/src/runtime/base/timeout_thread.cpp -%%DATADIR%%/src/runtime/base/timeout_thread.h -%%DATADIR%%/src/runtime/base/tv_helpers.h -%%DATADIR%%/src/runtime/base/tv_macros.h -%%DATADIR%%/src/runtime/base/type_array.cpp -%%DATADIR%%/src/runtime/base/type_array.h -%%DATADIR%%/src/runtime/base/type_conversions.cpp -%%DATADIR%%/src/runtime/base/type_conversions.h -%%DATADIR%%/src/runtime/base/type_object.cpp -%%DATADIR%%/src/runtime/base/type_object.h -%%DATADIR%%/src/runtime/base/type_string.cpp -%%DATADIR%%/src/runtime/base/type_string.h -%%DATADIR%%/src/runtime/base/type_variant.cpp -%%DATADIR%%/src/runtime/base/type_variant.h -%%DATADIR%%/src/runtime/base/types.h -%%DATADIR%%/src/runtime/base/util/countable.cpp -%%DATADIR%%/src/runtime/base/util/countable.h -%%DATADIR%%/src/runtime/base/util/exceptions.cpp -%%DATADIR%%/src/runtime/base/util/exceptions.h -%%DATADIR%%/src/runtime/base/util/extended_logger.cpp -%%DATADIR%%/src/runtime/base/util/extended_logger.h -%%DATADIR%%/src/runtime/base/util/http_client.cpp -%%DATADIR%%/src/runtime/base/util/http_client.h -%%DATADIR%%/src/runtime/base/util/libevent_http_client.cpp -%%DATADIR%%/src/runtime/base/util/libevent_http_client.h -%%DATADIR%%/src/runtime/base/util/php_thrift_buffer.cpp -%%DATADIR%%/src/runtime/base/util/php_thrift_buffer.h -%%DATADIR%%/src/runtime/base/util/request_local.h -%%DATADIR%%/src/runtime/base/util/simple_counter.cpp -%%DATADIR%%/src/runtime/base/util/simple_counter.h -%%DATADIR%%/src/runtime/base/util/smart_object.h -%%DATADIR%%/src/runtime/base/util/smart_ptr.h -%%DATADIR%%/src/runtime/base/util/string_buffer.cpp -%%DATADIR%%/src/runtime/base/util/string_buffer.h -%%DATADIR%%/src/runtime/base/util/thrift_buffer.cpp -%%DATADIR%%/src/runtime/base/util/thrift_buffer.h -%%DATADIR%%/src/runtime/base/variable_serializer.cpp -%%DATADIR%%/src/runtime/base/variable_serializer.h -%%DATADIR%%/src/runtime/base/variable_table.cpp -%%DATADIR%%/src/runtime/base/variable_table.h -%%DATADIR%%/src/runtime/base/variable_unserializer.cpp -%%DATADIR%%/src/runtime/base/variable_unserializer.h -%%DATADIR%%/src/runtime/base/zend/Makefile -%%DATADIR%%/src/runtime/base/zend/intl_convert.cpp -%%DATADIR%%/src/runtime/base/zend/intl_convert.h -%%DATADIR%%/src/runtime/base/zend/utf8_decode.cpp -%%DATADIR%%/src/runtime/base/zend/utf8_decode.h -%%DATADIR%%/src/runtime/base/zend/zend_collator.cpp -%%DATADIR%%/src/runtime/base/zend/zend_collator.h -%%DATADIR%%/src/runtime/base/zend/zend_functions.cpp -%%DATADIR%%/src/runtime/base/zend/zend_functions.h -%%DATADIR%%/src/runtime/base/zend/zend_html.cpp -%%DATADIR%%/src/runtime/base/zend/zend_html.h -%%DATADIR%%/src/runtime/base/zend/zend_ini.lex.yy.cpp -%%DATADIR%%/src/runtime/base/zend/zend_ini.tab.cpp -%%DATADIR%%/src/runtime/base/zend/zend_ini.tab.hpp -%%DATADIR%%/src/runtime/base/zend/zend_ini.x -%%DATADIR%%/src/runtime/base/zend/zend_ini.y -%%DATADIR%%/src/runtime/base/zend/zend_math.h -%%DATADIR%%/src/runtime/base/zend/zend_md5.cpp -%%DATADIR%%/src/runtime/base/zend/zend_multiply.h -%%DATADIR%%/src/runtime/base/zend/zend_pack.cpp -%%DATADIR%%/src/runtime/base/zend/zend_pack.h -%%DATADIR%%/src/runtime/base/zend/zend_php_config.h -%%DATADIR%%/src/runtime/base/zend/zend_printf.cpp -%%DATADIR%%/src/runtime/base/zend/zend_printf.h -%%DATADIR%%/src/runtime/base/zend/zend_qsort.cpp -%%DATADIR%%/src/runtime/base/zend/zend_qsort.h -%%DATADIR%%/src/runtime/base/zend/zend_rand.cpp -%%DATADIR%%/src/runtime/base/zend/zend_scanf.cpp -%%DATADIR%%/src/runtime/base/zend/zend_scanf.h -%%DATADIR%%/src/runtime/base/zend/zend_sha1.cpp -%%DATADIR%%/src/runtime/base/zend/zend_string.cpp -%%DATADIR%%/src/runtime/base/zend/zend_string.h -%%DATADIR%%/src/runtime/base/zend/zend_strtod.cpp -%%DATADIR%%/src/runtime/base/zend/zend_strtod.h -%%DATADIR%%/src/runtime/base/zend/zend_url.cpp -%%DATADIR%%/src/runtime/base/zend/zend_url.h -%%DATADIR%%/src/runtime/eval/Makefile -%%DATADIR%%/src/runtime/eval/analysis/block.cpp -%%DATADIR%%/src/runtime/eval/analysis/block.h -%%DATADIR%%/src/runtime/eval/ast/array_element_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/array_element_expression.h -%%DATADIR%%/src/runtime/eval/ast/array_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/array_expression.h -%%DATADIR%%/src/runtime/eval/ast/assignment_op_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/assignment_op_expression.h -%%DATADIR%%/src/runtime/eval/ast/assignment_ref_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/assignment_ref_expression.h -%%DATADIR%%/src/runtime/eval/ast/binary_op_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/binary_op_expression.h -%%DATADIR%%/src/runtime/eval/ast/break_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/break_statement.h -%%DATADIR%%/src/runtime/eval/ast/class_constant_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/class_constant_expression.h -%%DATADIR%%/src/runtime/eval/ast/class_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/class_statement.h -%%DATADIR%%/src/runtime/eval/ast/closure_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/closure_expression.h -%%DATADIR%%/src/runtime/eval/ast/constant_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/constant_expression.h -%%DATADIR%%/src/runtime/eval/ast/construct.cpp -%%DATADIR%%/src/runtime/eval/ast/construct.h -%%DATADIR%%/src/runtime/eval/ast/do_while_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/do_while_statement.h -%%DATADIR%%/src/runtime/eval/ast/echo_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/echo_statement.h -%%DATADIR%%/src/runtime/eval/ast/encaps_list_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/encaps_list_expression.h -%%DATADIR%%/src/runtime/eval/ast/expr_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/expr_statement.h -%%DATADIR%%/src/runtime/eval/ast/expression.cpp -%%DATADIR%%/src/runtime/eval/ast/expression.h -%%DATADIR%%/src/runtime/eval/ast/for_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/for_statement.h -%%DATADIR%%/src/runtime/eval/ast/foreach_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/foreach_statement.h -%%DATADIR%%/src/runtime/eval/ast/function_call_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/function_call_expression.h -%%DATADIR%%/src/runtime/eval/ast/function_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/function_statement.h -%%DATADIR%%/src/runtime/eval/ast/global_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/global_statement.h -%%DATADIR%%/src/runtime/eval/ast/goto_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/goto_statement.h -%%DATADIR%%/src/runtime/eval/ast/if_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/if_statement.h -%%DATADIR%%/src/runtime/eval/ast/inc_op_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/inc_op_expression.h -%%DATADIR%%/src/runtime/eval/ast/include_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/include_expression.h -%%DATADIR%%/src/runtime/eval/ast/instanceof_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/instanceof_expression.h -%%DATADIR%%/src/runtime/eval/ast/isset_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/isset_expression.h -%%DATADIR%%/src/runtime/eval/ast/label_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/label_statement.h -%%DATADIR%%/src/runtime/eval/ast/list_assignment_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/list_assignment_expression.h -%%DATADIR%%/src/runtime/eval/ast/lval_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/lval_expression.h -%%DATADIR%%/src/runtime/eval/ast/method_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/method_statement.h -%%DATADIR%%/src/runtime/eval/ast/name.cpp -%%DATADIR%%/src/runtime/eval/ast/name.h -%%DATADIR%%/src/runtime/eval/ast/new_object_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/new_object_expression.h -%%DATADIR%%/src/runtime/eval/ast/object_method_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/object_method_expression.h -%%DATADIR%%/src/runtime/eval/ast/object_property_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/object_property_expression.h -%%DATADIR%%/src/runtime/eval/ast/qop_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/qop_expression.h -%%DATADIR%%/src/runtime/eval/ast/ref_param_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/ref_param_expression.h -%%DATADIR%%/src/runtime/eval/ast/return_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/return_statement.h -%%DATADIR%%/src/runtime/eval/ast/scalar_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/scalar_expression.h -%%DATADIR%%/src/runtime/eval/ast/scalar_value_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/scalar_value_expression.h -%%DATADIR%%/src/runtime/eval/ast/simple_function_call_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/simple_function_call_expression.h -%%DATADIR%%/src/runtime/eval/ast/statement.cpp -%%DATADIR%%/src/runtime/eval/ast/statement.h -%%DATADIR%%/src/runtime/eval/ast/statement_list_statement.cpp -%%DATADIR%%/src/runtime/eval/ast/statement_list_statement.h -%%DATADIR%%/src/runtime/eval/ast/static_member_expression.cpp -%%DATADIR%%/src/runtime/eval/ast/static_member_expression.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307212206.r6LM6urC010223>