Module Name: src
Committed By: plunky
Date: Fri May 20 16:02:23 UTC 2011
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/external/bsd/pcc: prepare-import.sh
src/external/bsd/pcc/libexec: Makefile
src/external/bsd/pcc/usr.bin: Makefile
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
Log Message:
simplify PCC inclusion; MKPCCDMDS is not really required
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1624 -r1.1625 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1316 -r1.1317 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/prepare-import.sh
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pcc/libexec/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/usr.bin/Makefile
cvs rdiff -u -r1.52 -r1.53 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.281 -r1.282 src/share/mk/bsd.README
cvs rdiff -u -r1.667 -r1.668 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.131 src/distrib/sets/sets.subr:1.132
--- src/distrib/sets/sets.subr:1.131 Mon May 9 14:45:44 2011
+++ src/distrib/sets/sets.subr Fri May 20 16:02:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.131 2011/05/09 14:45:44 haad Exp $
+# $NetBSD: sets.subr,v 1.132 2011/05/20 16:02:22 plunky Exp $
#
#
@@ -172,7 +172,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.131 2011/05/09 14:45:44 haad Exp $
+# # $NetBSD: sets.subr,v 1.132 2011/05/20 16:02:22 plunky Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -232,7 +232,6 @@
# nvi ${MKNVI} != no
# pam ${MKPAM} != no
# pcc ${MKPCC} != no
-# pcccmds ${MKPCCCMDS} != no
# pf ${MKPF} != no
# pic ${MKPIC} != no
# postfix ${MKPOSTFIX} != no
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1624 src/distrib/sets/lists/comp/mi:1.1625
--- src/distrib/sets/lists/comp/mi:1.1624 Thu May 19 21:39:02 2011
+++ src/distrib/sets/lists/comp/mi Fri May 20 16:02:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1624 2011/05/19 21:39:02 riastradh Exp $
+# $NetBSD: mi,v 1.1625 2011/05/20 16:02:21 plunky Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -69,7 +69,7 @@
./usr/bin/nm comp-util-bin binutils
./usr/bin/objcopy comp-util-bin binutils
./usr/bin/objdump comp-util-bin binutils
-./usr/bin/pcc comp-c-bin pcccmds
+./usr/bin/pcc comp-c-bin pcc
./usr/bin/protoize comp-c-bin gcccmds
./usr/bin/ranlib comp-util-bin binutils
./usr/bin/rcs2log comp-cvs-bin cvs
@@ -3372,7 +3372,7 @@
./usr/libdata/debug/usr/bin/pathchk.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/pawd.debug comp-amd-debug debug
./usr/libdata/debug/usr/bin/paxctl.debug comp-obsolete obsolete
-./usr/libdata/debug/usr/bin/pcc.debug comp-c-debug pcccmds,debug
+./usr/libdata/debug/usr/bin/pcc.debug comp-c-debug pcc,debug
./usr/libdata/debug/usr/bin/pfbtops.debug comp-groff-debug groff,debug
./usr/libdata/debug/usr/bin/pic.debug comp-groff-debug groff,debug
./usr/libdata/debug/usr/bin/pigz.debug comp-util-debug debug
@@ -3578,11 +3578,11 @@
./usr/libdata/debug/usr/libexec/cc1.debug comp-c-debug gcccmds,debug
./usr/libdata/debug/usr/libexec/cc1obj.debug comp-objc-debug gcccmds,debug
./usr/libdata/debug/usr/libexec/cc1plus.debug comp-cxx-debug gcccmds,debug
-./usr/libdata/debug/usr/libexec/ccom.debug comp-c-debug pcccmds,debug
+./usr/libdata/debug/usr/libexec/ccom.debug comp-c-debug pcc,debug
./usr/libdata/debug/usr/libexec/ching/castching.debug comp-games-debug debug
./usr/libdata/debug/usr/libexec/ching/printching.debug comp-games-debug debug
./usr/libdata/debug/usr/libexec/comsat.debug comp-mail-debug debug
-./usr/libdata/debug/usr/libexec/cpp.debug comp-obsolete pcccmds,obsolete
+./usr/libdata/debug/usr/libexec/cpp.debug comp-obsolete pcc,obsolete
./usr/libdata/debug/usr/libexec/f771.debug comp-fortran-debug gcc=3,gcccmds,debug
./usr/libdata/debug/usr/libexec/digest-service.debug comp-krb5-debug kerberos,debug
./usr/libdata/debug/usr/libexec/f771.debug comp-obsolete gcc=4,obsolete
@@ -3608,7 +3608,7 @@
./usr/libdata/debug/usr/libexec/makekey.debug comp-crypto-debug debug
./usr/libdata/debug/usr/libexec/makewhatis.debug comp-man-debug debug
./usr/libdata/debug/usr/libexec/ntalkd.debug comp-netutil-debug debug
-./usr/libdata/debug/usr/libexec/pcpp.debug comp-c-debug pcccmds,debug
+./usr/libdata/debug/usr/libexec/pcpp.debug comp-c-debug pcc,debug
./usr/libdata/debug/usr/libexec/postfix/anvil.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/libexec/postfix/bounce.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/libexec/postfix/cleanup.debug comp-postfix-debug postfix,debug
@@ -4039,14 +4039,14 @@
./usr/libexec/cc1 comp-c-bin gcccmds
./usr/libexec/cc1obj comp-objc-bin gcccmds
./usr/libexec/cc1plus comp-cxx-bin gcccmds
-./usr/libexec/ccom comp-c-bin pcccmds
+./usr/libexec/ccom comp-c-bin pcc
./usr/libexec/collect2 comp-obsolete obsolete
-./usr/libexec/cpp comp-obsolete pcccmds,obsolete
+./usr/libexec/cpp comp-obsolete pcc,obsolete
./usr/libexec/f771 comp-fortran-bin gcc=3,gcccmds
./usr/libexec/f771 comp-obsolete gcc=4,obsolete
./usr/libexec/lint1 comp-c-bin
./usr/libexec/lint2 comp-c-bin
-./usr/libexec/pcpp comp-c-bin pcccmds
+./usr/libexec/pcpp comp-c-bin pcc
./usr/sbin/config comp-obsolete obsolete
./usr/sbin/config.new comp-obsolete obsolete
./usr/sbin/genassym comp-obsolete obsolete
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1316 src/distrib/sets/lists/man/mi:1.1317
--- src/distrib/sets/lists/man/mi:1.1316 Mon May 9 17:13:21 2011
+++ src/distrib/sets/lists/man/mi Fri May 20 16:02:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1316 2011/05/09 17:13:21 manu Exp $
+# $NetBSD: mi,v 1.1317 2011/05/20 16:02:22 plunky Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -87,7 +87,7 @@
./usr/share/man/cat1/calendar.0 man-util-catman .cat
./usr/share/man/cat1/cap_mkdb.0 man-util-catman .cat
./usr/share/man/cat1/cat.0 man-util-catman .cat
-./usr/share/man/cat1/ccom.0 man-util-catman pcccmds,.cat
+./usr/share/man/cat1/ccom.0 man-util-catman pcc,.cat
./usr/share/man/cat1/cd.0 man-util-catman .cat
./usr/share/man/cat1/cdplay.0 man-audio-catman .cat
./usr/share/man/cat1/chflags.0 man-util-catman .cat
@@ -375,8 +375,8 @@
./usr/share/man/cat1/pax.0 man-util-catman .cat
./usr/share/man/cat1/paxctl.0 man-obsolete obsolete
./usr/share/man/cat1/pcap-config.0 man-util-catman .cat
-./usr/share/man/cat1/pcc.0 man-util-catman pcccmds,.cat
-./usr/share/man/cat1/pcpp.0 man-util-catman pcccmds,.cat
+./usr/share/man/cat1/pcc.0 man-util-catman pcc,.cat
+./usr/share/man/cat1/pcpp.0 man-util-catman pcc,.cat
./usr/share/man/cat1/pgrep.0 man-util-catman .cat
./usr/share/man/cat1/prenice.0 man-util-catman .cat
./usr/share/man/cat1/pigz.0 man-util-catman .cat
@@ -2954,7 +2954,7 @@
./usr/share/man/html1/calendar.html man-util-htmlman html
./usr/share/man/html1/cap_mkdb.html man-util-htmlman html
./usr/share/man/html1/cat.html man-util-htmlman html
-./usr/share/man/html1/ccom.html man-util-htmlman pcccmds,html
+./usr/share/man/html1/ccom.html man-util-htmlman pcc,html
./usr/share/man/html1/cd.html man-util-htmlman html
./usr/share/man/html1/cdplay.html man-audio-htmlman html
./usr/share/man/html1/chflags.html man-util-htmlman html
@@ -3225,8 +3225,8 @@
./usr/share/man/html1/pawd.html man-amd-htmlman html
./usr/share/man/html1/pax.html man-util-htmlman html
./usr/share/man/html1/pcap-config.html man-util-htmlman html
-./usr/share/man/html1/pcc.html man-util-htmlman pcccmds,html
-./usr/share/man/html1/pcpp.html man-util-htmlman pcccmds,html
+./usr/share/man/html1/pcc.html man-util-htmlman pcc,html
+./usr/share/man/html1/pcpp.html man-util-htmlman pcc,html
./usr/share/man/html1/pgrep.html man-util-htmlman html
./usr/share/man/html1/prenice.html man-util-htmlman html
./usr/share/man/html1/pigz.html man-util-htmlman html
@@ -5434,7 +5434,7 @@
./usr/share/man/man1/calendar.1 man-util-man .man
./usr/share/man/man1/cap_mkdb.1 man-util-man .man
./usr/share/man/man1/cat.1 man-util-man .man
-./usr/share/man/man1/ccom.1 man-util-man pcccmds,.man
+./usr/share/man/man1/ccom.1 man-util-man pcc,.man
./usr/share/man/man1/cd.1 man-util-man .man
./usr/share/man/man1/cdplay.1 man-audio-man .man
./usr/share/man/man1/chflags.1 man-util-man .man
@@ -5722,8 +5722,8 @@
./usr/share/man/man1/pax.1 man-util-man .man
./usr/share/man/man1/paxctl.1 man-obsolete obsolete
./usr/share/man/man1/pcap-config.1 man-util-man .man
-./usr/share/man/man1/pcc.1 man-util-man pcccmds,.man
-./usr/share/man/man1/pcpp.1 man-util-man pcccmds,.man
+./usr/share/man/man1/pcc.1 man-util-man pcc,.man
+./usr/share/man/man1/pcpp.1 man-util-man pcc,.man
./usr/share/man/man1/pgrep.1 man-util-man .man
./usr/share/man/man1/prenice.1 man-util-man .man
./usr/share/man/man1/pigz.1 man-util-man .man
Index: src/external/bsd/pcc/prepare-import.sh
diff -u src/external/bsd/pcc/prepare-import.sh:1.2 src/external/bsd/pcc/prepare-import.sh:1.3
--- src/external/bsd/pcc/prepare-import.sh:1.2 Tue Feb 1 20:28:10 2011
+++ src/external/bsd/pcc/prepare-import.sh Fri May 20 16:02:23 2011
@@ -9,7 +9,6 @@
# and as a native binary for a release build by setting
#
# MKPCC=yes
-# MKPCCCMDS=yes
#
#
Index: src/external/bsd/pcc/libexec/Makefile
diff -u src/external/bsd/pcc/libexec/Makefile:1.5 src/external/bsd/pcc/libexec/Makefile:1.6
--- src/external/bsd/pcc/libexec/Makefile:1.5 Thu Apr 14 09:31:25 2011
+++ src/external/bsd/pcc/libexec/Makefile Fri May 20 16:02:23 2011
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2011/04/14 09:31:25 plunky Exp $
+# $NetBSD: Makefile,v 1.6 2011/05/20 16:02:23 plunky Exp $
.include <bsd.own.mk>
-.if (${MKPCCCMDS} != "no")
SUBDIR= mkext .WAIT ccom cpp
-.endif
.include <bsd.subdir.mk>
Index: src/external/bsd/pcc/usr.bin/Makefile
diff -u src/external/bsd/pcc/usr.bin/Makefile:1.3 src/external/bsd/pcc/usr.bin/Makefile:1.4
--- src/external/bsd/pcc/usr.bin/Makefile:1.3 Fri Feb 5 08:42:40 2010
+++ src/external/bsd/pcc/usr.bin/Makefile Fri May 20 16:02:23 2011
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/02/05 08:42:40 plunky Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/20 16:02:23 plunky Exp $
.include <bsd.own.mk>
-.if (${MKPCCCMDS} != "no")
SUBDIR= pcc
-.endif
.include <bsd.subdir.mk>
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.52 src/share/man/man5/mk.conf.5:1.53
--- src/share/man/man5/mk.conf.5:1.52 Mon Feb 21 18:12:26 2011
+++ src/share/man/man5/mk.conf.5 Fri May 20 16:02:23 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.52 2011/02/21 18:12:26 njoly Exp $
+.\" $NetBSD: mk.conf.5,v 1.53 2011/05/20 16:02:23 plunky Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -538,19 +538,6 @@
are built.
.DFLTn
.
-.It Sy MKPCCCMDS
-.YorN
-Indicates whether
-.Xr pcc 1
-is built.
-If
-.Dq no ,
-then
-.Sy MKPCC
-controls if the
-PCC libraries are built.
-.DFLTn
-.
.It Sy MKPF
.YorN
Indicates whether the
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.281 src/share/mk/bsd.README:1.282
--- src/share/mk/bsd.README:1.281 Thu May 19 14:29:27 2011
+++ src/share/mk/bsd.README Fri May 20 16:02:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.281 2011/05/19 14:29:27 joerg Exp $
+# $NetBSD: bsd.README,v 1.282 2011/05/20 16:02:23 plunky Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -284,10 +284,6 @@
libraries (libpcc, libpccsoftfloat).
Default: no
-MKPCCCMDS If "no", don't build pcc(1), but do build the PCC-related
- libraries (libpcc, libpccsoftfloat).
- Default: no
-
MKPF If "no", don't build or install the pf programs and LKM.
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.667 src/share/mk/bsd.own.mk:1.668
--- src/share/mk/bsd.own.mk:1.667 Thu May 19 14:29:27 2011
+++ src/share/mk/bsd.own.mk Fri May 20 16:02:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.667 2011/05/19 14:29:27 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.668 2011/05/20 16:02:23 plunky Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -795,7 +795,7 @@
MKBSDGREP MKBSDTAR MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG \
MKDEBUGLIB MKDTRACE MKEXTSRC \
MKMANDOC MKMANZ MKOBJDIRS \
- MKLLVM MKPCC MKPCCCMDS \
+ MKLLVM MKPCC \
MKPIGZGZIP \
MKREPRO \
MKSOFTFLOAT MKSTRIPIDENT \
