5 files changed, 6 insertions, 61 deletions

diff --git a/textproc/xqilla/Makefile b/textproc/xqilla/Makefile
index 1231667c72cc..1b9909ae90d1 100644
--- a/textproc/xqilla/Makefile
+++ b/textproc/xqilla/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xqilla
-PORTVERSION=	2.3.3
-PORTREVISION=	1
+PORTVERSION=	2.3.4
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}
diff --git a/textproc/xqilla/distinfo b/textproc/xqilla/distinfo
index de5d4f649659..6ed5b95a494e 100644
--- a/textproc/xqilla/distinfo
+++ b/textproc/xqilla/distinfo
@@ -1,2 +1,3 @@
-SHA256 (XQilla-2.3.3.tar.gz) = 8f76b9b4f966f315acc2a8e104e426d8a76ba4ea3441b0ecfdd1e39195674fd6
-SIZE (XQilla-2.3.3.tar.gz) = 16170903
+TIMESTAMP = 1526394824
+SHA256 (XQilla-2.3.4.tar.gz) = adfd4df011fcda08be3f51771006da23e852bac81e2fe63159beddc3633b3f55
+SIZE (XQilla-2.3.4.tar.gz) = 15436023
diff --git a/textproc/xqilla/files/patch-src_dom-api_impl_XPathDocumentImpl.cpp b/textproc/xqilla/files/patch-src_dom-api_impl_XPathDocumentImpl.cpp
deleted file mode 100644
index 27839ca27557..000000000000
--- a/textproc/xqilla/files/patch-src_dom-api_impl_XPathDocumentImpl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/dom-api/impl/XPathDocumentImpl.cpp.orig	2017-09-03 19:24:35 UTC
-+++ src/dom-api/impl/XPathDocumentImpl.cpp
-@@ -62,7 +62,11 @@ DOMNode *XPathDocumentImpl::insertBefore
-     if (thisNodeImpl->isReadOnly())
-         throw DOMException(DOMException::NO_MODIFICATION_ALLOWED_ERR, 0, getMemoryManager());
- 
-+#if _XERCES_VERSION >= 30200
-+    DOMNode* thisNode = fParent.fContainingNode;
-+#else
-     DOMNode* thisNode = castToNode(&fParent);
-+#endif
-     if (newChild->getOwnerDocument() != thisNode)
-         throw DOMException(DOMException::WRONG_DOCUMENT_ERR, 0, getMemoryManager());
- 
diff --git a/textproc/xqilla/files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp b/textproc/xqilla/files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp
deleted file mode 100644
index 041e925009df..000000000000
--- a/textproc/xqilla/files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/dom-api/impl/XPathNamespaceImpl.cpp.orig	2017-09-03 20:26:37 UTC
-+++ src/dom-api/impl/XPathNamespaceImpl.cpp
-@@ -33,7 +33,11 @@ XERCES_CPP_NAMESPACE_USE;
- 
- XPathNamespaceImpl::XPathNamespaceImpl(const XMLCh* const nsPrefix, 
- 		const XMLCh* const nsUri, DOMElement *owner, DOMDocument *docOwner) 
-+#if _XERCES_VERSION >= 30200 
-+	: fNode(this, docOwner)
-+#else
- 	: fNode(docOwner)
-+#endif
- {
-     DOMNodeImpl *argImpl = castToNodeImpl(this);
- 
-@@ -54,7 +58,13 @@ XPathNamespaceImpl::XPathNamespaceImpl(c
- }
- 
- XPathNamespaceImpl::XPathNamespaceImpl(const XPathNamespaceImpl &other) 
--	: fNode(other.fNode), uri(other.uri), prefix(other.prefix)
-+#if _XERCES_VERSION >= 30200 
-+	: fNode(this, other.fNode),
-+#else
-+	: fNode(other.fNode), 
-+
-+#endif
-+	  uri(other.uri), prefix(other.prefix)
- {
- }
- 
-@@ -196,7 +206,11 @@ short            XPathNamespaceImpl::com
- 
-     //if it is a custom node and bigger than us we must ask it for the order
-     if(otherType > DOMXPathNamespace::XPATH_NAMESPACE_NODE) {
-+#if _XERCES_VERSION >= 30200 
-+        DOMNodeImpl tmp(const_cast<XPathNamespaceImpl *>(this), 0);
-+#else
-         DOMNodeImpl tmp(0);
-+#endif
- #if _XERCES_VERSION >= 30000
-         return tmp.reverseTreeOrderBitPattern(other->compareDocumentPosition(this));
- #else
diff --git a/textproc/xqilla/pkg-plist b/textproc/xqilla/pkg-plist
index 76b9909eddff..43bd76adceff 100644
--- a/textproc/xqilla/pkg-plist
+++ b/textproc/xqilla/pkg-plist
@@ -394,5 +394,5 @@ include/xqilla/xqts/TestSuiteResultListener.hpp
 include/xqilla/xqts/TestSuiteRunner.hpp
 lib/libxqilla.a
 lib/libxqilla.so
-lib/libxqilla.so.3
-lib/libxqilla.so.3.3.0
+lib/libxqilla.so.2
+lib/libxqilla.so.2.4.0