Attachment #21863 for bug #38168

Lines 30-37 Link Here

(-)usr.bin/nclear/Makefile (-2 / +1 lines)
30	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}	30	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
31		31
32	ncurses_def.h: MKncurses_def.sh ncurses_defs	32	ncurses_def.h: MKncurses_def.sh ncurses_defs
33	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \	33	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
34	${NCURSES}/include/ncurses_defs > ncurses_def.h
35		34
36	# MAN page junk	35	# MAN page junk
37	MAN1= ${PROG}.1	36	MAN1= ${PROG}.1




${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}

ncurses_def.h:  MKncurses_def.sh ncurses_defs
	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
	    ${NCURSES}/include/ncurses_defs > ncurses_def.h

parametrized.h: MKparametrized.sh Caps
	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
	    ${NCURSES}/include/Caps > $@

termsort.c: MKtermsort.sh Caps
	set ${.ALLSRC}; sh $$1 ${AWK} $$2 > ${.TARGET}
	    ${AWK} ${NCURSES}/include/Caps > $@

# MAN page junk
MAN1m=	${PROG}.1m




${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}

ncurses_def.h:  MKncurses_def.sh ncurses_defs
	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
	    ${NCURSES}/include/ncurses_defs > ncurses_def.h

parametrized.h: MKparametrized.sh Caps
	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
	    ${NCURSES}/include/Caps > $@

transform.h:
	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@

	echo "#define PROG_INIT      \"${INIT}\""      >>$@

termsort.c: MKtermsort.sh Caps
	set ${.ALLSRC}; sh $$1 ${AWK} $$2 > ${.TARGET}
	    ${AWK} ${NCURSES}/include/Caps > $@

# MAN page junk
MAN1m=	${PROG}.1m

Lines 30-37 Link Here

(-)usr.bin/ntoe/Makefile (-2 / +1 lines)
30	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}	30	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
31		31
32	ncurses_def.h: MKncurses_def.sh ncurses_defs	32	ncurses_def.h: MKncurses_def.sh ncurses_defs
33	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \	33	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
34	${NCURSES}/include/ncurses_defs > ncurses_def.h
35		34
36	# MAN page junk	35	# MAN page junk
37	MAN1m= ${PROG}.1m	36	MAN1m= ${PROG}.1m




${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}

ncurses_def.h:  MKncurses_def.sh ncurses_defs
	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
	    ${NCURSES}/include/ncurses_defs > ncurses_def.h

termsort.c: MKtermsort.sh Caps
	set ${.ALLSRC}; sh $$1 ${AWK} $$2 > ${.TARGET}
	    ${AWK} ${NCURSES}/include/Caps > $@

transform.h:
	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@

Lines 32-39 Link Here

(-)usr.bin/ntset/Makefile (-2 / +1 lines)
32	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}	32	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
33		33
34	ncurses_def.h: MKncurses_def.sh ncurses_defs	34	ncurses_def.h: MKncurses_def.sh ncurses_defs
35	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \	35	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
36	${NCURSES}/include/ncurses_defs > ncurses_def.h
37		36
38	transform.h:	37	transform.h:
39	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@	38	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@

Lines 6-14 Link Here

(-)share/terminfo/Makefile (-1 / +16 lines)
6		6
7	NCURSES= ${.CURDIR}/../../contrib/ncurses	7	NCURSES= ${.CURDIR}/../../contrib/ncurses
8		8
		9	.PATH: ${NCURSES}/include
		10	.PATH: ${NCURSES}/man
		11
		12	NO_TERMTYPES= yes # ncurses terminfo database appear to be up-to-date.
		13
9	.if defined(NO_TERMTYPES)	14	.if defined(NO_TERMTYPES)
		15	# ftp://invisible-island.net/ncurses/terminfo.src.gz
10	TERMINFOSRC= ${NCURSES}/misc/terminfo.src	16	TERMINFOSRC= ${NCURSES}/misc/terminfo.src
11	.else	17	.else
		18	# http://tuxedo.org/terminfo/termtypes.ti.gz
12	TERMINFOSRC= ${.CURDIR}/termtypes.ti	19	TERMINFOSRC= ${.CURDIR}/termtypes.ti
13	.endif	20	.endif
14		21
Lines 16-22 Link Here
16		23
17	FILES= ${TERMINFO}	24	FILES= ${TERMINFO}
18	FILESDIR= ${BINDIR}/misc	25	FILESDIR= ${BINDIR}/misc
19	CLEANFILES+= ${FILES}	26	CLEANFILES+= ${FILES} ${MAN}
		27
		28	MAN5= terminfo.5
		29
		30	MANFILTER= sed -e 's\|@TERMINFO@\|${TERMINFODIR}\|g'
20		31
21	all: ${FILES}	32	all: ${FILES}
22		33
Lines 25-29 Link Here
25		36
26	afterinstall:	37	afterinstall:
27	${TIC} ${TERMINFO}	38	${TIC} ${TERMINFO}
		39
		40	# sources order is important.
		41	terminfo.5: MKterminfo.sh terminfo.head Caps terminfo.tail
		42	sh ${.ALLSRC} > ${.TARGET}
28		43
29	.include <bsd.prog.mk>	44	.include <bsd.prog.mk>

Return to bug 38168

Lines 30-45 Link Here

(-)usr.bin/ninfocmp/Makefile (-6 / +3 lines)
30	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}	30	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
31		31
32	ncurses_def.h: MKncurses_def.sh ncurses_defs	32	ncurses_def.h: MKncurses_def.sh ncurses_defs
33	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \	33	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
34	${NCURSES}/include/ncurses_defs > ncurses_def.h
35		34
36	parametrized.h: MKparametrized.sh Caps	35	parametrized.h: MKparametrized.sh Caps
37	AWK=${AWK} sh ${NCURSES}/include/MKparametrized.sh \	36	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
38	${NCURSES}/include/Caps > $@
39		37
40	termsort.c: MKtermsort.sh Caps	38	termsort.c: MKtermsort.sh Caps
41	sh ${NCURSES}/progs/MKtermsort.sh \	39	set ${.ALLSRC}; sh $$1 ${AWK} $$2 > ${.TARGET}
42	${AWK} ${NCURSES}/include/Caps > $@
43		40
44	# MAN page junk	41	# MAN page junk
45	MAN1m= ${PROG}.1m	42	MAN1m= ${PROG}.1m

Lines 33-44 Link Here

(-)usr.bin/ntic/Makefile (-6 / +3 lines)
33	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}	33	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
34		34
35	ncurses_def.h: MKncurses_def.sh ncurses_defs	35	ncurses_def.h: MKncurses_def.sh ncurses_defs
36	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \	36	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
37	${NCURSES}/include/ncurses_defs > ncurses_def.h
38		37
39	parametrized.h: MKparametrized.sh Caps	38	parametrized.h: MKparametrized.sh Caps
40	AWK=${AWK} sh ${NCURSES}/include/MKparametrized.sh \	39	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
41	${NCURSES}/include/Caps > $@
42		40
43	transform.h:	41	transform.h:
44	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@	42	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@
Lines 47-54 Link Here
47	echo "#define PROG_INIT \"${INIT}\"" >>$@	45	echo "#define PROG_INIT \"${INIT}\"" >>$@
48		46
49	termsort.c: MKtermsort.sh Caps	47	termsort.c: MKtermsort.sh Caps
50	sh ${NCURSES}/progs/MKtermsort.sh \	48	set ${.ALLSRC}; sh $$1 ${AWK} $$2 > ${.TARGET}
51	${AWK} ${NCURSES}/include/Caps > $@
52		49
53	# MAN page junk	50	# MAN page junk
54	MAN1m= ${PROG}.1m	51	MAN1m= ${PROG}.1m

Lines 30-41 Link Here

(-)usr.bin/ntput/Makefile (-4 / +2 lines)
30	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}	30	${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
31		31
32	ncurses_def.h: MKncurses_def.sh ncurses_defs	32	ncurses_def.h: MKncurses_def.sh ncurses_defs
33	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \	33	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
34	${NCURSES}/include/ncurses_defs > ncurses_def.h
35		34
36	termsort.c: MKtermsort.sh Caps	35	termsort.c: MKtermsort.sh Caps
37	sh ${NCURSES}/progs/MKtermsort.sh \	36	set ${.ALLSRC}; sh $$1 ${AWK} $$2 > ${.TARGET}
38	${AWK} ${NCURSES}/include/Caps > $@
39		37
40	transform.h:	38	transform.h:
41	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@	39	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@