git: 291711eb1c9c - main - security/nextcloud-twofactor_totp: Included in www/nextcloud

The branch main has been updated by brnrd:

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

commit 291711eb1c9c7ddd3e02e64dff1579f4526f719c
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-10-21 12:22:45 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2022-10-21 12:23:52 +0000

    security/nextcloud-twofactor_totp: Included in www/nextcloud
    
     * Nextcloud Hub 3 / 25.0.0 includes the twofactor TOTP provider
---
 MOVED                                       |  1 +
 security/Makefile                           |  1 -
 security/nextcloud-twofactor_totp/Makefile  | 40 -----------------------------
 security/nextcloud-twofactor_totp/distinfo  |  3 ---
 security/nextcloud-twofactor_totp/pkg-descr |  1 -
 5 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/MOVED b/MOVED
index ad34fa9c2c75..b2f7df62044f 100644
--- a/MOVED
+++ b/MOVED
@@ -17604,3 +17604,4 @@ x11-toolkits/libshumate-shortwave|x11-toolkits/libshumate|2022-10-15|No longer u
 misc/orion||2022-10-16|Dead upstream and fails to build with mpv-0.35
 devel/msgpack|devel/msgpack-c|2022-10-16|MsgPack now separates C and C++ versions
 games/arttime|deskutils/arttime|2022-10-18|Moved to a better category
+security/nextcloud-twofactor_totp|www/nextcloud|2022-10-21|Twofactor TOTP provider bundled with Nextcloud 25
diff --git a/security/Makefile b/security/Makefile
index 8fecb015e301..8bd8b76d2f0d 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -360,7 +360,6 @@
     SUBDIR += nextcloud-passman
     SUBDIR += nextcloud-twofactor_admin
     SUBDIR += nextcloud-twofactor_nextcloud_notification
-    SUBDIR += nextcloud-twofactor_totp
     SUBDIR += nextcloud-twofactor_webauthn
     SUBDIR += nflib
     SUBDIR += ngrok
diff --git a/security/nextcloud-twofactor_totp/Makefile b/security/nextcloud-twofactor_totp/Makefile
deleted file mode 100644
index 3c79169a4d81..000000000000
--- a/security/nextcloud-twofactor_totp/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-PORTNAME=	twofactor_totp
-PORTVERSION=	6.4.1
-DISTVERSIONPREFIX=	v
-CATEGORIES=	security
-MASTER_SITES=	https://github.com/${PKGNAMEPREFIX}releases/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
-PKGNAMEPREFIX=	nextcloud-
-PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
-DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}/${DISTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}
-
-MAINTAINER=	brnrd@FreeBSD.org
-COMMENT=	TOTP multi-factor auth app for Nextcloud
-WWW=		https://apps.nextcloud.com/apps/twofactor_totp
-
-LICENSE=	AGPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=21:www/nextcloud@${PHP_FLAVOR}
-
-USES=		php:flavors
-IGNORE_WITH_PHP=	82
-NO_BUILD=	yes
-NO_ARCH=	yes
-
-NEXTCLOUD_USERNAME?=	${WWWOWN}
-NEXTCLOUD_GROUPNAME?=	${WWWGRP}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_SUB=	NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \
-		NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME}
-
-WWWDIR=		${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME}
-
-do-install:
-	${MKDIR} ${STAGEDIR}${WWWDIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
-	(cd ${WRKSRC}; ${FIND} . -not -type d) | ${SORT} | \
-		${SED} -e 's,^\.,${WWWDIR_REL},' >> ${TMPPLIST}
-
-.include <bsd.port.mk>
diff --git a/security/nextcloud-twofactor_totp/distinfo b/security/nextcloud-twofactor_totp/distinfo
deleted file mode 100644
index d1fc18452f96..000000000000
--- a/security/nextcloud-twofactor_totp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1665942656
-SHA256 (nextcloud/twofactor_totp-v6.4.1-v6.4.1/twofactor_totp-v6.4.1.tar.gz) = 59ad8feada69ef92310ac4c6e01e4343cfa24f347bca32818b864305cbfe00e2
-SIZE (nextcloud/twofactor_totp-v6.4.1-v6.4.1/twofactor_totp-v6.4.1.tar.gz) = 1008516
diff --git a/security/nextcloud-twofactor_totp/pkg-descr b/security/nextcloud-twofactor_totp/pkg-descr
deleted file mode 100644
index f70903bd87a8..000000000000
--- a/security/nextcloud-twofactor_totp/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-A Two-Factor-Auth Provider for TOTP (RFC 6238)