git: b42e7a0d4f86 - main - security/libgsasl: Update to 2.0.0

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Tue, 21 Jun 2022 20:59:39 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b42e7a0d4f867c70519806553bc58f6fe70a32ea

commit b42e7a0d4f867c70519806553bc58f6fe70a32ea
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-06-21 20:57:59 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-06-21 20:57:59 +0000

    security/libgsasl: Update to 2.0.0
    
    - Bump PORTREVISION of dependent ports for shlib change
    
    Changes:        https://gitlab.com/gsasl/gsasl/-/blob/master/NEWS
---
 mail/anubis/Makefile                          |   2 +-
 mail/libvmime/Makefile                        |   2 +-
 mail/mpop/Makefile                            |   2 +-
 mail/msmtp/Makefile                           |   1 +
 mail/mutt/Makefile                            |   1 +
 net-im/jabberd/Makefile                       |   2 +-
 net/gnu-dico/Makefile                         |   1 +
 security/libgsasl/Makefile                    |   5 +-
 security/libgsasl/distinfo                    |   6 +-
 security/libgsasl/files/patch-Makefile.in     |  16 ++--
 security/libgsasl/files/patch-configure       |  20 ++--
 security/libgsasl/files/patch-doc-Makefile.in |  27 ++----
 security/libgsasl/files/patch-lib-po-LINGUAS  |   8 --
 security/libgsasl/pkg-plist                   | 133 ++++----------------------
 14 files changed, 61 insertions(+), 165 deletions(-)

diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index d8e73d4883f0..a7532d0d1e71 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	anubis
 PORTVERSION=	4.2
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	mail
 MASTER_SITES=	GNU
 
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index 918d634186fa..e715cf674eca 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	libvmime
 PORTVERSION=	0.9.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	mail
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 9e6aade58b6f..32699fb90328 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mpop
 DISTVERSION=	1.4.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://marlam.de/mpop/releases/
 
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 567c8e0342c1..918d39ddaf1a 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	msmtp
 PORTVERSION=	1.8.20
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://marlam.de/msmtp/releases/
 
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 9b3e1531d9c9..94c69d6ca114 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mutt
 DISTVERSION=	2.2.6
+PORTREVISION=	1
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/ \
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 0d10907eea2d..889d4fd30934 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	jabberd
 PORTVERSION=	2.7.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \
 		LOCAL/matthew/${PORTNAME}
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index 53c494c8422c..414cffecfe82 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	dico
 PORTVERSION=	2.10
+PORTREVISION=	1
 CATEGORIES=	net textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu-
diff --git a/security/libgsasl/Makefile b/security/libgsasl/Makefile
index 58f046432b55..6962e7c11fce 100644
--- a/security/libgsasl/Makefile
+++ b/security/libgsasl/Makefile
@@ -1,7 +1,7 @@
 # Created by: ijliao
 
 PORTNAME=	gsasl
-PORTVERSION=	1.10.0
+PORTVERSION=	2.0.0
 CATEGORIES=	security
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	lib
@@ -38,6 +38,9 @@ GSSAPI_NONE_CONFIGURE_ON=	--disable-gssapi
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/lib/gl/.libs/liblgl.a ${STAGEDIR}${PREFIX}/lib
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/reference
 	${INSTALL_DATA} ${WRKSRC}/doc/reference/html/* ${STAGEDIR}${DOCSDIR}/reference
diff --git a/security/libgsasl/distinfo b/security/libgsasl/distinfo
index ffe86769a80f..93cf47ee52dd 100644
--- a/security/libgsasl/distinfo
+++ b/security/libgsasl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609953869
-SHA256 (gsasl-1.10.0.tar.gz) = 85bcbd8ee6095ade7870263a28ebcb8832f541ea7393975494926015c07568d3
-SIZE (gsasl-1.10.0.tar.gz) = 5946076
+TIMESTAMP = 1655829812
+SHA256 (gsasl-2.0.0.tar.gz) = c5a8ae625d06fcada29c4aa89747012e90b24b0c02d7c81d338784066070026e
+SIZE (gsasl-2.0.0.tar.gz) = 3274625
diff --git a/security/libgsasl/files/patch-Makefile.in b/security/libgsasl/files/patch-Makefile.in
index 076c85722f51..ec9305ee0624 100644
--- a/security/libgsasl/files/patch-Makefile.in
+++ b/security/libgsasl/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2021-01-01 16:32:52 UTC
+--- Makefile.in.orig	2022-06-20 15:57:22 UTC
 +++ Makefile.in
-@@ -1580,7 +1580,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -1855,7 +1855,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-gssapi-impl=no
+ ACLOCAL_AMFLAGS = -I m4 -I lib/m4
 -SUBDIRS = lib po gl src examples tests doc gltests
-+SUBDIRS = lib gl examples tests doc gltests # po src
- EXTRA_DIST = cfg.mk maint.mk .clcopying
- ACLOCAL_AMFLAGS = -I m4
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-obsolete --with-gssapi-impl=no
++SUBDIRS = lib doc # po gl src examples tests docests
+ 
+ # git-version-gen
+ EXTRA_DIST = cfg.mk maint.mk build-aux/git2cl m4/gnulib-cache.m4 \
diff --git a/security/libgsasl/files/patch-configure b/security/libgsasl/files/patch-configure
index 2be957361fa1..9459534ea199 100644
--- a/security/libgsasl/files/patch-configure
+++ b/security/libgsasl/files/patch-configure
@@ -1,18 +1,18 @@
---- configure.orig	2021-01-01 16:32:49 UTC
+--- configure.orig	2022-06-20 15:57:21 UTC
 +++ configure
-@@ -50235,7 +50235,7 @@ fi
- subdirs="$subdirs lib"
+@@ -57197,7 +57197,7 @@ fi
+   done
+ fi
  
- 
--ac_config_files="$ac_config_files Makefile doc/Makefile doc/cyclo/Makefile doc/doxygen/Doxyfile doc/reference/Makefile doc/reference/version.xml examples/Makefile examples/openid20/Makefile examples/saml20/Makefile gl/Makefile gltests/Makefile po/Makefile.in src/Makefile tests/Makefile"
-+ac_config_files="$ac_config_files Makefile doc/Makefile doc/cyclo/Makefile doc/doxygen/Doxyfile doc/reference/Makefile doc/reference/version.xml examples/Makefile examples/openid20/Makefile examples/saml20/Makefile gl/Makefile gltests/Makefile tests/Makefile"
+-ac_config_files="$ac_config_files Makefile doc/Makefile doc/cyclo/Makefile doc/doxygen/Doxyfile doc/reference/Makefile doc/reference/version.xml examples/Makefile examples/openid20/Makefile examples/saml20/Makefile gl/Makefile gltests/Makefile lib/Makefile lib/anonymous/Makefile lib/cram-md5/Makefile lib/digest-md5/Makefile lib/external/Makefile lib/gl/Makefile lib/gs2/Makefile lib/gssapi/Makefile lib/libgsasl.pc lib/login/Makefile lib/ntlm/Makefile lib/openid20/Makefile lib/plain/Makefile lib/saml20/Makefile lib/scram/Makefile lib/securid/Makefile lib/src/Makefile lib/src/gsasl-version.h po/Makefile.in src/Makefile tests/Makefile"
++ac_config_files="$ac_config_files Makefile doc/Makefile doc/cyclo/Makefile doc/doxygen/Doxyfile doc/reference/Makefile doc/reference/version.xml examples/Makefile examples/openid20/Makefile examples/saml20/Makefile gl/Makefile gltests/Makefile lib/Makefile lib/anonymous/Makefile lib/cram-md5/Makefile lib/digest-md5/Makefile lib/external/Makefile lib/gl/Makefile lib/gs2/Makefile lib/gssapi/Makefile lib/libgsasl.pc lib/login/Makefile lib/ntlm/Makefile lib/openid20/Makefile lib/plain/Makefile lib/saml20/Makefile lib/scram/Makefile lib/securid/Makefile lib/src/Makefile lib/src/gsasl-version.h tests/Makefile"
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -51417,8 +51417,6 @@ do
-     "examples/saml20/Makefile") CONFIG_FILES="$CONFIG_FILES examples/saml20/Makefile" ;;
-     "gl/Makefile") CONFIG_FILES="$CONFIG_FILES gl/Makefile" ;;
-     "gltests/Makefile") CONFIG_FILES="$CONFIG_FILES gltests/Makefile" ;;
+@@ -58468,8 +58468,6 @@ do
+     "lib/securid/Makefile") CONFIG_FILES="$CONFIG_FILES lib/securid/Makefile" ;;
+     "lib/src/Makefile") CONFIG_FILES="$CONFIG_FILES lib/src/Makefile" ;;
+     "lib/src/gsasl-version.h") CONFIG_FILES="$CONFIG_FILES lib/src/gsasl-version.h" ;;
 -    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 -    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
      "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
diff --git a/security/libgsasl/files/patch-doc-Makefile.in b/security/libgsasl/files/patch-doc-Makefile.in
index 9d37018bf834..b4ac2536ac1e 100644
--- a/security/libgsasl/files/patch-doc-Makefile.in
+++ b/security/libgsasl/files/patch-doc-Makefile.in
@@ -1,34 +1,25 @@
---- doc/Makefile.in.orig	2021-01-01 16:35:59 UTC
+--- doc/Makefile.in.orig	2022-06-20 15:56:39 UTC
 +++ doc/Makefile.in
-@@ -289,13 +289,13 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+@@ -293,13 +293,13 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
  am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
  am__v_texidevnull_0 = > /dev/null
  am__v_texidevnull_1 = 
 -INFO_DEPS = $(srcdir)/gsasl.info
-+INFO_DEPS = 
- TEXINFO_TEX = $(top_srcdir)/lib/build-aux/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/lib/build-aux
++INFO_DEPS =
+ TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
  DVIS = gsasl.dvi
  PDFS = gsasl.pdf
  PSS = gsasl.ps
 -HTMLS = gsasl.html
-+HTMLS = 
++HTMLS =
  TEXINFOS = gsasl.texi
  TEXI2PDF = $(TEXI2DVI) --pdf --batch
  MAKEINFOHTML = $(MAKEINFO) --html
-@@ -1656,7 +1656,7 @@ top_srcdir = @top_srcdir@
- SUBDIRS = cyclo $(am__append_1)
- EXTRA_DIST = gdoc \
- 	gsasl-controlflow.dia gsasl-controlflow2.dia gsasl-abstraction.dia \
--	gsasl.html gsasl.ps gsasl.pdf texinfo.css \
-+	texinfo.css \
- 	doxygen/Doxyfile.in doxygen/gdoc2doxygen
- 
- info_TEXINFOS = gsasl.texi
-@@ -1681,7 +1681,7 @@ TEXI2DVI = texi2dvi $(AM_MAKEINFOFLAGS)
- AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
- 	--no-split --number-sections --css-include=texinfo.css
+@@ -1947,7 +1947,7 @@ AM_MAKEINFOFLAGS = -I $(top_srcdir)/examples \
  
+ TEXI2DVI = texi2dvi $(AM_MAKEINFOFLAGS)
+ AM_MAKEINFOHTMLFLAGS = --no-split $(AM_MAKEINFOFLAGS)
 -dist_man_MANS = gsasl.1 $(gdoc_MANS)
 +dist_man_MANS = $(gdoc_MANS)
  MAINTAINERCLEANFILES = $(dist_man_MANS)
diff --git a/security/libgsasl/files/patch-lib-po-LINGUAS b/security/libgsasl/files/patch-lib-po-LINGUAS
deleted file mode 100644
index 4cb9d080d0da..000000000000
--- a/security/libgsasl/files/patch-lib-po-LINGUAS
+++ /dev/null
@@ -1,8 +0,0 @@
---- lib/po/LINGUAS.orig	2021-01-01 16:43:18 UTC
-+++ lib/po/LINGUAS
-@@ -1,5 +1,3 @@
--en@boldquot
--en@quot
- da
- de
- eo
diff --git a/security/libgsasl/pkg-plist b/security/libgsasl/pkg-plist
index 994bd3c18d5b..ffc8e3828532 100644
--- a/security/libgsasl/pkg-plist
+++ b/security/libgsasl/pkg-plist
@@ -1,17 +1,12 @@
-include/gsasl-compat.h
 include/gsasl-mech.h
+include/gsasl-version.h
 include/gsasl.h
 lib/libgsasl.a
 lib/libgsasl.so
-lib/libgsasl.so.7
-lib/libgsasl.so.7.10.0
+lib/libgsasl.so.18
+lib/libgsasl.so.18.0.0
+lib/liblgl.a
 libdata/pkgconfig/libgsasl.pc
-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
@@ -19,132 +14,64 @@ 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_hash_length.3.gz
 man/man3/gsasl_hex_from.3.gz
 man/man3/gsasl_hex_to.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_md5.3.gz
-man/man3/gsasl_md5pwd_get_password.3.gz
 man/man3/gsasl_mechanism_name.3.gz
+man/man3/gsasl_mechanism_name_p.3.gz
 man/man3/gsasl_nonce.3.gz
 man/man3/gsasl_property_fast.3.gz
+man/man3/gsasl_property_free.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_scram_secrets_from_password.3.gz
 man/man3/gsasl_scram_secrets_from_salted_password.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%%/reference/api-index-0-2-0.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/api-index-0-2-14.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/api-index-0-2-19.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/api-index-0-2-2.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/api-index-0-2-28.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/api-index-0-2-29.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/api-index-0-2-3.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/api-index-1-1.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/api-index-1-10.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/api-index-2-0-0.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/deprecated-api-index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/gsasl-abstraction.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/gsasl-controlflow.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/gsasl-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-gsasl-mech.h.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/gsasl-gsasl-version.h.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/gsasl-gsasl.h.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/gsasl.devhelp2
 %%PORTDOCS%%%%DOCSDIR%%/reference/home.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/ix02.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/ix03.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/ix04.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/ix05.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/ix06.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/ix07.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/ix08.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/ix09.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/left-insensitive.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/left.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/right-insensitive.png
@@ -152,23 +79,3 @@ man/man3/gsasl_stringprep_trace.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/reference/style.css
 %%PORTDOCS%%%%DOCSDIR%%/reference/up-insensitive.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/up.png
-%%NLS%%share/locale/da/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/id/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgsasl.mo