4 files changed, 79 insertions, 45 deletions

diff --git a/devel/xmltooling/Makefile b/devel/xmltooling/Makefile
index bff224f6fc6c..bc685c3ba55e 100644
--- a/devel/xmltooling/Makefile
+++ b/devel/xmltooling/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	xmltooling
-DISTVERSION=	1.2
+PORTVERSION=	1.3.3
 CATEGORIES=	devel security
-MASTER_SITES=	http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.2/
+MASTER_SITES=	http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.3/
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Low level XML support for SAML
@@ -25,7 +25,13 @@ USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
 post-patch:
+	@${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \
+		${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
 
+.if defined(NOPORTDOCS)
+        @${REINPLACE_CMD} -e '/^SUBDIRS/s,doc ,,' ${WRKSRC}/Makefile.in
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/xmltooling/distinfo b/devel/xmltooling/distinfo
index 2bc4222d340f..6f4fffa83359 100644
--- a/devel/xmltooling/distinfo
+++ b/devel/xmltooling/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmltooling-1.2.tar.gz) = c6f698f19f2a2aa07dbb9bbda90a2754
-SHA256 (xmltooling-1.2.tar.gz) = a45f4a96e2377d92cbb93452780a12672ae6a2559129c097f957f98561b1f0bd
-SIZE (xmltooling-1.2.tar.gz) = 571925
+MD5 (xmltooling-1.3.3.tar.gz) = 3074edc8a00bba1d26c02e798ea8039c
+SHA256 (xmltooling-1.3.3.tar.gz) = 2e60c74aabdf56dc1bf1f92bfa1da1284198aa114d3174539b6ff1f02dc0599b
+SIZE (xmltooling-1.3.3.tar.gz) = 1475368
diff --git a/devel/xmltooling/files/patch-doc_Makefile.in b/devel/xmltooling/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..c15c24d1a8b9
--- /dev/null
+++ b/devel/xmltooling/files/patch-doc_Makefile.in
@@ -0,0 +1,29 @@
+--- doc/Makefile.in.orig	2010-01-04 19:18:00.000000000 +0000
++++ doc/Makefile.in	2010-01-04 19:18:17.000000000 +0000
+@@ -229,7 +229,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
+-pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
++pkgdocdir = $(datadir)/doc/@PACKAGE@
+ docfiles = \
+ 	README.txt \
+ 	LICENSE.txt \
+@@ -239,7 +239,7 @@
+ 	CURL.LICENSE
+ 
+ pkgdoc_DATA = $(docfiles)
+-EXTRA_DIST = $(docfiles) api
++EXTRA_DIST = $(docfiles)
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -425,8 +425,6 @@
+ 
+ 
+ install-data-hook:
+-	cp -r api $(DESTDIR)$(pkgdocdir)
+-	rm -rf `find $(DESTDIR)$(pkgdocdir)/api -name .svn`
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/devel/xmltooling/pkg-plist b/devel/xmltooling/pkg-plist
index 05fc779663bb..30497da11541 100644
--- a/devel/xmltooling/pkg-plist
+++ b/devel/xmltooling/pkg-plist
@@ -1,38 +1,42 @@
-include/xmltooling/char_traits.h
-include/xmltooling/encryption/Decrypter.h
-include/xmltooling/encryption/EncryptedKeyResolver.h
-include/xmltooling/encryption/Encrypter.h
-include/xmltooling/encryption/Encryption.h
-include/xmltooling/impl/AnyElement.h
-include/xmltooling/impl/UnknownElement.h
-include/xmltooling/io/AbstractXMLObjectMarshaller.h
-include/xmltooling/io/AbstractXMLObjectUnmarshaller.h
-include/xmltooling/io/GenericRequest.h
-include/xmltooling/io/GenericResponse.h
-include/xmltooling/io/HTTPRequest.h
-include/xmltooling/io/HTTPResponse.h
+%%DOCSDIR%%/CURL.LICENSE
+%%DOCSDIR%%/LICENSE.txt
+%%DOCSDIR%%/LOG4CPP.LICENSE
+%%DOCSDIR%%/NOTICE.txt
+%%DOCSDIR%%/OPENSSL.LICENSE
+%%DOCSDIR%%/README.txt
 include/xmltooling/AbstractAttributeExtensibleXMLObject.h
 include/xmltooling/AbstractComplexElement.h
 include/xmltooling/AbstractDOMCachingXMLObject.h
 include/xmltooling/AbstractSimpleElement.h
 include/xmltooling/AbstractXMLObject.h
 include/xmltooling/AttributeExtensibleXMLObject.h
-include/xmltooling/base.h
 include/xmltooling/ConcreteXMLObjectBuilder.h
-include/xmltooling/config_pub.h
 include/xmltooling/ElementExtensibleXMLObject.h
 include/xmltooling/ElementProxy.h
-include/xmltooling/exceptions.h
 include/xmltooling/Lockable.h
-include/xmltooling/logging.h
 include/xmltooling/Namespace.h
 include/xmltooling/PluginManager.h
 include/xmltooling/QName.h
-include/xmltooling/unicode.h
-include/xmltooling/version.h
 include/xmltooling/XMLObject.h
 include/xmltooling/XMLObjectBuilder.h
 include/xmltooling/XMLToolingConfig.h
+include/xmltooling/base.h
+include/xmltooling/char_traits.h
+include/xmltooling/config_pub.h
+include/xmltooling/encryption/Decrypter.h
+include/xmltooling/encryption/EncryptedKeyResolver.h
+include/xmltooling/encryption/Encrypter.h
+include/xmltooling/encryption/Encryption.h
+include/xmltooling/exceptions.h
+include/xmltooling/impl/AnyElement.h
+include/xmltooling/impl/UnknownElement.h
+include/xmltooling/io/AbstractXMLObjectMarshaller.h
+include/xmltooling/io/AbstractXMLObjectUnmarshaller.h
+include/xmltooling/io/GenericRequest.h
+include/xmltooling/io/GenericResponse.h
+include/xmltooling/io/HTTPRequest.h
+include/xmltooling/io/HTTPResponse.h
+include/xmltooling/logging.h
 include/xmltooling/security/AbstractPKIXTrustEngine.h
 include/xmltooling/security/BasicX509Credential.h
 include/xmltooling/security/ChainingTrustEngine.h
@@ -43,23 +47,24 @@ include/xmltooling/security/CredentialResolver.h
 include/xmltooling/security/KeyInfoCredentialContext.h
 include/xmltooling/security/KeyInfoResolver.h
 include/xmltooling/security/OpenSSLCredential.h
+include/xmltooling/security/OpenSSLCryptoX509CRL.h
+include/xmltooling/security/OpenSSLTrustEngine.h
 include/xmltooling/security/SecurityHelper.h
 include/xmltooling/security/SignatureTrustEngine.h
 include/xmltooling/security/TrustEngine.h
 include/xmltooling/security/X509Credential.h
 include/xmltooling/security/X509TrustEngine.h
-include/xmltooling/security/OpenSSLTrustEngine.h
 include/xmltooling/security/XSECCryptoX509CRL.h
-include/xmltooling/security/OpenSSLCryptoX509CRL.h
 include/xmltooling/signature/ContentReference.h
 include/xmltooling/signature/KeyInfo.h
 include/xmltooling/signature/Signature.h
 include/xmltooling/signature/SignatureValidator.h
+include/xmltooling/soap/HTTPSOAPTransport.h
+include/xmltooling/soap/OpenSSLSOAPTransport.h
 include/xmltooling/soap/SOAP.h
 include/xmltooling/soap/SOAPClient.h
 include/xmltooling/soap/SOAPTransport.h
-include/xmltooling/soap/HTTPSOAPTransport.h
-include/xmltooling/soap/OpenSSLSOAPTransport.h
+include/xmltooling/unicode.h
 include/xmltooling/util/CurlURLInputStream.h
 include/xmltooling/util/DateTime.h
 include/xmltooling/util/NDC.h
@@ -77,31 +82,25 @@ include/xmltooling/util/XMLHelper.h
 include/xmltooling/util/XMLObjectChildrenList.h
 include/xmltooling/validation/Validator.h
 include/xmltooling/validation/ValidatorSuite.h
+include/xmltooling/version.h
 lib/libxmltooling-lite.so
-lib/libxmltooling-lite.so.3
-lib/libxmltooling.so.3
+lib/libxmltooling-lite.so.4
 lib/libxmltooling.so
-%%DOCSDIR%%/README.txt
-%%DOCSDIR%%/LICENSE.txt
-%%DOCSDIR%%/NOTICE.txt
-%%DOCSDIR%%/OPENSSL.LICENSE
-%%DOCSDIR%%/LOG4CPP.LICENSE
-%%DOCSDIR%%/CURL.LICENSE
+lib/libxmltooling.so.4
 share/xml/xmltooling/catalog.xml
 share/xml/xmltooling/soap-envelope.xsd
 share/xml/xmltooling/xenc-schema.xsd
-share/xml/xmltooling/xmldsig-core-schema.xsd
 share/xml/xmltooling/xml.xsd
+share/xml/xmltooling/xmldsig-core-schema.xsd
 share/xml/xmltooling/xmltooling.xsd
-@dirrm %%DOCSDIR%%/api
 @dirrm %%DOCSDIR%%
-@dirrmtry include/xmltooling/validation
-@dirrmtry include/xmltooling/util
-@dirrmtry include/xmltooling/soap
-@dirrmtry include/xmltooling/signature
-@dirrmtry include/xmltooling/security
-@dirrmtry include/xmltooling/io
-@dirrmtry include/xmltooling/impl
 @dirrmtry include/xmltooling/encryption
+@dirrmtry include/xmltooling/impl
+@dirrmtry include/xmltooling/io
+@dirrmtry include/xmltooling/security
+@dirrmtry include/xmltooling/signature
+@dirrmtry include/xmltooling/soap
+@dirrmtry include/xmltooling/util
+@dirrmtry include/xmltooling/validation
 @dirrmtry include/xmltooling
 @dirrmtry share/xml/xmltooling