From nobody Thu Dec 1 21:32:03 2022 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 4NNTmh00xdz4jPKQ; Thu, 1 Dec 2022 21:32: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 4NNTmg6h4Bz3h6L; Thu, 1 Dec 2022 21:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669930323; 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=LSsQtWpQIXUfyBo9cueUIsnJ5CD75Eyv4vWHSmEScQM=; b=v+TPL5S5SRCIc1SaBYfbpk+qWg3w2m7wEOSyxofio+k18LNvv8XQbdsx5qhCVDAIUAESup GZA8F1nYr95lnO4A1D6cfcvzdFssKkQER7deTZEt7ci5O9riHeYLzDZv2U+y7a27UjTuGH ixdZcVg/4h5NqrgTU2xi57Wv+wa4X6cB93/nzGictWjtneegAFJAG857vUtFKKVUDD9Q7v KDdfr+GqTcI4QzvV1g3GWpRWAqc1UN7wRjMvDThNMVRYGgZImgPsLx7coW86QifvzcrjGB tpz2zHFZKW4hA3MSyr2UBRJNl943qVy6i21DLmAtso3EKh7G7uFNbeO5aezfBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669930323; 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=LSsQtWpQIXUfyBo9cueUIsnJ5CD75Eyv4vWHSmEScQM=; b=urRr2vyQf4nn4HUxIYrkrqCcBS2W2oB/RBPy0RB+pkv5iVbppkaudP59CIBFxM0fIoyUf7 unKEzbWvCUtDEdGnEsurnsRbBH3VlLgVQgO0Tylpk3ToAH/M0/psVmHtMpvJc9f6IDDwdf ezbirArIT1Pd7fAzcfWs0sPGFTnZTom0fjrx7NO2MdKOsptXL1IhZoyij5d918/7tLTe3L +s8dEMeLedPg2Yaj6sTke3dgS7bn3mblTrKiVUhKj3wF/JhHa18205cyqnM5xGwLMItHT8 aJiQbzUuM5deqAZgokYpiqH71Z/kp0cE+1i4Cpx+F6pUY1Uthjlqty2IIhhY5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669930323; a=rsa-sha256; cv=none; b=U03f3sCBTVeb2xp2EOEK+ZPCnMlIluyAwRu6jjXZFgSMZ7DV9M3MM/OCOx2YA7Rk58UapB T+V9c8JgbEm2+jJXJBel7LME7wdaMoa/6YMyyOnx+maVDp5FCIHlAjnh2Oq74oMOOoDF+P Xw0pMcpNINnnaISLRC1yayTyt93zWTgK6WoWuxKR4D4lFnxQ2FCx8I3Qz4kDkOrbzUe3A0 MZC55tVVZJAN3eMmBa9RivPCs7lFe0crVoOCp6bMUSFFgiBRDPgzidJPVYgQPS1qz6Jgue 1oEn3vS8NB5nG4zi9iY3prwO+bBUwU6tYETQNt6I8l2nUhpPwjhBGEudZhLreg== 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 4NNTmg5lxszs2M; Thu, 1 Dec 2022 21:32:03 +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 2B1LW3DW089194; Thu, 1 Dec 2022 21:32:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1LW3gK089193; Thu, 1 Dec 2022 21:32:03 GMT (envelope-from git) Date: Thu, 1 Dec 2022 21:32:03 GMT Message-Id: <202212012132.2B1LW3gK089193@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: b5784a64918e - main - devel/rubygem-kt-paperclip-rails61: Fix build 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5784a64918e9d83b70d7f26126c2f89e9d4aa3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5784a64918e9d83b70d7f26126c2f89e9d4aa3e commit b5784a64918e9d83b70d7f26126c2f89e9d4aa3e Author: Muhammad Moinur Rahman AuthorDate: 2022-12-01 21:30:31 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-12-01 21:30:31 +0000 devel/rubygem-kt-paperclip-rails61: Fix build This conflicts with rails as both installs libwmf and the other one uses the x11 variant. So fix the imagemagick dependency. Sponsored by: Nepustil --- devel/rubygem-kt-paperclip-rails61/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devel/rubygem-kt-paperclip-rails61/Makefile b/devel/rubygem-kt-paperclip-rails61/Makefile index d1c49d8f04d5..74bb6b8ba59d 100644 --- a/devel/rubygem-kt-paperclip-rails61/Makefile +++ b/devel/rubygem-kt-paperclip-rails61/Makefile @@ -1,5 +1,6 @@ PORTNAME= kt-paperclip PORTVERSION= 7.1.1 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails61 @@ -19,7 +20,7 @@ RUN_DEPENDS= rubygem-activemodel61>0:databases/rubygem-activemodel61 \ NO_ARCH= yes USE_RUBY= yes -USES= cpe gem magick:7,nox11,run +USES= cpe gem magick:7,run CPE_VENDOR= thoughtbot .include