diff --git a/distrib/notes/Makefile.inc b/distrib/notes/Makefile.inc
index 2901c4cfaa5c..175d66a2fca1 100644
--- a/distrib/notes/Makefile.inc
+++ b/distrib/notes/Makefile.inc
@@ -1,9 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.2 1999/02/07 18:29:51 kleink Exp $
+#	$NetBSD: Makefile.inc,v 1.3 1999/02/13 23:53:56 lukem Exp $
 
 # Ross Harvey <ross@netbsd.org>
 
-NOPROG=	notreally
-
 M?=	${.CURDIR:T}
 V!=	/bin/sh ${.CURDIR}/../../../sys/conf/osrelease.sh
 V_S!=	/bin/sh ${.CURDIR}/../../../sys/conf/osrelease.sh -s
diff --git a/games/countmail/Makefile b/games/countmail/Makefile
index 32457011a581..cf254c439c6c 100644
--- a/games/countmail/Makefile
+++ b/games/countmail/Makefile
@@ -1,9 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 1997/10/03 10:25:35 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 1999/02/13 23:53:57 lukem Exp $
 
-NOPROG=	yes
-FILES=	countmail
-FILESDIR=	/usr/games
-FILESMODE=	555
-MAN=	countmail.6
+SCRIPTS=	countmail
+SCRIPTSDIR=	/usr/games
+MAN=		countmail.6
 
 .include <bsd.prog.mk>
diff --git a/gnu/lib/libstdc++/config/Makefile b/gnu/lib/libstdc++/config/Makefile
index 2d8e1baeee3b..10fe68cc7d16 100644
--- a/gnu/lib/libstdc++/config/Makefile
+++ b/gnu/lib/libstdc++/config/Makefile
@@ -1,9 +1,8 @@
-#	$NetBSD: Makefile,v 1.2 1999/02/11 18:20:58 tv Exp $
+#	$NetBSD: Makefile,v 1.3 1999/02/13 23:53:57 lukem Exp $
 
 # Makefile for _G_config.h, a machine-dependent automatically generated
 # configuration file.
 
-NOPROG=
 DPSRCS=		_G_config.h
 INCS=		_G_config.h
 INCSDIR=	/usr/include/${MACHINE}
diff --git a/gnu/lib/libstdc++/io/Makefile b/gnu/lib/libstdc++/io/Makefile
index 6ae8f7f91b93..eb2b7c01b652 100644
--- a/gnu/lib/libstdc++/io/Makefile
+++ b/gnu/lib/libstdc++/io/Makefile
@@ -1,6 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 1998/08/28 15:31:30 tv Exp $
-
-NOPROG=	yes
+#	$NetBSD: Makefile,v 1.3 1999/02/13 23:53:57 lukem Exp $
 
 INCS=	PlotFile.h SFile.h builtinbuf.h editbuf.h floatio.h fstream.h \
 	indstream.h iolibio.h iomanip.h iostdio.h iostream.h iostreamP.h \
@@ -8,6 +6,8 @@ INCS=	PlotFile.h SFile.h builtinbuf.h editbuf.h floatio.h fstream.h \
 	procbuf.h stdiostream.h stream.h streambuf.h strfile.h strstream.h
 INCSDIR=/usr/include/g++
 
+MKOBJ=	no
+
 .PATH: ${.CURDIR}/../../../dist/libio
 
 .include <bsd.prog.mk>
diff --git a/gnu/lib/libstdc++/std/Makefile b/gnu/lib/libstdc++/std/Makefile
index 49c0a693bcf8..972f27599910 100644
--- a/gnu/lib/libstdc++/std/Makefile
+++ b/gnu/lib/libstdc++/std/Makefile
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.3 1999/01/19 15:27:24 tv Exp $
-
-NOPROG=	yes
+#	$NetBSD: Makefile,v 1.4 1999/02/13 23:53:57 lukem Exp $
 
 INCS=	bastring.cc bastring.h complext.cc complext.h dcomplex.h fcomplex.h \
 	ldcomplex.h straits.h
 INCS+=	bastring_inst.h complext_inst.h
 INCSDIR=/usr/include/g++/std
 
+MKOBJ=	no
+
 .PATH: ${.CURDIR}/../../../dist/libstdc++/std
 
 .include <bsd.prog.mk>
diff --git a/gnu/lib/libstdc++/stl/Makefile b/gnu/lib/libstdc++/stl/Makefile
index 2fafba39f2e2..40cb04d916e6 100644
--- a/gnu/lib/libstdc++/stl/Makefile
+++ b/gnu/lib/libstdc++/stl/Makefile
@@ -1,6 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 1998/08/28 15:31:30 tv Exp $
-
-NOPROG=	yes
+#	$NetBSD: Makefile,v 1.5 1999/02/13 23:53:57 lukem Exp $
 
 INCS=	algorithm deque functional hash_map hash_set iterator list map \
 	memory numeric pthread_alloc queue rope set slist stack utility \
@@ -18,6 +16,8 @@ INCS=	algorithm deque functional hash_map hash_set iterator list map \
 	tempbuf.h tree.h type_traits.h vector.h
 INCSDIR=/usr/include/g++
 
+MKOBJ=	no
+
 .PATH: ${.CURDIR}/../../../dist/libstdc++/stl
 
 .SUFFIXES:
diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile
index 625854abc5ad..f412eec836e6 100644
--- a/gnu/libexec/uucp/uusched/Makefile
+++ b/gnu/libexec/uucp/uusched/Makefile
@@ -1,9 +1,8 @@
-#	$NetBSD: Makefile,v 1.7 1997/03/24 22:06:07 christos Exp $
+#	$NetBSD: Makefile,v 1.8 1999/02/13 23:53:57 lukem Exp $
 # Makefile for uusched
 
 BINDIR=		$(bindir)
 
-NOPROG=
 CLEANFILES=	uusched
 
 all:	${CLEANFILES}
diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile
index 3c0cd17aa9c9..25ffcb98118c 100644
--- a/gnu/libexec/uucp/uuto/Makefile
+++ b/gnu/libexec/uucp/uuto/Makefile
@@ -1,9 +1,8 @@
-#	$NetBSD: Makefile,v 1.7 1997/03/24 22:06:08 christos Exp $
+#	$NetBSD: Makefile,v 1.8 1999/02/13 23:53:57 lukem Exp $
 # Makefile for uuto
 
 BINDIR=		$(bindir)
 
-NOPROG=
 CLEANFILES=	uuto
 
 all:	${CLEANFILES}
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index 79a940890d1e..818de2e08af4 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 1999/02/13 02:54:28 lukem Exp $
+#	$NetBSD: Makefile,v 1.23 1999/02/13 23:53:58 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -48,7 +48,6 @@ ECHON = bsd
 
 BINDIR=		${bindir}
 LIBDIR=		${datadir}
-NOPROG=	
 MAN=		send-pr.1
 
 CLEANFILES=	send-pr send-pr.1 send-pr.el install-sid
diff --git a/gnu/usr.bin/texinfo/texi2dvi/Makefile b/gnu/usr.bin/texinfo/texi2dvi/Makefile
index 93f3e4b0c263..ff66c407d2e5 100644
--- a/gnu/usr.bin/texinfo/texi2dvi/Makefile
+++ b/gnu/usr.bin/texinfo/texi2dvi/Makefile
@@ -1,6 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 1999/02/11 15:42:16 tv Exp $
+#	$NetBSD: Makefile,v 1.2 1999/02/13 23:53:58 lukem Exp $
 
-NOPROG=
 FILES=		texi2dvi
 FILESMODE=	${BINMODE}
 
diff --git a/libexec/makewhatis/Makefile b/libexec/makewhatis/Makefile
index c2fd5b3a35c1..9fa79a696840 100644
--- a/libexec/makewhatis/Makefile
+++ b/libexec/makewhatis/Makefile
@@ -1,7 +1,6 @@
-#	$NetBSD: Makefile,v 1.6 1997/10/20 02:39:50 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 1999/02/13 23:53:57 lukem Exp $
 
 MAN=makewhatis.8
-NOPROG=
 SCRIPTS=makewhatis.sh
 
 .include <bsd.prog.mk>