Update to use the contrib/libg++ version, now that my (slow) 486 has

finished a 'make world'.

2 files changed, 58 insertions, 34 deletions

diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile
index 6ec09425ad6f..9beec86cea9d 100644
--- a/gnu/lib/libg++/Makefile
+++ b/gnu/lib/libg++/Makefile
@@ -1,42 +1,52 @@
 #
-# $Id: Makefile,v 1.12 1996/08/30 02:09:09 peter Exp $
+# $Id$
 #
+
+GPPDIR=	${.CURDIR}/../../../contrib/libg++
+
+.PATH:	${GPPDIR}/libiberty ${GPPDIR}/libio ${GPPDIR}/libg++/src ${GPPDIR}/librx
+
+SUBDIR+=	doc
+
+LIB=		g++
+SHLIB_MAJOR=	4
+SHLIB_MINOR=	0
+CPLUSPLUSLIB=	1	# include c++rt0.o for static constructors
+
+CFLAGS+=	-I${GPPDIR}/include -I/usr/include/g++
+CXXFLAGS+=	-I${GPPDIR}/include -I${GPPDIR}/libio -I${GPPDIR}/libstdc++
+
+# C source
 SRCS=	bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c \
-	bitinvert.c bitlcomp.c bitset1.c bitxor.c cleanup.c except.c \
-	filedoalloc.c fileops.c floatconv.c genops.c iofclose.c iofgetpos.c \
-	iofread.c iofscanf.c iofsetpos.c iogetdelim.c iogetline.c ioignore.c \
-	iopadn.c iopopen.c ioprims.c ioprintf.c ioseekoff.c ioseekpos.c \
-	iostrerror.c ioungetc.c iovfprintf.c iovfscanf.c outfloat.c \
-	rx.c strerror.c strops.c strsignal.c timer.c
-SRCS+=	ACG.cc AllocRing.cc Binomial.cc BitSet.cc BitString.cc Complex.cc \
-	CursesW.cc DLList.cc DiscUnif.cc Erlang.cc Fix.cc Fix16.cc Fix24.cc \
-	Geom.cc GetOpt.cc HypGeom.cc Intdouble.cc Integer.cc LogNorm.cc \
-	MLCG.cc NegExp.cc Normal.cc Obstack.cc PlotFile.cc Poisson.cc RNG.cc \
-	Random.cc Rational.cc Regex.cc RndInt.cc SFile.cc SLList.cc \
-	SmplHist.cc SmplStat.cc String.cc Uniform.cc Weibull.cc builtin.cc \
-	builtinbuf.cc chr.cc compare.cc editbuf.cc error.cc filebuf.cc \
-	fmtq.cc fstream.cc gcd.cc hash.cc indstream.cc ioassign.cc \
-	ioextend.cc iomanip.cc ioob.cc iostream.cc isgetline.cc isgetsb.cc \
-	isscan.cc lg.cc math.cc new.cc osform.cc parsestream.cc pfstream.cc \
-	pow.cc procbuf.cc sbform.cc sbgetline.cc sbscan.cc sqrt.cc \
-	stdiostream.cc stdstrbufs.cc stdstreams.cc str.cc stream.cc \
-	streambuf.cc strstream.cc
-LIB=	g++
-SHLIB_MAJOR= 3
-SHLIB_MINOR= 0
-CPLUSPLUSLIB= 1		# include c++rt0.o for constructors
-NOMAN=	noman
-CFLAGS+=	-nostdinc -I${.CURDIR}/include -I/usr/include
-CXXFLAGS+=	-I${.CURDIR}/include -I/usr/include/g++ -I/usr/include \
-		-nostdinc++
-DPADD=	${LIBCURSES} ${LIBCOMPAT} ${LIBGCC_PIC}
-LDADD=	-lcurses -lcompat -lgcc_pic
-.PATH:	${.CURDIR}/libiberty ${.CURDIR}/libio ${.CURDIR}/libg++ ${.CURDIR}/librx
+	bitinvert.c bitlcomp.c bitset1.c bitxor.c timer.c
+
+# C source for librx
+SRCS+=	rx.c
+
+# C++ source
+SRCS+=	ACG.cc AllocRing.cc Binomial.cc BitSet.cc BitString.cc DLList.cc \
+	DiscUnif.cc Erlang.cc Fix.cc Fix16.cc Fix24.cc Geom.cc GetOpt.cc \
+	HypGeom.cc Intdouble.cc Integer.cc LogNorm.cc MLCG.cc NegExp.cc \
+	Normal.cc Obstack.cc Poisson.cc RNG.cc Random.cc Rational.cc \
+	Regex.cc RndInt.cc SLList.cc SmplHist.cc SmplStat.cc String.cc \
+	Uniform.cc Weibull.cc \
+	builtin.cc compare.cc error.cc fmtq.cc gcd.cc hash.cc ioob.cc \
+	lg.cc pow.cc sqrt.cc
+
+# "normal" headers  (no CursesW.h[its useless], no bool.h[in stdc++])
+HDRS=	ACG.h AllocRing.h Binomial.h BitSet.h BitString.h Complex.h \
+	DLList.h DiscUnif.h Erlang.h Fix.h Fix16.h Fix24.h Geom.h GetOpt.h \
+	HypGeom.h Incremental.h Integer.h LogNorm.h MLCG.h NegExp.h Normal.h \
+	Obstack.h Pix.h Poisson.h RNG.h Random.h Rational.h Regex.h RndInt.h \
+	SLList.h SmplHist.h SmplStat.h String.h Uniform.h Weibull.h \
+	bitdo1.h bitdo2.h bitprims.h builtin.h compare.h generic.h \
+	getpagesize.h libc.h minmax.h std.h strclass.h swap.h \
+	sysent.h typemacros.h
 
 beforeinstall:
-	cd ${.CURDIR}/include; \
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${HDRS:S;^;${GPPDIR}/libg++/src/;} \
+		${GPPDIR}/librx/rx.h \
 		${DESTDIR}/usr/include/g++
 
 .include <bsd.lib.mk>
-.include <bsd.prog.mk>
diff --git a/gnu/lib/libg++/doc/Makefile b/gnu/lib/libg++/doc/Makefile
new file mode 100644
index 000000000000..c3a584c4db01
--- /dev/null
+++ b/gnu/lib/libg++/doc/Makefile
@@ -0,0 +1,14 @@
+# $Id$
+
+INFO = g++FAQ libg++ iostream
+
+.PATH: ${.CURDIR}/../../../../contrib/libg++/libg++
+.PATH: ${.CURDIR}/../../../../contrib/libg++/libio
+
+# HACK ALERT!
+CLEANFILES+= lgpl.texinfo
+libg++.info:	lgpl.texinfo
+lgpl.texinfo:
+	echo "See the file: /usr/src/gnu/COPYING.LIB" > lgpl.texinfo
+
+.include <bsd.info.mk>