From 0367ff759998b65384d84e7cc6f322d8028b8c21 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 29 May 2002 00:48:14 +0000
Subject: [PATCH] Put on peril sensitive sunglasses and turn C++ stuff back on.

---
 Makefile.inc1        | 6 ++----
 gnu/usr.bin/Makefile | 6 +-----
 usr.sbin/Makefile    | 3 ---
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 253d0046635..9e17fa42fe6 100644
--- a/Makefile.inc1
+++ b/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 \
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index c896303fb1b..955452b3a6e 100644
--- a/gnu/usr.bin/Makefile
+++ b/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
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index a8bc67df4f0..969c0abac2a 100644
--- a/usr.sbin/Makefile
+++ b/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