Put on peril sensitive sunglasses and turn C++ stuff back on.

svn path=/head/; revision=97435

Makefile.inc1

@@ -230,8 +230,8 @@ USRDIRS=	usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \
 		usr/share/groff_font/devutf8 \
 		usr/share/tmac/mdoc usr/share/tmac/mm
 
-INCDIRS=	arpa dev fs g++/std isc isofs libmilter objc openssl \
-		protocols readline rpc rpcsvc security ufs
+INCDIRS=	arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \
+		objc openssl protocols readline rpc rpcsvc security ufs
 
 #
 # buildworld
@@ -572,9 +572,7 @@ installmost:
 .if exists(${.CURDIR}/games) && !defined(NOGAMES)
 _strfile=	games/fortune/strfile
 .endif
-.if ${CXX:T} != "c++"
 _cxx_consumers=	gnu/usr.bin/gperf gnu/usr.bin/groff
-.endif
 
 bootstrap-tools:
 .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \

gnu/usr.bin/Makefile

@@ -1,11 +1,7 @@
 # $FreeBSD$
 
 SUBDIR= awk bc binutils cc cpio dc dialog diff diff3 \
-	grep gzip man patch rcs sdiff send-pr sort tar texinfo
-
-.if ${CXX:T} != "c++"
-SUBDIR+=groff
-.endif
+	gperf grep groff gzip man patch rcs sdiff send-pr sort tar texinfo
 
 .if !defined(NO_CVS)
 SUBDIR+=cvs

usr.sbin/Makefile

@@ -131,9 +131,6 @@ SUBDIR+=ipftest \
 	iptest
 .endif
 
-.if ${CXX:T} == "c++"
-NOLIBC_R=	yes
-.endif
 .if !defined(NOLIBC_R) && ${MACHINE_ARCH} != "ia64"
 SUBDIR+=pppctl
 .endif