diff --git a/gnu/lib/libg++/libg++/genclass/Makefile b/gnu/lib/libg++/libg++/genclass/Makefile
index 81c0956229b3..9d49cc649ea9 100644
--- a/gnu/lib/libg++/libg++/genclass/Makefile
+++ b/gnu/lib/libg++/libg++/genclass/Makefile
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.1.1.1 1996/03/09 00:01:12 phil Exp $
+#	$NetBSD: Makefile,v 1.2 1996/12/20 01:04:20 cgd Exp $
 # Makefile for g++ library genclass 
 
 PROG=		genclass
 SRCS=	genclass.sh 
 NOMAN=
+NOLINT=
 STRIP=
 
 SRCDIR=${.CURDIR}
diff --git a/gnu/lib/libg++/libg++/src/Makefile b/gnu/lib/libg++/libg++/src/Makefile
index 2cb74fa67d16..0287196fdc5d 100644
--- a/gnu/lib/libg++/libg++/src/Makefile
+++ b/gnu/lib/libg++/libg++/src/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 1996/12/17 21:32:27 cgd Exp $
+#	$NetBSD: Makefile,v 1.3 1996/12/20 01:04:21 cgd Exp $
 
 LIB=		g++
 
@@ -24,6 +24,7 @@ LDADD=		${DESTDIR}/usr/lib/c++rt0.o -lcurses
 DPADD=		${DESTDIR}/usr/lib/c++rt0.o ${LIBCURSES}
 .endif
 NOMAN=		noman
+NOLINT=		nolint
 LIBCURSES!=	printf "xxx:\n\techo \$${LIBCURSES}\n.include <bsd.prog.mk>" |\
 			$(MAKE) -r -s -f - xxx | grep curses
 
diff --git a/gnu/lib/libg++/libg++2netbsd b/gnu/lib/libg++/libg++2netbsd
index 5f517349d86d..25e46c4e8bee 100644
--- a/gnu/lib/libg++/libg++2netbsd
+++ b/gnu/lib/libg++/libg++2netbsd
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-#	$NetBSD: libg++2netbsd,v 1.13 1996/12/17 21:32:26 cgd Exp $
+#	$NetBSD: libg++2netbsd,v 1.14 1996/12/20 01:04:17 cgd Exp $
 #
 #  Perl script to convert a standard distribution directory for libg++ into
 #	a NetBSD source tree.
@@ -485,6 +485,7 @@ SUBDIR = src genclass
 PROG=		genclass
 %% srcs genclass
 NOMAN=
+NOLING=
 STRIP=
 
 SRCDIR=${.CURDIR}
@@ -514,6 +515,7 @@ LDADD=		${DESTDIR}/usr/lib/c++rt0.o -lcurses
 DPADD=		${DESTDIR}/usr/lib/c++rt0.o ${LIBCURSES}
 .endif
 NOMAN=		noman
+NOLINT=		nolint
 LIBCURSES!=	printf "xxx:\n\techo \$${LIBCURSES}\n.include <bsd.prog.mk>" |\
 			$(MAKE) -r -s -f - xxx | grep curses
 
@@ -528,6 +530,7 @@ LIB=	io
 CXXFLAGS+=	-nostdinc++ -I$(.CURDIR)/../include 
 CFLAGS+=	-I$(.CURDIR)
 NOMAN=		noman
+NOLINT=		nolint
 
 .include <bsd.lib.mk>
 %% file libiostream/Makefile
@@ -541,6 +544,7 @@ CXXFLAGS+=	-nostdinc++ -I$(.CURDIR)/../include \
 		  -I$(.CURDIR)/../libio 
 CFLAGS+=	-I$(.CURDIR) -I$(.CURDIR)/../libio
 NOMAN=		noman
+NOLINT=		nolint
 
 .PATH: $(.CURDIR)/../libio
 
@@ -555,6 +559,7 @@ LIB=	stdc++
 CXXFLAGS+=  -nostdinc++ 
 CFLAGS+=    -I$(.CURDIR) -I$(.CURDIR)/../libio -I$(.CURDIR)/stl
 NOMAN=	    noman
+NOLINT=	    nolint
 
 .PATH: $(.CURDIR)/../libio  $(.CURDIR)/stl $(.CURDIR)/../librx
 
diff --git a/gnu/lib/libg++/libio/Makefile b/gnu/lib/libg++/libio/Makefile
index 28c6c41e15c8..e51f0662dad6 100644
--- a/gnu/lib/libg++/libio/Makefile
+++ b/gnu/lib/libg++/libio/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.2 1996/12/17 18:58:06 phil Exp $
+#	$NetBSD: Makefile,v 1.2 1996/12/20 01:04:23 cgd Exp $
 
 LIB=	io
 
@@ -14,5 +14,6 @@ outfloat.c str.cc stdfiles.c strops.c
 CXXFLAGS+=	-nostdinc++ -I$(.CURDIR)/../include 
 CFLAGS+=	-I$(.CURDIR)
 NOMAN=		noman
+NOLINT=		nolint
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libg++/libiostream/Makefile b/gnu/lib/libg++/libiostream/Makefile
index 27773fac7649..30fb611c23e5 100644
--- a/gnu/lib/libg++/libiostream/Makefile
+++ b/gnu/lib/libg++/libiostream/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 1996/03/09 00:01:31 phil Exp $
+#	$NetBSD: Makefile,v 1.2 1996/12/20 01:04:25 cgd Exp $
 
 LIB=	iostream
 
@@ -16,6 +16,7 @@ CXXFLAGS+=	-nostdinc++ -I$(.CURDIR)/../include \
 		  -I$(.CURDIR)/../libio 
 CFLAGS+=	-I$(.CURDIR) -I$(.CURDIR)/../libio
 NOMAN=		noman
+NOLINT=		nolint
 
 .PATH: $(.CURDIR)/../libio
 
diff --git a/gnu/lib/libg++/libstdc++/Makefile b/gnu/lib/libg++/libstdc++/Makefile
index 63725ac6b3cd..01851f343a31 100644
--- a/gnu/lib/libg++/libstdc++/Makefile
+++ b/gnu/lib/libg++/libstdc++/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 1996/04/04 23:34:25 phil Exp $
+#	$NetBSD: Makefile,v 1.4 1996/12/20 01:04:27 cgd Exp $
 
 LIB=	stdc++
 
@@ -18,6 +18,7 @@ ldcomplex.cc ldcomio.cc random.cc tempbuf.cc tree.cc rx.c \
 CXXFLAGS+=  -nostdinc++ 
 CFLAGS+=    -I$(.CURDIR) -I$(.CURDIR)/../libio -I$(.CURDIR)/stl
 NOMAN=	    noman
+NOLINT=	    nolint
 
 .PATH: $(.CURDIR)/../libio  $(.CURDIR)/stl $(.CURDIR)/../librx