From nobody Wed Mar 08 19:12:13 2023 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 4PX24Y24Fwz3wlV1; Wed, 8 Mar 2023 19:12:13 +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 4PX24Y1blnz40CP; Wed, 8 Mar 2023 19:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678302733; 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=bHP6wVVIvtaKKAigpbHdb8SMHrgnhd+65U2Tdmk3oyk=; b=Qjv6Xsk+KMLYzqNRFrOzFImjBceRoWNRQp2wIgtCIzv5EQ3cs2ucOEU/UAVCYNQrUgLGde tkXdhs0zpXk9Xw4yExncfKj6NyQ8dEBkGYOQedS55IrQIk//G8zLAsAavx1sWKirLMSkFO RqowfwOi+ofeoRVM31DbjQ2AL39kry2Clr0fx/GOgSTjAJgpt0oFN+z0gLeaPIXrnTpHfU Wx65iULza4HcBJONm9u44zUSIUN6a1dLMCI5zsqOO4Efwi+gAnQSvP/exn6qICOKFsbIK7 seSi1pehBJHsi/O9PajRQrycVsg9dV1yvMRqYqSwyRozrTKReA9o0ZhVdJqu+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678302733; 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=bHP6wVVIvtaKKAigpbHdb8SMHrgnhd+65U2Tdmk3oyk=; b=p782BJc2Oy5ShtMsyiOljpzcfHuvluUeftyRA4D2t3ENiD0+bnw39JqFaBHehvb1xkXVTo oEilNG0ESirZ/24sWo8sYFi9I3sxvHncQyBwikgn7jt2NE0t/lk1O9a+k48ALM2MI2VmYE bsacJOLlkuLpNFAwhFx+oJ5XFpE5EotPdyVWr2YXXbRW/5+j5rT+NQCsgdzW/U8tzcmcm3 5u4HTHFO2K2eEfHBoIF/Y92xMT/I7DfNFe+sIQzPXgtqTlHf2MEsxOJPL3lXSLQQ13CHhj Sy1rtO8VNejiRqgiAdQqqe0Pz2D+T8SLtDridA5jtLOe3eRVM34LDhr6esku+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678302733; a=rsa-sha256; cv=none; b=I0UKrbWzjxGpNzuU+9k2cKZDY5Cvggayc/+6cHPPJ91VavizfDN0jT7AC6Q0HnH24WygHU q4bhfequ7xTvEuUdcyvb//AD194d9R0gYhcI40Yiyyiknadzkr+DkvzpLWhOMlw5WVXGOe /TiKvRPdX2owVcn77AFtVlT610FtVBqaUjMAhl8+m5Y/HKU1bqEyV72xKBGyTj5cUHMt7s V8miOgjHfIrohqJ3TjFf85XApOq0z4tsHz+hH5qtbBlN3PV+RaeTr82QkQJjQTVwIsDciu LVaPvGrd1C3brF6YoNsIt9bk1UTiufNk1jWwgAqIIT5RyDt3v0A4g/a3WXQs+A== 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 4PX24Y0hMdzd09; Wed, 8 Mar 2023 19:12:13 +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 328JCD14023368; Wed, 8 Mar 2023 19:12:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328JCDm4023367; Wed, 8 Mar 2023 19:12:13 GMT (envelope-from git) Date: Wed, 8 Mar 2023 19:12:13 GMT Message-Id: <202303081912.328JCDm4023367@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexander Leidinger Subject: git: e620341ed324 - main - www/piwigo: Respect defaults for ImageMagick. 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: netchild X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e620341ed324b82f483adeb371ef26e6a5d1ce8b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=e620341ed324b82f483adeb371ef26e6a5d1ce8b commit e620341ed324b82f483adeb371ef26e6a5d1ce8b Author: Krysztof Stryjek AuthorDate: 2023-03-08 19:09:37 +0000 Commit: Alexander Leidinger CommitDate: 2023-03-08 19:10:47 +0000 www/piwigo: Respect defaults for ImageMagick. --- www/piwigo/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile index c3b175a93c36..1fe8a1577e07 100644 --- a/www/piwigo/Makefile +++ b/www/piwigo/Makefile @@ -1,6 +1,6 @@ PORTNAME= piwigo DISTVERSION= 13.6.0 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} CATEGORIES= www MASTER_SITES= https://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/ @@ -48,11 +48,17 @@ OPT_DESC= Optional dependencies EXIFTOOL_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg -IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR} +IMAGICK_RUN_DEPENDS= ${IMAGEMAGICK_DEPENDS} MEDIAINFO_RUN_DEPENDS= mediainfo:multimedia/mediainfo .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} +.endif + pre-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/