4 files changed, 47 insertions, 8 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 8abf5a8d080a..d75836f629d0 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	1.6.3
+PORTVERSION=	2.0.2
 CATEGORIES=	security net
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 	ftp://ftp.gnutls.org/pub/gnutls/ \
diff --git a/security/gnutls/Makefile.man b/security/gnutls/Makefile.man
index 7c5d68cf2442..4fabb0cbf190 100644
--- a/security/gnutls/Makefile.man
+++ b/security/gnutls/Makefile.man
@@ -64,6 +64,7 @@ MAN3=	\
 	gnutls_certificate_set_x509_trust_mem.3 \
 	gnutls_certificate_type_get.3 \
 	gnutls_certificate_type_get_name.3 \
+	gnutls_certificate_type_list.3 \
 	gnutls_certificate_type_set_priority.3 \
 	gnutls_certificate_verify_peers.3 \
 	gnutls_certificate_verify_peers2.3 \
@@ -71,10 +72,13 @@ MAN3=	\
 	gnutls_cipher_get.3 \
 	gnutls_cipher_get_key_size.3 \
 	gnutls_cipher_get_name.3 \
+	gnutls_cipher_list.3 \
 	gnutls_cipher_set_priority.3 \
 	gnutls_cipher_suite_get_name.3 \
+	gnutls_cipher_suite_info.3 \
 	gnutls_compression_get.3 \
 	gnutls_compression_get_name.3 \
+	gnutls_compression_list.3 \
 	gnutls_compression_set_priority.3 \
 	gnutls_credentials_clear.3 \
 	gnutls_credentials_set.3 \
@@ -142,9 +146,11 @@ MAN3=	\
 	gnutls_init.3 \
 	gnutls_kx_get.3 \
 	gnutls_kx_get_name.3 \
+	gnutls_kx_list.3 \
 	gnutls_kx_set_priority.3 \
 	gnutls_mac_get.3 \
 	gnutls_mac_get_name.3 \
+	gnutls_mac_list.3 \
 	gnutls_mac_set_priority.3 \
 	gnutls_malloc.3 \
 	gnutls_openpgp_key_check_hostname.3 \
@@ -172,6 +178,7 @@ MAN3=	\
 	gnutls_openpgp_privkey_get_pk_algorithm.3 \
 	gnutls_openpgp_privkey_import.3 \
 	gnutls_openpgp_privkey_init.3 \
+	gnutls_openpgp_privkey_sign_hash.3 \
 	gnutls_openpgp_send_key.3 \
 	gnutls_openpgp_set_recv_key_function.3 \
 	gnutls_openpgp_trustdb_deinit.3 \
@@ -223,6 +230,7 @@ MAN3=	\
 	gnutls_prf_raw.3 \
 	gnutls_protocol_get_name.3 \
 	gnutls_protocol_get_version.3 \
+	gnutls_protocol_list.3 \
 	gnutls_protocol_set_priority.3 \
 	gnutls_psk_allocate_client_credentials.3 \
 	gnutls_psk_allocate_server_credentials.3 \
@@ -268,6 +276,8 @@ MAN3=	\
 	gnutls_set_default_export_priority.3 \
 	gnutls_set_default_priority.3 \
 	gnutls_sign_algorithm_get_name.3 \
+	gnutls_sign_callback_set.3 \
+	gnutls_sign_callback_get.3 \
 	gnutls_srp_allocate_client_credentials.3 \
 	gnutls_srp_allocate_server_credentials.3 \
 	gnutls_srp_base64_decode.3 \
@@ -298,14 +308,22 @@ MAN3=	\
 	gnutls_x509_crl_get_crt_count.3 \
 	gnutls_x509_crl_get_crt_serial.3 \
 	gnutls_x509_crl_get_dn_oid.3 \
+	gnutls_x509_crt_get_extension_info.3 \
+	gnutls_x509_crt_get_extension_data.3 \
 	gnutls_x509_crl_get_issuer_dn.3 \
 	gnutls_x509_crl_get_issuer_dn_by_oid.3 \
 	gnutls_x509_crl_get_next_update.3 \
+	gnutls_x509_crt_get_raw_issuer_dn.3 \
+	gnutls_x509_crt_get_raw_dn.3 \
+	gnutls_x509_crt_get_signature.3 \
 	gnutls_x509_crl_get_signature_algorithm.3 \
+	gnutls_x509_crt_get_subject_alt_othername_oid.3 \
 	gnutls_x509_crl_get_this_update.3 \
 	gnutls_x509_crl_get_version.3 \
 	gnutls_x509_crl_import.3 \
 	gnutls_x509_crl_init.3 \
+	gnutls_x509_crl_print.3 \
+	gnutls_x509_crt_print.3 \
 	gnutls_x509_crl_set_crt.3 \
 	gnutls_x509_crl_set_crt_serial.3 \
 	gnutls_x509_crl_set_next_update.3 \
@@ -339,9 +357,8 @@ MAN3=	\
 	gnutls_x509_crt_export.3 \
 	gnutls_x509_crt_get_activation_time.3 \
 	gnutls_x509_crt_get_authority_key_id.3 \
+	gnutls_x509_crt_get_basic_constraints.3 \
 	gnutls_x509_crt_get_crl_dist_points.3 \
-	gnutls_x509_crt_get_raw_issuer_dn.3 \
-	gnutls_x509_crt_get_raw_dn.3 \
 	gnutls_x509_crt_get_dn.3 \
 	gnutls_x509_crt_get_dn_by_oid.3 \
 	gnutls_x509_crt_get_dn_oid.3 \
@@ -357,7 +374,9 @@ MAN3=	\
 	gnutls_x509_crt_get_pk_algorithm.3 \
 	gnutls_x509_crt_get_pk_dsa_raw.3 \
 	gnutls_x509_crt_get_pk_rsa_raw.3 \
+	gnutls_x509_crt_get_proxy.3 \
 	gnutls_x509_crt_get_serial.3 \
+	gnutls_x509_crl_get_signature.3 \
 	gnutls_x509_crt_get_signature_algorithm.3 \
 	gnutls_x509_crt_get_subject_alt_name.3 \
 	gnutls_x509_crt_get_subject_key_id.3 \
@@ -367,6 +386,7 @@ MAN3=	\
 	gnutls_x509_crt_list_verify.3 \
 	gnutls_x509_crt_set_activation_time.3 \
 	gnutls_x509_crt_set_authority_key_id.3 \
+	gnutls_x509_crt_set_basic_constraints.3 \
 	gnutls_x509_crt_set_ca_status.3 \
 	gnutls_x509_crt_set_crl_dist_points.3 \
 	gnutls_x509_crt_set_dn_by_oid.3 \
@@ -376,6 +396,8 @@ MAN3=	\
 	gnutls_x509_crt_set_key.3 \
 	gnutls_x509_crt_set_key_purpose_oid.3 \
 	gnutls_x509_crt_set_key_usage.3 \
+	gnutls_x509_crt_set_proxy.3 \
+	gnutls_x509_crt_set_proxy_dn.3 \
 	gnutls_x509_crt_set_serial.3 \
 	gnutls_x509_crt_set_subject_alternative_name.3 \
 	gnutls_x509_crt_set_subject_key_id.3 \
@@ -399,6 +421,7 @@ MAN3=	\
 	gnutls_x509_privkey_import_rsa_raw.3 \
 	gnutls_x509_privkey_init.3 \
 	gnutls_x509_privkey_sign_data.3 \
+	gnutls_x509_privkey_sign_hash.3 \
 	gnutls_x509_privkey_verify_data.3 \
 	gnutls_x509_rdn_get.3 \
 	gnutls_x509_rdn_get_by_oid.3 \
@@ -408,8 +431,11 @@ MAN3=	\
         gnutls_x509_crt_check_revocation.3 \
         gnutls_x509_crt_get_ca_status.3 \
         gnutls_x509_crt_get_extension_by_oid.3 \
-        gnutls_x509_crt_init.3 \
+        gnutls_x509_crt_get_subject.3 \
+	gnutls_x509_crt_get_issuer.3 \
+	gnutls_x509_crt_init.3 \
         gnutls_x509_crt_set_crq.3 \
         gnutls_x509_crt_set_version.3 \
         gnutls_x509_crt_sign.3 \
-        gnutls_x509_crt_verify_data.3
+        gnutls_x509_crt_verify_data.3 \
+	gnutls_x509_dn_get_rdn_ava.3
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 019a6025d145..5a7bdc34be6a 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnutls-1.6.3.tar.bz2) = 73da68a4248d34c4d38491ce2119af0f
-SHA256 (gnutls-1.6.3.tar.bz2) = 885b22a93b97116cd69824b91905dd909828943d78de069508a56cdf0d8d9203
-SIZE (gnutls-1.6.3.tar.bz2) = 4286276
+MD5 (gnutls-2.0.2.tar.bz2) = e22aafc38991dd6ed937376156ea2efc
+SHA256 (gnutls-2.0.2.tar.bz2) = 71b11b1668d9ac5df7387d3dd09f3339a958f135b9139ef93a78718ebdd383b7
+SIZE (gnutls-2.0.2.tar.bz2) = 4831867
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index f030525570e9..859f839a29d0 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -7,6 +7,18 @@ bin/libgnutls-config
 bin/libgnutls-extra-config
 bin/psktool
 bin/srptool
+info/gnutls-certificate-user-use-case.png
+info/gnutls-extensions_st.png
+info/gnutls-handshake-state.png
+info/gnutls-layers.png
+info/gnutls-mod_auth_st.png
+info/gnutls-pgp.png
+info/gnutls-client-server-use-case.png
+info/gnutls-handshake-sequence.png
+info/gnutls-internals.png
+info/gnutls-logo.png
+info/gnutls-objects.png
+info/gnutls-x509.png
 include/gnutls/compat.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
@@ -57,6 +69,7 @@ share/aclocal/libgnutls.m4
 %%NLS%%share/locale/de/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gnutls.mo
 @dirrm %%EXAMPLESDIR%%