svn commit: r468708 - in head: mail/nextcloud-mail security/nextcloud-passman security/nextcloud-twofactor_totp security/nextcloud-twofactor_u2f www/nextcloud www/nextcloud-calendar www/nextcloud-c...

Mon Apr 30 15:43:18 UTC 2018

Author: brnrd
Date: Mon Apr 30 15:43:16 2018
New Revision: 468708
URL: https://svnweb.freebsd.org/changeset/ports/468708

Log:
  www/nextcloud: PHP-flavorize
  
   - Create flavors for all PHP versions
   - Use releases dir (not pre-)
  
  PR:		227510
  Approved by:	mat
  Differential Revision:	https://reviews.freebsd.org/D15235

Modified:
  head/mail/nextcloud-mail/Makefile
  head/security/nextcloud-passman/Makefile
  head/security/nextcloud-twofactor_totp/Makefile
  head/security/nextcloud-twofactor_u2f/Makefile
  head/www/nextcloud-calendar/Makefile
  head/www/nextcloud-contacts/Makefile
  head/www/nextcloud-notes/Makefile
  head/www/nextcloud-tasks/Makefile
  head/www/nextcloud/Makefile

Modified: head/mail/nextcloud-mail/Makefile
==============================================================================

--- head/mail/nextcloud-mail/Makefile	Mon Apr 30 15:42:17 2018	(r468707)
+++ head/mail/nextcloud-mail/Makefile	Mon Apr 30 15:43:16 2018	(r468708)
@@ -8,6 +8,7 @@ DISTVERSIONPREFIX=	v
 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 @@ COMMENT=	Mail app for Nextcloud
 
 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

Modified: head/security/nextcloud-passman/Makefile
==============================================================================
--- head/security/nextcloud-passman/Makefile	Mon Apr 30 15:42:17 2018	(r468707)
+++ head/security/nextcloud-passman/Makefile	Mon Apr 30 15:43:16 2018	(r468708)
@@ -7,6 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://releases.passman.cc/
 PKGNAMEPREFIX=	nextcloud-
+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	brnrd at freebsd.org
@@ -15,11 +16,11 @@ COMMENT=	Full featured password manager for Nextcloud
 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
 

Modified: head/security/nextcloud-twofactor_totp/Makefile
==============================================================================
--- head/security/nextcloud-twofactor_totp/Makefile	Mon Apr 30 15:42:17 2018	(r468707)
+++ head/security/nextcloud-twofactor_totp/Makefile	Mon Apr 30 15:43:16 2018	(r468708)
@@ -7,6 +7,7 @@ PORTREVISION=	1
 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 @@ COMMENT=	TOTP multi-factor auth app for Nextcloud
 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
 

Modified: head/security/nextcloud-twofactor_u2f/Makefile
==============================================================================
--- head/security/nextcloud-twofactor_u2f/Makefile	Mon Apr 30 15:42:17 2018	(r468707)
+++ head/security/nextcloud-twofactor_u2f/Makefile	Mon Apr 30 15:43:16 2018	(r468708)
@@ -7,6 +7,7 @@ PORTREVISION=	1
 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 @@ COMMENT=	U2F multi-factor auth app for Nextcloud
 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
 

Modified: head/www/nextcloud-calendar/Makefile
==============================================================================
--- head/www/nextcloud-calendar/Makefile	Mon Apr 30 15:42:17 2018	(r468707)
+++ head/www/nextcloud-calendar/Makefile	Mon Apr 30 15:43:16 2018	(r468708)
@@ -8,6 +8,7 @@ DISTVERSIONPREFIX=	v
 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 @@ COMMENT=	Calendar app for Nextcloud
 
 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
 

Modified: head/www/nextcloud-contacts/Makefile
==============================================================================
--- head/www/nextcloud-contacts/Makefile	Mon Apr 30 15:42:17 2018	(r468707)
+++ head/www/nextcloud-contacts/Makefile	Mon Apr 30 15:43:16 2018	(r468708)
@@ -8,6 +8,7 @@ DISTVERSIONPREFIX=	v
 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 @@ COMMENT=	Contacts app for Nextcloud
 
 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
 

Modified: head/www/nextcloud-notes/Makefile
==============================================================================
--- head/www/nextcloud-notes/Makefile	Mon Apr 30 15:42:17 2018	(r468707)
+++ head/www/nextcloud-notes/Makefile	Mon Apr 30 15:43:16 2018	(r468708)
@@ -8,6 +8,7 @@ DISTVERSIONPREFIX=	v
 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 @@ COMMENT=	Notes app for Nextcloud
 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
 

Modified: head/www/nextcloud-tasks/Makefile
==============================================================================
--- head/www/nextcloud-tasks/Makefile	Mon Apr 30 15:42:17 2018	(r468707)
+++ head/www/nextcloud-tasks/Makefile	Mon Apr 30 15:43:16 2018	(r468708)
@@ -8,6 +8,7 @@ DISTVERSIONPREFIX=	v
 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 @@ COMMENT=	Tasks app for Nextcloud
 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
 

Modified: head/www/nextcloud/Makefile
==============================================================================
--- head/www/nextcloud/Makefile	Mon Apr 30 15:42:17 2018	(r468707)
+++ head/www/nextcloud/Makefile	Mon Apr 30 15:43:16 2018	(r468708)
@@ -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 at 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
