From nobody Sun Apr 03 11:30:25 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 602651A5475F; Sun, 3 Apr 2022 11:30:25 +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 4KWWt92JWJz3CMP; Sun, 3 Apr 2022 11:30:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648985425; 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=3t59mHo7MnqFxwBcVPVBNT28SFDABqcbTx6XK1EZlKU=; b=QR1+/wUwX4grMrroSkMNUjvRmPNpqJN/pgIxXCF+6LSBB13rxsTxmHEp3toISQwNkYdfg3 +h+3XHRYRU6iAlL2GSN4XTnnVcF4sSRAlk+T7A3jJnH5zkJMHWGA6x3dmrNXMeVFAy6qRb 5wllchvOsrPitjHbTCYf4HN4N3K/UYNY5Tuy15y3IjyJhLvzER5m9AV7O7ivHXnPYk2uja sxK4Ddio/HZve67lcGB2h+7/KLaALLXBBtP85itsxcbd45HN4wK3zB4LUBzUrTeL25t7r9 r6z7y3TNjUfjAL92oRDAuNKz0hM3Aw4eTnWCJojz7E/vY2HGn0/kWlSMcUj0EQ== 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 2F74B1C815; Sun, 3 Apr 2022 11:30:25 +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 233BUPKb081572; Sun, 3 Apr 2022 11:30:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 233BUPVI081571; Sun, 3 Apr 2022 11:30:25 GMT (envelope-from git) Date: Sun, 3 Apr 2022 11:30:25 GMT Message-Id: <202204031130.233BUPVI081571@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 7de40f7d3b31 - 2022Q2 - graphics/darktable: clean up obsolete CONFLICTS 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 7de40f7d3b31cb1e642aa53b4b38fd3fdeba4bec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648985425; 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=3t59mHo7MnqFxwBcVPVBNT28SFDABqcbTx6XK1EZlKU=; b=BdV72IDrM5tH9zY6D9e6dzQvzoNIKJSic07xfRgT5e0MNykNKwrby4ooDUKQOtlRiBGS2l Yezdtsm4cHr8KAICO7QPhQGEjcme/IjFYH8tkVxwIixNuMGC233rN5PL2da4LmdI4x0nnY 3OcHxJsGUS4QF8mO4YT3VC0VdAi4+fhgNDyWRsQnkAcoGFHRYaXJq0QQ2DFtsxWpA/Bs4C DH4U0MgXNwWOzHy8+cAaQ8TYr9kmemSjmeMKMsiFmM6vMrYuSzCCqZWACRUQq9OkQkKumQ ZUzJJjWX4o5irvwXYF2841fUSJ/ZnjEzMRCRwZHnUOucj/+sZgWSMxqQtB4aFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648985425; a=rsa-sha256; cv=none; b=Q8RGfXSDekvQfGutjrvA5TBWpLQmXPXjx7uHVEFff+2wehkeyoGYp2IRWyCbbphITK2Z44 7GHvVsa4Fdlc72plezy1Pq4by0f3xzver5JZ/JF6+FBCstxbmXQUX/Q43bd8T4ZLYZyEh6 bxeP18bKh4MqK3FtZWzaRS5QFS14o9jp8tZwwZ96q5Nj2KHJkAxP7xl00baICP3h7VRU75 VSgVe1eg1inB6PcZ7rEgbc4S5xeW5bXY3mqqHalRK5EH5shVo6K7Pv6FmYH2GAe093MzoT Y7byV1t5wwklItsAUTfCe9MumBqwVH4l9i9E2nDFFyoj2gRswHaVNj7iZcbF7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=7de40f7d3b31cb1e642aa53b4b38fd3fdeba4bec commit 7de40f7d3b31cb1e642aa53b4b38fd3fdeba4bec Author: Matthias Andree AuthorDate: 2022-04-03 11:29:19 +0000 Commit: Matthias Andree CommitDate: 2022-04-03 11:30:17 +0000 graphics/darktable: clean up obsolete CONFLICTS ...with darktable38, which is no more. Approved by: portmgr (blanket for CONFLICTS) MFH: 2022Q2 (cherry picked from commit 5d4744fe1f00a86dcdf230a12ecd62d64983c45c) --- graphics/darktable/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 688ce82dad68..e21777ab82ba 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -49,9 +49,6 @@ USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_SDL= sdl2 USE_XORG= ice sm x11 xext xrandr -CONFLICTS_BUILD= darktable38 -CONFLICTS_INSTALL= darktable38 - SHEBANG_FILES= tools/*.sh CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1 \