From owner-dev-commits-src-main@freebsd.org Tue Jul 20 16:10:17 2021 Return-Path: Delivered-To: dev-commits-src-main@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 1A8C066EF87; Tue, 20 Jul 2021 16:10:17 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (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 4GTkFg5kdqz4xSX; Tue, 20 Jul 2021 16:10:15 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: by mail-qv1-f46.google.com with SMTP id ay16so10309599qvb.12; Tue, 20 Jul 2021 09:10:15 -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=B78Ad2q6YPBOo/RdtkDPjcKLFJxbrn1bxJZvPPdApso=; b=gH/VOkgGdMHvc6RNvA/53uUnG9xkmMsLpMqS5IA3mkTBotPbfQ/1U6tofgmRzwz5SX BxbAiIJPwVR6agxQs+2oQKijVVqdusqSyxGULif6w4nMROqbxc0mb+ppCbi84tOfzG+6 HRXvTsLU+SqtYROXALA1e3bZOJ7hfNZzujhLz9S9zea49cZ6sPwJWsyU01uB61mhLp30 6E8Su6K+ciH9dDNe5b0rHfKRNp7OGtZkvBg2faq0xDnj9GYuD5o9+W85jAnLQhsrSeno H5+nqR11ggdauy4XwkdAQWSOr9fCT5hKT+7+UXADSPT50wWUlDwmJN1Xm9t3hbW0hJg6 XIxw== X-Gm-Message-State: AOAM5301RERG8pINHJ5eLOBJHvrhrL9R98iz/65aXd+gCXYJNv6Rlr0I GtrL47u8t3cAi7k5q9Ju9UUfTtY59FQ= X-Google-Smtp-Source: ABdhPJznjzPsOqKA0sB/c6UxGQT26HdBIfINN8uElpD8SsoCegLJdIrBoPoD7NE1SyRTBnYfpj23MA== X-Received: by 2002:a0c:ec02:: with SMTP id y2mr31064206qvo.61.1626797414512; Tue, 20 Jul 2021 09:10:14 -0700 (PDT) Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com. [209.85.219.178]) by smtp.gmail.com with ESMTPSA id e2sm10010019qkn.69.2021.07.20.09.10.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Jul 2021 09:10:14 -0700 (PDT) Received: by mail-yb1-f178.google.com with SMTP id b13so33466602ybk.4; Tue, 20 Jul 2021 09:10:14 -0700 (PDT) X-Received: by 2002:a25:db85:: with SMTP id g127mr38201731ybf.418.1626797414030; Tue, 20 Jul 2021 09:10:14 -0700 (PDT) MIME-Version: 1.0 References: <202107072012.167KC1IL065912@gitrepo.freebsd.org> In-Reply-To: From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Tue, 20 Jul 2021 16:09:59 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: f6043a672135 - main - ObsoleteFiles.inc: Remove manpages from OLD_FILES To: Wolfram Schneider Cc: Mark Millard , Ed Maste , 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: 4GTkFg5kdqz4xSX X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of fernandoapesteguia@gmail.com designates 209.85.219.46 as permitted sender) smtp.mailfrom=fernandoapesteguia@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[fernape@freebsd.org,fernandoapesteguia@gmail.com]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TAGGED_FROM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.219.46:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_NEQ_ENVFROM(0.00)[fernape@freebsd.org,fernandoapesteguia@gmail.com]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.219.46:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.219.46:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.219.46:from]; FREEMAIL_CC(0.00)[yahoo.com,freebsd.org]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2021 16:10:17 -0000 On Mon, Jul 19, 2021 at 3:37 PM Wolfram Schneider wrote= : > > 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/= amd64/apm.8.gz > tools/build/mk/OptionalObsoleteFiles.inc:OLD_FILES+=3Dusr/share/man/man8/= amd64/apmconf.8.gz > Is it needed? Those files were not affected by the original commit and are, at this point, installed only for amd64, arm64 and i386. apmd.8.gz and sconfig.8.gz were affected though in 0a0f7486413c and they needed to be removed from OLD_FILES. Cheers. > -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=3Df6043a672135da8ec090d887= 8cc844b8aace54f9 > > > > 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= .gz > > 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 > > > > -- > Wolfram Schneider https://wolfram.schneider.org