From nobody Sun Apr 03 11:29:57 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 4501B1A5480E; Sun, 3 Apr 2022 11:29:58 +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 4KWWsf1Pslz3C33; Sun, 3 Apr 2022 11:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648985398; 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=iecnr3b9rom5tmIzIyIZl1DG0jdRcMoBBxKp89ApvtM=; b=MiBHLWExREvXfesmsUqTrfO4X7ipyGvJGeUXzINhXGBu0D07xgqil79pKhKUuJnL2IUqKs xM7mnuEkLE/tpQW3Us7t3lDldEkKf3yeQFmr7KClP9Edv4hwA0nISQ7L9IXeYIvZiom+/a 99M3H4eIczC56O3wbPXPNI/fNJISTR8ATM0wYb9t4KnJNuq+OiVv7giJZ9juuHLLov78D1 S109H+QtSLVI987QHuG3i7eXzYycCGMhnpPBbF3LTqM2CEJpkKI7r4hsR4pExpPGUDvuG1 Tn3QkNCE42xX8oKtd+J9hgGWJj/sGOGiRzHvxVapop8VX3x8REn22Pvkd3DB6g== 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 10E7A1C6A3; Sun, 3 Apr 2022 11:29:58 +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 233BTvSP073158; Sun, 3 Apr 2022 11:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 233BTvjc073157; Sun, 3 Apr 2022 11:29:57 GMT (envelope-from git) Date: Sun, 3 Apr 2022 11:29:57 GMT Message-Id: <202204031129.233BTvjc073157@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 5d4744fe1f00 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5d4744fe1f00a86dcdf230a12ecd62d64983c45c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648985398; 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=iecnr3b9rom5tmIzIyIZl1DG0jdRcMoBBxKp89ApvtM=; b=CtQ+QE7D0LXQ1nvhNVdD9v9SmPbBFL81Dp0qRtKBnmr72T8OpkaRVBNWMrWI6JE9HNly95 pBvLWudiUiId5X+vu3X8CtLPVPXOuHZrJN3zHX6wEwqYmAPli2mWnhViko2xbz9KL6X0Me gTnufJUrDkjayU2Evd45vS+KHWdDgXUfxf6uUrM09xLJB0StsZkDSH1Fjq+yFhQh4LI17w TB3/cu+hTlTI7lOnwNKdc+LnjVbjFTMLJRyjE5oS59N6gAmAOZvkWplbZ36uoEcFZ58y25 4/9GFEpVD56Swj90GvMmXtsExREArvg1D53so1wO/x1A64CaH83DwilEJnXQyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648985398; a=rsa-sha256; cv=none; b=gqRmLj4MgyFN+vIq2F94+B1czLvQuvPyVN6lxiRZ3c2GwBWxH/y9e2vGMcqRq1MA7NcoOO ML0Xj5esaOyIUFrSZ7YYnyYmfvzxb9yNWzsOq7ofcyOmlXg88+myXjP6RHfM2Zb7VNX05g Ism0RtO3mtSEoAar261pwLlGzurj5ApLPMDyxPRB8AsucckI4rFF9aYsYcTvT5tjX2uEm4 PXfeQySer4IkGrGUCVlJRAopazpP4Dw9Ei4vJkgL8Gjx1TQjYhU/6ICtRfZ5xZlPDL5e+c qnO2sRb360tv4sA/FuXJIfR7ZtGW5VaPaMP+TlPZPEbeXTtFF9s8LvYv+vYHAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d4744fe1f00a86dcdf230a12ecd62d64983c45c commit 5d4744fe1f00a86dcdf230a12ecd62d64983c45c Author: Matthias Andree AuthorDate: 2022-04-03 11:29:19 +0000 Commit: Matthias Andree CommitDate: 2022-04-03 11:29:19 +0000 graphics/darktable: clean up obsolete CONFLICTS ...with darktable38, which is no more. Approved by: portmgr (blanket for CONFLICTS) MFH: 2022Q2 --- 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 \