View | Details | Raw Unified | Return to bug 38168 | Differences between
and this patch

Collapse All | Expand All

(-)etc/defaults/make.conf (+3 lines)
Lines 100-105 Link Here
100
#NO_SENDMAIL=	true	# do not build sendmail and related programs
100
#NO_SENDMAIL=	true	# do not build sendmail and related programs
101
#NO_SHAREDOCS=	true	# do not build the 4.4BSD legacy docs
101
#NO_SHAREDOCS=	true	# do not build the 4.4BSD legacy docs
102
#NO_TCSH=	true	# do not build and install /bin/csh (which is tcsh)
102
#NO_TCSH=	true	# do not build and install /bin/csh (which is tcsh)
103
#NO_CURSES=	true	# do not build curses related programs
104
#NO_TERMINFO=	true	# do not build the terminfo database
105
#NO_TERMTYPES=	true	# do not use the new tuxedo termcap database
103
#NO_X=		true	# do not compile in XWindows support (e.g. doscmd)
106
#NO_X=		true	# do not compile in XWindows support (e.g. doscmd)
104
#NOCRYPT=	true	# do not build any crypto code
107
#NOCRYPT=	true	# do not build any crypto code
105
#NOGAMES=	true	# do not build games (games/ subdir)
108
#NOGAMES=	true	# do not build games (games/ subdir)
(-)etc/mtree/BSD.usr.dist (+126 lines)
Lines 761-766 Link Here
761
            terminfo
762
		0
763
		..
764
		1
765
		..
766
		2
767
		..
768
		3
769
		..
770
		4
771
		..
772
		5
773
		..
774
		6
775
		..
776
		7
777
		..
778
		8
779
		..
780
		9
781
		..
782
		A
783
		..
784
		B
785
		..
786
		C
787
		..
788
		D
789
		..
790
		E
791
		..
792
		F
793
		..
794
		G
795
		..
796
		H
797
		..
798
		I
799
		..
800
		J
801
		..
802
		K
803
		..
804
		L
805
		..
806
		M
807
		..
808
		N
809
		..
810
		O
811
		..
812
		P
813
		..
814
		Q
815
		..
816
		R
817
		..
818
		S
819
		..
820
		T
821
		..
822
		U
823
		..
824
		V
825
		..
826
		W
827
		..
828
		X
829
		..
830
		Y
831
		..
832
		Z
833
		..
834
		a
835
		..
836
		b
837
		..
838
		c
839
		..
840
		d
841
		..
842
		e
843
		..
844
		f
845
		..
846
		g
847
		..
848
		h
849
		..
850
		i
851
		..
852
		j
853
		..
854
		k
855
		..
856
		l
857
		..
858
		m
859
		..
860
		n
861
		..
862
		o
863
		..
864
		p
865
		..
866
		q
867
		..
868
		r
869
		..
870
		s
871
		..
872
		t
873
		..
874
		u
875
		..
876
		v
877
		..
878
		w
879
		..
880
		x
881
		..
882
		y
883
		..
884
		z
885
		..
886
            ..
(-)usr.bin/Makefile (+11 lines)
Lines 217-222 Link Here
217
SUBDIR+=vacation 
217
SUBDIR+=vacation 
218
.endif
218
.endif
219
219
220
.if !defined(NO_CURSES)
221
SUBDIR+=nclear \
222
	ninfocmp \
223
	ntic \
224
	ntoe \
225
	ntput \
226
	ntset
227
.elif !defined(NO_TERMINFO)
228
SUBDIR+=ntic
229
.endif
230
220
.if ${MACHINE_ARCH} == "i386"
231
.if ${MACHINE_ARCH} == "i386"
221
# Things that don't compile on alpha or are aout specific:
232
# Things that don't compile on alpha or are aout specific:
222
SUBDIR+=ar \
233
SUBDIR+=ar \
(-)share/Makefile (+4 lines)
Lines 18-21 Link Here
18
SUBDIR+= sendmail
18
SUBDIR+= sendmail
19
.endif
19
.endif
20
20
21
.if !defined(NO_TERMINFO)
22
SUBDIR+= terminfo
23
.endif
24
21
.include <bsd.subdir.mk>
25
.include <bsd.subdir.mk>
(-)usr.bin/nclear/Makefile (+48 lines)
Added Link Here
1
# $FreeBSD$
2
3
THIS=	clear
4
5
.if exists(${.CURDIR}/../ntic/Makefile.nc)
6
.include "${.CURDIR}/../ntic/Makefile.nc"
7
.endif
8
9
NCURSES=	${.CURDIR}/../../contrib/ncurses
10
LIBNCURSES=	${.CURDIR}/../../lib/libncurses
11
12
.PATH:	${NCURSES}/progs
13
.PATH:	${NCURSES}/include
14
.PATH:	${NCURSES}/man
15
16
AWK?=	awk
17
18
PROG=	${NCPREFIX}${THIS}
19
SRCS=	${PROG:S/^${NCPREFIX}//}.c
20
21
CFLAGS+= -I. -I${NCURSES}/progs -I${NCURSES}/include -I${LIBNCURSES}
22
DPADD=	${LIBTERMCAP}
23
LDADD=	-ltermcap
24
25
# Generated headers
26
GENHDR=	ncurses_def.h
27
28
CLEANFILES+= ${GENHDR}
29
30
${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
31
32
ncurses_def.h:  MKncurses_def.sh ncurses_defs
33
	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
34
	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
35
36
# MAN page junk
37
MAN1=	${PROG}.1
38
39
MANFILTER= sed -e 's|@TERMINFO@|${TERMINFODIR}|g' \
40
	       -e 's|@TPUT@|${TPUT}|g'
41
42
# Generate the MAN1 links
43
.for page in ${MAN1}
44
${page:T}: ${page:S/^${NCPREFIX}//}
45
	ln -s ${.ALLSRC} ${.TARGET}
46
.endfor
47
48
.include <bsd.prog.mk>
(-)usr.bin/ninfocmp/Makefile (+60 lines)
Added Link Here
1
# $FreeBSD$
2
3
THIS=	infocmp
4
5
.if exists(${.CURDIR}/../ntic/Makefile.nc)
6
.include "${.CURDIR}/../ntic/Makefile.nc"
7
.endif
8
9
NCURSES=	${.CURDIR}/../../contrib/ncurses
10
LIBNCURSES=	${.CURDIR}/../../lib/libncurses
11
12
.PATH:	${NCURSES}/progs
13
.PATH:	${NCURSES}/include
14
.PATH:	${NCURSES}/man
15
16
AWK?=	awk
17
18
PROG=	${NCPREFIX}${THIS}
19
SRCS=	${PROG:S/^${NCPREFIX}//}.c dump_entry.c
20
21
CFLAGS+= -I. -I${NCURSES}/progs -I${NCURSES}/include -I${LIBNCURSES}
22
DPADD=	${LIBTERMCAP}
23
LDADD=	-ltermcap
24
25
# Generated headers
26
GENHDR=	ncurses_def.h parametrized.h termsort.c
27
28
CLEANFILES+= ${GENHDR}
29
30
${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
31
32
ncurses_def.h:  MKncurses_def.sh ncurses_defs
33
	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
34
	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
35
36
parametrized.h: MKparametrized.sh Caps
37
	AWK=${AWK} sh ${NCURSES}/include/MKparametrized.sh \
38
	    ${NCURSES}/include/Caps > $@
39
40
termsort.c: MKtermsort.sh Caps
41
	sh ${NCURSES}/progs/MKtermsort.sh \
42
	    ${AWK} ${NCURSES}/include/Caps > $@
43
44
# MAN page junk
45
MAN1m=	${PROG}.1m
46
47
MANFILTER= sed -e 's|@TERMINFO@|${TERMINFODIR}|g'
48
49
# Generate the MAN8 list from MAN1m
50
.for page in ${MAN1m}
51
CLEANFILES+=${page:T:S/1m$/8/g}
52
MAN8+=${page:T:S/1m$/8/g}
53
all-man: ${page:T:S/1m$/8/g}
54
${page:T:S/1m$/8/g}: ${page:S/^${NCPREFIX}//}
55
	ln -s ${.ALLSRC} ${.TARGET}
56
.endfor
57
58
.include <bsd.prog.mk>
59
60
.SUFFIXES: .1m .8
(-)usr.bin/ntic/Makefile (+73 lines)
Added Link Here
1
# $FreeBSD$
2
3
THIS=	tic
4
5
.if exists(${.CURDIR}/../ntic/Makefile.nc)
6
.include "${.CURDIR}/../ntic/Makefile.nc"
7
.endif
8
9
NCURSES=	${.CURDIR}/../../contrib/ncurses
10
LIBNCURSES=	${.CURDIR}/../../lib/libncurses
11
12
.PATH:	${NCURSES}/progs
13
.PATH:	${NCURSES}/include
14
.PATH:	${NCURSES}/man
15
16
AWK?=	awk
17
18
PROG=	${NCPREFIX}${THIS}
19
SRCS=	${PROG:S/^${NCPREFIX}//}.c dump_entry.c
20
21
CFLAGS+= -I. -I${NCURSES}/progs -I${NCURSES}/include -I${LIBNCURSES}
22
DPADD=	${LIBTERMCAP}
23
LDADD=	-ltermcap
24
25
LINKS=	${BINDIR}/${PROG} ${BINDIR}/${CAPTOINFO} \
26
	${BINDIR}/${PROG} ${BINDIR}/${INFOTOCAP}
27
28
# Generated headers
29
GENHDR=	ncurses_def.h parametrized.h transform.h termsort.c
30
31
CLEANFILES+= ${GENHDR}
32
33
${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
34
35
ncurses_def.h:  MKncurses_def.sh ncurses_defs
36
	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
37
	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
38
39
parametrized.h: MKparametrized.sh Caps
40
	AWK=${AWK} sh ${NCURSES}/include/MKparametrized.sh \
41
	    ${NCURSES}/include/Caps > $@
42
43
transform.h:
44
	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@
45
	echo "#define PROG_INFOTOCAP \"${INFOTOCAP}\"" >>$@
46
	echo "#define PROG_RESET     \"${RESET}\""     >>$@
47
	echo "#define PROG_INIT      \"${INIT}\""      >>$@
48
49
termsort.c: MKtermsort.sh Caps
50
	sh ${NCURSES}/progs/MKtermsort.sh \
51
	    ${AWK} ${NCURSES}/include/Caps > $@
52
53
# MAN page junk
54
MAN1m=	${PROG}.1m
55
56
MANFILTER= sed -e 's|@TERMINFO@|${TERMINFODIR}|g' \
57
	       -e 's|@INFOCMP@|${INFOCMP}|g' \
58
	       -e 's|@CAPTOINFO@|${CAPTOINFO}|g' \
59
	       -e 's|@INFOTOCAP@|${INFOTOCAP}|g' \
60
	       -e 's|@TOE@|${TOE}|g'
61
62
# Generate the MAN8 list from MAN1m
63
.for page in ${MAN1m}
64
CLEANFILES+=${page:T:S/1m$/8/g}
65
MAN8+=${page:T:S/1m$/8/g}
66
all-man: ${page:T:S/1m$/8/g}
67
${page:T:S/1m$/8/g}: ${page:S/^${NCPREFIX}//}
68
	ln -s ${.ALLSRC} ${.TARGET}
69
.endfor
70
71
.include <bsd.prog.mk>
72
73
.SUFFIXES: .1m .8
(-)usr.bin/ntic/Makefile.nc (+16 lines)
Added Link Here
1
# $FreeBSD$
2
3
TERMINFODIR?=	${SHAREDIR}/misc/terminfo
4
5
NCPREFIX=	n
6
7
CLEAR?=		${NCPREFIX}clear
8
INFOCMP?=	${NCPREFIX}infocmp
9
TIC?=		${NCPREFIX}tic
10
CAPTOINFO?=	${NCPREFIX}captoinfo
11
INFOTOCAP?=	${NCPREFIX}infotocap
12
INIT?=		${NCPREFIX}init
13
TOE?=		${NCPREFIX}toe
14
TPUT?=		${NCPREFIX}tput
15
TSET?=		${NCPREFIX}tset
16
RESET?=		${NCPREFIX}reset
(-)usr.bin/ntoe/Makefile (+56 lines)
Added Link Here
1
# $FreeBSD$
2
3
THIS=	toe
4
5
.if exists(${.CURDIR}/../ntic/Makefile.nc)
6
.include "${.CURDIR}/../ntic/Makefile.nc"
7
.endif
8
9
NCURSES=	${.CURDIR}/../../contrib/ncurses
10
LIBNCURSES=	${.CURDIR}/../../lib/libncurses
11
12
.PATH:	${NCURSES}/progs
13
.PATH:	${NCURSES}/include
14
.PATH:	${NCURSES}/man
15
16
AWK?=	awk
17
18
PROG=	${NCPREFIX}${THIS}
19
SRCS=	${PROG:S/^${NCPREFIX}//}.c
20
21
CFLAGS+= -I. -I${NCURSES}/progs -I${NCURSES}/include -I${LIBNCURSES}
22
DPADD=	${LIBTERMCAP}
23
LDADD=	-ltermcap
24
25
# Generated headers
26
GENHDR=	ncurses_def.h
27
28
CLEANFILES+= ${GENHDR}
29
30
${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
31
32
ncurses_def.h:  MKncurses_def.sh ncurses_defs
33
	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
34
	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
35
36
# MAN page junk
37
MAN1m=	${PROG}.1m
38
39
MANFILTER= sed -e 's|@TERMINFO@|${TERMINFODIR}|g' \
40
               -e 's|@INFOCMP@|${INFOCMP}|g' \
41
               -e 's|@CAPTOINFO@|${CAPTOINFO}|g' \
42
               -e 's|@INFOTOCAP@|${INFOTOCAP}|g' \
43
               -e 's|@TIC@|${TIC}|g'
44
45
# Generate the MAN8 list from MAN1m
46
.for page in ${MAN1m}
47
CLEANFILES+=${page:T:S/1m$/8/g}
48
MAN8+=${page:T:S/1m$/8/g}
49
all-man: ${page:T:S/1m$/8/g}
50
${page:T:S/1m$/8/g}: ${page:S/^${NCPREFIX}//}
51
	ln -s ${.ALLSRC} ${.TARGET}
52
.endfor
53
54
.include <bsd.prog.mk>
55
56
.SUFFIXES: .1m .8
(-)usr.bin/ntput/Makefile (+58 lines)
Added Link Here
1
# $FreeBSD$
2
3
THIS=	tput
4
5
.if exists(${.CURDIR}/../ntic/Makefile.nc)
6
.include "${.CURDIR}/../ntic/Makefile.nc"
7
.endif
8
9
NCURSES=	${.CURDIR}/../../contrib/ncurses
10
LIBNCURSES=	${.CURDIR}/../../lib/libncurses
11
12
.PATH:	${NCURSES}/progs
13
.PATH:	${NCURSES}/include
14
.PATH:	${NCURSES}/man
15
16
AWK?=	awk
17
18
PROG=	${NCPREFIX}${THIS}
19
SRCS=	${PROG:S/^${NCPREFIX}//}.c
20
21
CFLAGS+= -I. -I${NCURSES}/progs -I${NCURSES}/include -I${LIBNCURSES}
22
DPADD=	${LIBTERMCAP}
23
LDADD=	-ltermcap
24
25
# Generated headers
26
GENHDR=	ncurses_def.h termsort.c transform.h
27
28
CLEANFILES+= ${GENHDR}
29
30
${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
31
32
ncurses_def.h:  MKncurses_def.sh ncurses_defs
33
	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
34
	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
35
36
termsort.c: MKtermsort.sh Caps
37
	sh ${NCURSES}/progs/MKtermsort.sh \
38
	    ${AWK} ${NCURSES}/include/Caps > $@
39
40
transform.h:
41
	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@
42
	echo "#define PROG_INFOTOCAP \"${INFOTOCAP}\"" >>$@
43
	echo "#define PROG_RESET     \"${RESET}\""     >>$@
44
	echo "#define PROG_INIT      \"${INIT}\""      >>$@
45
46
# MAN page junk
47
MAN1=	${PROG}.1
48
49
MANFILTER= sed -e 's|@TERMINFO@|${TERMINFODIR}|g' \
50
	       -e 's|@CLEAR@|${CLEAR}|g'
51
52
# Generate the MAN1 links
53
.for page in ${MAN1}
54
${page:T}: ${page:S/^${NCPREFIX}//}
55
	ln -s ${.ALLSRC} ${.TARGET}
56
.endfor
57
58
.include <bsd.prog.mk>
(-)usr.bin/ntset/Makefile (+55 lines)
Added Link Here
1
# $FreeBSD$
2
3
THIS=	tset
4
5
.if exists(${.CURDIR}/../ntic/Makefile.nc)
6
.include "${.CURDIR}/../ntic/Makefile.nc"
7
.endif
8
9
NCURSES=	${.CURDIR}/../../contrib/ncurses
10
LIBNCURSES=	${.CURDIR}/../../lib/libncurses
11
12
.PATH:	${NCURSES}/progs
13
.PATH:	${NCURSES}/include
14
.PATH:	${NCURSES}/man
15
16
AWK?=	awk
17
18
PROG=	${NCPREFIX}${THIS}
19
SRCS=	${PROG:S/^${NCPREFIX}//}.c
20
21
CFLAGS+= -I. -I${NCURSES}/progs -I${NCURSES}/include -I${LIBNCURSES}
22
DPADD=	${LIBTERMCAP}
23
LDADD=	-ltermcap
24
25
LINKS=	${BINDIR}/${PROG} ${BINDIR}/${RESET}
26
27
# Generated headers
28
GENHDR=	ncurses_def.h transform.h
29
30
CLEANFILES+= ${GENHDR}
31
32
${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
33
34
ncurses_def.h:  MKncurses_def.sh ncurses_defs
35
	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
36
	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
37
38
transform.h:
39
	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@
40
	echo "#define PROG_INFOTOCAP \"${INFOTOCAP}\"" >>$@
41
	echo "#define PROG_RESET     \"${RESET}\""     >>$@
42
	echo "#define PROG_INIT      \"${INIT}\""      >>$@
43
44
# MAN page junk
45
MAN1=	${PROG}.1
46
47
MANFILTER= sed -e 's|@TERMINFO@|${TERMINFODIR}|g'
48
49
# Generate the MAN1 links
50
.for page in ${MAN1}
51
${page:T}: ${page:S/^${NCPREFIX}//}
52
	ln -s ${.ALLSRC} ${.TARGET}
53
.endfor
54
55
.include <bsd.prog.mk>
(-)share/terminfo/Makefile (+29 lines)
Added Link Here
1
# $FreeBSD$
2
3
.if exists(${.CURDIR}/../../usr.bin/ntic/Makefile.nc)
4
.include "${.CURDIR}/../../usr.bin/ntic/Makefile.nc"
5
.endif
6
7
NCURSES=	${.CURDIR}/../../contrib/ncurses
8
9
.if defined(NO_TERMTYPES)
10
TERMINFOSRC=	${NCURSES}/misc/terminfo.src
11
.else
12
TERMINFOSRC=	${.CURDIR}/termtypes.ti
13
.endif
14
15
TERMINFO=	terminfo.src
16
17
FILES=		${TERMINFO}
18
FILESDIR=	${BINDIR}/misc
19
CLEANFILES+=	${FILES}
20
21
all: ${FILES}
22
23
${TERMINFO}: ${TERMINFOSRC}
24
	ln -fs ${TERMINFOSRC} ${.TARGET}
25
26
afterinstall:
27
	${TIC} ${TERMINFO}
28
29
.include <bsd.prog.mk>

Return to bug 38168