From nobody Tue Sep 13 20:44:59 2022 X-Original-To: dev-commits-src-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 4MRwSq3Tpmz4cPM0; Tue, 13 Sep 2022 20:44:59 +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 4MRwSq2Zbkz3cbc; Tue, 13 Sep 2022 20:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663101899; 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=UVegZtKXEJFBEKNpCWYCjqjX1iNiHhxgONqEIBWPB0o=; b=neOaMDIYWdtdZ2TFqEI7K1DP29XXoRPzrEzYrTMuSsxkB/xW4h1szrT/KUcNQMxq1nsIY7 VCtaXF0AzBVETtYLEgi6ct9URhDEi4HMAHDA2V8mLwPFVClHZVAlno4CruiZbjRt4HViJ6 fe230E3rC5B24qfbtIpQefGbe6C/R+6fQKWxeFZz1GPAvhKdox7lc3//7oIf7tDwhHI0Ch 3ENjf3I+CjX9gDuiiGzkTS15G8VusajGyADl4qX+RUb59L8Sy3t5F+SwKX+6tIbFc2W+d3 it3j/GAdByJdxklj4o+d3WNjHBNrKNkSqnBu0G5dASmxGAJ6jOq3H+9N6E+PeQ== 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 4MRwSq1b7fzRmn; Tue, 13 Sep 2022 20:44:59 +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 28DKixpL086043; Tue, 13 Sep 2022 20:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28DKixSP086042; Tue, 13 Sep 2022 20:44:59 GMT (envelope-from git) Date: Tue, 13 Sep 2022 20:44:59 GMT Message-Id: <202209132044.28DKixSP086042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Sobolev Subject: git: 3078531de10d - main - Fix mergemaster(8) breakage in the 6ad780caa. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3078531de10dcae44b253a35125c949ff4235284 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663101899; 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=UVegZtKXEJFBEKNpCWYCjqjX1iNiHhxgONqEIBWPB0o=; b=fCWI225R5K4h46RCnx/TpqHMNg8aBDsbqCzOJX5b+ok3aynKcJnYlw9S4dnY6mUovaXZI/ ZRS7pa1peVHZ5QQGNkTQ61GBXWaRAGG5YAni7Cxm4svm8ed0/ykWI/coCBO/Mr6ekBdrDL PmGuQbRalvKonfk140G6lN3RaYiR+7Ydr+WunTYH+Vs18ek2+ZSS/USg58pFdrYxzasmRp SvvcyoGM8kEZXh78qqF+4/JcZHLDPPVO87Oi1qgAz2tNMQHQkaRuow+Zh8V+HMMFugHR90 V4lmzpX6uetdfpOHCpwf7O+4oDHU45YFJPAPNzKPLIqkeVLKiPBYGB/YHp3Wqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663101899; a=rsa-sha256; cv=none; b=P/KsHgIKhZH8wJ4aPJX4RUOrI13bDTVkcMNxPaSwfPntefUB7HpFQgftkeCW7axdQpv4cz tiJiL69tOcSkwVAZy7dXiozjQOeaC4+KjWkrqEwHEB8hhYiCp7NiQ17abkPIJ/Ybe2d+mo YIo11ni2W68/kfGGJt/njmLIE5hRyCPzzs3UxsMYEJ5crkWig76Dvwb3sKYNITXRIOF21a 2++QTvXZOzf4EU6eJ41JuTUWcj4efnCgzfd998lzI+JZ8W8MtH9PGwYdUyYQIvbQ73PXY8 FXn7yoDUHWge6kIhIjpnYXCUcQMYJpVtebZqzaQVYc6ZnVbTK3w8vvXJPe+glw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=3078531de10dcae44b253a35125c949ff4235284 commit 3078531de10dcae44b253a35125c949ff4235284 Author: Maxim Sobolev AuthorDate: 2022-09-13 20:36:22 +0000 Commit: Maxim Sobolev CommitDate: 2022-09-13 20:36:22 +0000 Fix mergemaster(8) breakage in the 6ad780caa. Split out termcap.small generation into its own Makefile under etc/termcap, so it's properly executed by the underlying command: make 'SUBDIR_OVERRIDE=etc' everything Reported by: gbe MFC after: 1 month --- etc/Makefile | 1 + etc/termcap/Makefile | 27 +++++++++++++++++++++++++++ etc/termcap/Makefile.depend | 11 +++++++++++ share/termcap/Makefile | 24 +----------------------- 4 files changed, 40 insertions(+), 23 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index c465596de3a0..3036b7acdd19 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -11,6 +11,7 @@ NLS_ALIASES= POSIX C \ # No need as it is empty and just causes rebuilds since this file does so much. UPDATE_DEPENDFILE= no +SUBDIR+=termcap .if ${MK_SENDMAIL} != "no" SUBDIR+=sendmail .endif diff --git a/etc/termcap/Makefile b/etc/termcap/Makefile new file mode 100644 index 000000000000..85054265b4b2 --- /dev/null +++ b/etc/termcap/Makefile @@ -0,0 +1,27 @@ +.PATH: ${SRCTOP}/share/termcap + +CLEANFILES+= termcap.small +CONFS= termcap.small + +TERMCAP_SMALL_ENTS?= SC cons25 cons25-m cons25-w cons25l1 cons25l1-m \ + cons25l1-w cons25l2 cons25l2-m cons25l7 cons25l7-m cons25r cons25r-m \ + cons25r-mv cons25r-v cons25w cons30 cons30-m cons30-w cons30l1 cons30l1-m \ + cons30l1-w cons30l2 cons30l2-m cons30l7 cons30l7-m cons30r cons30r-m \ + cons30r-mv cons30r-v cons43 cons43-m cons43-w cons43l1 cons43l1-m \ + cons43l1-w cons43l2 cons43l2-m cons43l7 cons43l7-m cons43r cons43r-m \ + cons43r-mv cons43r-v cons50 cons50-m cons50-w cons50l1 cons50l1-m \ + cons50l1-w cons50l2 cons50l2-m cons50l7 cons50l7-m cons50r cons50r-m \ + cons50r-mv cons50r-v cons60 cons60-m cons60-w cons60l1 cons60l1-m \ + cons60l1-w cons60l2 cons60l2-m cons60l7 cons60l7-m cons60r cons60r-m \ + cons60r-mv cons60r-v ecma[+]italics vt100 xterm xterm-basic xterm-clear \ + xterm-color xterm-new xterm-r6 xterm-r6-clear + +termcap.small: termcap + set -e; set -o pipefail; \ + (echo "# AUTOMATICALLY GENERATED FROM `basename ${.ALLSRC}`"; \ + for tcname in ${TERMCAP_SMALL_ENTS}; \ + do \ + echo; awk "/^$${tcname}[:|]/{ f = 1; print; next } /^[^\t]/{ f = 0 } f" ${.ALLSRC}; \ + done) > ${.TARGET} + +.include diff --git a/etc/termcap/Makefile.depend b/etc/termcap/Makefile.depend new file mode 100644 index 000000000000..f80275d86ab1 --- /dev/null +++ b/etc/termcap/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/share/termcap/Makefile b/share/termcap/Makefile index d051e47b5d1b..8e2a82a7b268 100644 --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -10,21 +10,7 @@ MAN= termcap.5 PACKAGE= runtime FILES= termcap termcap.db FILESDIR= ${BINDIR}/misc -CLEANFILES+= termcap.db termcap.small -CONFS= termcap.small - -TERMCAP_SMALL_ENTS?= SC cons25 cons25-m cons25-w cons25l1 cons25l1-m \ - cons25l1-w cons25l2 cons25l2-m cons25l7 cons25l7-m cons25r cons25r-m \ - cons25r-mv cons25r-v cons25w cons30 cons30-m cons30-w cons30l1 cons30l1-m \ - cons30l1-w cons30l2 cons30l2-m cons30l7 cons30l7-m cons30r cons30r-m \ - cons30r-mv cons30r-v cons43 cons43-m cons43-w cons43l1 cons43l1-m \ - cons43l1-w cons43l2 cons43l2-m cons43l7 cons43l7-m cons43r cons43r-m \ - cons43r-mv cons43r-v cons50 cons50-m cons50-w cons50l1 cons50l1-m \ - cons50l1-w cons50l2 cons50l2-m cons50l7 cons50l7-m cons50r cons50r-m \ - cons50r-mv cons50r-v cons60 cons60-m cons60-w cons60l1 cons60l1-m \ - cons60l1-w cons60l2 cons60l2-m cons60l7 cons60l7-m cons60r cons60r-m \ - cons60r-mv cons60r-v ecma[+]italics vt100 xterm xterm-basic xterm-clear \ - xterm-color xterm-new xterm-r6 xterm-r6-clear +CLEANFILES+= termcap.db .include .include @@ -32,14 +18,6 @@ TERMCAP_SMALL_ENTS?= SC cons25 cons25-m cons25-w cons25l1 cons25l1-m \ termcap.db: termcap ${CAP_MKDB_CMD} ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC} -termcap.small: termcap - set -e; set -o pipefail; \ - (echo "# AUTOMATICALLY GENERATED FROM `basename ${.ALLSRC}`"; \ - for tcname in ${TERMCAP_SMALL_ENTS}; \ - do \ - echo; awk "/^$${tcname}[:|]/{ f = 1; print; next } /^[^\t]/{ f = 0 } f" ${.ALLSRC}; \ - done) > ${.TARGET} - etc-termcap: ${INSTALL_SYMLINK} -T "package=runtime" \ ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap