6 files changed, 5 insertions, 72 deletions

diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 4088e192714c..ecb9cf9f5043 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.31.04
+PORTVERSION=	1.31.05
 CATEGORIES=	net
 MASTER_SITES=	LOCAL/garga/xmlrpc-c
 PKGNAMESUFFIX=	-devel
@@ -26,12 +26,13 @@ CPLUSPLUS_DESC=	 Build xmlrpc-c c++ libs and tools
 CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-[0-9]*
 
 USE_GMAKE=	yes
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/advanced
+
 .include <bsd.port.pre.mk>
 
 .if empty(PORT_OPTIONS:MDEBUG)
diff --git a/net/xmlrpc-c-devel/distinfo b/net/xmlrpc-c-devel/distinfo
index 9bea687167af..75f52cacea28 100644
--- a/net/xmlrpc-c-devel/distinfo
+++ b/net/xmlrpc-c-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmlrpc-c-1.31.04.tar.bz2) = 8ab30ee65ab9399f537662527d72ba696258f1779a84d819f8eae75112c2271d
-SIZE (xmlrpc-c-1.31.04.tar.bz2) = 606730
+SHA256 (xmlrpc-c-1.31.05.tar.gz) = 6c00de832c3ef53728cd47a6440064833f668d98a8cbfbf015603597bc074840
+SIZE (xmlrpc-c-1.31.05.tar.gz) = 767022
diff --git a/net/xmlrpc-c-devel/files/patch-test__Makefile b/net/xmlrpc-c-devel/files/patch-test__Makefile
deleted file mode 100644
index 8049cee54483..000000000000
--- a/net/xmlrpc-c-devel/files/patch-test__Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- test/Makefile	(revision 2386)
-+++ test/Makefile	(revision 2387)
-@@ -11,8 +11,6 @@
- 
- XMLRPC_C_CONFIG = $(BLDDIR)/xmlrpc-c-config.test
- 
--LDADD_CLIENT = \
--  $(shell $(XMLRPC_C_CONFIG) client --ldadd)
- LDADD_ABYSS_SERVER = \
-   $(shell $(XMLRPC_C_CONFIG) abyss-server --ldadd)
- LDADD_CGI_SERVER = \
-@@ -43,9 +41,11 @@
- ifeq ($(MUST_BUILD_CLIENT),yes)
-   TEST_OBJS += client.o
-   LIBXMLRPC_CLIENT_DEP = $(LIBXMLRPC_CLIENT_A)
-+  LDADD_CLIENT = $(shell $(XMLRPC_C_CONFIG) client --ldadd)
- else
-   TEST_OBJS += client_dummy.o
-   LIBXMLRPC_CLIENT_DEP =
-+  LDADD_CLIENT =
- endif
- 
- include $(SRCDIR)/common.mk
diff --git a/net/xmlrpc-c-devel/files/patch-test__cpp__Makefile b/net/xmlrpc-c-devel/files/patch-test__cpp__Makefile
deleted file mode 100644
index 4989cda01cb2..000000000000
--- a/net/xmlrpc-c-devel/files/patch-test__cpp__Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- test/cpp/Makefile	(revision 2386)
-+++ test/cpp/Makefile	(revision 2387)
-@@ -16,7 +16,7 @@
- 
- XMLRPC_C_CONFIG = $(BLDDIR)/xmlrpc-c-config.test
- 
--LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd)
-+LIBS := 
- 
- LIBS += -lpthread
- 
-@@ -42,6 +42,7 @@
- ifeq ($(MUST_BUILD_CLIENT),yes)
-   TEST_OBJS += testclient.o
-   CLIENT_LIBS = $(LIBXMLRPC_CLIENTPP_A) $(LIBXMLRPC_CLIENT_A)
-+  LIBS += $(shell $(XMLRPC_C_CONFIG) client --ldadd)
- else
-   TEST_OBJS += testclient_dummy.o
-   CLIENT_LIBS =
-Index: test/Makefile
-===================================================================
diff --git a/net/xmlrpc-c-devel/files/patch-test__cpp__test.cpp b/net/xmlrpc-c-devel/files/patch-test__cpp__test.cpp
deleted file mode 100644
index 590b4b7318dc..000000000000
--- a/net/xmlrpc-c-devel/files/patch-test__cpp__test.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- test/cpp/test.cpp	(revision 2386)
-+++ test/cpp/test.cpp	(revision 2387)
-@@ -9,7 +9,6 @@
- 
- #include "xmlrpc-c/girerr.hpp"
- using girerr::error;
--#include "transport_config.h"
- #include "xmlrpc-c/base.hpp"
- #include "xmlrpc-c/oldcppwrapper.hpp"
- #include "xmlrpc-c/registry.hpp"
-Index: test/cpp/Makefile
-===================================================================
diff --git a/net/xmlrpc-c-devel/files/patch-test__cpp__value.cpp b/net/xmlrpc-c-devel/files/patch-test__cpp__value.cpp
deleted file mode 100644
index 61ed885062d7..000000000000
--- a/net/xmlrpc-c-devel/files/patch-test__cpp__value.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- test/cpp/value.cpp	(revision 2386)
-+++ test/cpp/value.cpp	(revision 2387)
-@@ -9,7 +9,6 @@
- 
- #include "xmlrpc-c/girerr.hpp"
- using girerr::error;
--#include "transport_config.h"
- #include "xmlrpc-c/base.hpp"
- #include "xmlrpc-c/oldcppwrapper.hpp"
- #include "xmlrpc-c/registry.hpp"
-Index: test/cpp/test.cpp
-===================================================================