pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang Add php72 7.2.0RC6



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d321c7fb5662
branches:  trunk
changeset: 371538:d321c7fb5662
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Wed Nov 15 08:56:12 2017 +0000

description:
Add php72 7.2.0RC6

PHP 7.2.x builds upon 7.1.x, adding new features:

* Argument type declarations
* Object return type declarations
* Parameter Type Widening
* Trailing commas in list syntax
* Argon2 in password hash
* Libsodium as part of PHP Core
* Deprecated: __autoload, $php_errormsg, create_function(),
  mbstring.func_overload, parse_str() without second argument,
  gmp_random(), each(), assert(), $errcontext
* uniqid() patch to avoid usleep() integrated, 10000x improvement on NetBSD,
  about 10x on Linux

diffstat:

 lang/Makefile                                            |    3 +-
 lang/php/phpversion.mk                                   |   27 +-
 lang/php72/DESCR                                         |   22 +
 lang/php72/MESSAGE                                       |   11 +
 lang/php72/Makefile                                      |   72 +++
 lang/php72/Makefile.common                               |   20 +
 lang/php72/Makefile.php                                  |   96 +++++
 lang/php72/PLIST                                         |  284 +++++++++++++++
 lang/php72/buildlink3.mk                                 |   15 +
 lang/php72/distinfo                                      |   29 +
 lang/php72/patches/patch-acinclude.m4                    |   13 +
 lang/php72/patches/patch-configure                       |   91 ++++
 lang/php72/patches/patch-ext_imap_config.m4              |   28 +
 lang/php72/patches/patch-ext_intl_config.m4              |   15 +
 lang/php72/patches/patch-ext_pcre_pcrelib_config.h       |   27 +
 lang/php72/patches/patch-ext_pdo__mysql_config.m4        |   13 +
 lang/php72/patches/patch-ext_pdo_config.m4               |   25 +
 lang/php72/patches/patch-ext_phar_Makefile.frag          |   13 +
 lang/php72/patches/patch-ext_phar_phar_phar.php          |   10 +
 lang/php72/patches/patch-ext_recode_recode.c             |   22 +
 lang/php72/patches/patch-ext_sqlite3_libsqlite_sqlite3.c |   13 +
 lang/php72/patches/patch-ext_xsl_php__xsl.h              |   15 +
 lang/php72/patches/patch-makedist                        |   13 +
 lang/php72/patches/patch-php.ini-development             |   33 +
 lang/php72/patches/patch-php.ini-production              |   33 +
 lang/php72/patches/patch-run-tests.php                   |   10 +
 lang/php72/patches/patch-sapi_cgi_Makefile.frag          |   16 +
 lang/php72/patches/patch-sapi_cli_Makefile.frag          |   19 +
 lang/php72/patches/patch-sapi_fpm_fpm_events_port.c      |   45 ++
 lang/php72/patches/patch-sapi_fpm_php-fpm.conf.in        |   13 +
 30 files changed, 1037 insertions(+), 9 deletions(-)

diffs (truncated from 1245 to 300 lines):

diff -r 385858efd493 -r d321c7fb5662 lang/Makefile
--- a/lang/Makefile     Wed Nov 15 08:41:06 2017 +0000
+++ b/lang/Makefile     Wed Nov 15 08:56:12 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.469 2017/11/01 12:07:31 fhajny Exp $
+# $NetBSD: Makefile,v 1.470 2017/11/15 08:56:12 jdolecek Exp $
 #
 
 COMMENT=       Programming languages
@@ -171,6 +171,7 @@
 SUBDIR+=       php56
 SUBDIR+=       php70
 SUBDIR+=       php71
+SUBDIR+=       php72
 SUBDIR+=       picoc
 SUBDIR+=       pict
 SUBDIR+=       polyml
diff -r 385858efd493 -r d321c7fb5662 lang/php/phpversion.mk
--- a/lang/php/phpversion.mk    Wed Nov 15 08:41:06 2017 +0000
+++ b/lang/php/phpversion.mk    Wed Nov 15 08:56:12 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.193 2017/10/27 08:47:49 taca Exp $
+# $NetBSD: phpversion.mk,v 1.194 2017/11/15 08:56:12 jdolecek Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -10,7 +10,7 @@
 #      The PHP version to choose when more than one is acceptable to
 #      the package.
 #
-#      Possible: 56 70 71
+#      Possible: 56 70 71 72
 #      Default: 56
 #
 # === Infrastructure variables ===
@@ -27,13 +27,13 @@
 # PHP_VERSIONS_ACCEPTED
 #      The PHP versions that are accepted by the package.
 #
-#      Possible: 56 70 71
+#      Possible: 56 70 71 72
 #      Default: 56
 #
 # PHP_VERSIONS_INCOMPATIBLE
 #      The PHP versions that are not supported by the package.
 #
-#      Possible: 56 70 71
+#      Possible: 56 70 71 72
 #      Default: (empty)
 #
 # PHP_CHECK_INSTALLED
@@ -48,7 +48,7 @@
 # PKG_PHP_VERSION
 #      The selected PHP version.
 #
-#      Possible: 56 70 71
+#      Possible: 56 70 71 72
 #      Default: ${PHP_VERSION_DEFAULT}
 #
 # PHP_BASE_VERS
@@ -72,7 +72,7 @@
 # PHP_PKG_PREFIX
 #      The prefix that is prepended to the package name.
 #
-#      Example: php56 php70 php71
+#      Example: php56 php70 php71 php72
 #
 # PHP_EXTENSION_DIR
 #      Relative path to ${PREFIX} for PHP's extensions.  It is derived from
@@ -90,11 +90,13 @@
 PHP56_VERSION= 5.6.32
 PHP70_VERSION= 7.0.25
 PHP71_VERSION= 7.1.11
+PHP72_VERSION= 7.2.0RC6
 
 # Define initial release of major version.
 PHP56_RELDATE= 20140828
 PHP70_RELDATE= 20151203
 PHP71_RELDATE= 20160303
+PHP72_RELDATE= 20170718
 
 _VARGROUPS+=   php
 _USER_VARS.php=        PHP_VERSION_DEFAULT
@@ -105,7 +107,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 PHP_VERSION_DEFAULT?=          56
-PHP_VERSIONS_ACCEPTED?=                56 70 71
+PHP_VERSIONS_ACCEPTED?=                56 70 71 72
 .for pv in ${PHP_VERSIONS_ACCEPTED}
 .  if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
 _PHP_VERSIONS_ACCEPTED+=       ${pv}
@@ -118,7 +120,10 @@
 .endfor
 
 # check what is installed
-.if exists(${LOCALBASE}/lib/php/${PHP71_RELDATE})
+.if exists(${LOCALBASE}/lib/php/${PHP72_RELDATE})
+_PHP_VERSION_72_INSTALLED=     yes
+_PHP_INSTALLED=                        yes
+.elif exists(${LOCALBASE}/lib/php/${PHP71_RELDATE})
 _PHP_VERSION_71_INSTALLED=     yes
 _PHP_INSTALLED=                        yes
 .elif exists(${LOCALBASE}/lib/php/${PHP70_RELDATE})
@@ -213,6 +218,12 @@
 PHP_INITIAL_TEENY=     0
 PHP_PKG_PREFIX=                php71
 PHP_EXTENSION_DIR=     lib/php/${PHP71_RELDATE}
+.elif ${_PHP_VERSION} == "72"
+PHPPKGSRCDIR=          ../../lang/php72
+PHP_VERSION=           ${PHP72_VERSION}
+PHP_INITIAL_TEENY=     0
+PHP_PKG_PREFIX=                php72
+PHP_EXTENSION_DIR=     lib/php/${PHP72_RELDATE}
 .else
 # force an error
 PKG_FAIL_REASON+=      "${PKG_PHP} is not a valid package"
diff -r 385858efd493 -r d321c7fb5662 lang/php72/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php72/DESCR  Wed Nov 15 08:56:12 2017 +0000
@@ -0,0 +1,22 @@
+PHP is a widely-used open source general-purpose scripting language
+that is especially suited for web development and can be embedded
+into HTML. It is modular, and object-oriented. 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 7.2.x.
+
+PHP 7.2.x builds upon 7.1.x, adding new features:
+
+* Argument type declarations
+* Object return type declarations
+* Parameter Type Widening
+* Trailing commas in list syntax
+* Argon2 in password hash
+* Libsodium as part of PHP Core
+* Deprecated: __autoload, $php_errormsg, create_function(),
+  mbstring.func_overload, parse_str() without second argument,
+  gmp_random(), each(), assert(), $errcontext
+* uniqid() patch to avoid usleep() integrated, 10000x improvement on NetBSD,
+  about 10x on Linux
diff -r 385858efd493 -r d321c7fb5662 lang/php72/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php72/MESSAGE        Wed Nov 15 08:56:12 2017 +0000
@@ -0,0 +1,11 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2017/11/15 08:56:12 jdolecek 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 -r 385858efd493 -r d321c7fb5662 lang/php72/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php72/Makefile       Wed Nov 15 08:56:12 2017 +0000
@@ -0,0 +1,72 @@
+# $NetBSD: Makefile,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+
+#
+# We can't omit PKGNAME here to handle PKG_OPTIONS.
+#
+PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
+CATEGORIES=            lang
+MASTER_SITES=   https://downloads.php.net/~pollita/
+
+HOMEPAGE=              http://www.php.net/
+COMMENT=               PHP Hypertext Preprocessor version 7.2
+LICENSE=               php
+
+TEST_TARGET=           test
+
+USE_TOOLS+=            gmake lex pkg-config
+LIBTOOL_OVERRIDE=      # empty
+PHP_CHECK_INSTALLED=   No
+
+PHP_VERSIONS_ACCEPTED=         72
+
+.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=      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
+
+# segfault generating phar.phar for i386 & SPARC
+# revisit this if builtin PCRE is updated beyond PCRE1 8.38
+# https://bugs.php.net/bug.php?id=73880
+.if ${MACHINE_ARCH} != "x86_64"
+CONFIGURE_ARGS+=       --without-pcre-jit
+.endif
+
+# Make sure modules can link correctly
+.if ${OPSYS} == "Darwin"
+INSTALL_UNSTRIPPED=    yes
+.endif
+
+# 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
+
+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 -r 385858efd493 -r d321c7fb5662 lang/php72/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php72/Makefile.common        Wed Nov 15 08:56:12 2017 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.common,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+# used by lang/php72/Makefile.php
+# used by lang/php/ext.mk
+# used by meta-pkgs/php72-extensions/Makefile
+
+PHP_VERSION_REQD=      72
+
+.include "../../lang/php/common.mk"
+
+CATEGORIES+=           www
+MAINTAINER?=           pkgsrc-users%NetBSD.org@localhost
+
+# 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 -r 385858efd493 -r d321c7fb5662 lang/php72/Makefile.php
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php72/Makefile.php   Wed Nov 15 08:56:12 2017 +0000
@@ -0,0 +1,96 @@
+# $NetBSD: Makefile.php,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+# used by lang/php72/Makefile
+# used by www/ap-php/Makefile
+# used by www/php-fpm/Makefile
+
+# PHP bug #74526 - segfaults on build with GCC 4.8.5 i386
+.if ${MACHINE_ARCH} == "i386"
+GCC_REQD+=              4.9
+.endif
+
+.include "../../lang/php72/Makefile.common"
+
+DISTINFO_FILE= ${.CURDIR}/../../lang/php72/distinfo
+PATCHDIR=      ${.CURDIR}/../../lang/php72/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+=       --without-mysqli
+CONFIGURE_ARGS+=       --without-iconv
+CONFIGURE_ARGS+=       --without-pear
+#CONFIGURE_ARGS+=      --without-intl
+
+CONFIGURE_ARGS+=       --disable-posix
+CONFIGURE_ARGS+=       --disable-opcache
+CONFIGURE_ARGS+=       --disable-pdo



Home | Main Index | Thread Index | Old Index