diff -urN /usr/ports/net/xmlrpc-c/Makefile net/xmlrpc-c/Makefile
--- /usr/ports/net/xmlrpc-c/Makefile	2008-03-11 12:08:40.000000000 +0900
+++ net/xmlrpc-c/Makefile	2008-03-23 16:34:16.000000000 +0900
@@ -7,44 +7,49 @@
 #
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.06.24
+PORTVERSION=	1.06.25
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML-RPC library for C and C++
 
-OPTIONS=	CURL "Compile with curl support" on \
+OPTIONS=	DEBUG "Compile with debugging information" off \
+		CURL "Compile with curl support" on \
 		LIBWWW "Compile with libwww support" off
 
-USE_AUTOTOOLS=	libtool:15:env
+CONFLICTS=	xmlrpc-epi-0.*
+
+USE_GNOME=	gnometarget
+USE_PERL5=	yes
 USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15:env
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_PERL5=	yes
 MAKEFILE=	GNUmakefile
-MAKE_ENV+=	CFLAGS_FREEBSD="${CFLAGS}" \
-		CXXFLAGS_FREEBSD="${CXXFLAGS}"
-
-CONFLICTS=	xmlrpc-epi-0.*
+MAKE_ARGS=	LIBTOOL="${LIBTOOL}" \
+		CFLAGS_COMMON="${CFLAGS}" \
+		CXXFLAGS_COMMON="${CXXFLAGS}"
+USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_LIBWWW) || (!defined(WITHOUT_LIBWWW) && exists(${LOCALBASE}/lib/libwwwcore.so.1))
-LIB_DEPENDS+=	wwwcore.1:${PORTSDIR}/www/libwww
-OPT_LIBWWW=	yes
-.else
-CONFIGURE_ARGS+=	--disable-libwww-client
+.if !defined(WITH_DEBUG)
+CFLAGS+=	-DNDEBUG
 .endif
 
-.if !defined(WITHOUT_CURL)
+.if defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--disable-curl-client
+.else
 LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl
 OPT_CURL=	yes
+.endif
+
+.if defined(WITH_LIBWWW)
+LIB_DEPENDS+=	wwwcore.1:${PORTSDIR}/www/libwww
+OPT_LIBWWW=	yes
 .else
-CONFIGURE_ARGS+=	--disable-curl-client
+CONFIGURE_ARGS+=	--disable-libwww-client
 .endif
 
 .if !defined(OPT_LIBWWW) && !defined(OPT_CURL)
@@ -54,7 +59,7 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
+	@${GREP} -lR '\-lpthread' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-lpthread|${PTHREAD_LIBS}|g'
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/net/xmlrpc-c/distinfo net/xmlrpc-c/distinfo
--- /usr/ports/net/xmlrpc-c/distinfo	2008-03-11 12:08:41.000000000 +0900
+++ net/xmlrpc-c/distinfo	2008-03-23 15:37:28.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (xmlrpc-c-1.06.24.tgz) = 21a53745880da56334e1ddace5592c4b
-SHA256 (xmlrpc-c-1.06.24.tgz) = aa6d5294d8457f52af1f491370b24ca941568001a2060cd527fb2e366ad25e7e
-SIZE (xmlrpc-c-1.06.24.tgz) = 699312
+MD5 (xmlrpc-c-1.06.25.tgz) = 9974e4fd4460df1c2b438415159b9a56
+SHA256 (xmlrpc-c-1.06.25.tgz) = 92cba697605e3c970b4f47bcec797a8e2513d5fd18102cbc2aa38212706357f7
+SIZE (xmlrpc-c-1.06.25.tgz) = 699482
diff -urN /usr/ports/net/xmlrpc-c/files/patch-Makefile.common net/xmlrpc-c/files/patch-Makefile.common
--- /usr/ports/net/xmlrpc-c/files/patch-Makefile.common	2007-12-19 04:50:17.000000000 +0900
+++ net/xmlrpc-c/files/patch-Makefile.common	1970-01-01 09:00:00.000000000 +0900
@@ -1,16 +0,0 @@
---- Makefile.common.orig	2007-12-18 19:39:26.000000000 +0000
-+++ Makefile.common	2007-12-18 19:40:30.000000000 +0000
-@@ -32,11 +32,11 @@
- CXXFLAGS_COMMON = -DNDEBUG
- 
- ifeq ($(C_COMPILER_GNU),yes)
--  CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3
-+  CFLAGS_COMMON += $(GCC_C_WARNINGS) $(CFLAGS_FREEBSD)
- endif
- 
- ifeq ($(CXX_COMPILER_GNU),yes)
--  CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -g
-+  CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) $(CXXFLAGS_FREEBSD)
- endif
- 
- DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
diff -urN /usr/ports/net/xmlrpc-c/files/patch-ltconfig net/xmlrpc-c/files/patch-ltconfig
--- /usr/ports/net/xmlrpc-c/files/patch-ltconfig	2007-12-19 04:50:17.000000000 +0900
+++ net/xmlrpc-c/files/patch-ltconfig	1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
-Index: ltconfig
-===================================================================
---- ltconfig
-+++ ltconfig	(working copy)
-@@ -1133,7 +1133,7 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-