Update to 0.25.4.

  There are some API changes, but all dependend prots are build and run Ok.

12 files changed, 116 insertions, 92 deletions

diff --git a/www/neon/Makefile b/www/neon/Makefile
index 8c220934f35d..c074a6fc5304 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.24.7
+PORTVERSION=	0.25.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/ \
 		http://keyserver.kjsl.com/~jharris/distfiles/
@@ -36,25 +36,27 @@ MAN3=	ne_add_request_header.3 ne_addr_destroy.3 ne_addr_error.3 \
 	ne_buffer.3 ne_buffer_altered.3 ne_buffer_append.3 ne_buffer_clear.3 \
 	ne_buffer_concat.3 ne_buffer_create.3 ne_buffer_destroy.3 \
 	ne_buffer_finish.3 ne_buffer_grow.3 ne_buffer_ncreate.3 \
-	ne_buffer_zappend.3 ne_calloc.3 ne_close_connection.3 \
-	ne_forget_auth.3 ne_get_error.3 ne_get_status.3 ne_iaddr_cmp.3 \
-	ne_iaddr_free.3 ne_iaddr_make.3 ne_iaddr_print.3 ne_malloc.3 \
-	ne_oom_callback.3 ne_print_request_header.3 ne_qtoken.3 ne_realloc.3 \
-	ne_request_create.3 ne_request_destroy.3 ne_request_dispatch.3 \
-	ne_session_create.3 ne_session_destroy.3 ne_session_proxy.3 \
-	ne_set_error.3 ne_set_expect100.3 ne_set_persist.3 \
-	ne_set_proxy_auth.3 ne_set_read_timeout.3 \
+	ne_buffer_zappend.3 ne_calloc.3 ne_close_connection.3 ne_forget_auth.3 \
+	ne_get_error.3 ne_get_response_header.3 ne_get_scheme.3 \
+	ne_get_server_hostport.3 ne_get_status.3 ne_iaddr_cmp.3 \
+	ne_iaddr_free.3 ne_iaddr_make.3 ne_iaddr_print.3 ne_iaddr_typeof.3 \
+	ne_malloc.3 ne_oom_callback.3 ne_print_request_header.3 ne_qtoken.3 \
+	ne_realloc.3 ne_request_create.3 ne_request_destroy.3 \
+	ne_request_dispatch.3 ne_response_header_iterate.3 ne_session_create.3 \
+	ne_session_destroy.3 ne_session_proxy.3 ne_set_error.3 \
+	ne_set_persist.3 ne_set_proxy_auth.3 ne_set_read_timeout.3 \
 	ne_set_request_body_buffer.3 ne_set_request_body_fd.3 \
-	ne_set_server_auth.3 ne_set_useragent.3 ne_shave.3 ne_sock_init.3 \
-	ne_ssl_cert_cmp.3 ne_ssl_cert_export.3 ne_ssl_cert_free.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_import.3 ne_ssl_cert_issuer.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_signedby.3 ne_ssl_cert_subject.3 \
-	ne_ssl_cert_write.3 ne_ssl_clicert_decrypt.3 \
-	ne_ssl_clicert_encrypted.3 ne_ssl_clicert_free.3 \
-	ne_ssl_clicert_name.3 ne_ssl_clicert_owner.3 ne_ssl_clicert_read.3 \
-	ne_ssl_dname_cmp.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
-	ne_ssl_trust_cert.3 ne_ssl_trust_default_ca.3 ne_status.3 ne_strdup.3 \
-	ne_strndup.3 ne_token.3 ne_version_match.3 ne_version_string.3 neon.3
+	ne_set_request_expect100.3 ne_set_server_auth.3 ne_set_useragent.3 \
+	ne_shave.3 ne_sock_init.3 ne_ssl_cert_cmp.3 ne_ssl_cert_export.3 \
+	ne_ssl_cert_free.3 ne_ssl_cert_identity.3 ne_ssl_cert_import.3 \
+	ne_ssl_cert_issuer.3 ne_ssl_cert_read.3 ne_ssl_cert_signedby.3 \
+	ne_ssl_cert_subject.3 ne_ssl_cert_write.3 ne_ssl_clicert_decrypt.3 \
+	ne_ssl_clicert_encrypted.3 ne_ssl_clicert_free.3 ne_ssl_clicert_name.3 \
+	ne_ssl_clicert_owner.3 ne_ssl_clicert_read.3 ne_ssl_dname_cmp.3 \
+	ne_ssl_readable_dname.3 ne_ssl_set_verify.3 ne_ssl_trust_cert.3 \
+	ne_ssl_trust_default_ca.3 ne_status.3 ne_strdup.3 ne_strndup.3 \
+	ne_token.3 ne_version_match.3 ne_version_string.3 ne_xml_create.3 \
+	ne_xml_destroy.3 neon.3
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/www/neon/distinfo b/www/neon/distinfo
index 88b293451796..8adf394a79f5 100644
--- a/www/neon/distinfo
+++ b/www/neon/distinfo
@@ -1,2 +1,3 @@
-MD5 (neon-0.24.7.tar.gz) = 5108bcbe41de4afe2e19cc58500fb9f2
-SIZE (neon-0.24.7.tar.gz) = 603592
+MD5 (neon-0.25.4.tar.gz) = 4448c3a91e80429ea733aec8ce300009
+SHA256 (neon-0.25.4.tar.gz) = 99c48f769151bda3dd86befbcd10efdeef0f3a5597b94f9a36b98c4a5d062cb6
+SIZE (neon-0.25.4.tar.gz) = 734424
diff --git a/www/neon/pkg-plist b/www/neon/pkg-plist
index 1a882ac92ef3..94e92ae937e1 100644
--- a/www/neon/pkg-plist
+++ b/www/neon/pkg-plist
@@ -5,7 +5,6 @@ include/neon/ne_alloc.h
 include/neon/ne_auth.h
 include/neon/ne_basic.h
 include/neon/ne_compress.h
-include/neon/ne_cookies.h
 include/neon/ne_dates.h
 include/neon/ne_defs.h
 include/neon/ne_i18n.h
@@ -21,7 +20,8 @@ include/neon/ne_string.h
 include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
-lib/libneon.so.24
+include/neon/ne_xmlreq.h
+lib/libneon.so.25
 lib/libneon.so
 lib/libneon.a
 libdata/pkgconfig/neon.pc
@@ -61,9 +61,11 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refneon.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreqopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresolve.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refresphdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refshave.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsockinit.html
@@ -75,6 +77,7 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refstatus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/reftok.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refvers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refxml.html
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xml.html
 %%PORTDOCS%%%%DOCSDIR%%/using-neon.txt
diff --git a/www/neon26/Makefile b/www/neon26/Makefile
index 8c220934f35d..c074a6fc5304 100644
--- a/www/neon26/Makefile
+++ b/www/neon26/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.24.7
+PORTVERSION=	0.25.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/ \
 		http://keyserver.kjsl.com/~jharris/distfiles/
@@ -36,25 +36,27 @@ MAN3=	ne_add_request_header.3 ne_addr_destroy.3 ne_addr_error.3 \
 	ne_buffer.3 ne_buffer_altered.3 ne_buffer_append.3 ne_buffer_clear.3 \
 	ne_buffer_concat.3 ne_buffer_create.3 ne_buffer_destroy.3 \
 	ne_buffer_finish.3 ne_buffer_grow.3 ne_buffer_ncreate.3 \
-	ne_buffer_zappend.3 ne_calloc.3 ne_close_connection.3 \
-	ne_forget_auth.3 ne_get_error.3 ne_get_status.3 ne_iaddr_cmp.3 \
-	ne_iaddr_free.3 ne_iaddr_make.3 ne_iaddr_print.3 ne_malloc.3 \
-	ne_oom_callback.3 ne_print_request_header.3 ne_qtoken.3 ne_realloc.3 \
-	ne_request_create.3 ne_request_destroy.3 ne_request_dispatch.3 \
-	ne_session_create.3 ne_session_destroy.3 ne_session_proxy.3 \
-	ne_set_error.3 ne_set_expect100.3 ne_set_persist.3 \
-	ne_set_proxy_auth.3 ne_set_read_timeout.3 \
+	ne_buffer_zappend.3 ne_calloc.3 ne_close_connection.3 ne_forget_auth.3 \
+	ne_get_error.3 ne_get_response_header.3 ne_get_scheme.3 \
+	ne_get_server_hostport.3 ne_get_status.3 ne_iaddr_cmp.3 \
+	ne_iaddr_free.3 ne_iaddr_make.3 ne_iaddr_print.3 ne_iaddr_typeof.3 \
+	ne_malloc.3 ne_oom_callback.3 ne_print_request_header.3 ne_qtoken.3 \
+	ne_realloc.3 ne_request_create.3 ne_request_destroy.3 \
+	ne_request_dispatch.3 ne_response_header_iterate.3 ne_session_create.3 \
+	ne_session_destroy.3 ne_session_proxy.3 ne_set_error.3 \
+	ne_set_persist.3 ne_set_proxy_auth.3 ne_set_read_timeout.3 \
 	ne_set_request_body_buffer.3 ne_set_request_body_fd.3 \
-	ne_set_server_auth.3 ne_set_useragent.3 ne_shave.3 ne_sock_init.3 \
-	ne_ssl_cert_cmp.3 ne_ssl_cert_export.3 ne_ssl_cert_free.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_import.3 ne_ssl_cert_issuer.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_signedby.3 ne_ssl_cert_subject.3 \
-	ne_ssl_cert_write.3 ne_ssl_clicert_decrypt.3 \
-	ne_ssl_clicert_encrypted.3 ne_ssl_clicert_free.3 \
-	ne_ssl_clicert_name.3 ne_ssl_clicert_owner.3 ne_ssl_clicert_read.3 \
-	ne_ssl_dname_cmp.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
-	ne_ssl_trust_cert.3 ne_ssl_trust_default_ca.3 ne_status.3 ne_strdup.3 \
-	ne_strndup.3 ne_token.3 ne_version_match.3 ne_version_string.3 neon.3
+	ne_set_request_expect100.3 ne_set_server_auth.3 ne_set_useragent.3 \
+	ne_shave.3 ne_sock_init.3 ne_ssl_cert_cmp.3 ne_ssl_cert_export.3 \
+	ne_ssl_cert_free.3 ne_ssl_cert_identity.3 ne_ssl_cert_import.3 \
+	ne_ssl_cert_issuer.3 ne_ssl_cert_read.3 ne_ssl_cert_signedby.3 \
+	ne_ssl_cert_subject.3 ne_ssl_cert_write.3 ne_ssl_clicert_decrypt.3 \
+	ne_ssl_clicert_encrypted.3 ne_ssl_clicert_free.3 ne_ssl_clicert_name.3 \
+	ne_ssl_clicert_owner.3 ne_ssl_clicert_read.3 ne_ssl_dname_cmp.3 \
+	ne_ssl_readable_dname.3 ne_ssl_set_verify.3 ne_ssl_trust_cert.3 \
+	ne_ssl_trust_default_ca.3 ne_status.3 ne_strdup.3 ne_strndup.3 \
+	ne_token.3 ne_version_match.3 ne_version_string.3 ne_xml_create.3 \
+	ne_xml_destroy.3 neon.3
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/www/neon26/distinfo b/www/neon26/distinfo
index 88b293451796..8adf394a79f5 100644
--- a/www/neon26/distinfo
+++ b/www/neon26/distinfo
@@ -1,2 +1,3 @@
-MD5 (neon-0.24.7.tar.gz) = 5108bcbe41de4afe2e19cc58500fb9f2
-SIZE (neon-0.24.7.tar.gz) = 603592
+MD5 (neon-0.25.4.tar.gz) = 4448c3a91e80429ea733aec8ce300009
+SHA256 (neon-0.25.4.tar.gz) = 99c48f769151bda3dd86befbcd10efdeef0f3a5597b94f9a36b98c4a5d062cb6
+SIZE (neon-0.25.4.tar.gz) = 734424
diff --git a/www/neon26/pkg-plist b/www/neon26/pkg-plist
index 1a882ac92ef3..94e92ae937e1 100644
--- a/www/neon26/pkg-plist
+++ b/www/neon26/pkg-plist
@@ -5,7 +5,6 @@ include/neon/ne_alloc.h
 include/neon/ne_auth.h
 include/neon/ne_basic.h
 include/neon/ne_compress.h
-include/neon/ne_cookies.h
 include/neon/ne_dates.h
 include/neon/ne_defs.h
 include/neon/ne_i18n.h
@@ -21,7 +20,8 @@ include/neon/ne_string.h
 include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
-lib/libneon.so.24
+include/neon/ne_xmlreq.h
+lib/libneon.so.25
 lib/libneon.so
 lib/libneon.a
 libdata/pkgconfig/neon.pc
@@ -61,9 +61,11 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refneon.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreqopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresolve.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refresphdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refshave.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsockinit.html
@@ -75,6 +77,7 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refstatus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/reftok.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refvers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refxml.html
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xml.html
 %%PORTDOCS%%%%DOCSDIR%%/using-neon.txt
diff --git a/www/neon28/Makefile b/www/neon28/Makefile
index 8c220934f35d..c074a6fc5304 100644
--- a/www/neon28/Makefile
+++ b/www/neon28/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.24.7
+PORTVERSION=	0.25.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/ \
 		http://keyserver.kjsl.com/~jharris/distfiles/
@@ -36,25 +36,27 @@ MAN3=	ne_add_request_header.3 ne_addr_destroy.3 ne_addr_error.3 \
 	ne_buffer.3 ne_buffer_altered.3 ne_buffer_append.3 ne_buffer_clear.3 \
 	ne_buffer_concat.3 ne_buffer_create.3 ne_buffer_destroy.3 \
 	ne_buffer_finish.3 ne_buffer_grow.3 ne_buffer_ncreate.3 \
-	ne_buffer_zappend.3 ne_calloc.3 ne_close_connection.3 \
-	ne_forget_auth.3 ne_get_error.3 ne_get_status.3 ne_iaddr_cmp.3 \
-	ne_iaddr_free.3 ne_iaddr_make.3 ne_iaddr_print.3 ne_malloc.3 \
-	ne_oom_callback.3 ne_print_request_header.3 ne_qtoken.3 ne_realloc.3 \
-	ne_request_create.3 ne_request_destroy.3 ne_request_dispatch.3 \
-	ne_session_create.3 ne_session_destroy.3 ne_session_proxy.3 \
-	ne_set_error.3 ne_set_expect100.3 ne_set_persist.3 \
-	ne_set_proxy_auth.3 ne_set_read_timeout.3 \
+	ne_buffer_zappend.3 ne_calloc.3 ne_close_connection.3 ne_forget_auth.3 \
+	ne_get_error.3 ne_get_response_header.3 ne_get_scheme.3 \
+	ne_get_server_hostport.3 ne_get_status.3 ne_iaddr_cmp.3 \
+	ne_iaddr_free.3 ne_iaddr_make.3 ne_iaddr_print.3 ne_iaddr_typeof.3 \
+	ne_malloc.3 ne_oom_callback.3 ne_print_request_header.3 ne_qtoken.3 \
+	ne_realloc.3 ne_request_create.3 ne_request_destroy.3 \
+	ne_request_dispatch.3 ne_response_header_iterate.3 ne_session_create.3 \
+	ne_session_destroy.3 ne_session_proxy.3 ne_set_error.3 \
+	ne_set_persist.3 ne_set_proxy_auth.3 ne_set_read_timeout.3 \
 	ne_set_request_body_buffer.3 ne_set_request_body_fd.3 \
-	ne_set_server_auth.3 ne_set_useragent.3 ne_shave.3 ne_sock_init.3 \
-	ne_ssl_cert_cmp.3 ne_ssl_cert_export.3 ne_ssl_cert_free.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_import.3 ne_ssl_cert_issuer.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_signedby.3 ne_ssl_cert_subject.3 \
-	ne_ssl_cert_write.3 ne_ssl_clicert_decrypt.3 \
-	ne_ssl_clicert_encrypted.3 ne_ssl_clicert_free.3 \
-	ne_ssl_clicert_name.3 ne_ssl_clicert_owner.3 ne_ssl_clicert_read.3 \
-	ne_ssl_dname_cmp.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
-	ne_ssl_trust_cert.3 ne_ssl_trust_default_ca.3 ne_status.3 ne_strdup.3 \
-	ne_strndup.3 ne_token.3 ne_version_match.3 ne_version_string.3 neon.3
+	ne_set_request_expect100.3 ne_set_server_auth.3 ne_set_useragent.3 \
+	ne_shave.3 ne_sock_init.3 ne_ssl_cert_cmp.3 ne_ssl_cert_export.3 \
+	ne_ssl_cert_free.3 ne_ssl_cert_identity.3 ne_ssl_cert_import.3 \
+	ne_ssl_cert_issuer.3 ne_ssl_cert_read.3 ne_ssl_cert_signedby.3 \
+	ne_ssl_cert_subject.3 ne_ssl_cert_write.3 ne_ssl_clicert_decrypt.3 \
+	ne_ssl_clicert_encrypted.3 ne_ssl_clicert_free.3 ne_ssl_clicert_name.3 \
+	ne_ssl_clicert_owner.3 ne_ssl_clicert_read.3 ne_ssl_dname_cmp.3 \
+	ne_ssl_readable_dname.3 ne_ssl_set_verify.3 ne_ssl_trust_cert.3 \
+	ne_ssl_trust_default_ca.3 ne_status.3 ne_strdup.3 ne_strndup.3 \
+	ne_token.3 ne_version_match.3 ne_version_string.3 ne_xml_create.3 \
+	ne_xml_destroy.3 neon.3
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/www/neon28/distinfo b/www/neon28/distinfo
index 88b293451796..8adf394a79f5 100644
--- a/www/neon28/distinfo
+++ b/www/neon28/distinfo
@@ -1,2 +1,3 @@
-MD5 (neon-0.24.7.tar.gz) = 5108bcbe41de4afe2e19cc58500fb9f2
-SIZE (neon-0.24.7.tar.gz) = 603592
+MD5 (neon-0.25.4.tar.gz) = 4448c3a91e80429ea733aec8ce300009
+SHA256 (neon-0.25.4.tar.gz) = 99c48f769151bda3dd86befbcd10efdeef0f3a5597b94f9a36b98c4a5d062cb6
+SIZE (neon-0.25.4.tar.gz) = 734424
diff --git a/www/neon28/pkg-plist b/www/neon28/pkg-plist
index 1a882ac92ef3..94e92ae937e1 100644
--- a/www/neon28/pkg-plist
+++ b/www/neon28/pkg-plist
@@ -5,7 +5,6 @@ include/neon/ne_alloc.h
 include/neon/ne_auth.h
 include/neon/ne_basic.h
 include/neon/ne_compress.h
-include/neon/ne_cookies.h
 include/neon/ne_dates.h
 include/neon/ne_defs.h
 include/neon/ne_i18n.h
@@ -21,7 +20,8 @@ include/neon/ne_string.h
 include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
-lib/libneon.so.24
+include/neon/ne_xmlreq.h
+lib/libneon.so.25
 lib/libneon.so
 lib/libneon.a
 libdata/pkgconfig/neon.pc
@@ -61,9 +61,11 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refneon.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreqopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresolve.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refresphdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refshave.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsockinit.html
@@ -75,6 +77,7 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refstatus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/reftok.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refvers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refxml.html
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xml.html
 %%PORTDOCS%%%%DOCSDIR%%/using-neon.txt
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index 8c220934f35d..c074a6fc5304 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.24.7
+PORTVERSION=	0.25.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/ \
 		http://keyserver.kjsl.com/~jharris/distfiles/
@@ -36,25 +36,27 @@ MAN3=	ne_add_request_header.3 ne_addr_destroy.3 ne_addr_error.3 \
 	ne_buffer.3 ne_buffer_altered.3 ne_buffer_append.3 ne_buffer_clear.3 \
 	ne_buffer_concat.3 ne_buffer_create.3 ne_buffer_destroy.3 \
 	ne_buffer_finish.3 ne_buffer_grow.3 ne_buffer_ncreate.3 \
-	ne_buffer_zappend.3 ne_calloc.3 ne_close_connection.3 \
-	ne_forget_auth.3 ne_get_error.3 ne_get_status.3 ne_iaddr_cmp.3 \
-	ne_iaddr_free.3 ne_iaddr_make.3 ne_iaddr_print.3 ne_malloc.3 \
-	ne_oom_callback.3 ne_print_request_header.3 ne_qtoken.3 ne_realloc.3 \
-	ne_request_create.3 ne_request_destroy.3 ne_request_dispatch.3 \
-	ne_session_create.3 ne_session_destroy.3 ne_session_proxy.3 \
-	ne_set_error.3 ne_set_expect100.3 ne_set_persist.3 \
-	ne_set_proxy_auth.3 ne_set_read_timeout.3 \
+	ne_buffer_zappend.3 ne_calloc.3 ne_close_connection.3 ne_forget_auth.3 \
+	ne_get_error.3 ne_get_response_header.3 ne_get_scheme.3 \
+	ne_get_server_hostport.3 ne_get_status.3 ne_iaddr_cmp.3 \
+	ne_iaddr_free.3 ne_iaddr_make.3 ne_iaddr_print.3 ne_iaddr_typeof.3 \
+	ne_malloc.3 ne_oom_callback.3 ne_print_request_header.3 ne_qtoken.3 \
+	ne_realloc.3 ne_request_create.3 ne_request_destroy.3 \
+	ne_request_dispatch.3 ne_response_header_iterate.3 ne_session_create.3 \
+	ne_session_destroy.3 ne_session_proxy.3 ne_set_error.3 \
+	ne_set_persist.3 ne_set_proxy_auth.3 ne_set_read_timeout.3 \
 	ne_set_request_body_buffer.3 ne_set_request_body_fd.3 \
-	ne_set_server_auth.3 ne_set_useragent.3 ne_shave.3 ne_sock_init.3 \
-	ne_ssl_cert_cmp.3 ne_ssl_cert_export.3 ne_ssl_cert_free.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_import.3 ne_ssl_cert_issuer.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_signedby.3 ne_ssl_cert_subject.3 \
-	ne_ssl_cert_write.3 ne_ssl_clicert_decrypt.3 \
-	ne_ssl_clicert_encrypted.3 ne_ssl_clicert_free.3 \
-	ne_ssl_clicert_name.3 ne_ssl_clicert_owner.3 ne_ssl_clicert_read.3 \
-	ne_ssl_dname_cmp.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
-	ne_ssl_trust_cert.3 ne_ssl_trust_default_ca.3 ne_status.3 ne_strdup.3 \
-	ne_strndup.3 ne_token.3 ne_version_match.3 ne_version_string.3 neon.3
+	ne_set_request_expect100.3 ne_set_server_auth.3 ne_set_useragent.3 \
+	ne_shave.3 ne_sock_init.3 ne_ssl_cert_cmp.3 ne_ssl_cert_export.3 \
+	ne_ssl_cert_free.3 ne_ssl_cert_identity.3 ne_ssl_cert_import.3 \
+	ne_ssl_cert_issuer.3 ne_ssl_cert_read.3 ne_ssl_cert_signedby.3 \
+	ne_ssl_cert_subject.3 ne_ssl_cert_write.3 ne_ssl_clicert_decrypt.3 \
+	ne_ssl_clicert_encrypted.3 ne_ssl_clicert_free.3 ne_ssl_clicert_name.3 \
+	ne_ssl_clicert_owner.3 ne_ssl_clicert_read.3 ne_ssl_dname_cmp.3 \
+	ne_ssl_readable_dname.3 ne_ssl_set_verify.3 ne_ssl_trust_cert.3 \
+	ne_ssl_trust_default_ca.3 ne_status.3 ne_strdup.3 ne_strndup.3 \
+	ne_token.3 ne_version_match.3 ne_version_string.3 ne_xml_create.3 \
+	ne_xml_destroy.3 neon.3
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/www/neon29/distinfo b/www/neon29/distinfo
index 88b293451796..8adf394a79f5 100644
--- a/www/neon29/distinfo
+++ b/www/neon29/distinfo
@@ -1,2 +1,3 @@
-MD5 (neon-0.24.7.tar.gz) = 5108bcbe41de4afe2e19cc58500fb9f2
-SIZE (neon-0.24.7.tar.gz) = 603592
+MD5 (neon-0.25.4.tar.gz) = 4448c3a91e80429ea733aec8ce300009
+SHA256 (neon-0.25.4.tar.gz) = 99c48f769151bda3dd86befbcd10efdeef0f3a5597b94f9a36b98c4a5d062cb6
+SIZE (neon-0.25.4.tar.gz) = 734424
diff --git a/www/neon29/pkg-plist b/www/neon29/pkg-plist
index 1a882ac92ef3..94e92ae937e1 100644
--- a/www/neon29/pkg-plist
+++ b/www/neon29/pkg-plist
@@ -5,7 +5,6 @@ include/neon/ne_alloc.h
 include/neon/ne_auth.h
 include/neon/ne_basic.h
 include/neon/ne_compress.h
-include/neon/ne_cookies.h
 include/neon/ne_dates.h
 include/neon/ne_defs.h
 include/neon/ne_i18n.h
@@ -21,7 +20,8 @@ include/neon/ne_string.h
 include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
-lib/libneon.so.24
+include/neon/ne_xmlreq.h
+lib/libneon.so.25
 lib/libneon.so
 lib/libneon.a
 libdata/pkgconfig/neon.pc
@@ -61,9 +61,11 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refneon.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreqopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresolve.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refresphdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refshave.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsockinit.html
@@ -75,6 +77,7 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refstatus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/reftok.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refvers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refxml.html
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xml.html
 %%PORTDOCS%%%%DOCSDIR%%/using-neon.txt