From nobody Thu Feb 09 18:55:29 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 4PCQzk0ytvz3n866; Thu, 9 Feb 2023 18:55:30 +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 4PCQzk0Xpnz3L4v; Thu, 9 Feb 2023 18:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675968930; 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=us/+2Cz6Pw9fwNvEHOPBy8nsjq7kwEM5YnSzF/NYlXo=; b=HVgWB5bwptibxRWXuTjYxAwZ6RwaKPaGxcH9mm8SviumFtVa8B1Q6mGI78c+mtanceBt4B P7zSkWKuqD4q7eU6BHayPQyo4E/3TZjljCR/ZopAmEgFI5FRRlgaaxYK3rL9204I+R3UTA 1bLA847UrLbwukYFx/OahDK9am3rYzCnSmtLdM3jwWm7RYb7cwaMOwO+0tyxpTex3hwyWo B4kzr7nPYNJUZp5THz5zwLnElgAJvlgzqpUlhYn1uGuGyJzs0I6yUSeLBxLAMmMEXbOhJ4 LlBmfvbRk7aezecRmhghYITehC8kICdfI9P4Xal9bKmPyE5tvH7iKlRQYjBpWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675968930; 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=us/+2Cz6Pw9fwNvEHOPBy8nsjq7kwEM5YnSzF/NYlXo=; b=ZzE9KRlBayF8cR5CvgUMe87/R/V3LdK8CVFKTambT+JtnXIiBBlJXMGVET2KlvsdTtA2ns PV7nhftwUPenTLBDJfJ7S6cs7MfvzjT8Mwtd4Q0pzd3VXoYoa6rFhtUB2lMCfHN+biNeKA M6pv16q3v8RstfTO/39r4RXaMENsNaW1pFcOCU5yRGU97Ttix5sQsI1UX0EAUQvkpM6k8i ZKKXNmdn7ezUPdZYHjKp84hQfJPpHWDoZEDPKMHwXI8Vdt09QZUPJxRAOrVz7peVFSrIys PZDII7QN0KMIrJkB7AeF9Q70VJf+BZu6SSP+Nsz6jXQx+egsDcWzxDy9hLCUQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675968930; a=rsa-sha256; cv=none; b=pT50FhxfcqfNzyo5kL2DP8btviQcxWKDiawQsL1WU9WloGIT5rFDz5rrjb/hKEpNB/np7j grotPSGus1+6Mj4p8Vi6P9H8wirQZDn/VzK8DkLwUNp3VPGfPEeFOEeJHhAFUGrXy3Rc/y yyE5YqX6W0EaVWys+H2gGd/UNdUheV7vIQW0P2Rwx0xbl8ujsErn7nvn31upAanst1A4dQ xJngqJtfvyYWgu4I8P6zekMI2AVKS1Xklq2Q8SNC+8pn5YAdSM6QWlEgAdyYIFx778FFi3 /2eGj0adjjQb3jrNJExlydhgbu3cHPnx6pAnK1i0cMXMUjtd+TZouf3LgbPXYA== 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 4PCQzj6l0Qznnk; Thu, 9 Feb 2023 18:55:29 +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 319ItTB2040717; Thu, 9 Feb 2023 18:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319ItTeD040716; Thu, 9 Feb 2023 18:55:29 GMT (envelope-from git) Date: Thu, 9 Feb 2023 18:55:29 GMT Message-Id: <202302091855.319ItTeD040716@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: 3934afc3ff36 - main - sysutils/e2fsprogs-core: clean out 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: 3934afc3ff36557cfb26173bc0e29a69929586ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=3934afc3ff36557cfb26173bc0e29a69929586ab commit 3934afc3ff36557cfb26173bc0e29a69929586ab Author: Matthias Andree AuthorDate: 2023-02-09 18:54:11 +0000 Commit: Matthias Andree CommitDate: 2023-02-09 18:55:14 +0000 sysutils/e2fsprogs-core: clean out obsolete conflicts --- sysutils/e2fsprogs-core/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sysutils/e2fsprogs-core/Makefile b/sysutils/e2fsprogs-core/Makefile index b8b2fc9047cb..e70f10fef4c5 100644 --- a/sysutils/e2fsprogs-core/Makefile +++ b/sysutils/e2fsprogs-core/Makefile @@ -45,8 +45,6 @@ CFLAGS+= -Wno-unused-command-line-argument MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig' MAKE_ENV+= CHECK_CMD=@true -CONFLICTS_INSTALL= e2fsprogs-nobootfsck e2fsprogs-roothardlinks - PORTSCOUT= ignore:1 # cannot handle the version in the directory .if !defined(MASTERDIR)