From nobody Sat Dec 31 17:16:04 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NkpgS4lCSz2kqLh; Sat, 31 Dec 2022 17:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NkpgS3x1Bz3KLc; Sat, 31 Dec 2022 17:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672506964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tNRAI1ww4z0J/bGg03QlB691iEIN4ihxjW58tnuPAS4=; b=NqN9UxXQeAIqcK7zcqFyHWhHCWaY6zb39VyZ/K05vPAM/t6i4WWZ5DB10snAtgmTyTPf31 hZ+9yoIxhH4zHZIfhRQKLonBxBgRGnsU7PTVvfaXLwZpUByloBY6K5yGSIL2Dw1F1Qxfg0 8Rxqd3S0SJo649T50/OaPCsaJxl99FemjJGeBx+fiLlQcfMM5H7EgDyksYj0b9ij0AOucY O8Aq5YXCalKZIiJWtn+l4RYrV2a9zG+ezpU28b6c+8I141Cqmc/OrBOR0nvyAmRDsg4v13 H7vCJmZSGbmCCCNiMiMbAxFfUHknjFXGXhR9NbYiP8PSX9Dsy4a19h6VkKhAMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672506964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tNRAI1ww4z0J/bGg03QlB691iEIN4ihxjW58tnuPAS4=; b=hxNp2lImpe5hDrecpE0dqGrqRdDtscq0zTAQQOh/S8JQcFhxydsSdfaB+fDy01So5PUOu1 jPouDW1TOndm6ulVa2vmx6tNjH1GHB28sfwSEe9eckVWR/f1SsnB/mfnt/zZMsjqBr0AQB hOxlYUM5OpjVhwHqU47rzrcqpzGFPwSf+PWeAVVkUmgo9p710Py6YpW+PvqMUXXXbE3f34 wqmnkqBO6U1P3HH1w58jhdBL6F2V8NMZ7KWDdQeNTqR2nSmQ/1hZ1My6jmVOnlYe6DdxVg L4sGPZ7jQEbMeHoYxLWhhiFUKBW1Z91PVcjltMtew13DKzQwklf6vqeG/Pb0Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672506964; a=rsa-sha256; cv=none; b=ZI+8WepkRoqHFVLDbtDJl9QGoJQTEhDuTNiLvhX6e8rqsCxBpo9flraHnqoXB/kYOe+q4S LY4jEQe+CaHlx584dsmXBOr+Wvy6UZEKaYOf2DmgEjnKnqsqZs5kc4efW9FAW2Q0d08+Wj Cp343X5v6zP/PkKALPJCCspPLstpOuN1rdE9kxMUZdQ7tZBlf0Ta/w0k4o6KQ7IpQQrLmQ Wm0z3wLH7TYnGQwfwZj27i7I4EwXpQc4ESL+qNGgHFz7nEKb9XsO7wfJIWG11hS7u9XyQA Ck9YmUwygbkLTNNTaW+m5u8wrM00x9hE/FWbudWJgN5yAvWB6XDmAwk4Ri491Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NkpgS2zFNzwqd; Sat, 31 Dec 2022 17:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BVHG4Z1084443; Sat, 31 Dec 2022 17:16:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BVHG4KH084442; Sat, 31 Dec 2022 17:16:04 GMT (envelope-from git) Date: Sat, 31 Dec 2022 17:16:04 GMT Message-Id: <202212311716.2BVHG4KH084442@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 35085067c62a - main - www/nextcloud: use Uses/magick.mk List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35085067c62abae230c658e25db2c7f926c436ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=35085067c62abae230c658e25db2c7f926c436ce commit 35085067c62abae230c658e25db2c7f926c436ce Author: Bernard Spil AuthorDate: 2022-12-31 17:12:44 +0000 Commit: Bernard Spil CommitDate: 2022-12-31 17:12:44 +0000 www/nextcloud: use Uses/magick.mk * Fix for occ PR: 261557 Reported by: Submitted by: Tatsuki Makino --- www/nextcloud/Makefile | 13 ++++++++++++- 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 + +.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}" +)