summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-02-20 09:35:16 +0000
committerwiz <wiz@pkgsrc.org>2017-02-20 09:35:16 +0000
commita3f3a679407ee55d80c5ae19f264c94c40301ac6 (patch)
treeb9f996cb5a614b25b8e0f5cf3def375222cde8ef /lang
parentfa39cf59c20b64ff02a3f7d13d9830c38f8f9c15 (diff)
downloadpkgsrc-a3f3a679407ee55d80c5ae19f264c94c40301ac6.tar.gz
Fix build with tidy-5.x.
Diffstat (limited to 'lang')
-rw-r--r--lang/php56/distinfo3
-rw-r--r--lang/php56/patches/patch-ext_tidy_tidy.c13
-rw-r--r--lang/php70/distinfo3
-rw-r--r--lang/php70/patches/patch-ext_tidy_tidy.c15
4 files changed, 32 insertions, 2 deletions
diff --git a/lang/php56/distinfo b/lang/php56/distinfo
index bb3ce349db4..3fd602eeb6d 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2017/01/20 00:44:01 taca Exp $
+$NetBSD: distinfo,v 1.40 2017/02/20 09:35:17 wiz Exp $
SHA1 (php-5.6.30.tar.bz2) = 9ac486b7f86c01a297375cae5728b424ac5790ce
RMD160 (php-5.6.30.tar.bz2) = 445f7a88b802f88484671e2981f44147b13794fc
@@ -18,6 +18,7 @@ SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
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-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f
SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d
diff --git a/lang/php56/patches/patch-ext_tidy_tidy.c b/lang/php56/patches/patch-ext_tidy_tidy.c
new file mode 100644
index 00000000000..f5eed3a56c0
--- /dev/null
+++ b/lang/php56/patches/patch-ext_tidy_tidy.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-ext_tidy_tidy.c,v 1.1 2017/02/20 09:35:17 wiz Exp $
+
+--- ext/tidy/tidy.c.orig 2017-01-19 00:17:47.000000000 +0000
++++ ext/tidy/tidy.c
+@@ -31,7 +31,7 @@
+ #include "ext/standard/info.h"
+
+ #include "tidy.h"
+-#include "buffio.h"
++#include "tidybuffio.h"
+
+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL
diff --git a/lang/php70/distinfo b/lang/php70/distinfo
index 31bb06f13e2..1d8f8c1ed61 100644
--- a/lang/php70/distinfo
+++ b/lang/php70/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2017/02/20 03:22:55 taca Exp $
+$NetBSD: distinfo,v 1.28 2017/02/20 09:35:17 wiz Exp $
SHA1 (php-7.0.16.tar.bz2) = 413bf81cb8ea52a00cb38e0d6a4f528c364431c0
RMD160 (php-7.0.16.tar.bz2) = 8e8ca9080abfdcb37b52c1404217c5cd618bf8f8
@@ -17,6 +17,7 @@ SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
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_tidy_tidy.c) = 420559f0b36d054e4d954e666be2a519b67e1b84
SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
diff --git a/lang/php70/patches/patch-ext_tidy_tidy.c b/lang/php70/patches/patch-ext_tidy_tidy.c
new file mode 100644
index 00000000000..aba0645c943
--- /dev/null
+++ b/lang/php70/patches/patch-ext_tidy_tidy.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_tidy_tidy.c,v 1.1 2017/02/20 09:35:17 wiz Exp $
+
+tidy-5.x compatibility.
+
+--- ext/tidy/tidy.c.orig 2017-01-17 11:53:05.000000000 +0000
++++ ext/tidy/tidy.c
+@@ -31,7 +31,7 @@
+ #include "ext/standard/info.h"
+
+ #include "tidy.h"
+-#include "buffio.h"
++#include "tidybuffio.h"
+
+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL