From 8934fbcf20ec0e640b66cc43e6119d8c7d6925f2 Mon Sep 17 00:00:00 2001 From: brnrd Date: Wed, 4 Apr 2018 07:15:38 +0000 Subject: [PATCH] www/nextcloud: Chase change of /apps path - WWWDIR/apps to WWWDIR/apps-pkg - Bump portrevision to force reinstall - Update Nextcloud version dependencies PR: 227133 --- mail/nextcloud-mail/Makefile | 5 +++-- security/nextcloud-passman/Makefile | 3 ++- security/nextcloud-twofactor_totp/Makefile | 5 +++-- security/nextcloud-twofactor_u2f/Makefile | 5 +++-- www/nextcloud-calendar/Makefile | 5 +++-- www/nextcloud-contacts/Makefile | 5 +++-- www/nextcloud-notes/Makefile | 3 ++- www/nextcloud-tasks/Makefile | 5 +++-- 8 files changed, 22 insertions(+), 14 deletions(-) diff --git a/mail/nextcloud-mail/Makefile b/mail/nextcloud-mail/Makefile index 15ea970bb96f2..1c770483e9098 100644 --- a/mail/nextcloud-mail/Makefile +++ b/mail/nextcloud-mail/Makefile @@ -3,6 +3,7 @@ PORTNAME= mail PORTVERSION= 0.7.10 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= mail MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ @@ -15,7 +16,7 @@ COMMENT= Mail app for Nextcloud LICENSE= AGPLv3 -RUN_DEPENDS= nextcloud>=12:www/nextcloud +RUN_DEPENDS= nextcloud>=13:www/nextcloud USES= gettext php USE_PHP= imap @@ -29,7 +30,7 @@ NEXTCLOUD_GROUPNAME?= ${WWWGRP} PLIST_SUB= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME} -WWWDIR= ${PREFIX}/www/nextcloud/apps/${PORTNAME} +WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/security/nextcloud-passman/Makefile b/security/nextcloud-passman/Makefile index 051d11f6bad28..082f0a796d7f7 100644 --- a/security/nextcloud-passman/Makefile +++ b/security/nextcloud-passman/Makefile @@ -3,6 +3,7 @@ PORTNAME= passman PORTVERSION= 2.1.4 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://releases.passman.cc/ PKGNAMEPREFIX= nextcloud- @@ -22,7 +23,7 @@ USES= php NO_BUILD= yes NO_ARCH= yes -WWWDIR= ${PREFIX}/www/nextcloud/apps/${PORTNAME} +WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/security/nextcloud-twofactor_totp/Makefile b/security/nextcloud-twofactor_totp/Makefile index 5276b21e99af3..30ad80acead04 100644 --- a/security/nextcloud-twofactor_totp/Makefile +++ b/security/nextcloud-twofactor_totp/Makefile @@ -3,6 +3,7 @@ PORTNAME= twofactor_totp PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- @@ -15,7 +16,7 @@ COMMENT= TOTP multi-factor auth app for Nextcloud LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= nextcloud>=12:www/nextcloud +RUN_DEPENDS= nextcloud>=13:www/nextcloud USES= php NO_BUILD= yes @@ -27,7 +28,7 @@ NEXTCLOUD_GROUPNAME?= ${WWWGRP} PLIST_SUB= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME} -WWWDIR= ${PREFIX}/www/nextcloud/apps/${PORTNAME} +WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/security/nextcloud-twofactor_u2f/Makefile b/security/nextcloud-twofactor_u2f/Makefile index d196c0628a4af..dbc60e33808dc 100644 --- a/security/nextcloud-twofactor_u2f/Makefile +++ b/security/nextcloud-twofactor_u2f/Makefile @@ -3,6 +3,7 @@ PORTNAME= twofactor_u2f PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- @@ -15,13 +16,13 @@ COMMENT= U2F multi-factor auth app for Nextcloud LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= nextcloud>=12:www/nextcloud +RUN_DEPENDS= nextcloud>=13.0.1:www/nextcloud USES= php NO_BUILD= yes NO_ARCH= yes -WWWDIR= ${PREFIX}/www/nextcloud/apps/${PORTNAME} +WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/www/nextcloud-calendar/Makefile b/www/nextcloud-calendar/Makefile index d0dc6fc05daaa..a42476832d32b 100644 --- a/www/nextcloud-calendar/Makefile +++ b/www/nextcloud-calendar/Makefile @@ -3,6 +3,7 @@ PORTNAME= calendar PORTVERSION= 1.6.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ @@ -15,7 +16,7 @@ COMMENT= Calendar app for Nextcloud LICENSE= AGPLv3 -RUN_DEPENDS= nextcloud>=12:www/nextcloud +RUN_DEPENDS= nextcloud>=13:www/nextcloud USES= php NO_BUILD= yes @@ -27,7 +28,7 @@ NEXTCLOUD_GROUPNAME?= ${WWWGRP} PLIST_SUB= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME} -WWWDIR= ${PREFIX}/www/nextcloud/apps/${PORTNAME} +WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/www/nextcloud-contacts/Makefile b/www/nextcloud-contacts/Makefile index b9245e40568ef..032ca073425ab 100644 --- a/www/nextcloud-contacts/Makefile +++ b/www/nextcloud-contacts/Makefile @@ -3,6 +3,7 @@ PORTNAME= contacts PORTVERSION= 2.1.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ @@ -15,7 +16,7 @@ COMMENT= Contacts app for Nextcloud LICENSE= AGPLv3 -RUN_DEPENDS= nextcloud>=11:www/nextcloud +RUN_DEPENDS= nextcloud>=12:www/nextcloud USES= php NO_BUILD= yes @@ -27,7 +28,7 @@ NEXTCLOUD_GROUPNAME?= ${WWWGRP} PLIST_SUB= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME} -WWWDIR= ${PREFIX}/www/nextcloud/apps/${PORTNAME} +WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/www/nextcloud-notes/Makefile b/www/nextcloud-notes/Makefile index a83ec53d5ffda..b6ac8875e8a07 100644 --- a/www/nextcloud-notes/Makefile +++ b/www/nextcloud-notes/Makefile @@ -3,6 +3,7 @@ PORTNAME= notes PORTVERSION= 2.3.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ @@ -28,7 +29,7 @@ NEXTCLOUD_GROUPNAME?= ${WWWGRP} PLIST_SUB= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME} -WWWDIR= ${PREFIX}/www/nextcloud/apps/${PORTNAME} +WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/www/nextcloud-tasks/Makefile b/www/nextcloud-tasks/Makefile index cea180948bd9f..9f2497e23ba17 100644 --- a/www/nextcloud-tasks/Makefile +++ b/www/nextcloud-tasks/Makefile @@ -3,6 +3,7 @@ PORTNAME= tasks PORTVERSION= 0.9.6 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ @@ -16,7 +17,7 @@ COMMENT= Tasks app for Nextcloud LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= nextcloud>=10:www/nextcloud +RUN_DEPENDS= nextcloud>=12:www/nextcloud USES= php NO_BUILD= yes @@ -28,7 +29,7 @@ NEXTCLOUD_GROUPNAME?= ${WWWGRP} PLIST_SUB= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME} -WWWDIR= ${PREFIX}/www/nextcloud/apps/${PORTNAME} +WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install: ${MKDIR} ${STAGEDIR}${WWWDIR}