Merge pull request #1926 from beefcurtains/tidy5

New package: tidy5

Manual.md

@@ -545,7 +545,9 @@ to execute a `build_style` script must be defined via `$hostmakedepends`.
 The current list of available `build_style` scripts is the following:
 
 - `cmake` For packages that use the CMake build system, configuration arguments
-can be passed in via `configure_args`.
+can be passed in via `configure_args`. The `cmake_builddir` variable may be
+defined to specify the directory for building under `build_wrksrc` instead of
+the default `build`.
 
 - `configure` For packages that use non-GNU configure scripts, at least `--prefix=/usr`
 should be passed in via `configure_args`.

common/build-style/cmake.sh

@@ -2,8 +2,8 @@
 # This helper is for templates using cmake.
 #
 do_configure() {
-	[ ! -d build ] && mkdir build
-	cd build
+	[ ! -d ${cmake_builddir:=build} ] && mkdir -p ${cmake_builddir}
+	cd ${cmake_builddir}
 
 	if [ "$CROSS_BUILD" ]; then
 		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
@@ -32,13 +32,14 @@ _EOF
 
 	configure_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
 
-	cmake ${configure_args} ..
+	cmake ${configure_args} $(echo ${cmake_builddir}|sed \
+		-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
 }
 
 do_build() {
 	: ${make_cmd:=make}
 
-	cd build
+	cd ${cmake_builddir:=build}
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
 }
 
@@ -46,6 +47,6 @@ do_install() {
 	: ${make_cmd:=make}
 	: ${make_install_target:=install}
 
-	cd build
+	cd ${cmake_builddir:=build}
 	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
 }

common/shlibs

@@ -2070,3 +2070,4 @@ libprocps.so.4 procps-ng-3.3.10_8
 libskarnet.so.2 skalibs-2.3.5.1_1
 libportablexdr.so.0 portablexdr-4.9.1_1
 libtorrent-rasterbar.so.8 libtorrent1-1.0.5_1
+libtidy5.so.4 libtidy5-4.9.30_1

srcpkgs/libtidy5

@@ -0,0 +1 @@
+tidy5

srcpkgs/libtidy5-devel

@@ -0,0 +1 @@
+tidy5

srcpkgs/tidy5/patches/allow-cross.patch

@@ -0,0 +1,20 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -201,7 +201,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}
+             COMMENT "Generate ${TIDYHELP}"
+             VERBATIM
+         )
+@@ -209,7 +209,7 @@
+         # run built EXE to generate more xml output 
+         add_custom_command(
+             TARGET man
+-            COMMAND ${CMAKE_BINARY_DIR}/${LIB_NAME} -xml-config > ${TIDYCONFIG}
++            COMMAND ${CMAKE_SOURCE_DIR}/tidy5 -xml-config > ${TIDYCONFIG}
+             COMMENT "Generate ${TIDYCONFIG}"
+             VERBATIM
+         )

srcpkgs/tidy5/patches/link-dynlib.patch

@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -157,7 +157,11 @@
+ set(name ${LIB_NAME})
+ set ( BINDIR console )
+ add_executable( ${name} ${BINDIR}/tidy.c )
+-target_link_libraries( ${name} ${add_LIBS} )
++if (BUILD_SHARED_LIB)
++	target_link_libraries( ${name} tidy-share )
++else()
++	target_link_libraries( ${name} tidy-static )
++endif()
+ if (MSVC)
+     set_target_properties( ${name} PROPERTIES DEBUG_POSTFIX d )
+ endif ()

srcpkgs/tidy5/template

@@ -0,0 +1,54 @@
+# Template file for 'tidy5'
+# 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.30
+revision=1
+wrksrc=${_reponame}-${version}
+build_style=cmake
+cmake_builddir=build/cmake
+hostmakedepends="cmake libxslt"
+short_desc="HTML Tidy with HTML5 support"
+maintainer="beefcurtains <beefcurtains@voidlinux.eu>"
+license="W3C"
+homepage="http://www.htacg.org/${_reponame}/"
+distfiles="https://github.com/htacg/${_reponame}/archive/${version}.tar.gz"
+checksum=569c23f9028e28ca5dd2020116dec01d2e43e0c698fdf9d0f6e599878495386d
+
+pre_configure() {
+	# the $(man) target requires tidy5 to run on the host
+	ln -s ${cmake_builddir}/${pkgname}
+	if [ -n "$CROSS_BUILD" ]; then
+		rm ${pkgname}
+		cd ${cmake_builddir}
+
+		env - PATH=/usr/bin cmake -DBUILD_SHARED_LIB:BOOL=FALSE ${wrksrc}
+		make ${makejobs} ${pkgname}
+
+		cp ${pkgname} ${wrksrc}
+		cd ${wrksrc}
+		rm -rf ${cmake_builddir}
+	fi
+}
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}
+
+libtidy5_package() {
+	short_desc+=" - library files"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libtidy5-devel_package() {
+	depends="libtidy5>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}