Index: head/mail/nextcloud-mail/Makefile =================================================================== --- head/mail/nextcloud-mail/Makefile +++ head/mail/nextcloud-mail/Makefile @@ -8,6 +8,7 @@ CATEGORIES= mail MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME} DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}/${DISTNAME}-${DISTVERSIONPREFIX}${PORTVERSION} @@ -16,9 +17,9 @@ LICENSE= AGPLv3 -RUN_DEPENDS= nextcloud>=13:www/nextcloud +RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=13:www/nextcloud@${PHP_FLAVOR} -USES= gettext php +USES= gettext php:flavors USE_PHP= imap NO_BUILD= yes Index: head/security/nextcloud-passman/Makefile =================================================================== --- head/security/nextcloud-passman/Makefile +++ head/security/nextcloud-passman/Makefile @@ -7,6 +7,7 @@ CATEGORIES= security MASTER_SITES= https://releases.passman.cc/ PKGNAMEPREFIX= nextcloud- +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= brnrd@freebsd.org @@ -15,11 +16,11 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= nextcloud>=9:www/nextcloud +RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=9:www/nextcloud@${PHP_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME} -USES= php +USES= php:flavors NO_BUILD= yes NO_ARCH= yes Index: head/security/nextcloud-twofactor_totp/Makefile =================================================================== --- head/security/nextcloud-twofactor_totp/Makefile +++ head/security/nextcloud-twofactor_totp/Makefile @@ -7,6 +7,7 @@ CATEGORIES= security MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME} DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}/${DISTNAME}-${DISTVERSIONPREFIX}${PORTVERSION} @@ -16,9 +17,9 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= nextcloud>=13:www/nextcloud +RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=13:www/nextcloud@${PHP_FLAVOR} -USES= php +USES= php:flavors NO_BUILD= yes NO_ARCH= yes Index: head/security/nextcloud-twofactor_u2f/Makefile =================================================================== --- head/security/nextcloud-twofactor_u2f/Makefile +++ head/security/nextcloud-twofactor_u2f/Makefile @@ -7,6 +7,7 @@ CATEGORIES= security MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME} DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}/${DISTNAME}-${DISTVERSIONPREFIX}${PORTVERSION} @@ -16,9 +17,9 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= nextcloud>=13.0.1:www/nextcloud +RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=13.0.1:www/nextcloud@${PHP_FLAVOR} -USES= php +USES= php:flavors NO_BUILD= yes NO_ARCH= yes Index: head/www/nextcloud-calendar/Makefile =================================================================== --- head/www/nextcloud-calendar/Makefile +++ head/www/nextcloud-calendar/Makefile @@ -8,6 +8,7 @@ CATEGORIES= www MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME} DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}/${DISTNAME}-${DISTVERSIONPREFIX}${PORTVERSION} @@ -16,9 +17,9 @@ LICENSE= AGPLv3 -RUN_DEPENDS= nextcloud>=13:www/nextcloud +RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=13:www/nextcloud@${PHP_FLAVOR} -USES= php +USES= php:flavors NO_BUILD= yes NO_ARCH= yes Index: head/www/nextcloud-contacts/Makefile =================================================================== --- head/www/nextcloud-contacts/Makefile +++ head/www/nextcloud-contacts/Makefile @@ -8,6 +8,7 @@ CATEGORIES= www MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME} DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}/${DISTNAME}-${DISTVERSIONPREFIX}${PORTVERSION} @@ -16,9 +17,9 @@ LICENSE= AGPLv3 -RUN_DEPENDS= nextcloud>=12:www/nextcloud +RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=12:www/nextcloud@${PHP_FLAVOR} -USES= php +USES= php:flavors NO_BUILD= yes NO_ARCH= yes Index: head/www/nextcloud-notes/Makefile =================================================================== --- head/www/nextcloud-notes/Makefile +++ head/www/nextcloud-notes/Makefile @@ -8,6 +8,7 @@ CATEGORIES= www MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME} DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}/${DISTNAME}-${DISTVERSIONPREFIX}${PORTVERSION} @@ -17,9 +18,9 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= nextcloud>=9:www/nextcloud +RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=9:www/nextcloud@${PHP_FLAVOR} -USES= php +USES= php:flavors NO_BUILD= yes NO_ARCH= yes Index: head/www/nextcloud-tasks/Makefile =================================================================== --- head/www/nextcloud-tasks/Makefile +++ head/www/nextcloud-tasks/Makefile @@ -8,6 +8,7 @@ CATEGORIES= www MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME} DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}/${DISTNAME}-${DISTVERSIONPREFIX}${PORTVERSION} @@ -17,9 +18,9 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= nextcloud>=12:www/nextcloud +RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=12:www/nextcloud@${PHP_FLAVOR} -USES= php +USES= php:flavors NO_BUILD= yes NO_ARCH= yes Index: head/www/nextcloud/Makefile =================================================================== --- head/www/nextcloud/Makefile +++ head/www/nextcloud/Makefile @@ -3,14 +3,15 @@ PORTNAME= nextcloud DISTVERSION= 13.0.2 CATEGORIES= www -MASTER_SITES= https://download.nextcloud.com/server/prereleases/ +MASTER_SITES= https://download.nextcloud.com/server/releases/ +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} MAINTAINER= brnrd@FreeBSD.org COMMENT= Personal cloud which runs on your own server LICENSE= AGPLv3 -USES= cpe gettext-runtime php:web tar:bzip2 ssl +USES= cpe gettext-runtime php:flavors,web tar:bzip2 ssl USE_PHP= bz2 ctype curl dom fileinfo filter gd hash iconv json \ mbstring pdo posix session simplexml xml xmlreader xmlwriter \ xsl wddx zip zlib