4 files changed, 46 insertions, 13 deletions
diff --git a/textproc/py-pytidylib/Makefile b/textproc/py-pytidylib/Makefile
index 628c78e859ea..99fc8d0e73a6 100644
--- a/textproc/py-pytidylib/Makefile
+++ b/textproc/py-pytidylib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pytidylib
-PORTVERSION=	0.2.4
+PORTVERSION=	0.3.2
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,13 +13,25 @@ COMMENT=	Python wrapper for HTML Tidy (tidylib)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libtidy.so:www/tidy-lib
-
 USES=		python
 USE_PYTHON=	distutils autoplist
-
 NO_ARCH=	yes
 
+OPTIONS_DEFAULT=TIDYHTML5
+OPTIONS_SINGLE=	BACKEND
+OPTIONS_SINGLE_BACKEND=	TIDYLIB TIDYHTML5
+
+BACKEND_DESC=	Backend library selection
+TIDYLIB_DESC=	Use tidylib
+TIDYHTML5_DESC=	Use tidy-html5
+
+TIDYLIB_LIB_DEPENDS=	libtidy.so:www/tidy-lib
+TIDYHTML5_LIB_DEPENDS=	libtidy5.so:www/tidy-html5
+
+post-patch-TIDYHTML5-on:
+	@${REINPLACE_CMD} -e '/LIB_NAMES/ s|\[.*\]|["libtidy5.so"]|' \
+		${WRKSRC}/tidylib/tidy.py
+
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
diff --git a/textproc/py-pytidylib/distinfo b/textproc/py-pytidylib/distinfo
index 5176b874ad38..3a91a878f89e 100644
--- a/textproc/py-pytidylib/distinfo
+++ b/textproc/py-pytidylib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pytidylib-0.2.4.tar.gz) = 0af07bd8ebd256af70ca925ada9337faf16d85b3072624f975136a5134150ab6
-SIZE (pytidylib-0.2.4.tar.gz) = 86650
+TIMESTAMP = 1485774017
+SHA256 (pytidylib-0.3.2.tar.gz) = 22b1c8d75970d8064ff999c2369e98af1d0685417eda4c829a5c9f56764b0af3
+SIZE (pytidylib-0.3.2.tar.gz) = 87669
diff --git a/textproc/py-pytidylib/files/patch-setup.py b/textproc/py-pytidylib/files/patch-setup.py
index 4fe6c390b9f3..4fe564b7576b 100644
--- a/textproc/py-pytidylib/files/patch-setup.py
+++ b/textproc/py-pytidylib/files/patch-setup.py
@@ -1,9 +1,8 @@
---- setup.py.orig	2016-02-26 12:55:44 UTC
+--- setup.py.orig	2016-11-16 01:52:32 UTC
 +++ setup.py
-@@ -84,5 +84,6 @@ setup(
-           'Topic :: Text Processing :: Markup :: HTML',
-           'Topic :: Text Processing :: Markup :: XML',
-           ],
+@@ -94,4 +94,5 @@ setup(
+         'Topic :: Text Processing :: Markup :: HTML',
+         'Topic :: Text Processing :: Markup :: XML',
+     ],
 +    test_suite='tests',
-     )
- 
+ )
diff --git a/textproc/py-pytidylib/files/patch-tidylib_tidy.py b/textproc/py-pytidylib/files/patch-tidylib_tidy.py
new file mode 100644
index 000000000000..3c455de64633
--- /dev/null
+++ b/textproc/py-pytidylib/files/patch-tidylib_tidy.py
@@ -0,0 +1,21 @@
+--- tidylib/tidy.py.orig	2016-11-16 01:49:58 UTC
++++ tidylib/tidy.py
+@@ -29,8 +29,7 @@ from .sink import create_sink, destroy_s
+ __all__ = ['Tidy', 'PersistentTidy']
+ 
+ # Default search order for library names if nothing is passed in
+-LIB_NAMES = ['libtidy', 'libtidy.so', 'libtidy-0.99.so.0', 'cygtidy-0-99-0',
+-             'tidylib', 'libtidy.dylib', 'tidy']
++LIB_NAMES = ['libtidy-0.99.so.0']
+ 
+ # Error code from library
+ ENOMEM = -12
+@@ -84,7 +83,7 @@ class Tidy(object):
+     def __init__(self, lib_names=None):
+         self._tidy = None
+         if lib_names is None:
+-            lib_names = ctypes.util.find_library('tidy') or LIB_NAMES
++            lib_names = LIB_NAMES
+         if isinstance(lib_names, str):
+             lib_names = [lib_names]
+         for name in lib_names: