diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile index fc85459c92d2..ce3d8779f955 100644 --- a/www/nextcloud/Makefile +++ b/www/nextcloud/Makefile @@ -1,77 +1,85 @@ PORTNAME= nextcloud -PORTVERSION= 21.0.3 +PORTVERSION= 22.0.0 CATEGORIES= www MASTER_SITES= https://download.nextcloud.com/server/releases/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} +DIST_SUBDIR= ${PORTNAME} MAINTAINER= brnrd@FreeBSD.org COMMENT= Personal cloud which runs on your own server LICENSE= AGPLv3 USES= cpe gettext-runtime php:flavors,web tar:bzip2 USE_PHP= bcmath bz2 ctype curl dom fileinfo filter gd gmp hash iconv \ json mbstring pcntl pdo posix session simplexml xml xmlreader \ xmlwriter xsl zip zlib NEXTCLOUD_USERNAME?= ${WWWOWN} NEXTCLOUD_GROUPNAME?= ${WWWGRP} WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes NO_ARCH= yes -SUB_FILES= config.sample.php pkg-message -PLIST_SUB= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ +SUB_FILES= config.sample.php pkg-message plist.post +SUB_LIST= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME} +PLIST_SUB= ${SUB_LIST} OPTIONS_DEFINE= EXIF IMAGICK INTL LDAP PCNTL SMB SSL OPTIONS_GROUP= CACHING OPTIONS_GROUP_CACHING= APCU OPCACHE REDIS OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT= APCU EXIF INTL LDAP MYSQL OPCACHE SSL OPTIONS_SUB= yes APCU_DESC= Local data caching using APCu (recommended) CACHING_DESC= Caching DB_DESC= Database backend(s) EXIF_DESC= Image rotation support IMAGICK_DESC= Thumbnail support (recommended) INTL_DESC= International character support (recommended) OPCACHE_DESC= Enable OPcode caching (recommended) PCNTL_DESC= Long-running process control (recommended) REDIS_DESC= Distributed data caching using Redis APCU_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}APCu>0:devel/pecl-APCu@${PHP_FLAVOR} EXIF_USE= PHP=exif IMAGICK_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR} INTL_USE= PHP=intl LDAP_USE= PHP=ldap MYSQL_USE= PHP=pdo_mysql OPCACHE_USE= PHP=opcache PCNTL_USE= PHP=pcntl PGSQL_USE= PHP=pdo_pgsql,pgsql REDIS_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}redis>=2.2.6:databases/pecl-redis@${PHP_FLAVOR} SMB_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}smbclient>=0.9.0:net/pecl-smbclient@${PHP_FLAVOR} SQLITE_USE= PHP=pdo_sqlite,sqlite3 SSL_USE= PHP=openssl post-extract: @${MV} ${WRKSRC}/config/config.sample.php ${WRKSRC}/config/config.documented.php + @${MV} ${WRKSRC}/.htaccess ${WRKSRC}/.htaccess.dist post-patch: @${REINPLACE_CMD} -e 's|/var/www/${PORTNAME}|${WWWDIR}|;s|/var/log/|/var/log/${PORTNAME}/|' \ ${WRKSRC}/config/config.documented.php - @${RM} ${WRKSRC}/config/config.documented.php.* + @${RM} ${WRKSRC}/config/config.documented.php.* \ + ${WRKSRC}/updater/updater.phar @${MV} ${WRKSRC}/apps ${WRKSRC}/apps-pkg do-install: @${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} - ${INSTALL_SCRIPT} ${WRKDIR}/config.sample.php ${STAGEDIR}${WWWDIR}/config/config.sample.php - @${RM} ${STAGEDIR}${WWWDIR}/updater/updater.phar - @${MKDIR} ${STAGEDIR}${WWWDIR}/data - @${MKDIR} ${STAGEDIR}${WWWDIR}/apps - @${MKDIR} ${STAGEDIR}/var/log/${PORTNAME} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) + ${INSTALL_SCRIPT} ${WRKDIR}/config.sample.php \ + ${STAGEDIR}${WWWDIR}/config/config.sample.php + @${MKDIR} ${STAGEDIR}${WWWDIR}/data ${STAGEDIR}${WWWDIR}/apps \ + ${STAGEDIR}/var/log/${PORTNAME} + (cd ${WRKSRC}; ${FIND} . -type f) | ${SORT} | \ + ${SED} -Ee '/^\.\/\.(htaccess\.dist|user\.ini)/d' \ + -e '/^\.\/config\/config\.sample\.php/d' \ + -e 's,^\.,${WWWDIR_REL},' >> ${TMPPLIST} + ${CAT} ${WRKDIR}/plist.post >> ${TMPPLIST} .include diff --git a/www/nextcloud/distinfo b/www/nextcloud/distinfo index d871cf55b529..fe0226763750 100644 --- a/www/nextcloud/distinfo +++ b/www/nextcloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625397573 -SHA256 (nextcloud-21.0.3.tar.bz2) = 8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee -SIZE (nextcloud-21.0.3.tar.bz2) = 129433656 +TIMESTAMP = 1625571276 +SHA256 (nextcloud/nextcloud-22.0.0.tar.bz2) = 3911d3754c37aca7c9b5f3b2b37513c0f2b5bb979af00816c1117b1eedbc5d7a +SIZE (nextcloud/nextcloud-22.0.0.tar.bz2) = 144386509 diff --git a/www/nextcloud/files/pkg-message.in b/www/nextcloud/files/pkg-message.in index b7c467e290cf..1e835e22317f 100644 --- a/www/nextcloud/files/pkg-message.in +++ b/www/nextcloud/files/pkg-message.in @@ -1,43 +1,49 @@ [ { type: install message: < AllowOverride All Require all granted And restart Apache. Nextcloud will start the bundled installer on first access. Once the bundled installer finishes, further configuration can be done via 'Settings', 'Administration'. Additional configuration options are available in %%WWWDIR%%/config/config.php You can find annotated configuration options in config.documented.php in the same directory. Nextcloud's configuration documentation is at - https://docs.nextcloud.com/server/18/admin_manual/configuration_server + https://docs.nextcloud.com/server/stable/admin_manual/configuration_server The caching options require additional Nextcloud configuration. EOM } { type: upgrade message: <