Import neon28 version 0.28.2

6 files changed, 42 insertions, 22 deletions

diff --git a/www/neon28/Makefile b/www/neon28/Makefile
index b09d10c555f2..4369a235da99 100644
--- a/www/neon28/Makefile
+++ b/www/neon28/Makefile
@@ -5,18 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	neon
-PORTVERSION=	0.26.4
-PORTREVISION=	0
+PORTNAME=	neon28
+PORTVERSION=	0.28.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/ \
 		http://keyserver.kjsl.com/~jharris/distfiles/
+DISTNAME=	neon-${PORTVERSION}
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	An HTTP and WebDAV client library for Unix systems
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
+CONFLICTS=	neon26-[0-9]*
+
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 
@@ -46,7 +48,8 @@ MAN3=	ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \
 	ne_buffer_destroy.3 ne_get_error.3 ne_get_response_header.3 \
 	ne_get_status.3 ne_i18n_init.3 ne_iaddr_make.3 ne_has_support.3 \
 	ne_malloc.3 ne_request_create.3 ne_session_create.3 \
-	ne_set_request_body_buffer.3 ne_set_request_expect100.3 \
+	ne_set_request_body_buffer.3 ne_get_request_flag.3 \
+	ne_get_session_flag.3 ne_set_request_flag.3 ne_set_session_flag.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_identity.3 ne_ssl_cert_read.3 \
 	ne_ssl_clicert_read.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
@@ -109,6 +112,10 @@ MLINKS=	ne_add_request_header.3 ne_print_request_header.3 \
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+DOCSDIR:=	${DOCSDIR:S/28//}
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${MANPREFIX}/man/man3
@@ -117,4 +124,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/using-neon.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/neon28/distinfo b/www/neon28/distinfo
index 6263ee8f7172..2e880455ece8 100644
--- a/www/neon28/distinfo
+++ b/www/neon28/distinfo
@@ -1,3 +1,3 @@
-MD5 (neon-0.26.4.tar.gz) = 2d11fff51ffa856fc6b5d4bd801d6cc4
-SHA256 (neon-0.26.4.tar.gz) = 92d9a9f097734e9baa542febae9419b0d22540e3158e245220fea1b078b159de
-SIZE (neon-0.26.4.tar.gz) = 794225
+MD5 (neon-0.28.2.tar.gz) = b99b3f44e8507ae2d17362f1b34aaf02
+SHA256 (neon-0.28.2.tar.gz) = d9cd601613db6affb25655e0908b0bf8c266669cef31999b6b4121d585ff9094
+SIZE (neon-0.28.2.tar.gz) = 797944
diff --git a/www/neon28/pkg-plist b/www/neon28/pkg-plist
index 4da8200159bf..eb27c3582bb4 100644
--- a/www/neon28/pkg-plist
+++ b/www/neon28/pkg-plist
@@ -21,7 +21,8 @@ include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
 include/neon/ne_xmlreq.h
-lib/libneon.so.26
+include/neon/ne_pkcs11.h
+lib/libneon.so.28
 lib/libneon.so
 lib/libneon.la
 lib/libneon.a
@@ -31,9 +32,10 @@ libdata/pkgconfig/neon.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/zh/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/neon.mo
 %%PORTDOCS%%%%DOCSDIR%%/html/api.html
 %%PORTDOCS%%%%DOCSDIR%%/html/biblio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compliance.html
@@ -61,7 +63,8 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refreqopts.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreqflags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsessflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresolve.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresphdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsess.html
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index b09d10c555f2..4369a235da99 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -5,18 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	neon
-PORTVERSION=	0.26.4
-PORTREVISION=	0
+PORTNAME=	neon28
+PORTVERSION=	0.28.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/ \
 		http://keyserver.kjsl.com/~jharris/distfiles/
+DISTNAME=	neon-${PORTVERSION}
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	An HTTP and WebDAV client library for Unix systems
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
+CONFLICTS=	neon26-[0-9]*
+
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 
@@ -46,7 +48,8 @@ MAN3=	ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \
 	ne_buffer_destroy.3 ne_get_error.3 ne_get_response_header.3 \
 	ne_get_status.3 ne_i18n_init.3 ne_iaddr_make.3 ne_has_support.3 \
 	ne_malloc.3 ne_request_create.3 ne_session_create.3 \
-	ne_set_request_body_buffer.3 ne_set_request_expect100.3 \
+	ne_set_request_body_buffer.3 ne_get_request_flag.3 \
+	ne_get_session_flag.3 ne_set_request_flag.3 ne_set_session_flag.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_identity.3 ne_ssl_cert_read.3 \
 	ne_ssl_clicert_read.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
@@ -109,6 +112,10 @@ MLINKS=	ne_add_request_header.3 ne_print_request_header.3 \
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+DOCSDIR:=	${DOCSDIR:S/28//}
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${MANPREFIX}/man/man3
@@ -117,4 +124,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/using-neon.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/neon29/distinfo b/www/neon29/distinfo
index 6263ee8f7172..2e880455ece8 100644
--- a/www/neon29/distinfo
+++ b/www/neon29/distinfo
@@ -1,3 +1,3 @@
-MD5 (neon-0.26.4.tar.gz) = 2d11fff51ffa856fc6b5d4bd801d6cc4
-SHA256 (neon-0.26.4.tar.gz) = 92d9a9f097734e9baa542febae9419b0d22540e3158e245220fea1b078b159de
-SIZE (neon-0.26.4.tar.gz) = 794225
+MD5 (neon-0.28.2.tar.gz) = b99b3f44e8507ae2d17362f1b34aaf02
+SHA256 (neon-0.28.2.tar.gz) = d9cd601613db6affb25655e0908b0bf8c266669cef31999b6b4121d585ff9094
+SIZE (neon-0.28.2.tar.gz) = 797944
diff --git a/www/neon29/pkg-plist b/www/neon29/pkg-plist
index 4da8200159bf..eb27c3582bb4 100644
--- a/www/neon29/pkg-plist
+++ b/www/neon29/pkg-plist
@@ -21,7 +21,8 @@ include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
 include/neon/ne_xmlreq.h
-lib/libneon.so.26
+include/neon/ne_pkcs11.h
+lib/libneon.so.28
 lib/libneon.so
 lib/libneon.la
 lib/libneon.a
@@ -31,9 +32,10 @@ libdata/pkgconfig/neon.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/zh/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/neon.mo
 %%PORTDOCS%%%%DOCSDIR%%/html/api.html
 %%PORTDOCS%%%%DOCSDIR%%/html/biblio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compliance.html
@@ -61,7 +63,8 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refreqopts.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreqflags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsessflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresolve.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresphdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsess.html