3 files changed, 21 insertions, 21 deletions

diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 66248e298b10..a368c8eb83ac 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	Sablot
-PORTVERSION=	0.97
+PORTVERSION=	0.98
 CATEGORIES=	textproc
 MASTER_SITES=	http://download-2.gingerall.cz/download/sablot/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} sablot-docs-02.10.01${EXTRACT_SUFX}
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	XML toolkit implementing XSLT 1.0, XPath 1.0 and DOM Level2
@@ -32,9 +31,8 @@ PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++"
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
-AUTOMAKE_ARGS=	-a
 USE_LIBTOOL=	yes
+USE_PERL5_BUILD=	yes
 
 MAN1=	sabcmd.1
 
@@ -64,28 +62,25 @@ CONFIGURE_ARGS+=	--enable-check-leaks
 CONFIGURE_ARGS+=	--enable-debugger
 .endif
 
-WRKSRCDOC=	${WRKDIR}/sablot-docs
-DOCSLIST=	README README_JS RELEASE
-DOCSDIRLIST=	jsdom-ref sablot sxp
+.ifndef(NOPORTDOCS)
+BUILD_DEPENDS+=		${SITE_PERL}/mach/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+CONFIGURE_ARGS+=	--with-html-dir=${DOCSDIR}
+.endif
 
-pre-patch:
+DOCSLIST=	README README_JS RELEASE doc/misc/DEBUGGER doc/misc/NOTES
+
+post-patch:
 	@${PERL} -pi -e \
 	's!(?<=libsablot_la_LDFLAGS = -version-info )(\d+):(\d+):\1!${SHLIB_MAJOR}:$$1:${SHLIB_MAJOR}!;' \
-		${WRKSRC}/src/engine/Makefile.am
-	@${ECHO} "SUBDIRS = man" > ${WRKSRC}/doc/Makefile.am
+		${WRKSRC}/src/engine/Makefile.in
+.if defined(NOPORTDOCS)
+	@${PERL} -pi -e 's!(?<=SUBDIRS = )(.*)!man!' ${WRKSRC}/doc/Makefile.in
+.endif
 
 post-install:
 .ifndef(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	@${MKDIR} ${DOCSDIR}
+	@${ECHO_MSG} "===>   Installing additional documentation for ${PKGNAME}"
 	@${INSTALL_DATA} ${DOCSLIST:S!^!${WRKSRC}/!}	${DOCSDIR}
-.for _DOCSDIR in ${DOCSDIRLIST}
-	@${MKDIR} ${DOCSDIR}/${_DOCSDIR}/apidocs
-	@${INSTALL_DATA} ${WRKSRCDOC}/${_DOCSDIR}/*.html ${DOCSDIR}/${_DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRCDOC}/${_DOCSDIR}/apidocs/*.css \
-		${WRKSRCDOC}/${_DOCSDIR}/apidocs/*.html \
-		${DOCSDIR}/${_DOCSDIR}/apidocs/
-.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/sablotron/distinfo b/textproc/sablotron/distinfo
index 976357cd8397..5dcc6e5626f6 100644
--- a/textproc/sablotron/distinfo
+++ b/textproc/sablotron/distinfo
@@ -1,2 +1 @@
-MD5 (Sablot-0.97.tar.gz) = 253d5e7738d85beecc2c274478431529
-MD5 (sablot-docs-02.10.01.tar.gz) = 4777a9baec0d237fe4be0612eb44d9e7
+MD5 (Sablot-0.98.tar.gz) = b7ad9b3e0d70607bf18a20fc3d4e4448
diff --git a/textproc/sablotron/pkg-plist b/textproc/sablotron/pkg-plist
index 2f7406553b5d..2ba2169b38c2 100644
--- a/textproc/sablotron/pkg-plist
+++ b/textproc/sablotron/pkg-plist
@@ -10,6 +10,8 @@ lib/libsablot.a
 lib/libsablot.la
 lib/libsablot.so
 lib/libsablot.so.%%SHLIB_MAJOR%%
+%%PORTDOCS%%%%DOCSDIR%%/DEBUGGER
+%%PORTDOCS%%%%DOCSDIR%%/NOTES
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README_JS
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE
@@ -79,6 +81,7 @@ lib/libsablot.so.%%SHLIB_MAJOR%%
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sparse-toc-abc.html
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sparse-toc-grp.html
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sparse-toc.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sidebar-toc.html
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/complete-frameset.html
 %%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/sparse-frameset.html
 %%PORTDOCS%%%%DOCSDIR%%/sablot/complete-frameset.html
@@ -153,6 +156,8 @@ lib/libsablot.so.%%SHLIB_MAJOR%%
 %%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/sparse-toc-abc.html
 %%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/sparse-toc-grp.html
 %%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/sparse-toc.html
+%%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/api-SablotGetOptions.html
+%%PORTDOCS%%%%DOCSDIR%%/sablot/apidocs/sidebar-toc.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-content.css
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-toc.css
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-.Building.html
@@ -213,6 +218,7 @@ lib/libsablot.so.%%SHLIB_MAJOR%%
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/complete-toc.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/sparse-toc-abc.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/sparse-toc-grp.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/sidebar-toc.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/complete-frameset.html
 %%PORTDOCS%%%%DOCSDIR%%/sxp/sparse-frameset.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/jsdom-ref/apidocs