From nobody Thu May 05 11:29:23 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 757171AC8F78; Thu, 5 May 2022 11:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KvBLD04jZz4cDS; Thu, 5 May 2022 11:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651750164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTX+lgjbt79+Itwsux9mGn9lDySQ9WpMnzxJRXJ/ZHw=; b=Qf1Nf/ohTdywdyATy6jWgZhMg7hjGaC9S9ptGgS0HZ56ETte8evld4jZynaz1T/DH41SGr hGf0D+wXq9EbcZZGyr9q+JtIm8fZLlit2iNHe7/BsJldATLm1fP9CnjexcGY4X58MkEXmL 47L1CnWxT7uaowZ+vgczjsOZj4VCgiaFkaKVY9GCSScfy/n7O+MlaS9Tf+yL4ZCk65nUuh FkgKjOkLdyPPgIZxC46Zf8qKgN0kd7lO2wU8au9vl/WvJ6CTNFLNo1kuNiq4yjXeAt7/9Z AOvaIwGxp27G2P0VAGuKbzWTKWruUoir2RtPN/mP8s8JB8HtfsLvq8OKvGaH5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B9E0267A9; Thu, 5 May 2022 11:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 245BTNkU055067; Thu, 5 May 2022 11:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 245BTNVk055066; Thu, 5 May 2022 11:29:23 GMT (envelope-from git) Date: Thu, 5 May 2022 11:29:23 GMT Message-Id: <202205051129.245BTNVk055066@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: d2ed2b98e264 - main - www/nextcloud: PHP 8.1 compat List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2ed2b98e264a7f2991c1283773f2e63394f3776 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651750164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTX+lgjbt79+Itwsux9mGn9lDySQ9WpMnzxJRXJ/ZHw=; b=tyaRM3Hzl45Y1wdiMUvWCMD1UJNlvyrFNGYAsgby47R0mWfyl3AyxcIyNvs7a8jKlOJt5E Z7H+bTUWo3mV9EZx714pPVRaTkbLithMIJEx0eJ0D+OCL/NQkQJ8UCBhN+1aPm95lNtbQx apfVlbUp9MA06F4en417Tacjaso8f361lo4Ysov6AXjOljt1JaCe6qSxW2BIxoJpv3GMvW KzQddEcckqJUprlUNQYXRdRahjmw/koPPA1+bpMapW6Z+4TMsByncZu0g6KWbBnMN4UFNP d86CswkpSPeHevmRU1uYfKI2ZBJTWaGNXYz22zbyJXu+rYwT3YbBEmVPlw9kpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651750164; a=rsa-sha256; cv=none; b=i8TqQW8HY4PgHkTRhnW+pJ2l2PO4OlDQl8yuxmoTkkbVAG7sYGIMDGwiLZumDVCXrbqXkF lRHLpD8g9you8XaKY23F5i9IzOBHRg56P8u9aS5R7SemIN8jZDTH1ZNj243qUy+yZv1Fso rMqEub5bnkmpdySFgbAauc4LZ1E0MNiYbbdInoojWY8zsEP3rchMzIl1udFbnkX9roekEu 3eYzWG8YQJ2DMs7IuPCq9cJirjmttqLbrtmQuIRLKW9rGPm9t0TtZz2HZ7SVg4FjgBq8fZ jirCond7Rb6Gi6LNTy+hT4Kc5iqbuWi/AvEOKXpq96dl4Y7WuL4boZIzkP9QhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2ed2b98e264a7f2991c1283773f2e63394f3776 commit d2ed2b98e264a7f2991c1283773f2e63394f3776 Author: Bernard Spil AuthorDate: 2022-05-05 11:28:07 +0000 Commit: Bernard Spil CommitDate: 2022-05-05 11:28:07 +0000 www/nextcloud: PHP 8.1 compat * Pet portlint * Clean up * Standardize apps DIST_SUBDIR --- finance/nextcloud-cospend/Makefile | 7 ++----- security/nextcloud-end_to_end_encryption/Makefile | 3 +-- security/nextcloud-passman/Makefile | 5 ++--- security/nextcloud-passman/distinfo | 4 ++-- security/nextcloud-twofactor_admin/Makefile | 1 - security/nextcloud-twofactor_nextcloud_notification/Makefile | 10 ++-------- security/nextcloud-twofactor_nextcloud_notification/distinfo | 4 ++-- security/nextcloud-twofactor_u2f/Makefile | 1 - security/nextcloud-twofactor_webauthn/Makefile | 2 +- security/nextcloud-twofactor_webauthn/distinfo | 4 ++-- www/nextcloud-appointments/Makefile | 1 - www/nextcloud-calendar/Makefile | 1 - www/nextcloud-forms/Makefile | 3 +-- www/nextcloud-forms/distinfo | 4 ++-- www/nextcloud-notes/Makefile | 1 - www/nextcloud-tasks/Makefile | 3 +-- 16 files changed, 18 insertions(+), 36 deletions(-) diff --git a/finance/nextcloud-cospend/Makefile b/finance/nextcloud-cospend/Makefile index d3ff44562820..693077df9abe 100644 --- a/finance/nextcloud-cospend/Makefile +++ b/finance/nextcloud-cospend/Makefile @@ -2,16 +2,14 @@ PORTNAME= cospend PORTVERSION= 1.4.6 -DISTVERSIONPREFIX= v CATEGORIES= finance www editors -MASTER_SITES= https://github.com/eneiluj/${PORTNAME}-nc/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ +MASTER_SITES= https://github.com/eneiluj/${PORTNAME}-nc/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} -DISTNAME= ${PORTNAME}-${PORTVERSION} DIST_SUBDIR= nextcloud MAINTAINER= mr@FreeBSD.org -COMMENT= cospend app for Nextcloud +COMMENT= Cospend app for Nextcloud LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING @@ -19,7 +17,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=22:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes diff --git a/security/nextcloud-end_to_end_encryption/Makefile b/security/nextcloud-end_to_end_encryption/Makefile index 7f3d535b05b4..d329cf826475 100644 --- a/security/nextcloud-end_to_end_encryption/Makefile +++ b/security/nextcloud-end_to_end_encryption/Makefile @@ -15,10 +15,9 @@ COMMENT= End-to-End Encryption app for Nextcloud LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=22:www/nextcloud@${PHP_FLAVOR} +RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=23:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes diff --git a/security/nextcloud-passman/Makefile b/security/nextcloud-passman/Makefile index c1608067c38d..dbcac29b0b17 100644 --- a/security/nextcloud-passman/Makefile +++ b/security/nextcloud-passman/Makefile @@ -7,6 +7,7 @@ MASTER_SITES= https://releases.passman.cc/ PKGNAMEPREFIX= nextcloud- PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME}_${PORTVERSION} +DIST_SUBDIR= nextcloud MAINTAINER= brnrd@FreeBSD.org COMMENT= Full featured password manager for Nextcloud @@ -16,13 +17,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=20:www/nextcloud@${PHP_FLAVOR} -WRKSRC= ${WRKDIR}/${PORTNAME} - USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes +WRKSRC= ${WRKDIR}/${PORTNAME} WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: diff --git a/security/nextcloud-passman/distinfo b/security/nextcloud-passman/distinfo index a4f19bde0d85..788dd9212ea7 100644 --- a/security/nextcloud-passman/distinfo +++ b/security/nextcloud-passman/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1639730931 -SHA256 (passman_2.4.0.tar.gz) = 0d436caf9737b0e4bf34d2bc8753138c42034ba5062d53939501673723f76b08 -SIZE (passman_2.4.0.tar.gz) = 1978083 +SHA256 (nextcloud/passman_2.4.0.tar.gz) = 0d436caf9737b0e4bf34d2bc8753138c42034ba5062d53939501673723f76b08 +SIZE (nextcloud/passman_2.4.0.tar.gz) = 1978083 diff --git a/security/nextcloud-twofactor_admin/Makefile b/security/nextcloud-twofactor_admin/Makefile index 01dac1776de4..1a9c44d381d6 100644 --- a/security/nextcloud-twofactor_admin/Makefile +++ b/security/nextcloud-twofactor_admin/Makefile @@ -19,7 +19,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=17:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes diff --git a/security/nextcloud-twofactor_nextcloud_notification/Makefile b/security/nextcloud-twofactor_nextcloud_notification/Makefile index e22fdb2aaca4..f48c9079ebf5 100644 --- a/security/nextcloud-twofactor_nextcloud_notification/Makefile +++ b/security/nextcloud-twofactor_nextcloud_notification/Makefile @@ -7,7 +7,7 @@ CATEGORIES= security MASTER_SITES= https://github.com/nextcloud-releases/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} -WRKSRC= ${WRKDIR}/${PORTNAME} +DIST_SUBDIR= nextcloud MAINTAINER= brnrd@FreeBSD.org COMMENT= Use Nextcloud notification as MFA app for Nextcloud @@ -18,16 +18,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=22:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes -NEXTCLOUD_USERNAME?= ${WWWOWN} -NEXTCLOUD_GROUPNAME?= ${WWWGRP} - -PLIST_SUB= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ - NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME} - +WRKSRC= ${WRKDIR}/${PORTNAME} WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: diff --git a/security/nextcloud-twofactor_nextcloud_notification/distinfo b/security/nextcloud-twofactor_nextcloud_notification/distinfo index bdc191b0ea04..5768db2d5854 100644 --- a/security/nextcloud-twofactor_nextcloud_notification/distinfo +++ b/security/nextcloud-twofactor_nextcloud_notification/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1651225541 -SHA256 (twofactor_nextcloud_notification-v3.4.0.tar.gz) = 7be167036288c90e61a2be5a728b3e0f32d8adc1331d18ad4bd68c638a8c1a1f -SIZE (twofactor_nextcloud_notification-v3.4.0.tar.gz) = 833861 +SHA256 (nextcloud/twofactor_nextcloud_notification-v3.4.0.tar.gz) = 7be167036288c90e61a2be5a728b3e0f32d8adc1331d18ad4bd68c638a8c1a1f +SIZE (nextcloud/twofactor_nextcloud_notification-v3.4.0.tar.gz) = 833861 diff --git a/security/nextcloud-twofactor_u2f/Makefile b/security/nextcloud-twofactor_u2f/Makefile index f93ff9750298..fb94cc12c2cc 100644 --- a/security/nextcloud-twofactor_u2f/Makefile +++ b/security/nextcloud-twofactor_u2f/Makefile @@ -19,7 +19,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=20:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes diff --git a/security/nextcloud-twofactor_webauthn/Makefile b/security/nextcloud-twofactor_webauthn/Makefile index d649f8cb6312..42fa7926819d 100644 --- a/security/nextcloud-twofactor_webauthn/Makefile +++ b/security/nextcloud-twofactor_webauthn/Makefile @@ -5,6 +5,7 @@ CATEGORIES= security MASTER_SITES= https://github.com/nextcloud-releases/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} +DIST_SUBDIR= nextcloud MAINTAINER= brnrd@FreeBSD.org COMMENT= U2F webauthn app for Nextcloud @@ -15,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=21:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/security/nextcloud-twofactor_webauthn/distinfo b/security/nextcloud-twofactor_webauthn/distinfo index fc8162afa36e..59233883eebf 100644 --- a/security/nextcloud-twofactor_webauthn/distinfo +++ b/security/nextcloud-twofactor_webauthn/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1646681059 -SHA256 (twofactor_webauthn-v0.3.1.tar.gz) = 15d8eadf79ad5dcbad1ef79dbd91de04605693d8c8aeb8bf423b9188a4e77ca4 -SIZE (twofactor_webauthn-v0.3.1.tar.gz) = 2920762 +SHA256 (nextcloud/twofactor_webauthn-v0.3.1.tar.gz) = 15d8eadf79ad5dcbad1ef79dbd91de04605693d8c8aeb8bf423b9188a4e77ca4 +SIZE (nextcloud/twofactor_webauthn-v0.3.1.tar.gz) = 2920762 diff --git a/www/nextcloud-appointments/Makefile b/www/nextcloud-appointments/Makefile index f84ecc023d69..c3539fb534fc 100644 --- a/www/nextcloud-appointments/Makefile +++ b/www/nextcloud-appointments/Makefile @@ -19,7 +19,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=21:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes diff --git a/www/nextcloud-calendar/Makefile b/www/nextcloud-calendar/Makefile index cd1dfdefff73..f61e487d7226 100644 --- a/www/nextcloud-calendar/Makefile +++ b/www/nextcloud-calendar/Makefile @@ -17,7 +17,6 @@ LICENSE= AGPLv3 RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=20:www/nextcloud@${PHP_FLAVOR} USES= cpe php:flavors -IGNORE_WITH_PHP=81 WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes diff --git a/www/nextcloud-forms/Makefile b/www/nextcloud-forms/Makefile index c1a2d49e3c53..c5497b8008da 100644 --- a/www/nextcloud-forms/Makefile +++ b/www/nextcloud-forms/Makefile @@ -7,7 +7,7 @@ CATEGORIES= www MASTER_SITES= https://github.com/nextcloud-releases/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} -DIST_SUBDIR= nextcloud/${PORTNAME}-${DISTVERSION} +DIST_SUBDIR= nextcloud MAINTAINER= brnrd@FreeBSD.org COMMENT= Forms app for Nextcloud @@ -18,7 +18,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=22:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes diff --git a/www/nextcloud-forms/distinfo b/www/nextcloud-forms/distinfo index 3c5dbf49feeb..eb4fdf5e1272 100644 --- a/www/nextcloud-forms/distinfo +++ b/www/nextcloud-forms/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1649510164 -SHA256 (nextcloud/forms-2.5.0/forms-v2.5.0.tar.gz) = aa17dfb88acbe4660d6a5e4545bbcda65721a1cd4745c2e345951b8aba6973ec -SIZE (nextcloud/forms-2.5.0/forms-v2.5.0.tar.gz) = 4621967 +SHA256 (nextcloud/forms-v2.5.0.tar.gz) = aa17dfb88acbe4660d6a5e4545bbcda65721a1cd4745c2e345951b8aba6973ec +SIZE (nextcloud/forms-v2.5.0.tar.gz) = 4621967 diff --git a/www/nextcloud-notes/Makefile b/www/nextcloud-notes/Makefile index 7d23a76030f8..5e6e1e04c3b3 100644 --- a/www/nextcloud-notes/Makefile +++ b/www/nextcloud-notes/Makefile @@ -19,7 +19,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=20:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes diff --git a/www/nextcloud-tasks/Makefile b/www/nextcloud-tasks/Makefile index c9ca5ff2aadb..8abb4f1454c5 100644 --- a/www/nextcloud-tasks/Makefile +++ b/www/nextcloud-tasks/Makefile @@ -2,8 +2,8 @@ PORTNAME= tasks PORTVERSION= 0.14.4 -CATEGORIES= www DISTVERSIONPREFIX= v +CATEGORIES= www MASTER_SITES= https://github.com/nextcloud/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -19,7 +19,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=20:www/nextcloud@${PHP_FLAVOR} USES= php:flavors -IGNORE_WITH_PHP=81 NO_BUILD= yes NO_ARCH= yes