5 files changed, 59 insertions, 11 deletions

diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 4a1f83adb585..af8016a72ae8 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -7,11 +7,10 @@
 #
 
 PORTNAME=	gsasl
-PORTVERSION=	0.1.4
-PORTREVISION=	1
+PORTVERSION=	0.2.0
 CATEGORIES=	security
-MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/ \
-		${MASTER_SITE_GNU_ALPHA}
+MASTER_SITES=	${MASTER_SITE_GNU_ALPHA} \
+		http://josefsson.org/${PORTNAME}/releases/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	krion@FreeBSD.org
@@ -49,7 +48,7 @@ post-install:
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/reference
-	${INSTALL_DATA} ${WRKSRC}/doc/reference/*.html ${DOCSDIR}/reference
+	${INSTALL_DATA} ${WRKSRC}/doc/reference/html/* ${DOCSDIR}/reference
 .endif
 
 .include "Makefile.man"
diff --git a/security/gsasl/Makefile.man b/security/gsasl/Makefile.man
index 16ae995f1008..e85a5aa44d67 100644
--- a/security/gsasl/Makefile.man
+++ b/security/gsasl/Makefile.man
@@ -5,6 +5,10 @@ MAN3+=	gsasl_application_data_get.3
 MAN3+=	gsasl_application_data_set.3
 MAN3+=	gsasl_base64_decode.3
 MAN3+=	gsasl_base64_encode.3
+MAN3+=	gsasl_callback.3
+MAN3+=	gsasl_callback_hook_get.3
+MAN3+=	gsasl_callback_hook_set.3
+MAN3+=	gsasl_callback_set.3
 MAN3+=	gsasl_check_version.3
 MAN3+=	gsasl_client_application_data_get.3
 MAN3+=	gsasl_client_application_data_set.3
@@ -39,16 +43,23 @@ MAN3+=	gsasl_client_suggest_mechanism.3
 MAN3+=	gsasl_client_support_p.3
 MAN3+=	gsasl_ctx_get.3
 MAN3+=	gsasl_decode.3
+MAN3+=	gsasl_decode_inline.3
 MAN3+=	gsasl_done.3
 MAN3+=	gsasl_encode.3
+MAN3+=	gsasl_encode_inline.3
 MAN3+=	gsasl_finish.3
 MAN3+=	gsasl_hmac_md5.3
 MAN3+=	gsasl_init.3
 MAN3+=	gsasl_md5.3
 MAN3+=	gsasl_md5pwd_get_password.3
 MAN3+=	gsasl_nonce.3
+MAN3+=	gsasl_property_fast.3
+MAN3+=	gsasl_property_get.3
+MAN3+=	gsasl_property_set.3
+MAN3+=	gsasl_property_set_raw.3
 MAN3+=	gsasl_random.3
 MAN3+=	gsasl_randomize.3
+MAN3+=	gsasl_register.3
 MAN3+=	gsasl_server_application_data_get.3
 MAN3+=	gsasl_server_application_data_set.3
 MAN3+=	gsasl_server_callback_anonymous_get.3
diff --git a/security/gsasl/distinfo b/security/gsasl/distinfo
index f0a876c93e13..abee1e8cbc9a 100644
--- a/security/gsasl/distinfo
+++ b/security/gsasl/distinfo
@@ -1,2 +1,2 @@
-MD5 (gsasl-0.1.4.tar.gz) = d8a00db1b23bbe9f1d0d746c84e669e2
-SIZE (gsasl-0.1.4.tar.gz) = 1658659
+MD5 (gsasl-0.2.0.tar.gz) = b67534afefdb1327e3f7b16e44e4797b
+SIZE (gsasl-0.2.0.tar.gz) = 2527522
diff --git a/security/gsasl/files/patch-doc_gsasl.texi b/security/gsasl/files/patch-doc_gsasl.texi
new file mode 100644
index 000000000000..55d4d087c6ee
--- /dev/null
+++ b/security/gsasl/files/patch-doc_gsasl.texi
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- doc/gsasl.texi.orig
++++ doc/gsasl.texi
+@@ -123,14 +123,6 @@
+ and the command-line interface, self-tests and examples are licensed
+ under the GNU General Public License.
+ 
+-@float Illustration,fig:abstraction
+-@image{abstraction,10cm,5cm}
+-
+-@caption{Logical overview showing how applications use authentication
+-mechanisms through an abstract interface.}
+-
+-@end float
+-
+ @menu
+ * Getting Started::
+ * Features::
diff --git a/security/gsasl/pkg-plist b/security/gsasl/pkg-plist
index f57dea96bb42..feebf830d5cb 100644
--- a/security/gsasl/pkg-plist
+++ b/security/gsasl/pkg-plist
@@ -1,17 +1,32 @@
 bin/gsasl
+include/gsasl-compat.h
+include/gsasl-mech.h
 include/gsasl.h
 lib/libgsasl.a
 lib/libgsasl.so
-lib/libgsasl.so.6
+lib/libgsasl.so.7
 libdata/pkgconfig/libgsasl.pc
 %%PORTDOCS%%%%DOCSDIR%%/gsasl.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/c4.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/abstraction.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/controlflow.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/controlflow2.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/gsasl-gsasl-compat.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/gsasl-gsasl-mech.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/gsasl-gsasl.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/gsasl.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/reference/home.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/index.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/reference/ix01.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/ix02.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/ix03.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/left.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/right.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/style.css
+%%PORTDOCS%%%%DOCSDIR%%/reference/up.png
 %%NLS%%share/locale/de/LC_MESSAGES/gsasl.mo
-%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/libgsasl.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gsasl.mo
@@ -23,8 +38,11 @@ libdata/pkgconfig/libgsasl.pc
 %%NLS%%share/locale/pl/LC_MESSAGES/libgsasl.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/libgsasl.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/gsasl.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/libgsasl.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/libgsasl.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gsasl.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/reference
 %%PORTDOCS%%@dirrm %%DOCSDIR%%