Import of pkgsrc-2014Q1

This commit is contained in:
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
+2
View File
@@ -3,3 +3,5 @@ some object-oriented features. Much of its syntax is borrowed from
C, Java and Perl with a couple of unique PHP-specific features
thrown in. The language is designed to allow web developers to
write dynamically generated pages quickly.
This package provides PHP version 5.4.x.
+4 -2
View File
@@ -1,19 +1,21 @@
# $NetBSD: Makefile,v 1.8.4.3 2013/08/31 16:51:50 tron Exp $
# $NetBSD: Makefile,v 1.20 2014/03/29 22:06:06 he Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_BASE_VERS}
PKGREVISION= 2
CATEGORIES= lang
HOMEPAGE= http://www.php.net/
COMMENT= PHP Hypertext Preprocessor version 5
COMMENT= PHP Hypertext Preprocessor version 5.4
LICENSE= php
TEST_TARGET= test
USE_TOOLS+= gmake lex pkg-config
LIBTOOL_OVERRIDE= # empty
PHP_CHECK_INSTALLED= No
PHP_VERSIONS_ACCEPTED= 54
+7 -1
View File
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.13.2.2 2013/08/25 17:26:38 tron Exp $
# $NetBSD: Makefile.common,v 1.17 2013/10/25 21:47:51 joerg Exp $
# used by lang/php54/Makefile.php
# used by lang/php/ext.mk
# used by meta-pkgs/php54-extensions/Makefile
@@ -14,4 +14,10 @@ MAINTAINER?= pkgsrc-users@NetBSD.org
# needed due to (broken?) configure checks in php-xmlrpc and php5-dom
CONFIGURE_ENV+= PHP_LIBXML_SHARED="1"
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
# configure test gets confused by wrappers dropping -R /usr/lib
CONFIGURE_ARGS+= php_cv_cc_dashr=no
.endif
.include "../../mk/bsd.prefs.mk"
+5 -28
View File
@@ -1,6 +1,7 @@
# $NetBSD: Makefile.php,v 1.4 2012/07/27 00:21:03 obache Exp $
# $NetBSD: Makefile.php,v 1.6 2013/07/21 17:29:47 taca Exp $
# used by lang/php54/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
.include "../../lang/php54/Makefile.common"
@@ -11,7 +12,7 @@ USE_LIBTOOL= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
BUILD_DEFS+= VARBASE
PLIST_VARS+= suhosin dtrace
PLIST_VARS+= dtrace
CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
@@ -38,44 +39,21 @@ 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 # suhosin
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
#SUBST_CLASSES+= ini
#SUBST_STAGE.ini= post-patch
#SUBST_FILES.ini= php.ini-development
#SUBST_FILES.ini+= php.ini-production
#SUBST_SED.ini= -e "s|\\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g"
#SUBST_MESSAGE.ini= Fixing default ini files.
.include "../../mk/bsd.options.mk"
#.if !empty(PKG_OPTIONS:Msuhosin)
#SUHOSIN_PHPVER= 5.4.0
#. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS}
#PKG_FAIL_REASON+= "The suhosin patch is currently not available for"
#PKG_FAIL_REASON+= "this version of PHP. You may have to wait until"
#PKG_FAIL_REASON+= "an updated patch is released or temporarily"
#PKG_FAIL_REASON+= "build this package without the suhosin option."
#. else
#PATCH_SITES= http://download.suhosin.org/
#PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.10.patch.gz
#PATCH_DIST_STRIP= -p1
#PLIST.suhosin= yes
#MESSAGE_SRC= ${.CURDIR}/../../lang/php54/MESSAGE
#MESSAGE_SRC+= ${.CURDIR}/../../lang/php54/MESSAGE.suhosin
#. endif
#.endif
.if !empty(PKG_OPTIONS:Minet6)
CONFIGURE_ARGS+= --enable-ipv6
.else
@@ -99,7 +77,6 @@ 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
+1 -4
View File
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3.8.1 2013/08/25 17:26:38 tron Exp $
@comment $NetBSD: PLIST,v 1.5 2013/08/16 15:28:23 taca Exp $
bin/phar
bin/phar.phar
bin/php
@@ -213,9 +213,6 @@ 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
${PLIST.suhosin}include/php/main/suhosin_globals.h
${PLIST.suhosin}include/php/main/suhosin_logo.h
${PLIST.suhosin}include/php/main/suhosin_patch.h
include/php/main/win32_internal_function_disabled.h
include/php/main/win95nt.h
include/php/sapi/cli/cli.h
+12 -10
View File
@@ -1,10 +1,13 @@
$NetBSD: distinfo,v 1.18.2.3 2013/08/25 17:26:38 tron Exp $
$NetBSD: distinfo,v 1.36 2014/03/29 22:06:06 he Exp $
SHA1 (php-5.4.19.tar.bz2) = 465f4cd1f8a0fec3c63b79b229bc3893770e2d0b
RMD160 (php-5.4.19.tar.bz2) = 1b03e20b89d360ccaeac41e1a972a781b891e83a
Size (php-5.4.19.tar.bz2) = 11692563 bytes
SHA1 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746
SHA1 (patch-configure) = 64941d85b36fa2d44cf544c426cab41c8e4358d1
SHA1 (php-5.4.26.tar.bz2) = d8b309f4891e2a0a8061a518162fa267e0304a01
RMD160 (php-5.4.26.tar.bz2) = 5714914bd6704234b87b28faa66ded286f35e712
Size (php-5.4.26.tar.bz2) = 12270535 bytes
SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
SHA1 (patch-aclocal.m4) = eae2ed8ea2985933c4fe88ba52577c14ac88eb92
SHA1 (patch-build_libtool.m4) = 6dfef7c07a42dc54611c104265ef43c50a4e88ca
SHA1 (patch-configure) = 361f943d4aa2ef18335091f3c7ebcc5c17b37810
SHA1 (patch-ext_fileinfo_data__file.c) = 2e7c20a09e028c2c0ec6be8e1c3278646058c149
SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
@@ -13,9 +16,8 @@ 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-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add
SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae
SHA1 (patch-php.ini-development) = e6c4509378e26534d06103751d5616823492e18f
SHA1 (patch-php.ini-production) = a24a270e27b0163178c4f0ba4aac753794707f21
SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
SHA1 (patch-sapi_cgi_Makefile.frag) = 9a0736e5aee5b50179427013386645acdf74bffc
SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27
SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
+3 -3
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-acinclude.m4,v 1.1 2012/06/16 05:21:55 taca Exp $
$NetBSD: patch-acinclude.m4,v 1.2 2013/09/21 16:06:07 taca Exp $
--- acinclude.m4.orig 2012-05-03 17:10:43.000000000 +0000
--- acinclude.m4.orig 2013-09-18 05:48:57.000000000 +0000
+++ acinclude.m4
@@ -2352,7 +2352,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
@@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
+40
View File
@@ -0,0 +1,40 @@
$NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
--- aclocal.m4.orig 2014-03-05 08:26:32.000000000 +0000
+++ aclocal.m4
@@ -4546,7 +4546,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -4557,7 +4557,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[123]]|freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -6173,7 +6173,7 @@ case $host_os in
;;
esac
;;
- freebsd[[12]]*)
+ freebsd[[12]]|freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -8856,7 +8856,7 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
+ freebsd1|freebsd1.*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
+40
View File
@@ -0,0 +1,40 @@
$NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
--- build/libtool.m4.orig 2014-03-05 08:07:14.000000000 +0000
+++ build/libtool.m4
@@ -1532,7 +1532,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -1543,7 +1543,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[123]]|freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -3159,7 +3159,7 @@ case $host_os in
;;
esac
;;
- freebsd[[12]]*)
+ freebsd[[12]]|freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -5842,7 +5842,7 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
+ freebsd1|freebsd1.*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
+61 -16
View File
@@ -1,17 +1,8 @@
$NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
$NetBSD: patch-configure,v 1.6 2014/03/19 21:50:23 asau Exp $
--- configure.orig 2013-08-14 06:04:57.000000000 +0000
--- configure.orig 2014-03-05 08:26:39.000000000 +0000
+++ configure
@@ -20689,7 +20689,7 @@ _ACEOF
cat>>Makefile.objects<<EOF
$ac_bdir$ac_hdrobj: $abs_srcdir/$ac_provsrc
- dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$@
+ dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) 's,PHP_,DTRACE_,g' \$@ > \$@.tmp && mv \$@.tmp \$@
\$(PHP_DTRACE_OBJS): $ac_bdir$ac_hdrobj
@@ -23476,7 +23476,7 @@ fi
@@ -23554,7 +23554,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -20,7 +11,7 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -25626,7 +25626,7 @@ $as_echo "yes" >&6; }
@@ -25704,7 +25704,7 @@ $as_echo "yes" >&6; }
PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
@@ -29,7 +20,7 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
@@ -36872,7 +36872,7 @@ fi
@@ -36944,7 +36944,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +29,7 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -51704,7 +51704,7 @@ fi
@@ -51409,7 +51409,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -47,7 +38,7 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
@@ -105814,12 +105814,7 @@ old_CC=$CC
@@ -105616,12 +105616,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"
@@ -61,3 +52,57 @@ $NetBSD: patch-configure,v 1.2.8.1 2013/08/25 17:26:38 tron Exp $
fi
if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
@@ -108735,7 +108730,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
- freebsd1*)
+ freebsd1|freebsd1.*)
ld_shlibs=no
;;
@@ -109384,7 +109379,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -109395,7 +109390,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -111475,7 +111470,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
- freebsd[12]*)
+ freebsd[12]|freebsd[12].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs_CXX=no
;;
@@ -113021,7 +113016,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -113032,7 +113027,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
File diff suppressed because it is too large Load Diff
@@ -1,15 +0,0 @@
$NetBSD: patch-main_streams_cast.c,v 1.1.10.1 2013/08/06 14:55:05 tron 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
+5 -5
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-php.ini-development,v 1.1 2012/06/16 05:21:55 taca Exp $
$NetBSD: patch-php.ini-development,v 1.2 2014/01/11 17:03:57 taca Exp $
--- php.ini-development.orig 2012-05-03 17:10:43.000000000 +0000
--- php.ini-development.orig 2014-01-08 02:57:08.000000000 +0000
+++ php.ini-development
@@ -702,7 +702,7 @@ default_mimetype = "text/html"
@@ -703,7 +703,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@ $NetBSD: patch-php.ini-development,v 1.1 2012/06/16 05:21:55 taca Exp $
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
@@ -723,8 +723,8 @@ doc_root =
@@ -724,8 +724,8 @@ doc_root =
; http://php.net/user-dir
user_dir =
@@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-development,v 1.1 2012/06/16 05:21:55 taca Exp $
; extension_dir = "./"
; On windows:
; extension_dir = "ext"
@@ -793,7 +793,7 @@ file_uploads = On
@@ -794,7 +794,7 @@ file_uploads = On
; Temporary directory for HTTP uploaded files (will use system default if not
; specified).
; http://php.net/upload-tmp-dir
+5 -5
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-php.ini-production,v 1.1 2012/06/16 05:21:55 taca Exp $
$NetBSD: patch-php.ini-production,v 1.2 2014/01/11 17:03:57 taca Exp $
--- php.ini-production.orig 2012-05-03 17:10:43.000000000 +0000
--- php.ini-production.orig 2014-01-08 02:57:08.000000000 +0000
+++ php.ini-production
@@ -702,7 +702,7 @@ default_mimetype = "text/html"
@@ -703,7 +703,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@ $NetBSD: patch-php.ini-production,v 1.1 2012/06/16 05:21:55 taca Exp $
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
@@ -723,8 +723,8 @@ doc_root =
@@ -724,8 +724,8 @@ doc_root =
; http://php.net/user-dir
user_dir =
@@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-production,v 1.1 2012/06/16 05:21:55 taca Exp $
; extension_dir = "./"
; On windows:
; extension_dir = "ext"
@@ -793,7 +793,7 @@ file_uploads = On
@@ -794,7 +794,7 @@ file_uploads = On
; Temporary directory for HTTP uploaded files (will use system default if not
; specified).
; http://php.net/upload-tmp-dir
@@ -1,14 +1,13 @@
$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.1.10.1 2013/08/25 17:26:38 tron Exp $
$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.3 2013/09/21 16:06:07 taca Exp $
Install cgi binary as php instead of php-cgi.
--- sapi/cgi/Makefile.frag.orig 2013-08-14 05:47:24.000000000 +0000
--- sapi/cgi/Makefile.frag.orig 2013-09-18 05:48:57.000000000 +0000
+++ sapi/cgi/Makefile.frag
@@ -4,8 +4,8 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P
$(BUILD_CGI)
@@ -6,7 +6,8 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P
install-cgi: $(SAPI_CGI_PATH)
- @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
@echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
@$(mkinstalldirs) $(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@/$(program_prefix)php$(program_suffix)$(EXEEXT)