d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mergemaster(8) breakage in the 6ad780caa.

Browse Source 
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
This commit is contained in:
Maxim Sobolev 2022-09-13 13:36:22 -07:00
parent 4ee9db7a1d
commit 3078531de1
4 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/Makefile
View File

@ -11,6 +11,7 @@ NLS_ALIASES= POSIX C \
# No need as it is empty and just causes rebuilds since this file does so much. # No need as it is empty and just causes rebuilds since this file does so much.
UPDATE_DEPENDFILE= no UPDATE_DEPENDFILE= no
SUBDIR+=termcap
.if ${MK_SENDMAIL} != "no" .if ${MK_SENDMAIL} != "no"
SUBDIR+=sendmail SUBDIR+=sendmail
.endif .endif

27
etc/termcap/Makefile Normal file
View File

@ -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 <bsd.prog.mk>

11
etc/termcap/Makefile.depend Normal file
View File

@ -0,0 +1,11 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
.endif

24
share/termcap/Makefile
View File

@ -10,21 +10,7 @@ MAN= termcap.5
PACKAGE= runtime PACKAGE= runtime
FILES= termcap termcap.db FILES= termcap termcap.db
FILESDIR= ${BINDIR}/misc FILESDIR= ${BINDIR}/misc
CLEANFILES+= termcap.db termcap.small CLEANFILES+= termcap.db
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
.include <bsd.endian.mk> .include <bsd.endian.mk>
.include <src.tools.mk> .include <src.tools.mk>
@ -32,14 +18,6 @@ TERMCAP_SMALL_ENTS?= SC cons25 cons25-m cons25-w cons25l1 cons25l1-m \
termcap.db: termcap termcap.db: termcap
${CAP_MKDB_CMD} ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC} ${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: etc-termcap:
${INSTALL_SYMLINK} -T "package=runtime" \ ${INSTALL_SYMLINK} -T "package=runtime" \
${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap