svn commit: r39494 - projects/sgml2xml/share/mk

[Gabor Kovesdan]

Author: gabor
Date: Mon Sep  3 19:47:51 2012
New Revision: 39494
URL: http://svn.freebsd.org/changeset/doc/39494

Log:
  - 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)

Modified:
  projects/sgml2xml/share/mk/doc.docbook.mk

Modified: projects/sgml2xml/share/mk/doc.docbook.mk
==============================================================================
--- projects/sgml2xml/share/mk/doc.docbook.mk	Mon Sep  3 10:20:43 2012	(r39493)
+++ projects/sgml2xml/share/mk/doc.docbook.mk	Mon Sep  3 19:47:51 2012	(r39494)
@@ -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}