From nobody Fri Mar 11 20:36:57 2022 X-Original-To: dev-commits-ports-main@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 9CE8B1A02DAA; Fri, 11 Mar 2022 20:36:57 +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 4KFd5P3snVz3Nh5; Fri, 11 Mar 2022 20:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647031017; 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=S0dqqA1bNz9GUKTeLUPJ7vlg2mC/djHhfBlPL3470Eg=; b=g/f/ScopWhwcmtcqZEarqeWro//vzTX/LeT87i9puOxy1WGb+nO072rkovTgH0LSekxjHG Z4kv5M5FXdC77byF5Krtwlt56BzTaMQCI3VdkAFswvN2QWHsNba/dfQ5ITAC8gskDvQesQ 6gqL85MPTsIk+bperR/eHmvbFWjANOMwE9LYB6SHQEbs6OwtSqqykcrBRip/2Ot0Xj0P16 e1QSSAm82mzb9BOWBfPdy4JeQnseheGdeQc7PFm1JJBuwCv7hrtOEuViNb2sp++rMPmV2S 0gnNkx4u0soFj8b6B8ySTxqXvkNRCBcTzkDj1B7i2BcufnrGqqFg1l/xUd8DTg== 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 650581FDCE; Fri, 11 Mar 2022 20:36:57 +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 22BKav0U007941; Fri, 11 Mar 2022 20:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22BKavot007940; Fri, 11 Mar 2022 20:36:57 GMT (envelope-from git) Date: Fri, 11 Mar 2022 20:36:57 GMT Message-Id: <202203112036.22BKavot007940@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 52ddb47afcc7 - main - ports-mgmt/portlint: remove "conflicts with itself" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52ddb47afcc7645fc42a53661fc6fed99a57dc29 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647031017; 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=S0dqqA1bNz9GUKTeLUPJ7vlg2mC/djHhfBlPL3470Eg=; b=FEWw4BzN4MYhxgx17BU72lFQbEq1p0QqfzW35bEe7EbzCkFRTVujSVBxFDm1PRHEJYa13p ae3vr6SkU9H/FX0e1XWqpgOyySajSGOoR/00wRyH2EpWdO99D5zWz2MaezvIRG4YoSppXD seASZwlIgcfdWKy52UgY0QBuNDleDtPAhE9TkWbZouTKHvdkSKkuLzjUeFkhRtZSipPjuP aXt5j8wwVkGAZakuy6k7MEmNg6+FZlo/7mOWRttIC/QtuFeWejmllV68dnSh/zgWS/25DO QLYCzwnr8NgdiLVTIKcJLYows+2Pp5BWe8KfJuHeJvxAJIH96aNz0AwVYPnDYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647031017; a=rsa-sha256; cv=none; b=Jb1aszJUU5mHBuhg84yVwXqdGNt/wdF5b24Y2hKev6GkYEY7ts0CFrk69aZwBhhSRsxK1V fZcuJjdDlZ+Db9zltoZBL9qAOabBDUoxpw1wdNATDsryCSUSSnXJ5vaNl8fgcHFQ/ICl87 IQu4R5mPJ8Tmk0qjGFsguP+esQ1sgbiG1klfxBGzpZidcaEqXHDtJTy9BSWl10VPiYW6m1 gvu0FgTShJ8r8zuVzpfQUzCTaOs1hDvQ0AKfTf8YRygSf90fgdhJ+quBf2pUEPK5dtdWGi J4W/5pp6YIhwrj4wXlY8oRc24dA1aLnhfk4233/2T66FeQF00Te+6OFGfAlKrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=52ddb47afcc7645fc42a53661fc6fed99a57dc29 commit 52ddb47afcc7645fc42a53661fc6fed99a57dc29 Author: Stefan Eßer AuthorDate: 2022-03-11 20:06:24 +0000 Commit: Stefan Eßer CommitDate: 2022-03-11 20:06:24 +0000 ports-mgmt/portlint: remove "conflicts with itself" The warning about a CONFLICTS entry matching the package being built is bogus - the ports system excludes the port being built from the list of conflicts that is reported by "make list-install-conflicts" and the other targets that check for conflicts. It is in fact quite useful to specify CONFLICTS with wildcards that include the port being built instead of explicitly listing all other versions (e.g. in case of the mysql or mariadb ports - it is possible to use mysql[0-9][0-9]-client for example in the mysql57-client port instead of complex patterns like "mysql5[56]-client mysql80-client" in an attempt to not match the "57"). Since I'm fixing CONFLICTS entries in a large number of ports and want to use wildcards as explained above to simplify the entries and to reduce the maintenance effort (often are CONFLICTS entries stale when new versions of e.g. mysql are imported). The bogus portlint messages let maintainers think that the wildcards need to be adjusted to prevent this "self conflict", leading them to put back the unnecessarily complex patterns. The author of portlint has not provided any kind of response to my request to remove the misleading output sent more than 6 weeks ago. Due to a maintainer time-out I'm removing the bogus message. The test and print command are commented out in order to only apply the minimal change required. The version number is unchanged since I do not want to introduce a version that does not exist in the upstream sources, but a portrevision is added to enforce the creation of an updated package in the official repository. --- ports-mgmt/portlint/Makefile | 1 + ports-mgmt/portlint/src/portlint.pl | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index bda2fb9402fe..103f454493be 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -2,6 +2,7 @@ PORTNAME= portlint PORTVERSION= 2.19.10 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index 5f6240beae9b..6faf2ebd8404 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -2994,12 +2994,13 @@ DIST_SUBDIR EXTRACT_ONLY my %seen; foreach my $conflict (split ' ', $conflicts) { if (not $seen{$conflict}) { - `$pkg_version -T '$makevar{PKGBASE}' '$conflict' || $pkg_version -T '$makevar{PKGNAME}' '$conflict'`; - my $selfconflict = !$?; - if ($selfconflict) { - &perror("FATAL", "", -1, "Package conflicts with itself. ". - "You should remove \"$conflict\" from CONFLICTS."); - } elsif ($conflict =~ m/-\[0-9\]\*$/) { +# `$pkg_version -T '$makevar{PKGBASE}' '$conflict' || $pkg_version -T '$makevar{PKGNAME}' '$conflict'`; +# my $selfconflict = !$?; +# if ($selfconflict) { +# &perror("FATAL", "", -1, "Package conflicts with itself. ". +# "You should remove \"$conflict\" from CONFLICTS."); +# } elsif ($conflict =~ m/-\[0-9\]\*$/) { + if ($conflict =~ m/-\[0-9\]\*$/) { &perror("WARN", $file, -1, "CONFLICTS definition \"$conflict\" ". "ends in redundant version pattern. ". "You should remove \"-[0-9]*\" from that pattern.");