diff options
| author | taca <taca> | 2013-07-29 16:41:02 +0000 |
|---|---|---|
| committer | taca <taca> | 2013-07-29 16:41:02 +0000 |
| commit | 6d07a0cdbc6c7260c70ee8642ef573d33284b878 (patch) | |
| tree | 53969d975c96cc91cf74a7ca555c9999953a42ce | |
| parent | d2d121dd0d5ce69b3a5f292ecff3702e2db440a9 (diff) | |
| download | pkgsrc-6d07a0cdbc6c7260c70ee8642ef573d33284b878.tar.gz | |
Add PHP 5.5.1 as lang/php55 version 5.5.1 package.
This is new stable release of PHP. Please refer UPGRADING file for
changes and updating.
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 provices PHP version 5.5.x.
25 files changed, 858 insertions, 0 deletions
diff --git a/lang/php55/DESCR b/lang/php55/DESCR new file mode 100644 index 00000000000..f6a8edf8608 --- /dev/null +++ b/lang/php55/DESCR @@ -0,0 +1,7 @@ +PHP is an HTML-embedded scripting language. It is modular, with +some object-oriented features. Much of its syntax is borrowed from +C, Java and Perl with a couple of unique PHP-specific features +thrown in. The language is designed to allow web developers to +write dynamically generated pages quickly. + +This package provices PHP version 5.5.x. diff --git a/lang/php55/MESSAGE b/lang/php55/MESSAGE new file mode 100644 index 00000000000..68af4068ea1 --- /dev/null +++ b/lang/php55/MESSAGE @@ -0,0 +1,11 @@ +=========================================================================== +$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 new file mode 100644 index 00000000000..d34080b0492 --- /dev/null +++ b/lang/php55/Makefile @@ -0,0 +1,60 @@ +# $NetBSD: Makefile,v 1.1 2013/07/29 16:41:02 taca Exp $ + +# +# We can't omit PKGNAME here to handle PKG_OPTIONS. +# +PKGNAME= php-${PHP_BASE_VERS} +CATEGORIES= lang + +HOMEPAGE= http://www.php.net/ +COMMENT= PHP Hypertext Preprocessor version 5.5 +LICENSE= php + +TEST_TARGET= test + +USE_TOOLS+= gmake lex pkg-config +LIBTOOL_OVERRIDE= # empty +PHP_CHECK_INSTALLED= Yes + +.include "Makefile.php" + +CGIDIR= ${PREFIX}/libexec/cgi-bin +EGDIR= ${PREFIX}/share/examples/php +MESSAGE_SUBST+= CGIDIR=${CGIDIR} + +CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} +MAKE_ENV+= INSTALL_ROOT=${DESTDIR} + +CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini +PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" + +SUBST_CLASSES+= path +SUBST_MESSAGE.path= Fixing common paths. +SUBST_STAGE.path= pre-configure +SUBST_FILES.path= configure ext/phar/phar/phar.php +SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php +SUBST_FILES.path+= sapi/cgi/Makefile.frag +SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' +SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' + +INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php + +# Make sure modules can link correctly +.if ${OPSYS} == "Darwin" +INSTALL_UNSTRIPPED= yes +.endif + +post-extract: + cd ${WRKSRC} && \ + ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \; + +post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php + ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 + ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php + cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ + ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php + +.include "../../mk/bsd.pkg.mk" diff --git a/lang/php55/Makefile.common b/lang/php55/Makefile.common new file mode 100644 index 00000000000..c25a041d802 --- /dev/null +++ b/lang/php55/Makefile.common @@ -0,0 +1,15 @@ +# $NetBSD: Makefile.common,v 1.1 2013/07/29 16:41:02 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 +PHP_BASE_VERS= ${PHP55_VERSION} + +.include "../../lang/php/common.mk" + +CATEGORIES+= www +MAINTAINER?= pkgsrc-users@NetBSD.org + +# needed due to (broken?) configure checks in php-xmlrpc and php5-dom +CONFIGURE_ENV+= PHP_LIBXML_SHARED="1" diff --git a/lang/php55/Makefile.php b/lang/php55/Makefile.php new file mode 100644 index 00000000000..4cbbadc8ca3 --- /dev/null +++ b/lang/php55/Makefile.php @@ -0,0 +1,93 @@ +# $NetBSD: Makefile.php,v 1.1 2013/07/29 16:41:02 taca 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-xml +CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} +.include "../../textproc/libxml2/buildlink3.mk" + +# Note: This expression is the same as ${PKGBASE}, but the latter is +# not defined yet, so we cannot use it here. +PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} +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 + +.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 new file mode 100644 index 00000000000..dadacb7c06e --- /dev/null +++ b/lang/php55/PLIST @@ -0,0 +1,241 @@ +@comment $NetBSD: PLIST,v 1.1 2013/07/29 16:41:02 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/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/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 new file mode 100644 index 00000000000..de0dad9363b --- /dev/null +++ b/lang/php55/buildlink3.mk @@ -0,0 +1,15 @@ +# $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 new file mode 100644 index 00000000000..8fca3f0f2b8 --- /dev/null +++ b/lang/php55/distinfo @@ -0,0 +1,22 @@ +$NetBSD: distinfo,v 1.1 2013/07/29 16:41:02 taca Exp $ + +SHA1 (php-5.5.1.tar.bz2) = b31b6922cb2796a52be9dc6696f31fcbb20ac916 +RMD160 (php-5.5.1.tar.bz2) = fe1e20e59ac366f4c105c1cda22fbfeb98dbebd2 +Size (php-5.5.1.tar.bz2) = 12004597 bytes +SHA1 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746 +SHA1 (patch-configure) = ee537d9b0c5e13bddfbb04e944e81671ccb2ff22 +SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891 +SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc +SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b +SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 +SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 +SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba +SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c +SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841 +SHA1 (patch-main_streams_cast.c) = 955aee9efb4868e00fbfc443bb7d92c71844a853 +SHA1 (patch-makedist) = a2a77c3d15a28fee08fdd88f0c9fee6cbec107d8 +SHA1 (patch-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add +SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae +SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d +SHA1 (patch-sapi_cgi_Makefile.frag) = 16fc782c309c462d92e72b61d258b9701159748a +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 new file mode 100644 index 00000000000..9cbb562d1cf --- /dev/null +++ b/lang/php55/patches/patch-acinclude.m4 @@ -0,0 +1,13 @@ +$NetBSD: patch-acinclude.m4,v 1.1 2013/07/29 16:41:02 taca Exp $ + +--- acinclude.m4.orig 2012-05-03 17:10:43.000000000 +0000 ++++ acinclude.m4 +@@ -2352,7 +2352,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-configure b/lang/php55/patches/patch-configure new file mode 100644 index 00000000000..8531de149e1 --- /dev/null +++ b/lang/php55/patches/patch-configure @@ -0,0 +1,63 @@ +$NetBSD: patch-configure,v 1.1 2013/07/29 16:41:02 taca Exp $ + +--- configure.orig 2013-07-18 14:42:04.000000000 +0000 ++++ configure +@@ -20784,7 +20784,7 @@ _ACEOF + cat>>Makefile.objects<<EOF + + $ac_bdir$ac_hdrobj: $abs_srcdir/$ac_provsrc +- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$@ ++ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) 's,PHP_,DTRACE_,g' \$@ > \$@.tmp && mv \$@.tmp \$@ + + \$(PHP_DTRACE_OBJS): $ac_bdir$ac_hdrobj + +@@ -23567,7 +23567,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 +@@ -25717,7 +25717,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'` +@@ -36774,7 +36774,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 +@@ -48532,7 +48532,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 +@@ -104355,12 +104355,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 diff --git a/lang/php55/patches/patch-ext_gd_config.m4 b/lang/php55/patches/patch-ext_gd_config.m4 new file mode 100644 index 00000000000..facf887e063 --- /dev/null +++ b/lang/php55/patches/patch-ext_gd_config.m4 @@ -0,0 +1,49 @@ +$NetBSD: patch-ext_gd_config.m4,v 1.1 2013/07/29 16:41:02 taca Exp $ + +--- ext/gd/config.m4.orig 2012-05-03 17:10:43.000000000 +0000 ++++ ext/gd/config.m4 +@@ -50,18 +50,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" +@@ -70,7 +59,6 @@ AC_DEFUN([PHP_GD_ZLIB],[ + PHP_ZLIB_INCDIR="$i/include" + fi + done +- fi + ]) + + AC_DEFUN([PHP_GD_VPX],[ +@@ -139,13 +127,13 @@ AC_DEFUN([PHP_GD_PNG],[ + AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>]) + fi + +- PHP_CHECK_LIBRARY(png,png_write_image, ++ PHP_CHECK_LIBRARY(png16,png_write_image, + [ + PHP_ADD_INCLUDE($GD_PNG_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(png16, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) + ],[ +- AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) ++ AC_MSG_ERROR([Problem with libpng16.(a|so) or libz.(a|so). Please check config.log for more information.]) + ],[ + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR + ]) diff --git a/lang/php55/patches/patch-ext_imap_config.m4 b/lang/php55/patches/patch-ext_imap_config.m4 new file mode 100644 index 00000000000..8a038d469a4 --- /dev/null +++ b/lang/php55/patches/patch-ext_imap_config.m4 @@ -0,0 +1,28 @@ +$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 new file mode 100644 index 00000000000..c6da624cb8e --- /dev/null +++ b/lang/php55/patches/patch-ext_mssql_php__mssql.c @@ -0,0 +1,22 @@ +$NetBSD: patch-ext_mssql_php__mssql.c,v 1.1 2013/07/29 16:41:02 taca Exp $ + +--- ext/mssql/php_mssql.c.orig 2012-05-03 17:10:43.000000000 +0000 ++++ ext/mssql/php_mssql.c +@@ -764,7 +764,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); +@@ -1117,7 +1117,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_pdo__mysql_config.m4 b/lang/php55/patches/patch-ext_pdo__mysql_config.m4 new file mode 100644 index 00000000000..705f007615d --- /dev/null +++ b/lang/php55/patches/patch-ext_pdo__mysql_config.m4 @@ -0,0 +1,13 @@ +$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 new file mode 100644 index 00000000000..2589e484fb2 --- /dev/null +++ b/lang/php55/patches/patch-ext_pdo_config.m4 @@ -0,0 +1,25 @@ +$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 new file mode 100644 index 00000000000..cc5fe1f49a7 --- /dev/null +++ b/lang/php55/patches/patch-ext_phar_Makefile.frag @@ -0,0 +1,19 @@ +$NetBSD: patch-ext_phar_Makefile.frag,v 1.1 2013/07/29 16:41:02 taca Exp $ + +--- ext/phar/Makefile.frag.orig 2012-05-03 17:10:43.000000000 +0000 ++++ ext/phar/Makefile.frag +@@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \ + else \ + $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ + fi;` +-PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` ++PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` + + $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc + -@test -d $(builddir)/phar || mkdir $(builddir)/phar +@@ -39,4 +39,4 @@ install-pharcmd: pharcmd + -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) + $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) + -@rm -f $(INSTALL_ROOT)$(bindir)/phar +- $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar ++ $(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar diff --git a/lang/php55/patches/patch-ext_phar_phar_phar.php b/lang/php55/patches/patch-ext_phar_phar_phar.php new file mode 100644 index 00000000000..32c5fb48934 --- /dev/null +++ b/lang/php55/patches/patch-ext_phar_phar_phar.php @@ -0,0 +1,10 @@ +$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_standard_basic__functions.c b/lang/php55/patches/patch-ext_standard_basic__functions.c new file mode 100644 index 00000000000..a75487dcd1a --- /dev/null +++ b/lang/php55/patches/patch-ext_standard_basic__functions.c @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_standard_basic__functions.c,v 1.1 2013/07/29 16:41:02 taca Exp $ + +Work around VAX FP lack of INF + +--- ext/standard/basic_functions.c.orig 2012-05-08 05:22:56.000000000 +0000 ++++ ext/standard/basic_functions.c +@@ -3498,7 +3498,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-main_streams_cast.c b/lang/php55/patches/patch-main_streams_cast.c new file mode 100644 index 00000000000..ea742d7754e --- /dev/null +++ b/lang/php55/patches/patch-main_streams_cast.c @@ -0,0 +1,15 @@ +$NetBSD: patch-main_streams_cast.c,v 1.1 2013/07/29 16:41:02 taca Exp $ + +* For NetBSD 6.0+, __NetBSD_Version__ should includes 600000000. + +--- main/streams/cast.c.orig 2013-07-03 06:10:53.000000000 +0000 ++++ main/streams/cast.c +@@ -33,7 +33,7 @@ + #if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE) + + /* NetBSD 6.0+ uses off_t instead of fpos_t in funopen */ +-# if defined(__NetBSD__) && (__NetBSD_Version__ > 600000000) ++# if defined(__NetBSD__) && (__NetBSD_Version__ >= 600000000) + # define PHP_FPOS_T off_t + # else + # define PHP_FPOS_T fpos_t diff --git a/lang/php55/patches/patch-makedist b/lang/php55/patches/patch-makedist new file mode 100644 index 00000000000..6948f71984d --- /dev/null +++ b/lang/php55/patches/patch-makedist @@ -0,0 +1,13 @@ +$NetBSD: patch-makedist,v 1.1 2013/07/29 16:41:02 taca Exp $ + +--- makedist.orig 2013-07-18 14:37:33.000000000 +0000 ++++ makedist +@@ -35,7 +35,7 @@ if test "${1}" = "1" -a "${2}" -lt "28"; + fi + IFS="$old_IFS" + +-if test "$PHPROOTx" == "x"; then ++if test "$PHPROOTx" = "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 new file mode 100644 index 00000000000..3a44a6f0a81 --- /dev/null +++ b/lang/php55/patches/patch-php.ini-development @@ -0,0 +1,33 @@ +$NetBSD: patch-php.ini-development,v 1.1 2013/07/29 16:41:02 taca Exp $ + +--- php.ini-development.orig 2012-05-03 17:10:43.000000000 +0000 ++++ php.ini-development +@@ -702,7 +702,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" +@@ -723,8 +723,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" +@@ -793,7 +793,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 new file mode 100644 index 00000000000..28225d68704 --- /dev/null +++ b/lang/php55/patches/patch-php.ini-production @@ -0,0 +1,33 @@ +$NetBSD: patch-php.ini-production,v 1.1 2013/07/29 16:41:02 taca Exp $ + +--- php.ini-production.orig 2012-05-03 17:10:43.000000000 +0000 ++++ php.ini-production +@@ -702,7 +702,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" +@@ -723,8 +723,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" +@@ -793,7 +793,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 new file mode 100644 index 00000000000..36117e6510f --- /dev/null +++ b/lang/php55/patches/patch-run-tests.php @@ -0,0 +1,12 @@ +$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 new file mode 100644 index 00000000000..f106b05e780 --- /dev/null +++ b/lang/php55/patches/patch-sapi_cgi_Makefile.frag @@ -0,0 +1,15 @@ +$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.1 2013/07/29 16:41:02 taca Exp $ + +--- sapi/cgi/Makefile.frag.orig 2013-07-18 14:37:33.000000000 +0000 ++++ sapi/cgi/Makefile.frag +@@ -4,8 +4,8 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P + $(BUILD_CGI) + + install-cgi: $(SAPI_CGI_PATH) +- @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" +- @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) ++ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)@CGIDIR@/" ++ @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)@CGIDIR@/php + @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_php-fpm.conf.in b/lang/php55/patches/patch-sapi_fpm_php-fpm.conf.in new file mode 100644 index 00000000000..edf68a0d51d --- /dev/null +++ b/lang/php55/patches/patch-sapi_fpm_php-fpm.conf.in @@ -0,0 +1,16 @@ +$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 |