diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2022-12-31 17:12:44 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2022-12-31 17:12:44 +0000 |
| commit | 35085067c62abae230c658e25db2c7f926c436ce (patch) | |
| tree | cc3bc58f1e35a2db9c428c8c85b5189218d56cda /www/nextcloud | |
| parent | a0526990ffd575bd48c6dd95bea75bb926943d51 (diff) | |
| download | ports-35085067c62abae230c658e25db2c7f926c436ce.tar.gz ports-35085067c62abae230c658e25db2c7f926c436ce.zip | |
www/nextcloud: use Uses/magick.mk
* Fix for occ
PR: 261557
Reported by: <xavier groumpf org>
Submitted by: Tatsuki Makino <tatsuki_makino hotmail com>
Diffstat (limited to 'www/nextcloud')
| -rw-r--r-- | www/nextcloud/Makefile | 13 | ||||
| -rw-r--r-- | www/nextcloud/files/occ.in | 5 |
2 files changed, 16 insertions, 2 deletions
diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile index 924a487b9815..8c86b6ebb6ee 100644 --- a/www/nextcloud/Makefile +++ b/www/nextcloud/Makefile @@ -1,5 +1,6 @@ PORTNAME= nextcloud PORTVERSION= 25.0.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://download.nextcloud.com/server/releases/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -48,7 +49,7 @@ 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} +IMAGICK_RUN_DEPENDS= ${IMAGEMAGICK_DEPENDS} INTL_USE= PHP=intl LDAP_USE= PHP=ldap MYSQL_USE= PHP=pdo_mysql @@ -60,6 +61,16 @@ SMB_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}smbclient>=0.9.0:net/pecl-smbclient@${PHP_ SQLITE_USE= PHP=pdo_sqlite,sqlite3 SSL_USE= PHP=openssl +.include <bsd.port.options.mk> + +.if !empty(IMAGEMAGICK_DEFAULT:M6) || !empty(IMAGEMAGICK_DEFAULT:M6-*) +IMAGEMAGICK_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR} +.elif !empty(IMAGEMAGICK_DEFAULT:M7) || !empty(IMAGEMAGICK_DEFAULT:M7-*) +IMAGEMAGICK_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick-im7>=2.2.2:graphics/pecl-imagick-im7@${PHP_FLAVOR} +.else +# notreached +.endif + post-extract: @${MV} ${WRKSRC}/config/config.sample.php ${WRKSRC}/config/config.documented.php @${MV} ${WRKSRC}/.htaccess ${WRKSRC}/.htaccess.dist diff --git a/www/nextcloud/files/occ.in b/www/nextcloud/files/occ.in index 6dfbff45eae4..58bb53d1440b 100644 --- a/www/nextcloud/files/occ.in +++ b/www/nextcloud/files/occ.in @@ -9,5 +9,8 @@ for arg in "$@" ; do fi done +( cd %%WWWDIR%% -su -m %%NEXTCLOUD_USERNAME%% -c "%%LOCALBASE%%/bin/php %%WWWDIR%%/occ ${args}" +su -m %%NEXTCLOUD_USERNAME%% -c \ + "%%LOCALBASE%%/bin/php --define apc.enable_cli=1 %%WWWDIR%%/occ ${args}" +) |