Index: head/security/lasso/Makefile
===================================================================
--- head/security/lasso/Makefile	(revision 498732)
+++ head/security/lasso/Makefile	(revision 498733)
@@ -1,65 +1,37 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	lasso
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	security
 MASTER_SITES=	https://dev.entrouvert.org/releases/lasso/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Free Liberty Alliance Implementation
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xmlsec1:security/xmlsec1
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libxmlsec1-openssl.so:security/xmlsec1
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		cpe libtool pathfix pkgconfig ssl
+USES=		cpe gnome libtool pkgconfig python ssl
+USE_GNOME=	glib20 libxml2 libxslt
+USE_LDCONFIG=	yes
+
 CPE_VENDOR=	entrouvert
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-java --with-zlib
-USE_GNOME=	glib20 libxml2
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
+CONFIGURE_ARGS=	--disable-java --disable-php5 --with-zlib
 
-OPTIONS_DEFINE=	PERL PHP PYTHON DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--enable-perl
-PLIST_SUB+=	PERL=""
-USES+=		perl5
-.else
-CONFIGURE_ARGS+=	--disable-perl
-PLIST_SUB+=	PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPHP}
-CONFIGURE_ARGS+=	--enable-php5 \
-		--with-php5-config="${LOCALBASE}/bin/php-config"
-LDFLAGS+=	-L${LOCALBASE}/lib
-LIB_DEPENDS+=	libexpat.so:textproc/expat2
-PLIST_SUB+=	PHP5=""
-USES+=		php:build
-.else
-CONFIGURE_ARGS+=	--disable-php5
-PLIST_SUB+=	PHP5="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=	PYTHON=""
-USES+=		python:2.7
-.else
-USES+=		python:2.7,build
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=	PYTHON="@comment "
-.endif
+OPTIONS_DEFINE=	PERL PYTHON DOCS
+OPTIONS_SUB=	yes
+PERL_CONFIGURE_ENABLE=	perl
+PERL_USES=	perl5
+PYTHON_CONFIGURE_ENABLE=python
 
 post-patch:
 	@${REINPLACE_CMD} -E 's,(xmlsec1-openssl >= 1\.2\.6) openssl,\1,' \
 		${CONFIGURE_WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/security/lasso/distinfo
===================================================================
--- head/security/lasso/distinfo	(revision 498732)
+++ head/security/lasso/distinfo	(revision 498733)
@@ -1,2 +1,3 @@
-SHA256 (lasso-2.4.1.tar.gz) = e485f7643c3438e5efd3c3f28cf7e0c50618b209f044d61c21ff35181d3946cf
-SIZE (lasso-2.4.1.tar.gz) = 4392038
+TIMESTAMP = 1554942657
+SHA256 (lasso-2.6.0.tar.gz) = 146bff7a25166467d960003346cbc3291f3f29067e305cb82ebb12354c7d0acf
+SIZE (lasso-2.6.0.tar.gz) = 4443321
Index: head/security/lasso/files/patch-bindings_perl_Makefile.in
===================================================================
--- head/security/lasso/files/patch-bindings_perl_Makefile.in	(revision 498732)
+++ head/security/lasso/files/patch-bindings_perl_Makefile.in	(revision 498733)
@@ -1,20 +1,20 @@
---- bindings/perl/Makefile.in.orig	2014-12-05 04:41:25 UTC
+--- bindings/perl/Makefile.in.orig	2019-04-11 00:56:24 UTC
 +++ bindings/perl/Makefile.in
-@@ -307,7 +307,7 @@ uudecode = @uudecode@
+@@ -557,7 +557,7 @@ uudecode = @uudecode@
  MAINTAINERCLEANFILES = Makefile.in
  DISTCLEANFILES = __init__.pyc lang.pyc Makefile.perl.old
  CLEANFILES = Lasso.pm Lasso.xs Lasso.so typemap Lasso.o Lasso.bs pm_to_blib Lasso.c
 -LASSO_XS_CFLAGS = -fno-strict-aliasing $(LASSO_CFLAGS) $(LASSO_CORE_CFLAGS) $(PERL_CFLAGS) $(AM_CFLAGS) -Wno-unused-but-set-variable
 +LASSO_XS_CFLAGS = -fno-strict-aliasing $(LASSO_CFLAGS) $(LASSO_CORE_CFLAGS) $(PERL_CFLAGS) $(AM_CFLAGS)
  TESTS_ENVIRONMENT = TOP_SRCDIR=$(top_srcdir)
  TESTS = test.sh
- @PERL_ENABLED_TRUE@INCLUDES = \
-@@ -623,7 +623,7 @@ uninstall-am: uninstall-local
+ @PERL_ENABLED_TRUE@AM_CPPFLAGS = \
+@@ -948,7 +948,7 @@ uninstall-am: uninstall-local
  @PERL_ENABLED_TRUE@		done; \
  @PERL_ENABLED_TRUE@		chmod -R u+rwX $(TOCOPY); \
  @PERL_ENABLED_TRUE@	fi;
--@PERL_ENABLED_TRUE@	$(AM_V_SUBMAKE) $(PERL) Makefile.PL INSTALLDIRS=vendor CCFLAGS="$(LASSO_XS_CFLAGS)" INC="-I. -I$(top_srcdir) -I$(srcdir)" LIBS="`$(top_builddir)/lasso-src-config --libs`" OPTIMIZE="-g" $(AM_V_SUBMAKE_POSTFIX)
+-@PERL_ENABLED_TRUE@	$(AM_V_SUBMAKE) $(PERL) Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) PREFIX=$(prefix) CCFLAGS="$(LASSO_XS_CFLAGS)" INC="-I. -I$(top_srcdir) -I$(srcdir)" LIBS="`$(top_builddir)/lasso-src-config --libs`" OPTIMIZE="-g" $(AM_V_SUBMAKE_POSTFIX)
 +@PERL_ENABLED_TRUE@	$(AM_V_SUBMAKE) $(PERL) Makefile.PL CCFLAGS="$(LASSO_XS_CFLAGS)" INC="-I. -I$(top_srcdir) -I$(srcdir)" LIBS="`$(top_builddir)/lasso-src-config --libs`" OPTIMIZE="-g" $(AM_V_SUBMAKE_POSTFIX)
  
  @PERL_ENABLED_TRUE@Lasso.xs Lasso.pm: lang.py typemap-in typemap-out
  @PERL_ENABLED_TRUE@	$(AM_V_GEN) $(PYTHON) $(top_srcdir)/bindings/bindings.py -l perl --src-dir=$(top_srcdir)/lasso/ $(EXTRA_ARGS)
Index: head/security/lasso/pkg-plist
===================================================================
--- head/security/lasso/pkg-plist	(revision 498732)
+++ head/security/lasso/pkg-plist	(revision 498733)
@@ -1,175 +1,176 @@
 %%PORTDOCS%%%%DOCSDIR%%/book.rst
 %%PORTDOCS%%%%DOCSDIR%%/common-knowledge.rst
 %%PORTDOCS%%%%DOCSDIR%%/getting-lasso.rst
 %%PORTDOCS%%%%DOCSDIR%%/integration.rst
 %%PORTDOCS%%%%DOCSDIR%%/language-bindings.rst
 %%PORTDOCS%%%%DOCSDIR%%/lasso-architecture.rst
 %%PORTDOCS%%%%DOCSDIR%%/liberty-architecture.rst
 %%PORTDOCS%%%%DOCSDIR%%/other-profiles.rst
 %%PORTDOCS%%%%DOCSDIR%%/preface.rst
 %%PORTDOCS%%%%DOCSDIR%%/single-sign-on.rst
 %%PORTDOCS%%%%DOCSDIR%%/writing-a-c-sp.txt
 %%PORTDOCS%%%%DOCSDIR%%/writing-a-java-sp.txt
 %%PORTDOCS%%%%DOCSDIR%%/writing-a-php-sp.txt
 %%PORTDOCS%%%%DOCSDIR%%/writing-a-saml2-php-sp.txt
 %%PERL%%%%SITE_ARCH%%/auto/Lasso/Lasso.so
 %%PERL%%%%SITE_ARCH%%/Lasso.pm
-%%PHP5%%etc/php5/conf.d/lasso.ini
-%%PHP5%%share/php/lasso.php
-%%PHP5%%lib/php/%%PHP_EXT_DIR%%/lasso.a
-%%PHP5%%lib/php/%%PHP_EXT_DIR%%/lasso.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_lasso.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_lasso.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/lasso.py
 include/lasso/backward_comp.h
 include/lasso/ctypes.h
 include/lasso/debug.h
 include/lasso/errors.h
 include/lasso/export.h
 include/lasso/id-ff/defederation.h
 include/lasso/id-ff/federation.h
 include/lasso/id-ff/identity.h
 include/lasso/id-ff/lecp.h
 include/lasso/id-ff/login.h
 include/lasso/id-ff/logout.h
 include/lasso/id-ff/name_identifier_mapping.h
 include/lasso/id-ff/name_registration.h
 include/lasso/id-ff/profile.h
 include/lasso/id-ff/provider.h
 include/lasso/id-ff/server.h
 include/lasso/id-ff/session.h
 include/lasso/key.h
 include/lasso/keyprivate.h
 include/lasso/lasso.h
 include/lasso/lasso_config.h
 include/lasso/logging.h
 include/lasso/registry-private.h
 include/lasso/registry.h
 include/lasso/saml-2.0/assertion_query.h
 include/lasso/saml-2.0/ecp.h
 include/lasso/saml-2.0/name_id_management.h
 include/lasso/saml-2.0/profile.h
 include/lasso/saml-2.0/provider.h
 include/lasso/saml-2.0/saml2_helper.h
 include/lasso/utils.h
 include/lasso/xml/dsig/ds_key_info.h
 include/lasso/xml/dsig/ds_key_value.h
 include/lasso/xml/dsig/ds_rsa_key_value.h
 include/lasso/xml/dsig/ds_x509_data.h
 include/lasso/xml/dsig/strings.h
 include/lasso/xml/dsig/xml_dsig.h
+include/lasso/xml/ecp/ecp_relaystate.h
+include/lasso/xml/ecp/ecp_request.h
+include/lasso/xml/ecp/ecp_response.h
 include/lasso/xml/lib_assertion.h
 include/lasso/xml/lib_authentication_statement.h
 include/lasso/xml/lib_authn_context.h
 include/lasso/xml/lib_authn_request.h
 include/lasso/xml/lib_authn_request_envelope.h
 include/lasso/xml/lib_authn_response.h
 include/lasso/xml/lib_authn_response_envelope.h
 include/lasso/xml/lib_federation_termination_notification.h
 include/lasso/xml/lib_idp_entries.h
 include/lasso/xml/lib_idp_entry.h
 include/lasso/xml/lib_idp_list.h
 include/lasso/xml/lib_logout_request.h
 include/lasso/xml/lib_logout_response.h
 include/lasso/xml/lib_name_identifier_mapping_request.h
 include/lasso/xml/lib_name_identifier_mapping_response.h
 include/lasso/xml/lib_register_name_identifier_request.h
 include/lasso/xml/lib_register_name_identifier_response.h
 include/lasso/xml/lib_request_authn_context.h
 include/lasso/xml/lib_scoping.h
 include/lasso/xml/lib_status_response.h
 include/lasso/xml/lib_subject.h
 include/lasso/xml/misc_text_node.h
+include/lasso/xml/paos_request.h
+include/lasso/xml/paos_response.h
 include/lasso/xml/saml-2.0/saml2_action.h
 include/lasso/xml/saml-2.0/saml2_advice.h
 include/lasso/xml/saml-2.0/saml2_assertion.h
 include/lasso/xml/saml-2.0/saml2_attribute.h
 include/lasso/xml/saml-2.0/saml2_attribute_statement.h
 include/lasso/xml/saml-2.0/saml2_attribute_value.h
 include/lasso/xml/saml-2.0/saml2_audience_restriction.h
 include/lasso/xml/saml-2.0/saml2_authn_context.h
 include/lasso/xml/saml-2.0/saml2_authn_statement.h
 include/lasso/xml/saml-2.0/saml2_authz_decision_statement.h
 include/lasso/xml/saml-2.0/saml2_base_idabstract.h
 include/lasso/xml/saml-2.0/saml2_condition_abstract.h
 include/lasso/xml/saml-2.0/saml2_conditions.h
 include/lasso/xml/saml-2.0/saml2_encrypted_element.h
 include/lasso/xml/saml-2.0/saml2_evidence.h
 include/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h
 include/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h
 include/lasso/xml/saml-2.0/saml2_name_id.h
 include/lasso/xml/saml-2.0/saml2_one_time_use.h
 include/lasso/xml/saml-2.0/saml2_proxy_restriction.h
 include/lasso/xml/saml-2.0/saml2_statement_abstract.h
 include/lasso/xml/saml-2.0/saml2_strings.h
 include/lasso/xml/saml-2.0/saml2_subject.h
 include/lasso/xml/saml-2.0/saml2_subject_confirmation.h
 include/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h
 include/lasso/xml/saml-2.0/saml2_subject_locality.h
 include/lasso/xml/saml-2.0/saml2_xsd.h
 include/lasso/xml/saml-2.0/samlp2_artifact_resolve.h
 include/lasso/xml/saml-2.0/samlp2_artifact_response.h
 include/lasso/xml/saml-2.0/samlp2_assertion_id_request.h
 include/lasso/xml/saml-2.0/samlp2_attribute_query.h
 include/lasso/xml/saml-2.0/samlp2_authn_query.h
 include/lasso/xml/saml-2.0/samlp2_authn_request.h
 include/lasso/xml/saml-2.0/samlp2_authz_decision_query.h
 include/lasso/xml/saml-2.0/samlp2_extensions.h
 include/lasso/xml/saml-2.0/samlp2_idp_entry.h
 include/lasso/xml/saml-2.0/samlp2_idp_list.h
 include/lasso/xml/saml-2.0/samlp2_logout_request.h
 include/lasso/xml/saml-2.0/samlp2_logout_response.h
 include/lasso/xml/saml-2.0/samlp2_manage_name_id_request.h
 include/lasso/xml/saml-2.0/samlp2_manage_name_id_response.h
 include/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.h
 include/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.h
 include/lasso/xml/saml-2.0/samlp2_name_id_policy.h
 include/lasso/xml/saml-2.0/samlp2_request_abstract.h
 include/lasso/xml/saml-2.0/samlp2_requested_authn_context.h
 include/lasso/xml/saml-2.0/samlp2_response.h
 include/lasso/xml/saml-2.0/samlp2_scoping.h
 include/lasso/xml/saml-2.0/samlp2_status.h
 include/lasso/xml/saml-2.0/samlp2_status_code.h
 include/lasso/xml/saml-2.0/samlp2_status_detail.h
 include/lasso/xml/saml-2.0/samlp2_status_response.h
 include/lasso/xml/saml-2.0/samlp2_subject_query_abstract.h
 include/lasso/xml/saml-2.0/samlp2_terminate.h
 include/lasso/xml/saml_advice.h
 include/lasso/xml/saml_assertion.h
 include/lasso/xml/saml_attribute.h
 include/lasso/xml/saml_attribute_designator.h
 include/lasso/xml/saml_attribute_statement.h
 include/lasso/xml/saml_attribute_value.h
 include/lasso/xml/saml_audience_restriction_condition.h
 include/lasso/xml/saml_authentication_statement.h
 include/lasso/xml/saml_authority_binding.h
 include/lasso/xml/saml_condition_abstract.h
 include/lasso/xml/saml_conditions.h
 include/lasso/xml/saml_name_identifier.h
 include/lasso/xml/saml_statement_abstract.h
 include/lasso/xml/saml_subject.h
 include/lasso/xml/saml_subject_confirmation.h
 include/lasso/xml/saml_subject_locality.h
 include/lasso/xml/saml_subject_statement.h
 include/lasso/xml/saml_subject_statement_abstract.h
 include/lasso/xml/samlp_request.h
 include/lasso/xml/samlp_request_abstract.h
 include/lasso/xml/samlp_response.h
 include/lasso/xml/samlp_response_abstract.h
 include/lasso/xml/samlp_status.h
 include/lasso/xml/samlp_status_code.h
 include/lasso/xml/soap-1.1/soap_body.h
 include/lasso/xml/soap-1.1/soap_detail.h
 include/lasso/xml/soap-1.1/soap_envelope.h
 include/lasso/xml/soap-1.1/soap_fault.h
 include/lasso/xml/soap-1.1/soap_header.h
 include/lasso/xml/soap-1.1/xml_soap11.h
 include/lasso/xml/strings.h
 include/lasso/xml/tools.h
 include/lasso/xml/xml.h
 include/lasso/xml/xml_enc.h
 lib/liblasso.a
 lib/liblasso.so
 lib/liblasso.so.3
-lib/liblasso.so.3.11.1
+lib/liblasso.so.3.13.0
 libdata/pkgconfig/lasso.pc