From nobody Wed Jul 19 11:09:22 2023 X-Original-To: dev-commits-ports-all@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 4R5Y425Y4Jz4ns10; Wed, 19 Jul 2023 11:09:22 +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 4R5Y424C9dz3Llf; Wed, 19 Jul 2023 11:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689764962; 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=2k3LJHaLL0rpPnaSbPPh7Cz8hhmyMHW8zegWyuVnC6Q=; b=KgDYajeeTZYk2TrDCgieGjzm+iv/MKtriCh7JyeMNJAo72fNeXb+W55iA19BuGR06FjhF/ KPItaThMy/cQrtLkn1Mxx06BJBuCuY4sbxYs7RZl26ijuY9b0LUG80uTrBWVde+f8TaDRN dSY55v+d9qCQTERFtTsqMb6pVQvj4yKj8SJkcMDSHObwiVHbpZ5hmv+FrPtmhHNBOxOXtn huMQtX8ndEolskE8WL35geRQb5Gty9pBzEK3p3kDsSZgllNhsO2zxoQuMEnLkLgcR6hcKx zjEAV097Qna8p4ZGA23lmSHinP0HlAfyxGN61MAudzR1j9gqPudiRRjiGCMyXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689764962; 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=2k3LJHaLL0rpPnaSbPPh7Cz8hhmyMHW8zegWyuVnC6Q=; b=UeVKayyciMz+82bEQvZRz85xSpHQ4QzUVFWM74AQi0Y3MLkh4G+iqL8DWWLMp3Rxup9b8+ WOLcOjyGdCqnOtDhfbBRnyBbyh1ZSf+kQiHcdvN+hHtcF/aXaD2viZN+8O7nuVAKmkpEqX LDOiQKL0VxElZTcusv9le55QmyQWdFz/EX08oNE8XMSAW5csueg2qVgpUNA5J7fhD9Zw3R P/s4rtp7YvfmoQbLQSBwkx23HiVvwSMVPY8RTdppZkDqwxuTurmoc4pKgeG+FDaOcXG0fH O1av1UGKjTOFFnLDt0sfgRwtpfITn7f9qCbgHPB/66dZo8+rk1pErKjkjexmjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689764962; a=rsa-sha256; cv=none; b=yUBkP2g488GA4cVN8czu4hO0q8CijCnrUKCZOcEKKSDXz9m90+6sOXowxzSRbt8m3RxfVy JuysL+LBcJ0yFHbkYvud5j+pMx0gPKUlR+XIuJHguXhix0Dib2tzzctq4LUeL6j+is2JQQ NiL0UoA47LLagg/YYuSSLznn+vwrejrJwhoHuC9rQS/coGlODxrDNn5nFa/a3k6keVCa/w f8NBgmHHI6KtVkQUjCgZF1xh79tRjJxiZc/tsdptLVc4nKwvc35n1HYuUJB4LXAFidCx2D Xng0nujJWCehsuGyyD7+WAmPY4vFutKd1SbpudsRC6df+qnFmZEge+ZpvbLjlQ== 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 4R5Y423GxRzlKK; Wed, 19 Jul 2023 11:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36JB9MD6087071; Wed, 19 Jul 2023 11:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36JB9MUj087070; Wed, 19 Jul 2023 11:09:22 GMT (envelope-from git) Date: Wed, 19 Jul 2023 11:09:22 GMT Message-Id: <202307191109.36JB9MUj087070@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: b8e72f7c3104 - main - graphics/pecl-imagick: Convert to USES=magick List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8e72f7c31046aee0be12553dd1fffde7706ffde Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8e72f7c31046aee0be12553dd1fffde7706ffde commit b8e72f7c31046aee0be12553dd1fffde7706ffde Author: Miroslav Lachman <000.fbsd@quip.cz> AuthorDate: 2023-07-04 20:53:00 +0000 Commit: Felix Palmen CommitDate: 2023-07-19 11:05:15 +0000 graphics/pecl-imagick: Convert to USES=magick This will build it with whatever ImageMagick version is set in DEFAULT_VERSIONS, so it obsoletes the -im7 slave port. Remove it and document in MOVED. PR: 268833 --- MOVED | 1 + graphics/Makefile | 1 - graphics/pecl-imagick-im7/Makefile | 17 ----------------- graphics/pecl-imagick/Makefile | 13 +++---------- 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/MOVED b/MOVED index c10f42c670bb..5190c15456d9 100644 --- a/MOVED +++ b/MOVED @@ -7775,3 +7775,4 @@ japanese/kterm||2023-07-12|Has expired: Last upstream release was in 2011 graphics/gmic-qt@krita|graphics/krita-gmic-plugin|2023-07-14|Forked to a seperate project devel/capstone5|devel/capstone|2023-07-15|Keep the latest version without any pkgnamesufix games/naev-data||2023-07-15|Remove obsoleted port. Now games/naev installs data files +graphics/pecl-imagick-im7|graphics/pecl-imagick|2023-07-19|Merged into master port diff --git a/graphics/Makefile b/graphics/Makefile index 7a5011259ce2..8b052478eabf 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -763,7 +763,6 @@ SUBDIR += pear-Image_GraphViz SUBDIR += pear-Image_Transform SUBDIR += pecl-imagick - SUBDIR += pecl-imagick-im7 SUBDIR += pecl-qrencode SUBDIR += pecl-vips SUBDIR += pencil2d diff --git a/graphics/pecl-imagick-im7/Makefile b/graphics/pecl-imagick-im7/Makefile deleted file mode 100644 index 1fa2f32f9fe5..000000000000 --- a/graphics/pecl-imagick-im7/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -PORTREVISION= 2 - -PKGNAMESUFFIX= -im7 - -MAINTAINER= 000.fbsd@quip.cz -COMMENT= PHP wrapper to the ImageMagick/GraphicsMagick library version 7 - -LICENSE= PHP301 - -MASTERDIR= ${.CURDIR}/../pecl-imagick - -CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME} - -X11_USES?= magick:7 -X11_USES_OFF?= magick:7,nox11 - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile index 886a0b02fc73..c0021457cba7 100644 --- a/graphics/pecl-imagick/Makefile +++ b/graphics/pecl-imagick/Makefile @@ -1,25 +1,18 @@ PORTNAME= imagick PORTVERSION= 3.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= 000.fbsd@quip.cz -COMMENT?= PHP wrapper to the ImageMagick/GraphicsMagick library version 6 +COMMENT?= PHP wrapper to the ImageMagick/GraphicsMagick library WWW= https://pecl.php.net/package/imagick LICENSE= PHP301 -USES= cpe php:pecl localbase +USES= cpe php:pecl localbase magick CPE_VENDOR= php -CONFLICTS_INSTALL?= ${PKGNAMEPREFIX}${PORTNAME}-im7 - -OPTIONS_DEFINE= X11 - -X11_USES?= magick:6 -X11_USES_OFF?= magick:6,nox11 - CONFIGURE_ARGS= --with-imagick=${LOCALBASE} .include