3 files changed, 84 insertions, 39 deletions

diff --git a/www/neon/Makefile b/www/neon/Makefile
index dda338f2ec24..63ec9fc8cd36 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.26.3
+PORTVERSION=	0.26.4
 PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/ \
@@ -19,7 +19,14 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
 USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 .ifndef WITHOUT_OPENSSL
 USE_OPENSSL=	yes
@@ -34,33 +41,71 @@ CONFIGURE_ARGS=	--with-ssl \
 		--with-libs=${PREFIX}
 
 MAN1=	neon-config.1
-MAN3=	ne_add_request_header.3 ne_addr_destroy.3 ne_addr_error.3 \
-	ne_addr_first.3 ne_addr_next.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 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_has_support.3 \
-	ne_i18n_init.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_request_body_fd64.3\
-	ne_set_request_expect100.3 ne_set_server_auth.3 ne_set_useragent.3 \
-	ne_shave.3 ne_sock_init.3 ne_sock_exit.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
+MAN3=	ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \
+	ne_buffer_append.3 ne_buffer_clear.3 ne_buffer_create.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_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 \
+	ne_ssl_trust_cert.3 ne_status.3 ne_token.3 ne_version_match.3 \
+	ne_xml_create.3 neon.3
+MLINKS=	ne_add_request_header.3 ne_print_request_header.3 \
+	ne_addr_resolve.3 ne_addr_destroy.3 \
+	ne_addr_resolve.3 ne_addr_error.3 \
+	ne_addr_resolve.3 ne_addr_first.3 \
+	ne_addr_resolve.3 ne_addr_next.3 \
+	ne_addr_resolve.3 ne_addr_result.3 \
+	ne_buffer_append.3 ne_buffer_concat.3 \
+	ne_buffer_append.3 ne_buffer_zappend.3 \
+	ne_buffer_clear.3 ne_buffer_altered.3 \
+	ne_buffer_clear.3 ne_buffer_grow.3 \
+	ne_buffer_create.3 ne_buffer_ncreate.3 \
+	ne_buffer_destroy.3 ne_buffer_finish.3 \
+	ne_get_error.3 ne_set_error.3 \
+	ne_get_response_header.3 ne_response_header_iterate.3 \
+	ne_iaddr_make.3 ne_iaddr_cmp.3 \
+	ne_iaddr_make.3 ne_iaddr_free.3 \
+	ne_iaddr_make.3 ne_iaddr_print.3 \
+	ne_iaddr_make.3 ne_iaddr_typeof.3 \
+	ne_malloc.3 ne_calloc.3 \
+	ne_malloc.3 ne_oom_callback.3 \
+	ne_malloc.3 ne_realloc.3 \
+	ne_malloc.3 ne_strdup.3 \
+	ne_malloc.3 ne_strndup.3 \
+	ne_request_create.3 ne_request_destroy.3 \
+	ne_request_create.3 ne_request_dispatch.3 \
+	ne_session_create.3 ne_close_connection.3 \
+	ne_session_create.3 ne_session_destroy.3 \
+	ne_session_create.3 ne_session_proxy.3 \
+	ne_set_request_body_buffer.3 ne_set_request_body_fd.3 \
+	ne_set_request_body_buffer.3 ne_set_request_body_fd64.3 \
+	ne_set_server_auth.3 ne_forget_auth.3 \
+	ne_set_server_auth.3 ne_set_proxy_auth.3 \
+	ne_set_useragent.3 ne_get_scheme.3 \
+	ne_set_useragent.3 ne_get_server_hostport.3 \
+	ne_set_useragent.3 ne_set_persist.3 \
+	ne_set_useragent.3 ne_set_read_timeout.3 \
+	ne_sock_init.3 ne_sock_exit.3 \
+	ne_ssl_cert_cmp.3 ne_ssl_cert_free.3 \
+	ne_ssl_cert_identity.3 ne_ssl_cert_issuer.3 \
+	ne_ssl_cert_identity.3 ne_ssl_cert_signedby.3 \
+	ne_ssl_cert_identity.3 ne_ssl_cert_subject.3 \
+	ne_ssl_cert_read.3 ne_ssl_cert_export.3 \
+	ne_ssl_cert_read.3 ne_ssl_cert_import.3 \
+	ne_ssl_cert_read.3 ne_ssl_cert_write.3 \
+	ne_ssl_clicert_read.3 ne_ssl_clicert_decrypt.3 \
+	ne_ssl_clicert_read.3 ne_ssl_clicert_encrypted.3 \
+	ne_ssl_clicert_read.3 ne_ssl_clicert_free.3 \
+	ne_ssl_clicert_read.3 ne_ssl_clicert_name.3 \
+	ne_ssl_clicert_read.3 ne_ssl_clicert_owner.3 \
+	ne_ssl_readable_dname.3 ne_ssl_dname_cmp.3 \
+	ne_ssl_trust_cert.3 ne_ssl_trust_default_ca.3 \
+	ne_token.3 ne_qtoken.3 \
+	ne_version_match.3 ne_version_string.3 \
+	ne_xml_create.3 ne_xml_destroy.3
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/www/neon/distinfo b/www/neon/distinfo
index 2a3674364e1a..6263ee8f7172 100644
--- a/www/neon/distinfo
+++ b/www/neon/distinfo
@@ -1,3 +1,3 @@
-MD5 (neon-0.26.3.tar.gz) = 6e52cd9c03e372026d6eccbfb80f09ef
-SHA256 (neon-0.26.3.tar.gz) = b6897fb8354424dbd0fb120ee003ad5482f1c3fa61e1f27783ae3af08b2a7b3f
-SIZE (neon-0.26.3.tar.gz) = 789289
+MD5 (neon-0.26.4.tar.gz) = 2d11fff51ffa856fc6b5d4bd801d6cc4
+SHA256 (neon-0.26.4.tar.gz) = 92d9a9f097734e9baa542febae9419b0d22540e3158e245220fea1b078b159de
+SIZE (neon-0.26.4.tar.gz) = 794225
diff --git a/www/neon/pkg-plist b/www/neon/pkg-plist
index ce13cac81aa6..4da8200159bf 100644
--- a/www/neon/pkg-plist
+++ b/www/neon/pkg-plist
@@ -26,14 +26,14 @@ lib/libneon.so
 lib/libneon.la
 lib/libneon.a
 libdata/pkgconfig/neon.pc
-share/locale/cs/LC_MESSAGES/neon.mo
-share/locale/de/LC_MESSAGES/neon.mo
-share/locale/fr/LC_MESSAGES/neon.mo
-share/locale/ja/LC_MESSAGES/neon.mo
-share/locale/nn/LC_MESSAGES/neon.mo
-share/locale/ru/LC_MESSAGES/neon.mo
-share/locale/tr/LC_MESSAGES/neon.mo
-share/locale/zh/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/de/LC_MESSAGES/neon.mo
+%%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/ru/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/zh/LC_MESSAGES/neon.mo
 %%PORTDOCS%%%%DOCSDIR%%/html/api.html
 %%PORTDOCS%%%%DOCSDIR%%/html/biblio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compliance.html