summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/backgammon/common_source/Makefile4
-rw-r--r--gnu/usr.bin/diffutils/lib/Makefile4
-rw-r--r--gnu/usr.bin/gcc4/backend/Makefile4
-rw-r--r--gnu/usr.bin/gcc4/frontend/Makefile4
-rw-r--r--gnu/usr.bin/gcc4/libcpp/Makefile4
-rw-r--r--gnu/usr.bin/gcc4/libiberty/Makefile4
-rw-r--r--gnu/usr.bin/gdb6/bfd/Makefile4
-rw-r--r--gnu/usr.bin/gdb6/libgdb/Makefile4
-rw-r--r--gnu/usr.bin/gdb6/libiberty/Makefile4
-rw-r--r--gnu/usr.bin/gdb6/opcodes/Makefile4
-rw-r--r--gnu/usr.bin/gdb6/readline/Makefile4
-rw-r--r--gnu/usr.bin/gdb6/sim/ppc/Makefile4
-rw-r--r--gnu/usr.bin/gettext/libgrep/Makefile4
-rw-r--r--gnu/usr.bin/gettext/libnlspr/Makefile4
-rw-r--r--gnu/usr.bin/gettext/libnlsut/Makefile4
-rw-r--r--gnu/usr.bin/grep/lib/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/libs/libbib/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/libs/libdriver/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/libs/libgroff/Makefile4
-rw-r--r--gnu/usr.bin/rcs/lib/Makefile4
-rw-r--r--gnu/usr.bin/texinfo/common/Makefile4
-rw-r--r--gnu/usr.bin/xcvs/libcvs/Makefile4
-rw-r--r--gnu/usr.bin/xcvs/libdiff/Makefile4
-rw-r--r--gnu/usr.sbin/postfix/dns/Makefile4
-rw-r--r--gnu/usr.sbin/postfix/global/Makefile4
-rw-r--r--gnu/usr.sbin/postfix/masterlib/Makefile4
-rw-r--r--gnu/usr.sbin/postfix/milter/Makefile4
-rw-r--r--gnu/usr.sbin/postfix/tls/Makefile4
-rw-r--r--gnu/usr.sbin/postfix/util/Makefile4
-rw-r--r--gnu/usr.sbin/postfix/xsasl/Makefile4
-rw-r--r--lib/libtelnet/Makefile4
-rw-r--r--share/mk/bsd.README4
-rw-r--r--share/mk/bsd.lib.mk12
-rw-r--r--share/mk/bsd.own.mk4
-rw-r--r--sys/rump/Makefile.rump6
-rw-r--r--sys/rump/fs/lib/Makefile.inc6
-rw-r--r--usr.bin/audio/common/Makefile4
-rw-r--r--usr.sbin/altq/libaltq/Makefile4
-rw-r--r--usr.sbin/bootp/common/Makefile4
-rw-r--r--usr.sbin/dhcp/common/Makefile4
-rw-r--r--usr.sbin/dhcp/dhcpctl/Makefile4
-rw-r--r--usr.sbin/dhcp/dst/Makefile4
-rw-r--r--usr.sbin/dhcp/minires/Makefile4
-rw-r--r--usr.sbin/dhcp/omapip/Makefile4
-rw-r--r--usr.sbin/ipf/libipf/Makefile4
-rw-r--r--usr.sbin/lpr/common_source/Makefile4
-rw-r--r--usr.sbin/mopd/common/Makefile4
-rw-r--r--usr.sbin/ntp/libisc/Makefile4
-rw-r--r--usr.sbin/ntp/libntp/Makefile4
-rw-r--r--usr.sbin/ntp/libopts/Makefile4
-rw-r--r--usr.sbin/ntp/libparse/Makefile4
-rw-r--r--usr.sbin/pkg_install/lib/Makefile4
-rw-r--r--usr.sbin/sup/lib/Makefile4
-rw-r--r--usr.sbin/ypserv/common/Makefile4
-rw-r--r--x11/bin/xedit/lisp/Makefile4
-rw-r--r--x11/bin/xedit/mp/Makefile4
-rw-r--r--x11/bin/xedit/re/Makefile4
57 files changed, 119 insertions, 121 deletions
diff --git a/games/backgammon/common_source/Makefile b/games/backgammon/common_source/Makefile
index 7dc8044754e..ea9f7b0306c 100644
--- a/games/backgammon/common_source/Makefile
+++ b/games/backgammon/common_source/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2006/02/25 12:04:23 simonb Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= common
SRCS= allow.c board.c check.c fancy.c init.c odds.c \
diff --git a/gnu/usr.bin/diffutils/lib/Makefile b/gnu/usr.bin/diffutils/lib/Makefile
index a72ae088013..cdaf4906181 100644
--- a/gnu/usr.bin/diffutils/lib/Makefile
+++ b/gnu/usr.bin/diffutils/lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2004/05/23 02:24:50 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include "${.CURDIR}/../Makefile.inc"
diff --git a/gnu/usr.bin/gcc4/backend/Makefile b/gnu/usr.bin/gcc4/backend/Makefile
index 37ba57accc4..e1b21a73327 100644
--- a/gnu/usr.bin/gcc4/backend/Makefile
+++ b/gnu/usr.bin/gcc4/backend/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2007/04/08 09:35:32 scw Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= backend
diff --git a/gnu/usr.bin/gcc4/frontend/Makefile b/gnu/usr.bin/gcc4/frontend/Makefile
index 8edd8e9ed9c..67eec6b8d00 100644
--- a/gnu/usr.bin/gcc4/frontend/Makefile
+++ b/gnu/usr.bin/gcc4/frontend/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/11/12 01:24:44 christos Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
# For ../Makefile.inc and bsd.own.mk
.include <bsd.init.mk>
diff --git a/gnu/usr.bin/gcc4/libcpp/Makefile b/gnu/usr.bin/gcc4/libcpp/Makefile
index c99511f9ffd..89a37c9c910 100644
--- a/gnu/usr.bin/gcc4/libcpp/Makefile
+++ b/gnu/usr.bin/gcc4/libcpp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/11/12 01:24:45 christos Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= cpp
diff --git a/gnu/usr.bin/gcc4/libiberty/Makefile b/gnu/usr.bin/gcc4/libiberty/Makefile
index a470d4aed76..a5a823061fa 100644
--- a/gnu/usr.bin/gcc4/libiberty/Makefile
+++ b/gnu/usr.bin/gcc4/libiberty/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2007/05/20 21:31:05 christos Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.bin/gdb6/bfd/Makefile b/gnu/usr.bin/gdb6/bfd/Makefile
index 1f31611e02b..4015ac06b6f 100644
--- a/gnu/usr.bin/gdb6/bfd/Makefile
+++ b/gnu/usr.bin/gdb6/bfd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/05/29 19:18:56 nathanw Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
.include <bsd.own.mk>
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= bfd
diff --git a/gnu/usr.bin/gdb6/libgdb/Makefile b/gnu/usr.bin/gdb6/libgdb/Makefile
index d67cb975920..f388199be74 100644
--- a/gnu/usr.bin/gdb6/libgdb/Makefile
+++ b/gnu/usr.bin/gdb6/libgdb/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2007/01/12 13:24:30 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:31 lukem Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= gdb
.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
diff --git a/gnu/usr.bin/gdb6/libiberty/Makefile b/gnu/usr.bin/gdb6/libiberty/Makefile
index 3ad3fd76d61..613d9238311 100644
--- a/gnu/usr.bin/gdb6/libiberty/Makefile
+++ b/gnu/usr.bin/gdb6/libiberty/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/11/10 17:36:08 christos Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:31 lukem Exp $
.include <bsd.own.mk>
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= iberty
diff --git a/gnu/usr.bin/gdb6/opcodes/Makefile b/gnu/usr.bin/gdb6/opcodes/Makefile
index 4f548da3e0f..2440351487a 100644
--- a/gnu/usr.bin/gdb6/opcodes/Makefile
+++ b/gnu/usr.bin/gdb6/opcodes/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/05/29 19:18:56 nathanw Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
.include <bsd.own.mk>
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= opcodes
diff --git a/gnu/usr.bin/gdb6/readline/Makefile b/gnu/usr.bin/gdb6/readline/Makefile
index fef790a7054..47dfc2d83ba 100644
--- a/gnu/usr.bin/gdb6/readline/Makefile
+++ b/gnu/usr.bin/gdb6/readline/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/05/29 19:27:22 nathanw Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
.include <bsd.own.mk>
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= readline
diff --git a/gnu/usr.bin/gdb6/sim/ppc/Makefile b/gnu/usr.bin/gdb6/sim/ppc/Makefile
index b7a58f3b89d..15d2f67fc77 100644
--- a/gnu/usr.bin/gdb6/sim/ppc/Makefile
+++ b/gnu/usr.bin/gdb6/sim/ppc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/07/10 23:06:51 ross Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
NOGCCERROR=
.include <bsd.own.mk>
diff --git a/gnu/usr.bin/gettext/libgrep/Makefile b/gnu/usr.bin/gettext/libgrep/Makefile
index 9f8cd5929d3..acc2c0a4190 100644
--- a/gnu/usr.bin/gettext/libgrep/Makefile
+++ b/gnu/usr.bin/gettext/libgrep/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2006/11/10 17:36:08 christos Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.bin/gettext/libnlspr/Makefile b/gnu/usr.bin/gettext/libnlspr/Makefile
index 244f9974b52..bb8896420aa 100644
--- a/gnu/usr.bin/gettext/libnlspr/Makefile
+++ b/gnu/usr.bin/gettext/libnlspr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2006/11/10 17:36:08 christos Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.bin/gettext/libnlsut/Makefile b/gnu/usr.bin/gettext/libnlsut/Makefile
index 7d92fb23dfb..7b1f416d2d6 100644
--- a/gnu/usr.bin/gettext/libnlsut/Makefile
+++ b/gnu/usr.bin/gettext/libnlsut/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2006/11/10 17:36:08 christos Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.bin/grep/lib/Makefile b/gnu/usr.bin/grep/lib/Makefile
index c1ca5470f12..7c468d7d7e5 100644
--- a/gnu/usr.bin/grep/lib/Makefile
+++ b/gnu/usr.bin/grep/lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2006/11/10 17:36:09 christos Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include "${.CURDIR}/../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile
index 95abfab0d30..bdcd0a225e8 100644
--- a/gnu/usr.bin/groff/src/libs/libbib/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2004/05/23 02:24:51 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:30 lukem Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libbib/Makefile,v 1.3 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/libs/libbib
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= bib
SRCS= common.cpp index.cpp linear.cpp search.cpp map.c
diff --git a/gnu/usr.bin/groff/src/libs/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
index 2afabce2bf2..551f4290cd2 100644
--- a/gnu/usr.bin/groff/src/libs/libdriver/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2004/05/23 02:24:51 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:30 lukem Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libdriver/Makefile,v 1.3 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/libs/libdriver
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= driver
SRCS= input.cpp printer.cpp
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
index 484a400c6c8..3b42a3c7ee6 100644
--- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2006/02/06 18:29:48 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:30 lukem Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.5 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/libs/libgroff
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= groff
SRCS= assert.cpp change_lf.cpp cmap.cpp color.cpp cset.cpp \
diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile
index 18d469537ca..65194f2f0c5 100644
--- a/gnu/usr.bin/rcs/lib/Makefile
+++ b/gnu/usr.bin/rcs/lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2004/05/23 02:24:51 lukem Exp $
+# $NetBSD: Makefile,v 1.22 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
# Define FSYNC_ALL to get slower but safer writes in case of crashes in
# the middle of CVS/RCS changes
diff --git a/gnu/usr.bin/texinfo/common/Makefile b/gnu/usr.bin/texinfo/common/Makefile
index 809598e017c..41e5d929531 100644
--- a/gnu/usr.bin/texinfo/common/Makefile
+++ b/gnu/usr.bin/texinfo/common/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2006/02/25 12:04:23 simonb Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:30 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= common
SRCS+= substring.c xexit.c xmalloc.c xstrdup.c
diff --git a/gnu/usr.bin/xcvs/libcvs/Makefile b/gnu/usr.bin/xcvs/libcvs/Makefile
index b2ffb774bb1..e8f4b0ada23 100644
--- a/gnu/usr.bin/xcvs/libcvs/Makefile
+++ b/gnu/usr.bin/xcvs/libcvs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2006/02/04 16:22:53 christos Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include "${.CURDIR}/../Makefile.inc"
diff --git a/gnu/usr.bin/xcvs/libdiff/Makefile b/gnu/usr.bin/xcvs/libdiff/Makefile
index be1558ee5d1..107f014027c 100644
--- a/gnu/usr.bin/xcvs/libdiff/Makefile
+++ b/gnu/usr.bin/xcvs/libdiff/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2006/02/04 16:22:53 christos Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include "${.CURDIR}/../Makefile.inc"
diff --git a/gnu/usr.sbin/postfix/dns/Makefile b/gnu/usr.sbin/postfix/dns/Makefile
index 4fae1f44e82..71fdf018345 100644
--- a/gnu/usr.sbin/postfix/dns/Makefile
+++ b/gnu/usr.sbin/postfix/dns/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2005/08/18 22:30:37 rpaulo Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.sbin/postfix/global/Makefile b/gnu/usr.sbin/postfix/global/Makefile
index 6113f5b53e8..368728ac653 100644
--- a/gnu/usr.sbin/postfix/global/Makefile
+++ b/gnu/usr.sbin/postfix/global/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2006/07/19 02:04:43 rpaulo Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.sbin/postfix/masterlib/Makefile b/gnu/usr.sbin/postfix/masterlib/Makefile
index cf305fad5fc..b483116e84a 100644
--- a/gnu/usr.sbin/postfix/masterlib/Makefile
+++ b/gnu/usr.sbin/postfix/masterlib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/05/23 02:24:51 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.sbin/postfix/milter/Makefile b/gnu/usr.sbin/postfix/milter/Makefile
index 6c868e64346..dd05af424a8 100644
--- a/gnu/usr.sbin/postfix/milter/Makefile
+++ b/gnu/usr.sbin/postfix/milter/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2006/07/19 02:04:44 rpaulo Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.sbin/postfix/tls/Makefile b/gnu/usr.sbin/postfix/tls/Makefile
index 0bc4c4a85a0..dc367f20249 100644
--- a/gnu/usr.sbin/postfix/tls/Makefile
+++ b/gnu/usr.sbin/postfix/tls/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/07/19 02:04:44 rpaulo Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.sbin/postfix/util/Makefile b/gnu/usr.sbin/postfix/util/Makefile
index 612c6c0fcfb..930d922b3e3 100644
--- a/gnu/usr.sbin/postfix/util/Makefile
+++ b/gnu/usr.sbin/postfix/util/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2007/08/02 08:29:04 heas Exp $
+# $NetBSD: Makefile,v 1.18 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/gnu/usr.sbin/postfix/xsasl/Makefile b/gnu/usr.sbin/postfix/xsasl/Makefile
index 041bbe61c45..a3900e4f7e1 100644
--- a/gnu/usr.sbin/postfix/xsasl/Makefile
+++ b/gnu/usr.sbin/postfix/xsasl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2006/07/19 02:04:44 rpaulo Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 310eee05832..046c230e9e2 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -1,9 +1,9 @@
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
-# $NetBSD: Makefile,v 1.28 2007/05/28 12:06:22 tls Exp $
+# $NetBSD: Makefile,v 1.29 2008/05/03 14:48:31 lukem Exp $
USE_FORT?= yes # network protocol library
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index dd83e2fd116..764805e5d0f 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.206 2008/05/02 11:45:19 lukem Exp $
+# $NetBSD: bsd.README,v 1.207 2008/05/03 14:48:31 lukem Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the new (as of 1993) make "include" files
@@ -755,7 +755,7 @@ USE_SHLIBDIR If not "no", use ${SHLIBINSTALLDIR} instead of ${LIBDIR}
USE_SHLIBDIR must be defined before <bsd.own.mk> is included.
Default: no
-MKPRIVATELIB If not "no", act as "MKLINT=no MKPIC=no MKPROFILE=no",
+LIBISPRIVATE If not "no", act as "MKDEBUGLIB=no MKLINT=no MKPIC=no MKPROFILE=no",
and don't install the (.a) library.
This is useful for "build only" helper libraries.
Default: no
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 61318721413..156deef7d32 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.280 2008/05/03 14:36:06 lukem Exp $
+# $NetBSD: bsd.lib.mk,v 1.281 2008/05/03 14:48:31 lukem Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -7,7 +7,9 @@
# Pull in <bsd.sys.mk> here so we can override its .c.o rule
.include <bsd.sys.mk>
-.if ${MKPRIVATELIB} != "no"
+LIBISPRIVATE?= no
+
+.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
MKLINT:= no
MKPIC:= no
@@ -342,10 +344,10 @@ STOBJS+=${OBJS}
LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
-.if ${MKPRIVATELIB} != "no"
+.if ${LIBISPRIVATE} != "no"
# No installation is required
libinstall::
-.else # ${MKPRIVATELIB} == "no" # {
+.else # ${LIBISPRIVATE} == "no" # {
.if ${MKDEBUGLIB} != "no"
_LIBS+=lib${LIB}_g.a
@@ -384,7 +386,7 @@ _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
_LIBS+=llib-l${LIB}.ln
.endif
-.endif # ${MKPRIVATELIB} == "no" # }
+.endif # ${LIBISPRIVATE} == "no" # }
ALLOBJS=
.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 51a5d3d0e0f..56582adc1b4 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.508 2008/05/02 23:12:01 ad Exp $
+# $NetBSD: bsd.own.mk,v 1.509 2008/05/03 14:48:31 lukem Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -567,7 +567,7 @@ ${var}?= yes
#
.for var in \
MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
- MKMANZ MKMODULAR MKOBJDIRS MKPRIVATELIB MKPUFFS MKSOFTFLOAT \
+ MKMANZ MKMODULAR MKOBJDIRS MKPUFFS MKSOFTFLOAT \
MKUNPRIVED MKUPDATE MKX11
${var}?=no
.endfor
diff --git a/sys/rump/Makefile.rump b/sys/rump/Makefile.rump
index af4458e486c..96b56aa5080 100644
--- a/sys/rump/Makefile.rump
+++ b/sys/rump/Makefile.rump
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile.rump,v 1.6 2008/01/24 22:41:07 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.7 2008/05/03 14:48:31 lukem Exp $
#
.include <bsd.own.mk>
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
NOMAN= wizd
-MKLINT?= no
-MKPIC?= no
WARNS?= 4
DBG= -g -O0
diff --git a/sys/rump/fs/lib/Makefile.inc b/sys/rump/fs/lib/Makefile.inc
index 34177556f33..ed2c90efdef 100644
--- a/sys/rump/fs/lib/Makefile.inc
+++ b/sys/rump/fs/lib/Makefile.inc
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.4 2007/10/26 10:44:27 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.5 2008/05/03 14:48:31 lukem Exp $
#
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
NOMAN= wizd
-MKLINT?= no
-MKPIC?= no
WARNS?= 4
DBG= -O0 -g
diff --git a/usr.bin/audio/common/Makefile b/usr.bin/audio/common/Makefile
index 70ab3034d43..cb3f6b2b755 100644
--- a/usr.bin/audio/common/Makefile
+++ b/usr.bin/audio/common/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/05/23 02:24:51 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= audio
SRCS= audio.c wav.c sun.c
diff --git a/usr.sbin/altq/libaltq/Makefile b/usr.sbin/altq/libaltq/Makefile
index 3b41f19dfac..071addcc0b4 100644
--- a/usr.sbin/altq/libaltq/Makefile
+++ b/usr.sbin/altq/libaltq/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2006/10/12 19:59:13 peter Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/usr.sbin/bootp/common/Makefile b/usr.sbin/bootp/common/Makefile
index c903df6e23f..d725ecab92a 100644
--- a/usr.sbin/bootp/common/Makefile
+++ b/usr.sbin/bootp/common/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:31 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= common
SRCS= dovend.c dumptab.c getif.c hash.c hwaddr.c lookup.c readfile.c \
diff --git a/usr.sbin/dhcp/common/Makefile b/usr.sbin/dhcp/common/Makefile
index 2efc76e80b9..3ae56f0a7e6 100644
--- a/usr.sbin/dhcp/common/Makefile
+++ b/usr.sbin/dhcp/common/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.23 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB = dhcp
SRCS = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \
diff --git a/usr.sbin/dhcp/dhcpctl/Makefile b/usr.sbin/dhcp/dhcpctl/Makefile
index fff942601a5..b7b4faf427d 100644
--- a/usr.sbin/dhcp/dhcpctl/Makefile
+++ b/usr.sbin/dhcp/dhcpctl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB = dhcpctl
SRCS = dhcpctl.c callback.c remote.c
diff --git a/usr.sbin/dhcp/dst/Makefile b/usr.sbin/dhcp/dst/Makefile
index efe19c19a01..3890eebe229 100644
--- a/usr.sbin/dhcp/dst/Makefile
+++ b/usr.sbin/dhcp/dst/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB = dst
SRCS = dst_support.c dst_api.c hmac_link.c md5_dgst.c base64.c prandom.c
diff --git a/usr.sbin/dhcp/minires/Makefile b/usr.sbin/dhcp/minires/Makefile
index d6eaf42f412..bfb627cf2c3 100644
--- a/usr.sbin/dhcp/minires/Makefile
+++ b/usr.sbin/dhcp/minires/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB = minires
SRCS = res_mkupdate.c res_init.c res_update.c res_send.c res_comp.c \
diff --git a/usr.sbin/dhcp/omapip/Makefile b/usr.sbin/dhcp/omapip/Makefile
index be16f3715a8..70ff8fb8733 100644
--- a/usr.sbin/dhcp/omapip/Makefile
+++ b/usr.sbin/dhcp/omapip/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB = omapi
SRCS = protocol.c buffer.c alloc.c result.c connection.c errwarn.c \
diff --git a/usr.sbin/ipf/libipf/Makefile b/usr.sbin/ipf/libipf/Makefile
index dcff5c7d6b9..e8ae5168760 100644
--- a/usr.sbin/ipf/libipf/Makefile
+++ b/usr.sbin/ipf/libipf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2007/05/16 04:26:07 taca Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= ipf
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index b59091bb0ac..6e1ac5311ef 100644
--- a/usr.sbin/lpr/common_source/Makefile
+++ b/usr.sbin/lpr/common_source/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/05/23 14:05:39 tron Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= common
SRCS= common.c common_vars.c displayq.c fatal.c rmjob.c startdaemon.c
diff --git a/usr.sbin/mopd/common/Makefile b/usr.sbin/mopd/common/Makefile
index 572314024e3..80633b6242c 100644
--- a/usr.sbin/mopd/common/Makefile
+++ b/usr.sbin/mopd/common/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2006/05/12 01:54:57 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= common
SRCS= cmp.c device.c dl.c file.c get.c log.c loop-bsd.c mopdef.c nma.c pf.c \
diff --git a/usr.sbin/ntp/libisc/Makefile b/usr.sbin/ntp/libisc/Makefile
index 311d2025ee0..ec941d8e28a 100644
--- a/usr.sbin/ntp/libisc/Makefile
+++ b/usr.sbin/ntp/libisc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/06/11 19:34:22 kardel Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= isc
SRCS= assertions.c error.c interfaceiter.c isc_strerror.c lib.c mem.c \
diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile
index 5d158551f29..ea80ed90aff 100644
--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2006/08/26 18:15:37 christos Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= ntp
SRCS= a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
diff --git a/usr.sbin/ntp/libopts/Makefile b/usr.sbin/ntp/libopts/Makefile
index 112b5c0763e..e2fc7535031 100644
--- a/usr.sbin/ntp/libopts/Makefile
+++ b/usr.sbin/ntp/libopts/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2007/01/06 19:45:29 kardel Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= opts
SRCS= libopts.c
diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile
index 3982ab33add..a318c4f8702 100644
--- a/usr.sbin/ntp/libparse/Makefile
+++ b/usr.sbin/ntp/libparse/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2006/06/11 19:34:28 kardel Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= parse
SRCS= binio.c clk_computime.c clk_dcf7000.c clk_hopf6021.c \
diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile
index 38563b8a11b..987ec7dbf31 100644
--- a/usr.sbin/pkg_install/lib/Makefile
+++ b/usr.sbin/pkg_install/lib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2008/02/22 16:20:53 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/05/03 14:48:32 lukem Exp $
# Original from FreeBSD, no rcs id.
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= install
SRCS= automatic.c conflicts.c decompress.c dewey.c \
diff --git a/usr.sbin/sup/lib/Makefile b/usr.sbin/sup/lib/Makefile
index e12dae5b368..52a1d4c1953 100644
--- a/usr.sbin/sup/lib/Makefile
+++ b/usr.sbin/sup/lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2006/08/26 18:15:39 christos Exp $
+# $NetBSD: Makefile,v 1.13 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= sup
diff --git a/usr.sbin/ypserv/common/Makefile b/usr.sbin/ypserv/common/Makefile
index 073044a882d..f1c116b0ee6 100644
--- a/usr.sbin/ypserv/common/Makefile
+++ b/usr.sbin/ypserv/common/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
LIB= common
SRCS= localhostname.c ypdb.c yplib_host.c ypresp_xdr.c
diff --git a/x11/bin/xedit/lisp/Makefile b/x11/bin/xedit/lisp/Makefile
index 58166121452..42cec367c19 100644
--- a/x11/bin/xedit/lisp/Makefile
+++ b/x11/bin/xedit/lisp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/x11/bin/xedit/mp/Makefile b/x11/bin/xedit/mp/Makefile
index 4d7b027bbc4..03b6f17cf7c 100644
--- a/x11/bin/xedit/mp/Makefile
+++ b/x11/bin/xedit/mp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>
diff --git a/x11/bin/xedit/re/Makefile b/x11/bin/xedit/re/Makefile
index ceff6728b14..337ae42dd5e 100644
--- a/x11/bin/xedit/re/Makefile
+++ b/x11/bin/xedit/re/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/05/23 02:24:52 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:32 lukem Exp $
-MKPRIVATELIB= yes
+LIBISPRIVATE= yes
.include <bsd.own.mk>