3 files changed, 135 insertions, 144 deletions

diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index edd7700730f2..3d0aa0400d15 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -11,48 +11,39 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU SASL Library
 
-LIB_DEPENDS=	idn.17:${PORTSDIR}/dns/libidn \
-		gcrypt:${PORTSDIR}/security/libgcrypt \
-		gnutls.26:${PORTSDIR}/security/gnutls \
-		ntlm.0:${PORTSDIR}/security/libntlm
+LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+		libgnutls.so:${PORTSDIR}/security/gnutls \
+		libntlm.so:${PORTSDIR}/security/libntlm
 
 USES=		charsetfix pathfix perl5 pkgconfig
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-INFO=	gsasl
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+INFO=		gsasl
 
 CPPFLAGS+=	-nostdinc -I/usr/include -I${LOCALBASE}/include
 LDFLAGS+=	-L/usr/lib -L${LOCALBASE}/lib
 
 post-patch:
-.for file in \
-	lib/po/LINGUAS \
-	po/LINGUAS
-	@${REINPLACE_CMD} -e '/^en@/d' ${WRKSRC}/${file}
-.endfor
+	@${REINPLACE_CMD} -e '/^en@/d' \
+		${WRKSRC}/lib/po/LINGUAS ${WRKSRC}/po/LINGUAS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/reference
-	${INSTALL_DATA} ${WRKSRC}/doc/reference/html/* ${DOCSDIR}/reference
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgsasl.so
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/reference
+	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/reference/html/* \
+		${STAGEDIR}${DOCSDIR}/reference
 .endif
 
-.include "Makefile.man"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/gsasl/Makefile.man b/security/gsasl/Makefile.man
deleted file mode 100644
index 9b3bedf722ce..000000000000
--- a/security/gsasl/Makefile.man
+++ /dev/null
@@ -1,116 +0,0 @@
-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_base64_from.3
-MAN3+=	gsasl_base64_to.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
-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_decode_inline.3
-MAN3+=	gsasl_done.3
-MAN3+=	gsasl_encode.3
-MAN3+=	gsasl_encode_inline.3
-MAN3+=	gsasl_finish.3
-MAN3+=	gsasl_free.3
-MAN3+=	gsasl_hmac_md5.3
-MAN3+=	gsasl_hmac_sha1.3
-MAN3+=	gsasl_init.3
-MAN3+=	gsasl_mechanism_name.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_saslprep.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_session_hook_get.3
-MAN3+=	gsasl_session_hook_set.3
-MAN3+=	gsasl_sha1.3
-MAN3+=	gsasl_simple_getpass.3
-MAN3+=	gsasl_step.3
-MAN3+=	gsasl_step64.3
-MAN3+=	gsasl_strerror.3
-MAN3+=	gsasl_strerror_name.3
-MAN3+=	gsasl_stringprep_nfkc.3
-MAN3+=	gsasl_stringprep_saslprep.3
-MAN3+=	gsasl_stringprep_trace.3
diff --git a/security/gsasl/pkg-plist b/security/gsasl/pkg-plist
index 20b2dd29829a..55e3f162874b 100644
--- a/security/gsasl/pkg-plist
+++ b/security/gsasl/pkg-plist
@@ -7,6 +7,122 @@ lib/libgsasl.la
 lib/libgsasl.so
 lib/libgsasl.so.16
 libdata/pkgconfig/libgsasl.pc
+man/man1/gsasl.1.gz
+man/man3/gsasl_appinfo_get.3.gz
+man/man3/gsasl_appinfo_set.3.gz
+man/man3/gsasl_application_data_get.3.gz
+man/man3/gsasl_application_data_set.3.gz
+man/man3/gsasl_base64_decode.3.gz
+man/man3/gsasl_base64_encode.3.gz
+man/man3/gsasl_base64_from.3.gz
+man/man3/gsasl_base64_to.3.gz
+man/man3/gsasl_callback.3.gz
+man/man3/gsasl_callback_hook_get.3.gz
+man/man3/gsasl_callback_hook_set.3.gz
+man/man3/gsasl_callback_set.3.gz
+man/man3/gsasl_check_version.3.gz
+man/man3/gsasl_client_application_data_get.3.gz
+man/man3/gsasl_client_application_data_set.3.gz
+man/man3/gsasl_client_callback_anonymous_get.3.gz
+man/man3/gsasl_client_callback_anonymous_set.3.gz
+man/man3/gsasl_client_callback_authentication_id_get.3.gz
+man/man3/gsasl_client_callback_authentication_id_set.3.gz
+man/man3/gsasl_client_callback_authorization_id_get.3.gz
+man/man3/gsasl_client_callback_authorization_id_set.3.gz
+man/man3/gsasl_client_callback_maxbuf_get.3.gz
+man/man3/gsasl_client_callback_maxbuf_set.3.gz
+man/man3/gsasl_client_callback_passcode_get.3.gz
+man/man3/gsasl_client_callback_passcode_set.3.gz
+man/man3/gsasl_client_callback_password_get.3.gz
+man/man3/gsasl_client_callback_password_set.3.gz
+man/man3/gsasl_client_callback_pin_get.3.gz
+man/man3/gsasl_client_callback_pin_set.3.gz
+man/man3/gsasl_client_callback_qop_get.3.gz
+man/man3/gsasl_client_callback_qop_set.3.gz
+man/man3/gsasl_client_callback_realm_get.3.gz
+man/man3/gsasl_client_callback_realm_set.3.gz
+man/man3/gsasl_client_callback_service_get.3.gz
+man/man3/gsasl_client_callback_service_set.3.gz
+man/man3/gsasl_client_ctx_get.3.gz
+man/man3/gsasl_client_finish.3.gz
+man/man3/gsasl_client_listmech.3.gz
+man/man3/gsasl_client_mechlist.3.gz
+man/man3/gsasl_client_start.3.gz
+man/man3/gsasl_client_step.3.gz
+man/man3/gsasl_client_step_base64.3.gz
+man/man3/gsasl_client_suggest_mechanism.3.gz
+man/man3/gsasl_client_support_p.3.gz
+man/man3/gsasl_ctx_get.3.gz
+man/man3/gsasl_decode.3.gz
+man/man3/gsasl_decode_inline.3.gz
+man/man3/gsasl_done.3.gz
+man/man3/gsasl_encode.3.gz
+man/man3/gsasl_encode_inline.3.gz
+man/man3/gsasl_finish.3.gz
+man/man3/gsasl_free.3.gz
+man/man3/gsasl_hmac_md5.3.gz
+man/man3/gsasl_hmac_sha1.3.gz
+man/man3/gsasl_init.3.gz
+man/man3/gsasl_mechanism_name.3.gz
+man/man3/gsasl_md5.3.gz
+man/man3/gsasl_md5pwd_get_password.3.gz
+man/man3/gsasl_nonce.3.gz
+man/man3/gsasl_property_fast.3.gz
+man/man3/gsasl_property_get.3.gz
+man/man3/gsasl_property_set.3.gz
+man/man3/gsasl_property_set_raw.3.gz
+man/man3/gsasl_random.3.gz
+man/man3/gsasl_randomize.3.gz
+man/man3/gsasl_register.3.gz
+man/man3/gsasl_saslprep.3.gz
+man/man3/gsasl_server_application_data_get.3.gz
+man/man3/gsasl_server_application_data_set.3.gz
+man/man3/gsasl_server_callback_anonymous_get.3.gz
+man/man3/gsasl_server_callback_anonymous_set.3.gz
+man/man3/gsasl_server_callback_cipher_get.3.gz
+man/man3/gsasl_server_callback_cipher_set.3.gz
+man/man3/gsasl_server_callback_cram_md5_get.3.gz
+man/man3/gsasl_server_callback_cram_md5_set.3.gz
+man/man3/gsasl_server_callback_digest_md5_get.3.gz
+man/man3/gsasl_server_callback_digest_md5_set.3.gz
+man/man3/gsasl_server_callback_external_get.3.gz
+man/man3/gsasl_server_callback_external_set.3.gz
+man/man3/gsasl_server_callback_gssapi_get.3.gz
+man/man3/gsasl_server_callback_gssapi_set.3.gz
+man/man3/gsasl_server_callback_maxbuf_get.3.gz
+man/man3/gsasl_server_callback_maxbuf_set.3.gz
+man/man3/gsasl_server_callback_qop_get.3.gz
+man/man3/gsasl_server_callback_qop_set.3.gz
+man/man3/gsasl_server_callback_realm_get.3.gz
+man/man3/gsasl_server_callback_realm_set.3.gz
+man/man3/gsasl_server_callback_retrieve_get.3.gz
+man/man3/gsasl_server_callback_retrieve_set.3.gz
+man/man3/gsasl_server_callback_securid_get.3.gz
+man/man3/gsasl_server_callback_securid_set.3.gz
+man/man3/gsasl_server_callback_service_get.3.gz
+man/man3/gsasl_server_callback_service_set.3.gz
+man/man3/gsasl_server_callback_validate_get.3.gz
+man/man3/gsasl_server_callback_validate_set.3.gz
+man/man3/gsasl_server_ctx_get.3.gz
+man/man3/gsasl_server_finish.3.gz
+man/man3/gsasl_server_listmech.3.gz
+man/man3/gsasl_server_mechlist.3.gz
+man/man3/gsasl_server_start.3.gz
+man/man3/gsasl_server_step.3.gz
+man/man3/gsasl_server_step_base64.3.gz
+man/man3/gsasl_server_suggest_mechanism.3.gz
+man/man3/gsasl_server_support_p.3.gz
+man/man3/gsasl_session_hook_get.3.gz
+man/man3/gsasl_session_hook_set.3.gz
+man/man3/gsasl_sha1.3.gz
+man/man3/gsasl_simple_getpass.3.gz
+man/man3/gsasl_step.3.gz
+man/man3/gsasl_step64.3.gz
+man/man3/gsasl_strerror.3.gz
+man/man3/gsasl_strerror_name.3.gz
+man/man3/gsasl_stringprep_nfkc.3.gz
+man/man3/gsasl_stringprep_saslprep.3.gz
+man/man3/gsasl_stringprep_trace.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/gsasl.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/abstraction.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/api-index-full.html