diff -r 162319034b53 -r 82e0c142e47f components/tidy/Makefile
--- a/components/tidy/Makefile	Wed Aug 10 08:54:24 2016 +0000
+++ b/components/tidy/Makefile	Wed Aug 10 15:17:22 2016 -0700
@@ -23,53 +23,25 @@
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64_and_32
+COMPILER= gcc
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tidy
-COMPONENT_VERSION=	1.0.0
-COMPONENT_PROJECT_URL=	http://tidy.sourceforge.net/
+COMPONENT_VERSION=	5.2.0
+COMPONENT_PROJECT_URL=	http://www.html-tidy.org/
+COMPONENT_SRC_NAME=	tidy-html5
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:074023e48ed151db743d194af1028e4a17fa72a18e4069b4f18d4683db4bb9cf
-COMPONENT_ARCHIVE_URL=	$(EXTERNAL_ARCHIVE_MIRROR)/$(SOURCE_ARCHIVE)
+    sha256:80533415acf11ac55f24b874ab39448e390ffec3c2b93df4b857d15602fc7c4d
+COMPONENT_ARCHIVE_URL=	https://github.com/htacg/tidy-html5/archive/$(COMPONENT_VERSION).tar.gz
 COMPONENT_BUGDB=	library/tidy
 
-TPNO=			9098
+TPNO=			30761
 
+BUILD_STYLE= cmake
 SYSTEM_TEST_TARGET= $(SYSTEM_TEST_32_and_64)
 include $(WS_MAKE_RULES)/common.mk
 
-#tree.js, treeview.js, tidyenum_8h.html are installed 
-#from files directory manually as doxygen didn't generate them.
-#This needs to be fixed later. 
-
-COMPONENT_PREP_ACTION =  \
-        (cd $(SOURCE_DIR); doxygen htmldoc/doxygen.cfg)
-
-CONFIGURE_OPTIONS  +=       --disable-static 
-CONFIGURE_OPTIONS  +=       --enable-access 
-CONFIGURE_OPTIONS  +=       --enable-utf16 
-CONFIGURE_OPTIONS  +=       --enable-asian
-
-COMPONENT_PRE_CONFIGURE_ACTION = \
-	($(CP) -r $(SOURCE_DIR)/test $(@D))
-
-PROTODOCDIR=$(PROTOUSRSHAREDOCDIR)/tidy
+CMAKE_OPTIONS += -DBUILD_TAB2SPACE=ON
 
-COMPONENT_TEST_DIR =    $(@D)/test
-COMPONENT_TEST_CMD =	./testall.sh
-COMPONENT_TEST_TARGETS =
-
-# Master test results are the same for both 32-bit and 64-bit, so override
-# here, rather than create multiple identical master files.
-COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
-
-COMPONENT_SYSTEM_TEST_ENV =	TIDY_BIN=/usr/bin/tidy
-COMPONENT_SYSTEM_TEST_DIR =	$(SOURCE_DIR)/test
-COMPONENT_SYSTEM_TEST_CMD =	./testall.sh
-COMPONENT_SYSTEM_TEST_TARGETS =
-
-COMPONENT_POST_INSTALL_ACTION += \
-		($(MKDIR) $(PROTODOCDIR); \
-		$(CP) -r $(SOURCE_DIR)/htmldoc/api $(PROTODOCDIR))
-
-REQUIRED_PACKAGES += developer/documentation-tool/doxygen
+# Needed for the 64-bit tab2space executable.
+PKG_PROTO_DIRS += $(BUILD_DIR_64)