Fix build with tidy-5.x.

15 files changed, 106 insertions, 15 deletions

diff --git a/doc/guide/Makefile.common b/doc/guide/Makefile.common
index 73e9494d3b7..9bd7e7d6da0 100644
--- a/doc/guide/Makefile.common
+++ b/doc/guide/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2017/01/07 18:00:09 leot Exp $
+# $NetBSD: Makefile.common,v 1.8 2017/02/20 09:35:16 wiz Exp $
 #
 # This is included by doc/guide and meta-pkgs/pkgsrc-guide-tools.
 #
@@ -21,7 +21,7 @@ _GUIDE_DEPENDS+=	opensp>=1.5:../../textproc/opensp
 _GUIDE_DEPENDS+=	libxslt>=1.0.30:../../textproc/libxslt
 
 .if !empty(_GUIDE_OUTPUTS:Mhtml*)
-_GUIDE_DEPENDS+=	tidy>=20021108:../../www/tidy
+_GUIDE_DEPENDS+=	tidy-[0-9]*:../../www/tidy
 .endif
 
 .if !empty(_GUIDE_OUTPUTS:Mascii)
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 9f6c81550ea..9ccff781ab8 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2016/09/27 12:00:50 wiz Exp $
+$NetBSD: distinfo,v 1.72 2017/02/20 09:35:16 wiz Exp $
 
 SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
 RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
@@ -12,6 +12,7 @@ SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa9323
 SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
 SHA1 (patch-plugins_goffice_Makefile.am) = 1959eea3b4e19f085aeb56870f682ce44561d445
 SHA1 (patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp) = f3916dbc0b208bfe9dbb55eac850a3094683694c
+SHA1 (patch-plugins_mht_xp_tidyReader.h) = fa4ef0ee7f893fb070b76e21aaad4efd9b8b27ee
 SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
 SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
 SHA1 (patch-plugins_psion_Makefile.am) = d18356c2a273d99918076d5aefafec595af3f898
diff --git a/editors/abiword/patches/patch-plugins_mht_xp_tidyReader.h b/editors/abiword/patches/patch-plugins_mht_xp_tidyReader.h
new file mode 100644
index 00000000000..e962700c3c1
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_mht_xp_tidyReader.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_mht_xp_tidyReader.h,v 1.1 2017/02/20 09:35:17 wiz Exp $
+
+--- plugins/mht/xp/tidyReader.h.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/mht/xp/tidyReader.h
+@@ -25,7 +25,7 @@
+ #define TIDYREADER_H
+ 
+ #include <tidy/tidy.h>
+-#include <tidy/buffio.h>
++#include <tidy/tidybuffio.h>
+ 
+ #include "ut_xml.h"
+ 
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
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index e10375c07d0..44d08a30de2 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2011/06/30 01:17:37 schnoebe Exp $
+$NetBSD: distinfo,v 1.16 2017/02/20 09:35:17 wiz Exp $
 
 SHA1 (prayer-1.3.4.tar.gz) = 53399193b13c223422dcb5a546759f3a1ddab4ff
 RMD160 (prayer-1.3.4.tar.gz) = d7fe2de40d29a584f10af6e56ccc9eb7bb6357a4
@@ -10,4 +10,5 @@ SHA1 (patch-lib_os.c) = 7e9646b4aaa2518152f3c338ea22700e71f5c8be
 SHA1 (patch-lib_os__bsd.h) = b64c720e1ddbcf1756c05fed505aca00a7c61b8f
 SHA1 (patch-man_Makefile) = 2d5849da042477ea031292fce2da76e2a4f7452d
 SHA1 (patch-servers_Makefile) = db4f3051d7f22b1bb269b8dcc9977b7aa52dde47
+SHA1 (patch-session_html__secure__tidy.c) = e6a0c0252c09655dbf894cc94107d6cf92839c8b
 SHA1 (patch-utils_Makefile) = 12e95f0603fcb8b83fb20ab737fe2943ecba26b3
diff --git a/mail/prayer/patches/patch-session_html__secure__tidy.c b/mail/prayer/patches/patch-session_html__secure__tidy.c
new file mode 100644
index 00000000000..3d183982235
--- /dev/null
+++ b/mail/prayer/patches/patch-session_html__secure__tidy.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-session_html__secure__tidy.c,v 1.1 2017/02/20 09:35:17 wiz Exp $
+
+tidy-5.x compatibility.
+
+--- session/html_secure_tidy.c.orig	2011-06-17 14:25:54.000000000 +0000
++++ session/html_secure_tidy.c
+@@ -12,7 +12,7 @@
+ #include <tidy.h>
+ #endif
+ 
+-#include <buffio.h>
++#include <tidybuffio.h>
+ 
+ /* ====================================================================== */
+ 
diff --git a/meta-pkgs/netbsd-doc/Makefile b/meta-pkgs/netbsd-doc/Makefile
index 0eb223263a6..2aa515dbc46 100644
--- a/meta-pkgs/netbsd-doc/Makefile
+++ b/meta-pkgs/netbsd-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/10/07 19:08:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 2017/02/20 09:35:17 wiz Exp $
 #
 
 DISTNAME=	netbsd-doc-1.3
@@ -16,7 +16,7 @@ DEPENDS+=	iso8879>=1986:../../textproc/iso8879
 DEPENDS+=	iso12083>=1993:../../textproc/iso12083
 DEPENDS+=	dsssl-docbook-modular>=1.54:../../textproc/dsssl-docbook-modular
 DEPENDS+=	html>=4.0:../../textproc/html
-DEPENDS+=	tidy>=20031002:../../www/tidy
+DEPENDS+=	tidy-[0-9]*:../../www/tidy
 
 META_PACKAGE=	yes
 
diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo
index ff122ee5b76..de9b6510bfa 100644
--- a/www/kdewebdev4/distinfo
+++ b/www/kdewebdev4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2017/01/19 09:31:17 markd Exp $
+$NetBSD: distinfo,v 1.26 2017/02/20 09:35:17 wiz Exp $
 
 SHA1 (kdewebdev-16.08.0.tar.xz) = 416ef3b58cf0d3bfe8a71a212c8b64329b3b2b2f
 RMD160 (kdewebdev-16.08.0.tar.xz) = 1938d42a25a02b1f531c92b0456d4647d533f619
@@ -6,3 +6,4 @@ SHA512 (kdewebdev-16.08.0.tar.xz) = 7fe5ac57786372a0dd5d880dc131c278f36fc01f0f1c
 Size (kdewebdev-16.08.0.tar.xz) = 2536044 bytes
 SHA1 (patch-klinkstatus_src_CMakeLists.txt) = b3698f7edde82552e0395a27df980d0e58ce0994
 SHA1 (patch-klinkstatus_src_plugins_scripting_scripts_CMakeLists.txt) = aaf22196a55da6f8bd8ab43c8be444b65fed3502
+SHA1 (patch-klinkstatus_src_tidy_tidyx.h) = be38498a6cc819caa850ab04521095c13129fdc2
diff --git a/www/kdewebdev4/patches/patch-klinkstatus_src_tidy_tidyx.h b/www/kdewebdev4/patches/patch-klinkstatus_src_tidy_tidyx.h
new file mode 100644
index 00000000000..7d9d47a2283
--- /dev/null
+++ b/www/kdewebdev4/patches/patch-klinkstatus_src_tidy_tidyx.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-klinkstatus_src_tidy_tidyx.h,v 1.1 2017/02/20 09:35:17 wiz Exp $
+
+tidy-5.x compatibility.
+
+--- klinkstatus/src/tidy/tidyx.h.orig	2008-07-28 16:04:32.000000000 +0000
++++ klinkstatus/src/tidy/tidyx.h
+@@ -49,7 +49,7 @@
+ */
+ 
+ #include <tidy.h>
+-#include <buffio.h>
++#include <tidybuffio.h>
+ 
+ #include <config-tidy.h>
+     
diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo
index e34be997736..2ca0e87b062 100644
--- a/x11/kde-baseapps4/distinfo
+++ b/x11/kde-baseapps4/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.12 2016/01/11 01:30:34 markd Exp $
+$NetBSD: distinfo,v 1.13 2017/02/20 09:35:17 wiz Exp $
 
 SHA1 (kde-baseapps-15.12.0.tar.xz) = 4b111c8ab4982edb661674ec1045b83537997642
 RMD160 (kde-baseapps-15.12.0.tar.xz) = 89b15d1f980a6bc2cf343bec154062e76684d1ea
 SHA512 (kde-baseapps-15.12.0.tar.xz) = 67dfcfc46d0c9f10c6071927833d9a16c5c2696a16c1be7315a28d4c33ceb402c1505a613ff6222635771f55e6e71cb5df954ec6f477ee0ab199e8727aea8ed4
 Size (kde-baseapps-15.12.0.tar.xz) = 2050764 bytes
-SHA1 (patch-dolphin_src_CMakeLists.txt) = 2f1c6b33146c519c5741aa040ef93312d3cdd0e6
+SHA1 (patch-dolphin_src_CMakeLists.txt) = f524104916a8de097309fbc3d775b2ff7f9b13a8
 SHA1 (patch-dolphin_src_dolphin.desktop) = c97d4e0e9ac393b87f62fa88d4414944e18a014d
 SHA1 (patch-dolphin_src_kitemviews_private_kdirectorycontentscounterworker.cpp) = db1d193f2413ae1aa53dbc979076ba76d485883f
+SHA1 (patch-konq-plugins_validators_tidy__validator.cpp) = b1dbebad77ce52d4b07ed1015256378778400641
diff --git a/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt b/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt
index 64baeeac410..000e4e1b469 100644
--- a/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt
+++ b/x11/kde-baseapps4/patches/patch-dolphin_src_CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-dolphin_src_CMakeLists.txt,v 1.1 2016/01/10 19:03:55 markd Exp $
+$NetBSD: patch-dolphin_src_CMakeLists.txt,v 1.2 2017/02/20 09:35:17 wiz Exp $
 
 Install config files until such time as we have a kf5-based dolphin
 package.
 
 --- dolphin/src/CMakeLists.txt.orig	2015-12-08 07:04:21.000000000 +0000
 +++ dolphin/src/CMakeLists.txt
-@@ -347,17 +347,17 @@ install(TARGETS kio_filenamesearch DESTI
+@@ -347,15 +347,15 @@ install(TARGETS kio_filenamesearch DESTI
  ########### install files ###############
  
  # Disabled since Applications/15.08 contains kf5-based dolphin from dolphin.git
@@ -29,8 +29,6 @@ package.
  install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
  #install( FILES dolphin.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata )
  install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
- install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
- ${SERVICES_INSTALL_DIR} )
 @@ -365,6 +365,6 @@ install( FILES settings/kcm/kcmdolphinna
  install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
  install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/x11/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp b/x11/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp
new file mode 100644
index 00000000000..6dcc9c08ccc
--- /dev/null
+++ b/x11/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-konq-plugins_validators_tidy__validator.cpp,v 1.1 2017/02/20 09:35:17 wiz Exp $
+
+tidy-5.x compatibility.
+
+--- konq-plugins/validators/tidy_validator.cpp.orig	2015-12-08 07:04:21.000000000 +0000
++++ konq-plugins/validators/tidy_validator.cpp
+@@ -25,8 +25,8 @@
+ 
+ #include <kdebug.h>
+ 
+-#include <buffio.h>
+ #include <tidy.h>
++#include <tidybuffio.h>
+ 
+ #include <config-konq-validator.h>
+