From owner-dev-commits-src-all@freebsd.org Mon Jul 19 13:37:42 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C17AB6571E3; Mon, 19 Jul 2021 13:37:42 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GT2w56WzMz4ttf; Mon, 19 Jul 2021 13:37:41 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: by mail-lj1-f173.google.com with SMTP id y7so25957224ljm.1; Mon, 19 Jul 2021 06:37:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=nUj+TXbRpxeEAm/atViN6S3Hcq7zXyIq/CqGYvL62NQ=; b=b/jnRqN5PKKxQfA6CAWkVeQkwCCVGKrt6hQpn7rwlvU2c+JLBon0oqTpDJ9LCwW77h XbtpZaNNjJuLezjavC4eEmSUEdcZXAoc+BpWUJ+l+lYNNZ2AoZeV+dsRGXuGVmj7Aaww 0z4p098+0CRKRxvjnhFzfAO7NbQS/fAtPxtjVZtesWl//yt3JdEKQLoK0gMU0tDsbtUb VBUlcy9JAxvMrx6JNAJKgg2ZiXyG4k2MI8gJIiyD6hJoOQ5K8Upv/ojGgmCExf3A6VYB uLnFXsr7MEBcHENAKMO5G6QJUBWmMMmpjNrUOwzYBhI1abLFMMyAAkEDpWEpa7K38HGa jsBA== X-Gm-Message-State: AOAM531wyK2Pv+is442CcrgbuHwOCQTl4iCDGR1Sfv5vQkOwEGZk5o/u /7AXuzMMUeW9RT2ZrT8gOtddqei2QfhEoUsEQXsYFG2HG2A= X-Google-Smtp-Source: ABdhPJxPSfR1KzN5aLPFt/4bMJulMw0ND4oNPAY9t67hcYttYHRCuH0nqMXmYgjdI/sMdtz9SaU6CkTiW9fnn0nMJVo= X-Received: by 2002:a2e:989a:: with SMTP id b26mr22906821ljj.436.1626701860037; Mon, 19 Jul 2021 06:37:40 -0700 (PDT) MIME-Version: 1.0 References: <202107072012.167KC1IL065912@gitrepo.freebsd.org> In-Reply-To: <202107072012.167KC1IL065912@gitrepo.freebsd.org> From: Wolfram Schneider Date: Mon, 19 Jul 2021 15:37:28 +0200 Message-ID: Subject: Re: git: f6043a672135 - main - ObsoleteFiles.inc: Remove manpages from OLD_FILES To: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= , marklmi@yahoo.com, Ed Maste , Wolfram Schneider Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4GT2w56WzMz4ttf X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of wschnr@googlemail.com designates 209.85.208.173 as permitted sender) smtp.mailfrom=wschnr@googlemail.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_ENVFROM(0.00)[googlemail.com]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.208.173:from]; SPAMHAUS_ZRD(0.00)[209.85.208.173:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.173:from]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEMAIL_TO(0.00)[freebsd.org,yahoo.com]; FORGED_SENDER(0.30)[wosch@freebsd.org,wschnr@googlemail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.173:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[wosch@freebsd.org,wschnr@googlemail.com]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2021 13:37:42 -0000 How about apm.8.gz and apmconf.8.gz? $ git grep -E '(apm|apmconf|nvram|apmd|sconfig)\.8' | grep OLD_FILES ObsoleteFiles.inc:OLD_FILES+=3Dusr/share/man/man8/apm.8.gz ObsoleteFiles.inc:OLD_FILES+=3Dusr/share/man/man8/apmconf.8.gz tools/build/mk/OptionalObsoleteFiles.inc:OLD_FILES+=3Dusr/share/man/man8/am= d64/apm.8.gz tools/build/mk/OptionalObsoleteFiles.inc:OLD_FILES+=3Dusr/share/man/man8/am= d64/apmconf.8.gz -Wolfram On Wed, 7 Jul 2021 at 22:12, Fernando Apestegu=C3=ADa = wrote: > > The branch main has been updated by fernape (doc, ports committer): > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Df6043a672135da8ec090d8878c= c844b8aace54f9 > > commit f6043a672135da8ec090d8878cc844b8aace54f9 > Author: Fernando Apestegu=C3=ADa > AuthorDate: 2021-07-07 13:15:02 +0000 > Commit: Fernando Apestegu=C3=ADa > CommitDate: 2021-07-07 18:09:02 +0000 > > ObsoleteFiles.inc: Remove manpages from OLD_FILES > > In 0a0f7486413c147d56808b38055c40c64cff61f5 sconfig.8.gz and apmd.8.g= z > were moved back to the parent directory share/man/man8. > > This conflicts with a previous entry in OLD_FILES so running 'make > delete-old' would delete the new installed files. > > Reported by: marklmi@yahoo.com > Approved by: emaste@ > Fixes: 0a0f7486413c - Build manpages for all architectures > MFH: 4 weeks > Differential Revision: https://reviews.freebsd.org/D31092 > --- > ObsoleteFiles.inc | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index 60707faebefc..d72aea5e8efc 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc > @@ -14840,11 +14840,9 @@ OLD_FILES+=3Dusr/share/man/man7/mmroff.7.gz > OLD_FILES+=3Dusr/share/man/man7/mwww.7.gz > OLD_FILES+=3Dusr/share/man/man8/apm.8.gz > OLD_FILES+=3Dusr/share/man/man8/apmconf.8.gz > -OLD_FILES+=3Dusr/share/man/man8/apmd.8.gz > OLD_FILES+=3Dusr/share/man/man8/dm.8.gz > OLD_FILES+=3Dusr/share/man/man8/pam_ftp.8.gz > OLD_FILES+=3Dusr/share/man/man8/pam_wheel.8.gz > -OLD_FILES+=3Dusr/share/man/man8/sconfig.8.gz > OLD_FILES+=3Dusr/share/man/man8/ssl.8.gz > OLD_FILES+=3Dusr/share/man/man8/wlconfig.8.gz > OLD_FILES+=3Dusr/share/man/man9/CURSIG.9.gz --=20 Wolfram Schneider https://wolfram.schneider.org