Index: head/security/oath-toolkit/Makefile
===================================================================
--- head/security/oath-toolkit/Makefile	(revision 389670)
+++ head/security/oath-toolkit/Makefile	(revision 389671)
@@ -1,41 +1,40 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	oath-toolkit
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	security
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Library, tools, and PAM module for OATH authentication
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR}
 USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	PSKC DOCS
 OPTIONS_DEFAULT=PSKC
 OPTIONS_SUB=	yes
 
 PSKC_DESC=	Portable Symmetric Key Container (RFC 6030) support
 
 PSKC_CONFIGURE_ENABLE=	pskc
 PSKC_CONFIGURE_ON=	--with-xml-prefix=${LOCALBASE}
 PSKC_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
 			libxmlsec1.so:${PORTSDIR}/security/xmlsec1
 
 DOCS=		AUTHORS ChangeLog NEWS README
 
 PORTDOCS=	*
 
 post-install:
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}/
 .endfor
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}/pam_oath
 	${INSTALL_DATA} ${WRKSRC}/pam_oath/README \
 		${STAGEDIR}/${DOCSDIR}/pam_oath/
 
 .include <bsd.port.mk>
Index: head/security/oath-toolkit/distinfo
===================================================================
--- head/security/oath-toolkit/distinfo	(revision 389670)
+++ head/security/oath-toolkit/distinfo	(revision 389671)
@@ -1,2 +1,2 @@
-SHA256 (oath-toolkit-2.4.1.tar.gz) = 9bfa42cbc100eb6c43d2bf83e3badc51d9e6f4950a92e07513ae586d0c5e9b24
-SIZE (oath-toolkit-2.4.1.tar.gz) = 4136649
+SHA256 (oath-toolkit-2.6.0.tar.gz) = 2346cb8a2fc75ea56934cb9867463001665772308f2d9e7fe487159d38960926
+SIZE (oath-toolkit-2.6.0.tar.gz) = 4235568
Index: head/security/oath-toolkit/pkg-plist
===================================================================
--- head/security/oath-toolkit/pkg-plist	(revision 389670)
+++ head/security/oath-toolkit/pkg-plist	(revision 389671)
@@ -1,160 +1,159 @@
 bin/oathtool
 %%PSKC%%bin/pskctool
 include/liboath/oath.h
 %%PSKC%%include/pskc/container.h
 %%PSKC%%include/pskc/enums.h
 %%PSKC%%include/pskc/errors.h
 %%PSKC%%include/pskc/exports.h
 %%PSKC%%include/pskc/global.h
 %%PSKC%%include/pskc/keypackage.h
 %%PSKC%%include/pskc/pskc.h
 %%PSKC%%include/pskc/version.h
 lib/liboath.a
 lib/liboath.so
 lib/liboath.so.0
 lib/liboath.so.0.1.3
 %%PSKC%%lib/libpskc.a
 %%PSKC%%lib/libpskc.so
 %%PSKC%%lib/libpskc.so.0
 %%PSKC%%lib/libpskc.so.0.0.1
 lib/security/pam_oath.so
 libdata/pkgconfig/liboath.pc
 %%PSKC%%libdata/pkgconfig/libpskc.pc
 man/man1/oathtool.1.gz
 %%PSKC%%man/man1/pskctool.1.gz
 man/man3/oath_authenticate_usersfile.3.gz
 man/man3/oath_base32_decode.3.gz
 man/man3/oath_base32_encode.3.gz
 man/man3/oath_bin2hex.3.gz
 man/man3/oath_check_version.3.gz
 man/man3/oath_done.3.gz
 man/man3/oath_hex2bin.3.gz
 man/man3/oath_hotp_generate.3.gz
 man/man3/oath_hotp_validate.3.gz
 man/man3/oath_hotp_validate_callback.3.gz
 man/man3/oath_init.3.gz
 man/man3/oath_strerror.3.gz
 man/man3/oath_strerror_name.3.gz
 man/man3/oath_totp_generate.3.gz
+man/man3/oath_totp_generate2.3.gz
 man/man3/oath_totp_validate.3.gz
 man/man3/oath_totp_validate2.3.gz
+man/man3/oath_totp_validate4.3.gz
 man/man3/oath_totp_validate2_callback.3.gz
+man/man3/oath_totp_validate4_callback.3.gz
 man/man3/oath_totp_validate3.3.gz
 man/man3/oath_totp_validate3_callback.3.gz
 man/man3/oath_totp_validate_callback.3.gz
 %%PSKC%%man/man3/pskc_add_keypackage.3.gz
 %%PSKC%%man/man3/pskc_build_xml.3.gz
 %%PSKC%%man/man3/pskc_check_version.3.gz
 %%PSKC%%man/man3/pskc_done.3.gz
 %%PSKC%%man/man3/pskc_free.3.gz
 %%PSKC%%man/man3/pskc_get_cryptomodule_id.3.gz
 %%PSKC%%man/man3/pskc_get_device_devicebinding.3.gz
 %%PSKC%%man/man3/pskc_get_device_expirydate.3.gz
 %%PSKC%%man/man3/pskc_get_device_issueno.3.gz
 %%PSKC%%man/man3/pskc_get_device_manufacturer.3.gz
 %%PSKC%%man/man3/pskc_get_device_model.3.gz
 %%PSKC%%man/man3/pskc_get_device_serialno.3.gz
 %%PSKC%%man/man3/pskc_get_device_startdate.3.gz
 %%PSKC%%man/man3/pskc_get_device_userid.3.gz
 %%PSKC%%man/man3/pskc_get_id.3.gz
 %%PSKC%%man/man3/pskc_get_key_algorithm.3.gz
 %%PSKC%%man/man3/pskc_get_key_algparm_chall_checkdigits.3.gz
 %%PSKC%%man/man3/pskc_get_key_algparm_chall_encoding.3.gz
 %%PSKC%%man/man3/pskc_get_key_algparm_chall_max.3.gz
 %%PSKC%%man/man3/pskc_get_key_algparm_chall_min.3.gz
 %%PSKC%%man/man3/pskc_get_key_algparm_resp_checkdigits.3.gz
 %%PSKC%%man/man3/pskc_get_key_algparm_resp_encoding.3.gz
 %%PSKC%%man/man3/pskc_get_key_algparm_resp_length.3.gz
 %%PSKC%%man/man3/pskc_get_key_algparm_suite.3.gz
 %%PSKC%%man/man3/pskc_get_key_data_b64secret.3.gz
 %%PSKC%%man/man3/pskc_get_key_data_counter.3.gz
 %%PSKC%%man/man3/pskc_get_key_data_secret.3.gz
 %%PSKC%%man/man3/pskc_get_key_data_time.3.gz
 %%PSKC%%man/man3/pskc_get_key_data_timedrift.3.gz
 %%PSKC%%man/man3/pskc_get_key_data_timeinterval.3.gz
 %%PSKC%%man/man3/pskc_get_key_friendlyname.3.gz
 %%PSKC%%man/man3/pskc_get_key_id.3.gz
 %%PSKC%%man/man3/pskc_get_key_issuer.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_expirydate.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_keyusages.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_numberoftransactions.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_pinencoding.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_pinkeyid.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_pinmaxfailedattempts.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_pinmaxlength.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_pinminlength.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_pinusagemode.3.gz
 %%PSKC%%man/man3/pskc_get_key_policy_startdate.3.gz
 %%PSKC%%man/man3/pskc_get_key_profileid.3.gz
 %%PSKC%%man/man3/pskc_get_key_reference.3.gz
 %%PSKC%%man/man3/pskc_get_key_userid.3.gz
 %%PSKC%%man/man3/pskc_get_keypackage.3.gz
 %%PSKC%%man/man3/pskc_get_signed_p.3.gz
 %%PSKC%%man/man3/pskc_get_version.3.gz
 %%PSKC%%man/man3/pskc_global_done.3.gz
 %%PSKC%%man/man3/pskc_global_init.3.gz
 %%PSKC%%man/man3/pskc_global_log.3.gz
 %%PSKC%%man/man3/pskc_init.3.gz
 %%PSKC%%man/man3/pskc_keyusage2str.3.gz
 %%PSKC%%man/man3/pskc_output.3.gz
 %%PSKC%%man/man3/pskc_parse_from_memory.3.gz
 %%PSKC%%man/man3/pskc_pinusagemode2str.3.gz
 %%PSKC%%man/man3/pskc_set_cryptomodule_id.3.gz
 %%PSKC%%man/man3/pskc_set_device_devicebinding.3.gz
 %%PSKC%%man/man3/pskc_set_device_expirydate.3.gz
 %%PSKC%%man/man3/pskc_set_device_issueno.3.gz
 %%PSKC%%man/man3/pskc_set_device_manufacturer.3.gz
 %%PSKC%%man/man3/pskc_set_device_model.3.gz
 %%PSKC%%man/man3/pskc_set_device_serialno.3.gz
 %%PSKC%%man/man3/pskc_set_device_startdate.3.gz
 %%PSKC%%man/man3/pskc_set_device_userid.3.gz
 %%PSKC%%man/man3/pskc_set_id.3.gz
 %%PSKC%%man/man3/pskc_set_key_algorithm.3.gz
 %%PSKC%%man/man3/pskc_set_key_algparm_chall_checkdigits.3.gz
 %%PSKC%%man/man3/pskc_set_key_algparm_chall_encoding.3.gz
 %%PSKC%%man/man3/pskc_set_key_algparm_chall_max.3.gz
 %%PSKC%%man/man3/pskc_set_key_algparm_chall_min.3.gz
 %%PSKC%%man/man3/pskc_set_key_algparm_resp_checkdigits.3.gz
 %%PSKC%%man/man3/pskc_set_key_algparm_resp_encoding.3.gz
 %%PSKC%%man/man3/pskc_set_key_algparm_resp_length.3.gz
 %%PSKC%%man/man3/pskc_set_key_algparm_suite.3.gz
 %%PSKC%%man/man3/pskc_set_key_data_b64secret.3.gz
 %%PSKC%%man/man3/pskc_set_key_data_counter.3.gz
 %%PSKC%%man/man3/pskc_set_key_data_secret.3.gz
 %%PSKC%%man/man3/pskc_set_key_data_time.3.gz
 %%PSKC%%man/man3/pskc_set_key_data_timedrift.3.gz
 %%PSKC%%man/man3/pskc_set_key_data_timeinterval.3.gz
 %%PSKC%%man/man3/pskc_set_key_friendlyname.3.gz
 %%PSKC%%man/man3/pskc_set_key_id.3.gz
 %%PSKC%%man/man3/pskc_set_key_issuer.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_expirydate.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_keyusages.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_numberoftransactions.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_pinencoding.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_pinkeyid.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_pinmaxfailedattempts.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_pinmaxlength.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_pinminlength.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_pinusagemode.3.gz
 %%PSKC%%man/man3/pskc_set_key_policy_startdate.3.gz
 %%PSKC%%man/man3/pskc_set_key_profileid.3.gz
 %%PSKC%%man/man3/pskc_set_key_reference.3.gz
 %%PSKC%%man/man3/pskc_set_key_userid.3.gz
 %%PSKC%%man/man3/pskc_set_version.3.gz
 %%PSKC%%man/man3/pskc_sign_x509.3.gz
 %%PSKC%%man/man3/pskc_str2keyusage.3.gz
 %%PSKC%%man/man3/pskc_str2pinusagemode.3.gz
 %%PSKC%%man/man3/pskc_str2valueformat.3.gz
 %%PSKC%%man/man3/pskc_strerror.3.gz
 %%PSKC%%man/man3/pskc_strerror_name.3.gz
 %%PSKC%%man/man3/pskc_validate.3.gz
 %%PSKC%%man/man3/pskc_valueformat2str.3.gz
 %%PSKC%%man/man3/pskc_verify_x509crt.3.gz
 %%PSKC%%share/xml/pskc/catalog-pskc.xml
 %%PSKC%%share/xml/pskc/pskc-schema.xsd
 %%PSKC%%share/xml/pskc/xenc-schema.xsd
 %%PSKC%%share/xml/pskc/xmldsig-core-schema.xsd
-@dirrm include/liboath
-%%PSKC%%@dirrm include/pskc
-@dirrmtry lib/security
-%%PSKC%%@dirrm share/xml/pskc