8 files changed, 17 insertions, 89 deletions

diff --git a/devel/libiqxmlrpc/Makefile b/devel/libiqxmlrpc/Makefile
index 3d6506a92cd6..52c1b259eee0 100644
--- a/devel/libiqxmlrpc/Makefile
+++ b/devel/libiqxmlrpc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libiqxmlrpc
-PORTVERSION=	0.9.0
+PORTVERSION=	0.11.1
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	SF
@@ -14,14 +14,22 @@ MASTER_SITES=	SF
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Free, object-oriented XML-RPC implementation written in C++
 
-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs\
-		xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26
+BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
 
-GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	libxml2
+USE_CMAKE=	yes
+.if defined(NOPORTDOCS)
+CMAKE_ARGS=	-Dbuild_docs=off
+.endif
+LDFLAGS=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
+PORTDATA=	*
+
 post-patch:
-	@${REINPLACE_CMD} 's,libxml++-1.0,libxml++-2.6,g' ${WRKSRC}/configure 
-	@${REINPLACE_CMD} 's,{libdir}/pkgconfig,{prefix}/libdata/pkgconfig,' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's,lib/pkgconfig,libdata/pkgconfig,' ${WRKSRC}/libiqxmlrpc/CMakeLists.txt
+	${REINPLACE_CMD} -e 's,share/doc/libiqxmlrpc-$${Libiqxmlrpc_VERSION},share/libiqxmlrpc,' ${WRKSRC}/doc/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/devel/libiqxmlrpc/distinfo b/devel/libiqxmlrpc/distinfo
index 337cc70ae4a1..010514fc268a 100644
--- a/devel/libiqxmlrpc/distinfo
+++ b/devel/libiqxmlrpc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libiqxmlrpc-0.9.0.tar.gz) = 4cf0f25d521542d2fe823539a5e48fd0869c99703147ef886c4c89d6e0a5b227
-SIZE (libiqxmlrpc-0.9.0.tar.gz) = 451585
+SHA256 (libiqxmlrpc-0.11.1.tar.bz2) = fa63c41289f673055b5b36972a4316cb254915978c86fe1f7b51a5bea3e79930
+SIZE (libiqxmlrpc-0.11.1.tar.bz2) = 66674
diff --git a/devel/libiqxmlrpc/files/patch-doc-Makefile.in b/devel/libiqxmlrpc/files/patch-doc-Makefile.in
deleted file mode 100644
index c2b6b4ca32a8..000000000000
--- a/devel/libiqxmlrpc/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	2011-03-21 23:27:23.000000000 +0600
-+++ doc/Makefile.in	2011-03-21 23:28:15.000000000 +0600
-@@ -317,7 +317,7 @@
- 
- info-am:
- 
--install-data-am: install-data-local
-+install-data-am:
- 
- install-dvi: install-dvi-am
- 
-@@ -378,7 +378,7 @@
- 	ps ps-am uninstall uninstall-am uninstall-local
- 
- 
--all: libiqxmlrpc.html
-+all:
- 
- libiqxmlrpc.html:
- 	[ ${MKDOC} == Xyes ] && doxygen libiqxmlrpc.doxygen || true
diff --git a/devel/libiqxmlrpc/files/patch-libiqxmlrpc-executor.h b/devel/libiqxmlrpc/files/patch-libiqxmlrpc-executor.h
deleted file mode 100644
index 80c74380aa07..000000000000
--- a/devel/libiqxmlrpc/files/patch-libiqxmlrpc-executor.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libiqxmlrpc/executor.h.orig	2010-01-01 15:27:17.000000000 +0600
-+++ libiqxmlrpc/executor.h	2010-01-01 15:27:25.000000000 +0600
-@@ -26,7 +26,7 @@
- #pragma warning(disable: 4275)
- #endif
- 
--#include <boost/thread.hpp>
-+#include <boost/thread/thread.hpp>
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/condition.hpp>
- 
diff --git a/devel/libiqxmlrpc/files/patch-libiqxmlrpc-ssl_lib.cc b/devel/libiqxmlrpc/files/patch-libiqxmlrpc-ssl_lib.cc
deleted file mode 100644
index 55ee7707605a..000000000000
--- a/devel/libiqxmlrpc/files/patch-libiqxmlrpc-ssl_lib.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- libiqxmlrpc/ssl_lib.cc.orig	2010-08-14 02:12:36.000000000 +0700
-+++ libiqxmlrpc/ssl_lib.cc	2011-03-22 00:13:33.000000000 +0600
-@@ -55,8 +55,7 @@
- {
-   init_library();
- 
--  SSL_METHOD* meth = client ? SSLv23_method() : SSLv23_server_method();
--  ctx = SSL_CTX_new( meth );
-+  ctx = SSL_CTX_new( client ? SSLv23_method() : SSLv23_server_method() );
- 
-   if(
-     !SSL_CTX_use_certificate_file( ctx, cert_path.c_str(), SSL_FILETYPE_PEM ) ||
-@@ -71,8 +70,7 @@
- {
-   init_library();
- 
--  SSL_METHOD *meth = SSLv23_client_method();
--  ctx = SSL_CTX_new( meth );
-+  ctx = SSL_CTX_new( SSLv23_client_method() );
- }
- 
- 
diff --git a/devel/libiqxmlrpc/files/patch-libiqxmlrpc-utf_conv.cc b/devel/libiqxmlrpc/files/patch-libiqxmlrpc-utf_conv.cc
deleted file mode 100644
index 525ece6d823e..000000000000
--- a/devel/libiqxmlrpc/files/patch-libiqxmlrpc-utf_conv.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- libiqxmlrpc/utf_conv.cc.orig	2007-04-07 00:27:29.000000000 +0700
-+++ libiqxmlrpc/utf_conv.cc	2008-04-01 03:27:31.000000000 +0700
-@@ -89,7 +89,7 @@
-   size_t ileft = ilen;
-   size_t oleft = olen;
- 
--#if defined (_WINDOWS) || defined (__CYGWIN__)
-+#if defined(_LIBICONV_VERSION)
-   const char* ibuf = s.c_str();
- #else
-   char* ibuf = const_cast<char*>(s.c_str());
diff --git a/devel/libiqxmlrpc/pkg-descr b/devel/libiqxmlrpc/pkg-descr
index ff8b186e7f30..0d3a43c75bea 100644
--- a/devel/libiqxmlrpc/pkg-descr
+++ b/devel/libiqxmlrpc/pkg-descr
@@ -3,4 +3,4 @@ solution for both client and server. It supports HTTP and HTTPS,
 both single-threaded and multi-threaded computation models on the server side,
 method interceptors, and other features.
 
-WWW: http://libiqxmlrpc.sourceforge.net/
+WWW: http://libiqxmlrpc.wikidot.com/
diff --git a/devel/libiqxmlrpc/pkg-plist b/devel/libiqxmlrpc/pkg-plist
index a2997d081ece..1924ddf43e6f 100644
--- a/devel/libiqxmlrpc/pkg-plist
+++ b/devel/libiqxmlrpc/pkg-plist
@@ -23,7 +23,6 @@ include/libiqxmlrpc/libiqxmlrpc.h
 include/libiqxmlrpc/lock.h
 include/libiqxmlrpc/method.h
 include/libiqxmlrpc/net_except.h
-include/libiqxmlrpc/parser.h
 include/libiqxmlrpc/reactor.h
 include/libiqxmlrpc/reactor_interrupter.h
 include/libiqxmlrpc/request.h
@@ -34,25 +33,10 @@ include/libiqxmlrpc/socket.h
 include/libiqxmlrpc/ssl_connection.h
 include/libiqxmlrpc/ssl_lib.h
 include/libiqxmlrpc/sysinc.h
-include/libiqxmlrpc/utf_conv.h
 include/libiqxmlrpc/util.h
 include/libiqxmlrpc/value.h
 include/libiqxmlrpc/value_type.h
 include/libiqxmlrpc/value_type_visitor.h
-include/libiqxmlrpc/xml_utils.h
-lib/libiqxmlrpc-client.a
-lib/libiqxmlrpc-client.la
-lib/libiqxmlrpc-client.so
-lib/libiqxmlrpc-client.so.0
-lib/libiqxmlrpc-server.a
-lib/libiqxmlrpc-server.la
-lib/libiqxmlrpc-server.so
-lib/libiqxmlrpc-server.so.0
-lib/libiqxmlrpc.a
-lib/libiqxmlrpc.la
 lib/libiqxmlrpc.so
-lib/libiqxmlrpc.so.0
-libdata/pkgconfig/libiqxmlrpc-client.pc
-libdata/pkgconfig/libiqxmlrpc-server.pc
 libdata/pkgconfig/libiqxmlrpc.pc
 @dirrm include/libiqxmlrpc