From e04a639a0ea7a671b3ab79b459beea7aa86f2ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 25 Nov 2015 10:20:37 +0100
Subject: [PATCH] tidy5: update to 5.1.25

---
 common/shlibs                           |  2 +-
 srcpkgs/tidy5/patches/allow-cross.patch | 17 ++++++++---------
 srcpkgs/tidy5/template                  | 20 +++++++++++---------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8089a320879..d8c397ec7ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2104,7 +2104,7 @@ libgegl-sc-0.3.so gegl3-0.3.0_1
 libprocps.so.5 procps-ng-3.3.11_1
 libskarnet.so.2.3 skalibs-2.3.7.0_1
 libportablexdr.so.0 portablexdr-4.9.1_1
-libtidy5.so.4 libtidy5-4.9.30_1
+libtidy.so.5 libtidy5-5.1.25_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
 libQupZilla.so.1 qupzilla-1.8.6_1
 libinjeqt.so.0 injeqt-1.0.1_1
diff --git a/srcpkgs/tidy5/patches/allow-cross.patch b/srcpkgs/tidy5/patches/allow-cross.patch
index 00513a1bf52..038fbecc757 100644
--- a/srcpkgs/tidy5/patches/allow-cross.patch
+++ b/srcpkgs/tidy5/patches/allow-cross.patch
@@ -1,20 +1,19 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -201,7 +201,7 @@
+--- CMakeLists.txt	2015-11-23 16:07:04.000000000 +0100
++++ CMakeLists.txt	2015-11-25 09:59:50.944941514 +0100
+@@ -238,7 +238,7 @@
          # run built EXE to generate xml output 
          add_custom_command(
              TARGET man
--            COMMAND ${CMAKE_BINARY_DIR}/${LIB_NAME} -xml-help > ${TIDYHELP}
-+            COMMAND ${CMAKE_SOURCE_DIR}/tidy5 -xml-help > ${TIDYHELP}
+-            COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} -xml-help > ${TIDYHELP}
++            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tidy -xml-help > ${TIDYHELP}
              COMMENT "Generate ${TIDYHELP}"
              VERBATIM
          )
-@@ -209,7 +209,7 @@
-         # run built EXE to generate more xml output 
+@@ -247,6 +247,6 @@
          add_custom_command(
              TARGET man
--            COMMAND ${CMAKE_BINARY_DIR}/${LIB_NAME} -xml-config > ${TIDYCONFIG}
-+            COMMAND ${CMAKE_SOURCE_DIR}/tidy5 -xml-config > ${TIDYCONFIG}
+-            COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} -xml-config > ${TIDYCONFIG}
++            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tidy -xml-config > ${TIDYCONFIG}
              COMMENT "Generate ${TIDYCONFIG}"
              VERBATIM
          )
diff --git a/srcpkgs/tidy5/template b/srcpkgs/tidy5/template
index 5c6d936518f..838e1bd4183 100644
--- a/srcpkgs/tidy5/template
+++ b/srcpkgs/tidy5/template
@@ -2,9 +2,9 @@
 # This project has an identity crisis, it's "Tidy",
 # "HTML Tidy" and "Tidy HTML5". Binaries are tidy5.
 pkgname=tidy5
-_reponame=tidy-html5
-version=4.9.36
+version=5.1.25
 revision=1
+_reponame=tidy-html5
 wrksrc=${_reponame}-${version}
 build_style=cmake
 cmake_builddir=build/cmake
@@ -14,11 +14,11 @@ maintainer="beefcurtains <beefcurtains@voidlinux.eu>"
 license="W3C"
 homepage="http://www.htacg.org/${_reponame}/"
 distfiles="https://github.com/htacg/${_reponame}/archive/${version}.tar.gz"
-checksum=687ae85d52e9f368b3d74031b13fa4f346f77c1c7a50e6507a1db3792778d522
+checksum=be81e967537984fbd207b4b19d02e7be73cbf201f07bf55aa5560c9b1d19b106
 
 pre_configure() {
 	# the $(man) target requires tidy5 to run on the host
-	ln -s ${cmake_builddir}/${pkgname}
+	ln -s ${cmake_builddir}/tidy
 	if [ -n "$CROSS_BUILD" ]; then
 		rm ${pkgname}
 		cd ${cmake_builddir}
@@ -26,20 +26,22 @@ pre_configure() {
 		env - PATH=/usr/bin cmake -DBUILD_SHARED_LIB:BOOL=FALSE ${wrksrc}
 		make ${makejobs} ${pkgname}
 
-		cp ${pkgname} ${wrksrc}
+		cp tidy ${wrksrc}
 		cd ${wrksrc}
 		rm -rf ${cmake_builddir}
 	fi
 }
 
 post_install() {
-	vlicense LICENSE.txt LICENSE
+	vlicense README/LICENSE.txt LICENSE
+	mv ${DESTDIR}/usr/bin/tidy{,5}
+	mv ${DESTDIR}/usr/share/man/man1/tidy{,5}.1
 }
 
 libtidy5_package() {
 	short_desc+=" - library files"
 	pkg_install() {
-		vmove "usr/lib/*.so.*"
+		vmove usr/lib/*.so.*
 	}
 }
 
@@ -48,7 +50,7 @@ libtidy5-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
 	}
 }