4 files changed, 164 insertions, 21 deletions

diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 3d67fa212281..8ee0d8239b7f 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gsasl
-PORTVERSION=	0.0.8
+PORTVERSION=	0.0.10
 CATEGORIES=	security
 MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/ \
 		${MASTER_SITE_GNU_ALPHA}
@@ -16,24 +16,31 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU SASL Library
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext \
-		ntlm.0:${PORTSDIR}/security/libntlm \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		idn.12:${PORTSDIR}/devel/libidn \
 		gcrypt.6:${PORTSDIR}/security/libgcrypt \
-		idn.12:${PORTSDIR}/devel/libidn
+		ntlm.0:${PORTSDIR}/security/libntlm \
 
-USE_GNOME=	gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	LDFLAGS="-L${LOCALBASE}/lib"
-
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--disable-gssapi --disable-kerberos_v5
 INSTALLS_SHLIB=	yes
 
 INFO=	gsasl
-MAN1=	gsasl.1
 
-post-install:
-	@(cd ${WRKSRC}/doc/man ; \
-		${LS} *.3 | ${SED} 's,^,man/man3/,' >> ${TMPPLIST})
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc/html && ${FIND} . | \
+		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+.endif
+
+.include "Makefile.man"
+.include <bsd.port.post.mk>
diff --git a/security/gsasl/Makefile.man b/security/gsasl/Makefile.man
new file mode 100644
index 000000000000..33514f99f1cb
--- /dev/null
+++ b/security/gsasl/Makefile.man
@@ -0,0 +1,92 @@
+MAN1+=	gsasl.1
+MAN3+=	gsasl_appinfo_get.3
+MAN3+=	gsasl_appinfo_set.3
+MAN3+=	gsasl_application_data_get.3
+MAN3+=	gsasl_application_data_set.3
+MAN3+=	gsasl_base64_decode.3
+MAN3+=	gsasl_base64_encode.3
+MAN3+=	gsasl_check_version.3
+MAN3+=	gsasl_client_application_data_get.3
+MAN3+=	gsasl_client_application_data_set.3
+MAN3+=	gsasl_client_callback_anonymous_get.3
+MAN3+=	gsasl_client_callback_anonymous_set.3
+MAN3+=	gsasl_client_callback_authentication_id_get.3
+MAN3+=	gsasl_client_callback_authentication_id_set.3
+MAN3+=	gsasl_client_callback_authorization_id_get.3
+MAN3+=	gsasl_client_callback_authorization_id_set.3
+MAN3+=	gsasl_client_callback_maxbuf_get.3
+MAN3+=	gsasl_client_callback_maxbuf_set.3
+MAN3+=	gsasl_client_callback_passcode_get.3
+MAN3+=	gsasl_client_callback_passcode_set.3
+MAN3+=	gsasl_client_callback_password_get.3
+MAN3+=	gsasl_client_callback_password_set.3
+MAN3+=	gsasl_client_callback_pin_get.3
+MAN3+=	gsasl_client_callback_pin_set.3
+MAN3+=	gsasl_client_callback_qop_get.3
+MAN3+=	gsasl_client_callback_qop_set.3
+MAN3+=	gsasl_client_callback_realm_get.3
+MAN3+=	gsasl_client_callback_realm_set.3
+MAN3+=	gsasl_client_callback_service_get.3
+MAN3+=	gsasl_client_callback_service_set.3
+MAN3+=	gsasl_client_ctx_get.3
+MAN3+=	gsasl_client_finish.3
+MAN3+=	gsasl_client_listmech.3
+MAN3+=	gsasl_client_mechlist.3
+MAN3+=	gsasl_client_start.3
+MAN3+=	gsasl_client_step.3
+MAN3+=	gsasl_client_step_base64.3
+MAN3+=	gsasl_client_suggest_mechanism.3
+MAN3+=	gsasl_client_support_p.3
+MAN3+=	gsasl_ctx_get.3
+MAN3+=	gsasl_decode.3
+MAN3+=	gsasl_done.3
+MAN3+=	gsasl_encode.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_randomize.3
+MAN3+=	gsasl_server_application_data_get.3
+MAN3+=	gsasl_server_application_data_set.3
+MAN3+=	gsasl_server_callback_anonymous_get.3
+MAN3+=	gsasl_server_callback_anonymous_set.3
+MAN3+=	gsasl_server_callback_cipher_get.3
+MAN3+=	gsasl_server_callback_cipher_set.3
+MAN3+=	gsasl_server_callback_cram_md5_get.3
+MAN3+=	gsasl_server_callback_cram_md5_set.3
+MAN3+=	gsasl_server_callback_digest_md5_get.3
+MAN3+=	gsasl_server_callback_digest_md5_set.3
+MAN3+=	gsasl_server_callback_external_get.3
+MAN3+=	gsasl_server_callback_external_set.3
+MAN3+=	gsasl_server_callback_gssapi_get.3
+MAN3+=	gsasl_server_callback_gssapi_set.3
+MAN3+=	gsasl_server_callback_maxbuf_get.3
+MAN3+=	gsasl_server_callback_maxbuf_set.3
+MAN3+=	gsasl_server_callback_qop_get.3
+MAN3+=	gsasl_server_callback_qop_set.3
+MAN3+=	gsasl_server_callback_realm_get.3
+MAN3+=	gsasl_server_callback_realm_set.3
+MAN3+=	gsasl_server_callback_retrieve_get.3
+MAN3+=	gsasl_server_callback_retrieve_set.3
+MAN3+=	gsasl_server_callback_securid_get.3
+MAN3+=	gsasl_server_callback_securid_set.3
+MAN3+=	gsasl_server_callback_service_get.3
+MAN3+=	gsasl_server_callback_service_set.3
+MAN3+=	gsasl_server_callback_validate_get.3
+MAN3+=	gsasl_server_callback_validate_set.3
+MAN3+=	gsasl_server_ctx_get.3
+MAN3+=	gsasl_server_finish.3
+MAN3+=	gsasl_server_listmech.3
+MAN3+=	gsasl_server_mechlist.3
+MAN3+=	gsasl_server_start.3
+MAN3+=	gsasl_server_step.3
+MAN3+=	gsasl_server_step_base64.3
+MAN3+=	gsasl_server_suggest_mechanism.3
+MAN3+=	gsasl_server_support_p.3
+MAN3+=	gsasl_step.3
+MAN3+=	gsasl_step64.3
+MAN3+=	gsasl_strerror.3
+MAN3+=	gsasl_stringprep_nfkc.3
+MAN3+=	gsasl_stringprep_saslprep.3
+MAN3+=	gsasl_stringprep_trace.3
diff --git a/security/gsasl/distinfo b/security/gsasl/distinfo
index b27de979561b..4613215e3ce5 100644
--- a/security/gsasl/distinfo
+++ b/security/gsasl/distinfo
@@ -1 +1 @@
-MD5 (gsasl-0.0.8.tar.gz) = eae923fe86e38e4822f6d9e2459fe7de
+MD5 (gsasl-0.0.10.tar.gz) = 82cbcdb210e911f77ae82cf91ceee088
diff --git a/security/gsasl/pkg-plist b/security/gsasl/pkg-plist
index dd9a98da69c8..0a89a74e7e22 100644
--- a/security/gsasl/pkg-plist
+++ b/security/gsasl/pkg-plist
@@ -2,11 +2,55 @@ bin/gsasl
 include/gsasl.h
 lib/libgsasl.a
 lib/libgsasl.so
-lib/libgsasl.so.4
+lib/libgsasl.so.5
 libdata/pkgconfig/libgsasl.pc
 share/locale/sv/LC_MESSAGES/gsasl.mo
-%%DOCSDIR%%/c4.html
-%%DOCSDIR%%/gsasl-gsasl.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/a2496.html
+%%PORTDOCS%%%%DOCSDIR%%/a2612.html
+%%PORTDOCS%%%%DOCSDIR%%/c1101.html
+%%PORTDOCS%%%%DOCSDIR%%/c1189.html
+%%PORTDOCS%%%%DOCSDIR%%/c14.html
+%%PORTDOCS%%%%DOCSDIR%%/c1704.html
+%%PORTDOCS%%%%DOCSDIR%%/c1837.html
+%%PORTDOCS%%%%DOCSDIR%%/c1990.html
+%%PORTDOCS%%%%DOCSDIR%%/c2197.html
+%%PORTDOCS%%%%DOCSDIR%%/c2440.html
+%%PORTDOCS%%%%DOCSDIR%%/c2450.html
+%%PORTDOCS%%%%DOCSDIR%%/c2455.html
+%%PORTDOCS%%%%DOCSDIR%%/c2465.html
+%%PORTDOCS%%%%DOCSDIR%%/c2468.html
+%%PORTDOCS%%%%DOCSDIR%%/c2474.html
+%%PORTDOCS%%%%DOCSDIR%%/c2479.html
+%%PORTDOCS%%%%DOCSDIR%%/c2483.html
+%%PORTDOCS%%%%DOCSDIR%%/c2487.html
+%%PORTDOCS%%%%DOCSDIR%%/c2492.html
+%%PORTDOCS%%%%DOCSDIR%%/c303.html
+%%PORTDOCS%%%%DOCSDIR%%/c393.html
+%%PORTDOCS%%%%DOCSDIR%%/c427.html
+%%PORTDOCS%%%%DOCSDIR%%/c8.html
+%%PORTDOCS%%%%DOCSDIR%%/i2706.html
+%%PORTDOCS%%%%DOCSDIR%%/i2838.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/x1028.html
+%%PORTDOCS%%%%DOCSDIR%%/x177.html
+%%PORTDOCS%%%%DOCSDIR%%/x193.html
+%%PORTDOCS%%%%DOCSDIR%%/x24.html
+%%PORTDOCS%%%%DOCSDIR%%/x2429.html
+%%PORTDOCS%%%%DOCSDIR%%/x256.html
+%%PORTDOCS%%%%DOCSDIR%%/x2681.html
+%%PORTDOCS%%%%DOCSDIR%%/x274.html
+%%PORTDOCS%%%%DOCSDIR%%/x317.html
+%%PORTDOCS%%%%DOCSDIR%%/x329.html
+%%PORTDOCS%%%%DOCSDIR%%/x347.html
+%%PORTDOCS%%%%DOCSDIR%%/x374.html
+%%PORTDOCS%%%%DOCSDIR%%/x448.html
+%%PORTDOCS%%%%DOCSDIR%%/x46.html
+%%PORTDOCS%%%%DOCSDIR%%/x482.html
+%%PORTDOCS%%%%DOCSDIR%%/x57.html
+%%PORTDOCS%%%%DOCSDIR%%/x571.html
+%%PORTDOCS%%%%DOCSDIR%%/x645.html
+%%PORTDOCS%%%%DOCSDIR%%/x720.html
+%%PORTDOCS%%%%DOCSDIR%%/x836.html
+%%PORTDOCS%%%%DOCSDIR%%/x872.html
+%%PORTDOCS%%%%DOCSDIR%%/x948.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%