From 6b67dd8ee646af0ef7f0361d2db687806bc172f2 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 3 Sep 2012 19:47:51 +0000
Subject: [PATCH] - The latest version of tidy broke compatibility and expects
 different   command-line options. It seems that this is the correct fix for
 the   earlier problems.

Approved by:	doceng (implicit)
---
 share/mk/doc.docbook.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index cdc39d310a..b5f14d81f6 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -257,10 +257,11 @@ TOUCH?=		/usr/bin/touch
 XARGS?=		/usr/bin/xargs
 
 GROFF?=		groff
-.if empty(LANGCODE:S/./ . /g:MISO8859-1)
-TIDYOPTS?=	-wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
+TIDY_VER!=	${TIDY} -v
+.if ${TIDY_VER} == "HTML Tidy for FreeBSD released on 7 December 2008"
+TIDYOPTS?=	-wrap 90 -m -raw --preserve-entities yes -f /dev/null -asxml ${TIDYFLAGS}
 .else
-TIDYOPTS?=	-wrap 90 -m -f /dev/null -asxml ${TIDYFLAGS}
+TIDYOPTS?=	-wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
 .endif
 HTML2TXT?=	${PREFIX}/bin/links
 HTML2TXTOPTS?=	-dump -width 72 ${HTML2TXTFLAGS}