pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2017Q1]: pkgsrc Pullup ticket #5243 - requested by sevan
details: https://anonhg.NetBSD.org/pkgsrc/rev/b1738ea29a5a
branches: pkgsrc-2017Q1
changeset: 360229:b1738ea29a5a
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Wed Apr 12 18:22:19 2017 +0000
description:
Pullup ticket #5243 - requested by sevan
lang/php56: build fix
lang/php70: build fix
lang/php71: build fix
Revisions pulled up:
- lang/php56/Makefile 1.13
- lang/php56/Makefile.php 1.2
- lang/php56/PLIST 1.3
- lang/php56/distinfo 1.41
- lang/php56/patches/patch-ext_xsl_php__xsl.h 1.1
- lang/php70/Makefile 1.6
- lang/php70/Makefile.php 1.3
- lang/php70/PLIST 1.3
- lang/php70/distinfo 1.31
- lang/php70/patches/patch-ext_xsl_php__xsl.h 1.1
- lang/php71/Makefile 1.9
- lang/php71/Makefile.php 1.2
- lang/php71/PLIST 1.3
- lang/php71/distinfo 1.17
- lang/php71/patches/patch-ext_xsl_php__xsl.h 1.1
- textproc/Makefile 1.918
- textproc/php-dom/DESCR deleted
- textproc/php-dom/Makefile deleted
---
Module Name: pkgsrc
Committed By: fhajny
Date: Wed Apr 5 12:28:59 UTC 2017
Modified Files:
pkgsrc/lang/php56: Makefile Makefile.php PLIST distinfo
pkgsrc/lang/php70: Makefile Makefile.php PLIST distinfo
pkgsrc/lang/php71: Makefile Makefile.php PLIST distinfo
Added Files:
pkgsrc/lang/php56/patches: patch-ext_xsl_php__xsl.h
pkgsrc/lang/php70/patches: patch-ext_xsl_php__xsl.h
pkgsrc/lang/php71/patches: patch-ext_xsl_php__xsl.h
Log Message:
Build the dom extension embedded. This enables full functionality in xmlreader and fixes joyent/pkgsrc/issues/477. Bump PKREVISION.
---
Module Name: pkgsrc
Committed By: fhajny
Date: Wed Apr 5 12:34:47 UTC 2017
Modified Files:
pkgsrc/textproc: Makefile
Removed Files:
pkgsrc/textproc/php-dom: DESCR Makefile
Log Message:
Remove textproc/php-dom, the module is now built into the resp. PHP packages.
diffstat:
lang/php56/Makefile | 3 ++-
lang/php56/Makefile.php | 3 +--
lang/php56/PLIST | 3 ++-
lang/php56/distinfo | 3 ++-
lang/php56/patches/patch-ext_xsl_php__xsl.h | 15 +++++++++++++++
lang/php70/Makefile | 3 ++-
lang/php70/Makefile.php | 3 +--
lang/php70/PLIST | 3 ++-
lang/php70/distinfo | 3 ++-
lang/php70/patches/patch-ext_xsl_php__xsl.h | 15 +++++++++++++++
lang/php71/Makefile | 3 ++-
lang/php71/Makefile.php | 3 +--
lang/php71/PLIST | 3 ++-
lang/php71/distinfo | 3 ++-
lang/php71/patches/patch-ext_xsl_php__xsl.h | 15 +++++++++++++++
textproc/Makefile | 3 +--
textproc/php-dom/DESCR | 3 ---
textproc/php-dom/Makefile | 16 ----------------
18 files changed, 67 insertions(+), 36 deletions(-)
diffs (299 lines):
diff -r 03670e5dda7e -r b1738ea29a5a lang/php56/Makefile
--- a/lang/php56/Makefile Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php56/Makefile Wed Apr 12 18:22:19 2017 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2016/06/24 15:25:21 taca Exp $
+# $NetBSD: Makefile,v 1.12.8.1 2017/04/12 18:22:19 bsiegert Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_VERSION}
+PKGREVISION= 1
CATEGORIES= lang
HOMEPAGE= http://www.php.net/
diff -r 03670e5dda7e -r b1738ea29a5a lang/php56/Makefile.php
--- a/lang/php56/Makefile.php Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php56/Makefile.php Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2014/11/24 15:37:08 taca Exp $
+# $NetBSD: Makefile.php,v 1.1.20.1 2017/04/12 18:22:19 bsiegert Exp $
# used by lang/php56/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
@@ -31,7 +31,6 @@
#CONFIGURE_ARGS+= --without-intl
CONFIGURE_ARGS+= --disable-posix
-CONFIGURE_ARGS+= --disable-dom
CONFIGURE_ARGS+= --disable-opcache
CONFIGURE_ARGS+= --disable-pdo
CONFIGURE_ARGS+= --disable-json
diff -r 03670e5dda7e -r b1738ea29a5a lang/php56/PLIST
--- a/lang/php56/PLIST Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php56/PLIST Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/02/20 01:17:49 taca Exp $
+@comment $NetBSD: PLIST,v 1.2.18.1 2017/04/12 18:22:19 bsiegert Exp $
bin/phar
bin/phar.phar
bin/php
@@ -78,6 +78,7 @@
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/dom/xml_common.h
include/php/ext/ereg/php_ereg.h
include/php/ext/ereg/php_regex.h
include/php/ext/filter/php_filter.h
diff -r 03670e5dda7e -r b1738ea29a5a lang/php56/distinfo
--- a/lang/php56/distinfo Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php56/distinfo Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2017/02/20 09:35:17 wiz Exp $
+$NetBSD: distinfo,v 1.40.2.1 2017/04/12 18:22:19 bsiegert Exp $
SHA1 (php-5.6.30.tar.bz2) = 9ac486b7f86c01a297375cae5728b424ac5790ce
RMD160 (php-5.6.30.tar.bz2) = 445f7a88b802f88484671e2981f44147b13794fc
@@ -19,6 +19,7 @@
SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda
SHA1 (patch-ext_tidy_tidy.c) = dd66f203196af544dcc06fe2229ba23c3086d3e8
+SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f
SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d
diff -r 03670e5dda7e -r b1738ea29a5a lang/php56/patches/patch-ext_xsl_php__xsl.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php56/patches/patch-ext_xsl_php__xsl.h Wed Apr 12 18:22:19 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1.2.2 2017/04/12 18:22:19 bsiegert Exp $
+
+The dom header is now supplied by the main php bl3.
+
+--- ext/xsl/php_xsl.h.orig 2017-03-14 13:17:46.000000000 +0000
++++ ext/xsl/php_xsl.h
+@@ -41,7 +41,7 @@ extern zend_module_entry xsl_module_entr
+ #include <libexslt/exsltconfig.h>
+ #endif
+
+-#include "../dom/xml_common.h"
++#include "dom/xml_common.h"
+ #include "xsl_fe.h"
+
+ #include <libxslt/extensions.h>
diff -r 03670e5dda7e -r b1738ea29a5a lang/php70/Makefile
--- a/lang/php70/Makefile Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php70/Makefile Wed Apr 12 18:22:19 2017 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2017/01/22 11:37:29 maya Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2017/04/12 18:22:19 bsiegert Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_VERSION}
+PKGREVISION= 1
CATEGORIES= lang
HOMEPAGE= http://www.php.net/
diff -r 03670e5dda7e -r b1738ea29a5a lang/php70/Makefile.php
--- a/lang/php70/Makefile.php Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php70/Makefile.php Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.2 2016/06/24 15:27:57 taca Exp $
+# $NetBSD: Makefile.php,v 1.2.8.1 2017/04/12 18:22:19 bsiegert Exp $
# used by lang/php70/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
@@ -29,7 +29,6 @@
#CONFIGURE_ARGS+= --without-intl
CONFIGURE_ARGS+= --disable-posix
-CONFIGURE_ARGS+= --disable-dom
CONFIGURE_ARGS+= --disable-opcache
CONFIGURE_ARGS+= --disable-pdo
CONFIGURE_ARGS+= --disable-json
diff -r 03670e5dda7e -r b1738ea29a5a lang/php70/PLIST
--- a/lang/php70/PLIST Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php70/PLIST Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/02/18 13:09:19 taca Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2017/04/12 18:22:19 bsiegert Exp $
bin/phar
bin/phar.phar
bin/php
@@ -86,6 +86,7 @@
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/dom/xml_common.h
include/php/ext/filter/php_filter.h
include/php/ext/hash/php_hash.h
include/php/ext/hash/php_hash_adler32.h
diff -r 03670e5dda7e -r b1738ea29a5a lang/php70/distinfo
--- a/lang/php70/distinfo Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php70/distinfo Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2017/03/23 09:50:36 jperkin Exp $
+$NetBSD: distinfo,v 1.30.2.1 2017/04/12 18:22:19 bsiegert Exp $
SHA1 (php-7.0.17.tar.bz2) = 6c20436c50fdf342891f836f2864a43fdbe0bf71
RMD160 (php-7.0.17.tar.bz2) = 2f4dd83e4d4253aaad45fa5f28cd973815382edb
@@ -18,6 +18,7 @@
SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
SHA1 (patch-ext_tidy_tidy.c) = 420559f0b36d054e4d954e666be2a519b67e1b84
+SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
SHA1 (patch-main_php__config.h.in) = d70a1b53c5e31c37a7bc2703304318d15c371a0a
SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
diff -r 03670e5dda7e -r b1738ea29a5a lang/php70/patches/patch-ext_xsl_php__xsl.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php70/patches/patch-ext_xsl_php__xsl.h Wed Apr 12 18:22:19 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1.2.2 2017/04/12 18:22:19 bsiegert Exp $
+
+The dom header is now supplied by the main php bl3.
+
+--- ext/xsl/php_xsl.h.orig 2017-03-14 13:17:46.000000000 +0000
++++ ext/xsl/php_xsl.h
+@@ -41,7 +41,7 @@ extern zend_module_entry xsl_module_entr
+ #include <libexslt/exsltconfig.h>
+ #endif
+
+-#include "../dom/xml_common.h"
++#include "dom/xml_common.h"
+ #include "xsl_fe.h"
+
+ #include <libxslt/extensions.h>
diff -r 03670e5dda7e -r b1738ea29a5a lang/php71/Makefile
--- a/lang/php71/Makefile Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php71/Makefile Wed Apr 12 18:22:19 2017 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2017/02/18 13:13:07 taca Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2017/04/12 18:22:20 bsiegert Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_VERSION:S/RC/rc/}
+PKGREVISION= 1
CATEGORIES= lang
HOMEPAGE= http://www.php.net/
diff -r 03670e5dda7e -r b1738ea29a5a lang/php71/Makefile.php
--- a/lang/php71/Makefile.php Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php71/Makefile.php Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2016/08/04 14:09:03 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.1.6.1 2017/04/12 18:22:20 bsiegert Exp $
# used by lang/php71/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
@@ -29,7 +29,6 @@
#CONFIGURE_ARGS+= --without-intl
CONFIGURE_ARGS+= --disable-posix
-CONFIGURE_ARGS+= --disable-dom
CONFIGURE_ARGS+= --disable-opcache
CONFIGURE_ARGS+= --disable-pdo
CONFIGURE_ARGS+= --disable-json
diff -r 03670e5dda7e -r b1738ea29a5a lang/php71/PLIST
--- a/lang/php71/PLIST Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php71/PLIST Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/02/18 13:13:07 taca Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2017/04/12 18:22:20 bsiegert Exp $
bin/phar
bin/phar.phar
bin/php
@@ -87,6 +87,7 @@
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/dom/xml_common.h
include/php/ext/filter/php_filter.h
include/php/ext/hash/php_hash.h
include/php/ext/hash/php_hash_adler32.h
diff -r 03670e5dda7e -r b1738ea29a5a lang/php71/distinfo
--- a/lang/php71/distinfo Wed Apr 12 17:46:06 2017 +0000
+++ b/lang/php71/distinfo Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2017/03/23 09:33:02 jperkin Exp $
+$NetBSD: distinfo,v 1.16.2.1 2017/04/12 18:22:20 bsiegert Exp $
SHA1 (php-7.1.3.tar.bz2) = 60359b3154d00502f84adfea84d008e3aa0b81ab
RMD160 (php-7.1.3.tar.bz2) = a54b805e234a8bf7f1f6a1c0b2250e11bcaf1219
@@ -17,6 +17,7 @@
SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
+SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
SHA1 (patch-main_php__config.h.in) = a954c2963bdc9cbb280a9852e18ac8fb8fc834c2
SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
diff -r 03670e5dda7e -r b1738ea29a5a lang/php71/patches/patch-ext_xsl_php__xsl.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php71/patches/patch-ext_xsl_php__xsl.h Wed Apr 12 18:22:19 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1.2.2 2017/04/12 18:22:20 bsiegert Exp $
+
+The dom header is now supplied by the main php bl3.
+
+--- ext/xsl/php_xsl.h.orig 2017-03-14 13:17:46.000000000 +0000
++++ ext/xsl/php_xsl.h
+@@ -41,7 +41,7 @@ extern zend_module_entry xsl_module_entr
+ #include <libexslt/exsltconfig.h>
+ #endif
+
+-#include "../dom/xml_common.h"
++#include "dom/xml_common.h"
+ #include "xsl_fe.h"
+
+ #include <libxslt/extensions.h>
diff -r 03670e5dda7e -r b1738ea29a5a textproc/Makefile
--- a/textproc/Makefile Wed Apr 12 17:46:06 2017 +0000
+++ b/textproc/Makefile Wed Apr 12 18:22:19 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.915 2017/03/19 15:26:33 taca Exp $
+# $NetBSD: Makefile,v 1.915.2.1 2017/04/12 18:22:20 bsiegert Exp $
#
COMMENT= Text processing utilities (does not include desktop publishing)
@@ -675,7 +675,6 @@
SUBDIR+= pdfgrep
SUBDIR+= pear-Console_Table
SUBDIR+= pear-File_Find
-SUBDIR+= php-dom
SUBDIR+= php-enchant
SUBDIR+= php-excel
SUBDIR+= php-intl
diff -r 03670e5dda7e -r b1738ea29a5a textproc/php-dom/DESCR
--- a/textproc/php-dom/DESCR Wed Apr 12 17:46:06 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-The extension allows you to operate on an XML document with the DOM
-(Document Object Model) API.
diff -r 03670e5dda7e -r b1738ea29a5a textproc/php-dom/Makefile
--- a/textproc/php-dom/Makefile Wed Apr 12 17:46:06 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2015/03/20 16:33:28 taca Exp $
-
-MODNAME= dom
-CATEGORIES+= textproc
-COMMENT= PHP5 extension for DOM support
-
-CONFLICTS= php-dom-[0-9]*
-
-CONFIGURE_ARGS+= --enable-${MODNAME}
-CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_PREFIX.libxml2}
-
-.include "../../lang/php/ext.mk"
-#.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-#.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index