4 files changed, 182 insertions, 25 deletions

diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 4592c7cbb1f9..1e29b2f0fb8c 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -6,33 +6,62 @@
 #
 
 PORTNAME=	Sablot
-PORTVERSION=	0.81
-PORTREVISION=	1
+PORTVERSION=	0.90
 CATEGORIES=	textproc
 MASTER_SITES=	http://download-2.gingerall.cz/download/sablot/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} sablot-docs-0.81${EXTRACT_SUFX}
 
 MAINTAINER=	skv@FreeBSD.org
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		expat.2:${PORTSDIR}/textproc/expat2
 
-INSTALLS_SHLIB=	yes
+# If WITH_DISABLE_META is defined sablot will not output the META html tag
+#WITH_DISABLE_META=	yes
+
+# Define WITH_ICONV_TYPECAST to typecast the second parameter
+# of iconv to char**
+#WITH_ICONV_TYPECAST=	yes
 
-SHLIB_MAJOR=	67
-PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
+INSTALLS_SHLIB=	yes
 
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \
-		LIBTOOL=${LIBTOOL}
+SHLIB_MAJOR=	68	# API changes counter
+PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}" DOCSDIR="share/doc/${PORTNAME}"
 
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_AUTOMAKE_VER=14
+CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+USE_AUTOMAKE=	yes
 AUTOMAKE_ARGS=	-a
 USE_LIBTOOL=	yes
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DISABLE_META)
+CONFIGURE_ARGS+=	--disable-adding-meta
+.endif
+
+.if defined(WITH_ICONV_TYPECAST)
+CONFIGURE_ARGS+=	--enable-iconv-typecast
+.endif
+
+WRKSRCDOC=	${WRKDIR}/sablot-docs
+DOCSLIST=	README README_JS RELEASE
+
 pre-patch:
-		@${PERL} -pi -e \
-		's!(?<=libsablot_la_LDFLAGS = -version-info )(\d+):(\d+):\1!${SHLIB_MAJOR}:$$1:${SHLIB_MAJOR}!;' \
+	@${PERL} -pi -e \
+	's!(?<=libsablot_la_LDFLAGS = -version-info )(\d+):(\d+):\1!${SHLIB_MAJOR}:$$1:${SHLIB_MAJOR}!;' \
 		${WRKSRC}/src/engine/Makefile.am
 
-.include <bsd.port.mk>
+post-install:
+.ifndef(NOPORTDOCS)
+	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
+	@${MKDIR} ${DOCSDIR}/jsdom-ref/apidocs
+	@${MKDIR} ${DOCSDIR}/sxp/apidocs
+	@${INSTALL_DATA} ${DOCSLIST:S!^!${WRKSRC}/!}	${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRCDOC}/*.html		${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRCDOC}/jsdom-ref/*.html	${DOCSDIR}/jsdom-ref
+	@${INSTALL_DATA} ${WRKSRCDOC}/jsdom-ref/apidocs/* ${DOCSDIR}/jsdom-ref/apidocs
+	@${INSTALL_DATA} ${WRKSRCDOC}/sxp/*.html	${DOCSDIR}/sxp
+	@${INSTALL_DATA} ${WRKSRCDOC}/sxp/apidocs/*	${DOCSDIR}/sxp/apidocs
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/sablotron/distinfo b/textproc/sablotron/distinfo
index dbd9621754e8..0d6d7a3fa850 100644
--- a/textproc/sablotron/distinfo
+++ b/textproc/sablotron/distinfo
@@ -1 +1,2 @@
-MD5 (Sablot-0.81.tar.gz) = 830c90d751d1bc9fe85e93013f03477c
+MD5 (Sablot-0.90.tar.gz) = 48af1160b228310dd2dbc65b28075b61
+MD5 (sablot-docs-0.81.tar.gz) = e9df9492f164120ea7fe7b85713421ea
diff --git a/textproc/sablotron/files/patch-aclocal.m4 b/textproc/sablotron/files/patch-aclocal.m4
deleted file mode 100644
index e9ca43aa174a..000000000000
--- a/textproc/sablotron/files/patch-aclocal.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Tue Jan 22 12:34:25 2002
-+++ aclocal.m4	Tue Jan 22 12:34:51 2002
-@@ -135,7 +135,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL="${LIBTOOL}"
- AC_SUBST(LIBTOOL)dnl
- 
- # Prevent multiple expansion
diff --git a/textproc/sablotron/pkg-plist b/textproc/sablotron/pkg-plist
index 053843d59661..8ff0f55ee267 100644
--- a/textproc/sablotron/pkg-plist
+++ b/textproc/sablotron/pkg-plist
@@ -7,3 +7,141 @@ lib/libsablot.a
 lib/libsablot.la
 lib/libsablot.so
 lib/libsablot.so.%%SHLIB_MAJOR%%
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README_JS
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE
+%%PORTDOCS%%%%DOCSDIR%%/Sablot-0.81.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/sparse-frameset.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/complete-frameset.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/sparse-toc.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/sparse-toc-grp.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/sparse-toc-abc.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/complete.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/complete-toc.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/complete-toc-grp.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/complete-toc-abc.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-toc.css
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-retrieveDocument.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getPreviousSibling.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getPreviousAttrNS.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getParent.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getOwnerDocument.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getNodeValue.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getNodeType.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getNodeNameURI.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getNodeNameLocal.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getNodeName.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getNextSibling.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getNextAttrNS.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getNamespaceNo.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getNamespaceCount.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getChildNo.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getChildCount.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getAttributeNo.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-getAttributeCount.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-content.css
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-compareNodes.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SablotSituation.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SablotDestroySituation.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SablotCreateSituation.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_unregisterDOMHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_registerDOMHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_query.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_getResultType.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_getResultString.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_getResultNumber.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_getResultNodeset.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_getResultBool.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_getNodeListLength.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_getNodeListItem.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_destroyQueryContext.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_createQueryContext.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_addVariableString.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_addVariableNumber.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_char.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_addVariableBoolean.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_addVariableBinding.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_addNamespaceDeclaration.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_NodeType.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_NodeList.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_Node.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_ExpressionType.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-SXP_Document.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-QueryContext.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-DOMHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-.Usage.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-.Overview.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-.Errors.html
+%%PORTDOCS%%%%DOCSDIR%%/sxp/apidocs/api-.Building.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/sparse-frameset.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/complete-frameset.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sparse-toc.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sparse-toc-grp.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/sparse-toc-abc.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/complete.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/complete-toc.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/complete-toc-grp.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/complete-toc-abc.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-XSLTContext.ownerDocument.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-toc.css
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-XSLTContext.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-XSLTContext.currentNode.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-XSLTContext.contextSize.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-XSLTContext.contextPosition.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-XSLTContext.contextNode.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-NodeList.length.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-NodeList.item().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-NodeList.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.previousSibling.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.prefix.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.parentNode.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.ownerDocument.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.nodeValue.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-content.css
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.nodeType.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.nodeName.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.nextSibling.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.namespaceURI.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.localName.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.lastChild.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.isSupported().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.hasChildNodes().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.hasAttributes().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.firstChild.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.childNodes.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Node.attributes.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-NamedNodeMap.length.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-NamedNodeMap.item().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-NamedNodeMap.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-NamedNodeMap.getNamedItem().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Element.tagName.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Element.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Element.hasAttribute().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Element.getAttributeNode().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Element.getAttribute().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Document.implementation.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Document.documentElement.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-DOMImplementation.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-DOMImplementation.hasFeature().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-DOMException.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Document.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-DOMException.code.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-CharacterData.substringData().html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-CharacterData.length.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-CharacterData.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-CharacterData.data.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Attr.value.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Attr.specified.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Attr.ownerElement.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Attr.name.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-Attr.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-.Objects.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-.Introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-.Example.html
+%%PORTDOCS%%%%DOCSDIR%%/jsdom-ref/apidocs/api-.Conversions.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sxp/apidocs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sxp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/jsdom-ref/apidocs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/jsdom-ref
+%%PORTDOCS%%@dirrm %%DOCSDIR%%