Index: Mk/Uses/php.mk
===================================================================
--- Mk/Uses/php.mk	(revision 518074)
+++ Mk/Uses/php.mk	(working copy)
@@ -382,7 +382,7 @@
 		sockets spl sqlite3 sysvmsg sysvsem sysvshm \
 		tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib
 # version specific components
-_USE_PHP_VER71=	${_USE_PHP_ALL} interbase recode wddx
+_USE_PHP_VER71=	${_USE_PHP_ALL} interbase recode sodium wddx
 _USE_PHP_VER72=	${_USE_PHP_ALL} interbase recode sodium wddx
 _USE_PHP_VER73=	${_USE_PHP_ALL} interbase recode sodium wddx
 _USE_PHP_VER74=	${_USE_PHP_ALL} ffi sodium
@@ -449,7 +449,11 @@
 snmp_DEPENDS=	net-mgmt/php${PHP_VER}-snmp
 soap_DEPENDS=	net/php${PHP_VER}-soap
 sockets_DEPENDS=net/php${PHP_VER}-sockets
+.    if ${PHP_VER} < 72
+sodium_DEPENDS=	security/pecl-libsodium@${PHP_FLAVOR}
+.    else
 sodium_DEPENDS=	security/php${PHP_VER}-sodium
+.    endif
 sqlite3_DEPENDS=databases/php${PHP_VER}-sqlite3
 sybase_ct_DEPENDS=	databases/php${PHP_VER}-sybase_ct
 sysvmsg_DEPENDS=devel/php${PHP_VER}-sysvmsg
Index: security/pecl-libsodium/Makefile
===================================================================
--- security/pecl-libsodium/Makefile	(revision 518074)
+++ security/pecl-libsodium/Makefile	(working copy)
@@ -1,9 +1,10 @@
 # Created by: Gasol Wu <gasol.wu@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	libsodium
-PORTVERSION=	1.0.7
+PORTNAME=	sodium
+PORTVERSION=	2.0.22
 CATEGORIES=	security
+DISTNAME=	lib${PORTNAME}-${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP wrapper for the Sodium cryptographic library
@@ -12,8 +13,10 @@
 
 LIB_DEPENDS=	libsodium.so:security/libsodium
 
-USES=		php:pecl
+USES=		localbase php:pecl pkgconfig
 
+IGNORE_WITH_PHP=	72 73 74
+
 PORTSCOUT=	limit:^1\.
 
 .include <bsd.port.mk>
Index: security/pecl-libsodium/distinfo
===================================================================
--- security/pecl-libsodium/distinfo	(revision 518074)
+++ security/pecl-libsodium/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548360738
-SHA256 (PECL/libsodium-1.0.7.tgz) = 416af03f284bd56de7d1cf93c777d7dac49a948f859e0d123416beca4d9a6fb1
-SIZE (PECL/libsodium-1.0.7.tgz) = 170352
+TIMESTAMP = 1574348555
+SHA256 (PECL/libsodium-2.0.22.tgz) = c302a8b1527f2b0b08110122191c7363d28479291411c94494619bc313c33b95
+SIZE (PECL/libsodium-2.0.22.tgz) = 28531