3 files changed, 87 insertions, 29 deletions

diff --git a/www/neon/Makefile b/www/neon/Makefile
index dca0f4d87230..4e997b9040b9 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.22.0
+PORTVERSION=	0.23.5
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
-MAINTAINER=	rooneg@electricjellyfish.net
+MAINTAINER=	rodrigc@attbi.com
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
@@ -26,7 +26,9 @@ CONFIGURE_ARGS=	--with-ssl \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	neon-config.1
-MAN3=	ne_add_request_header.3 ne_buffer.3 ne_buffer_altered.3 \
+MAN3=	ne_add_request_header.3 ne_addr_destroy.3 ne_addr_error.3 \
+	ne_addr_first.3 ne_addr_next.3 ne_addr_print.3 ne_addr_resolve.3 \
+	ne_addr_result.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 \
@@ -38,18 +40,20 @@ MAN3=	ne_add_request_header.3 ne_buffer.3 ne_buffer_altered.3 \
 	ne_set_error.3 ne_set_expect100.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_set_server_auth.3 ne_set_useragent.3 ne_shave.3 ne_sock_init.3 \
 	ne_ssl_certificate.3 ne_ssl_dname.3 ne_ssl_load_ca.3 \
 	ne_ssl_load_default_ca.3 ne_ssl_readable_dname.3 \
 	ne_ssl_set_verify.3 ne_status.3 ne_strdup.3 ne_strndup.3 \
-	ne_token.3
+	ne_token.3 ne_version_match.3 ne_version_string.3 neon.3
+
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} 
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${MANPREFIX}/man/man3
 .ifndef NOPORTDOCS
-	${MKDIR} ${PREFIX}/share/doc/neon
-	${INSTALL_DATA} ${WRKSRC}/doc/using-neon.txt ${PREFIX}/share/doc/neon
+	(cd ${WRKSRC} ; ${MAKE} install-html)
+	${INSTALL_DATA} ${WRKSRC}/doc/using-neon.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/neon/distinfo b/www/neon/distinfo
index 2e4a7fe595d8..6e4010509fdf 100644
--- a/www/neon/distinfo
+++ b/www/neon/distinfo
@@ -1 +1 @@
-MD5 (neon-0.22.0.tar.gz) = 346323318c75c8bf6e53d8056a18ab0d
+MD5 (neon-0.23.5.tar.gz) = fd7d1bca0927490c5bd32787b0f2f4b1
diff --git a/www/neon/pkg-plist b/www/neon/pkg-plist
index d45a92e76e44..e82a8af6915b 100644
--- a/www/neon/pkg-plist
+++ b/www/neon/pkg-plist
@@ -1,28 +1,82 @@
 bin/neon-config
-include/neon/ne_request.h
-include/neon/ne_session.h
-include/neon/ne_utils.h
-include/neon/ne_uri.h
-include/neon/ne_socket.h
-include/neon/ne_basic.h
 include/neon/ne_207.h
-include/neon/ne_props.h
-include/neon/ne_xml.h
-include/neon/ne_dates.h
-include/neon/ne_string.h
+include/neon/ne_acl.h
+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
 include/neon/ne_locks.h
-include/neon/ne_alloc.h
 include/neon/ne_md5.h
-include/neon/ne_i18n.h
+include/neon/ne_props.h
 include/neon/ne_redirect.h
-include/neon/ne_auth.h
-include/neon/ne_compress.h
-include/neon/ne_acl.h
-lib/libneon.so.22
+include/neon/ne_request.h
+include/neon/ne_session.h
+include/neon/ne_socket.h
+include/neon/ne_string.h
+include/neon/ne_uri.h
+include/neon/ne_utils.h
+include/neon/ne_xml.h
+@dirrm include/neon
+lib/libneon.so.23
 lib/libneon.so
 lib/libneon.a
-%%PORTDOCS%%share/doc/neon/using-neon.txt
-%%PORTDOCS%%@dirrm share/doc/neon
-@dirrm include/neon
+%%PORTDOCS%%%%DOCSDIR%%/html/apas02.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas03.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas04.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas05.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas06.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas07.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas08.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas09.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/apas12.html
+%%PORTDOCS%%%%DOCSDIR%%/html/auth.html
+%%PORTDOCS%%%%DOCSDIR%%/html/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch01s02.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch01s03.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/html/compliance.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/locking.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lowlevel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/props.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refalloc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refauth.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refbufapp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refbufcr.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refbufdest.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refbufutil.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refconfig.html
+%%PORTDOCS%%%%DOCSDIR%%/html/referr.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refgetst.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refneon.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refresolve.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsess.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refshave.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsockinit.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsslca.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reftok.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsslcert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refssldname.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsslvfy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refstatus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refvers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ssl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/utils.html
+%%PORTDOCS%%%%DOCSDIR%%/html/xml.html
+%%PORTDOCS%%%%DOCSDIR%%/using-neon.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%