Merge remote-tracking branch 'origin/stable/10' into devel

43 files changed, 115 insertions, 41 deletions

diff --git a/share/Makefile b/share/Makefile
index 72b1b2e..078ee1d 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -98,4 +98,6 @@ _vt=		vt
 _zoneinfo=	zoneinfo
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 4b68f1e..b593894 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -42,7 +42,7 @@ LOCALES=	bg_BG.CP1251 \
 		uk_UA.ISO8859-5 \
 		uk_UA.KOI8-U
 
-LOCALEDIR=	/usr/share/locale
+LOCALEDIR=	${SHAREDIR}/locale
 
 .SUFFIXES: .src .out
 
diff --git a/share/doc/Makefile b/share/doc/Makefile
index d01a2b2..a8726bb 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -28,6 +28,8 @@ _IPv6=	IPv6
 _roffdocs=	papers psd smm usd
 .endif
 
+SUBDIR_PARALLEL=
+
 # Default output format for troff documents is ascii.
 # To generate postscript versions of troff documents, use:
 #  make PRINTERDEVICE=ps
diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile
index 9590800..345eafc 100644
--- a/share/doc/legal/Makefile
+++ b/share/doc/legal/Makefile
@@ -6,4 +6,6 @@ SUBDIR=	intel_ipw \
 	intel_wpi \
 	realtek
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index 866fe20..c126345 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -16,4 +16,6 @@ SUBDIR=	beyond4.3 \
 	sysperf \
 	timecounter
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index 243ba99..6b6d9cd 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -37,4 +37,6 @@ SUBDIR+=22.rpcgen \
 	26.rpcrfc \
 	27.nfsrpc
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index fd42bd4..fd7a23f 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -32,4 +32,6 @@ _08.sendmailop=	08.sendmailop
 _07.lpd=	07.lpd
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index 5fcb6b3..8638158 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -19,5 +19,6 @@ SUBDIR=	title \
 	20.meref \
 	21.troff \
 	22.trofftut
+SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 9d71e7a..ad4c40e 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -261,4 +261,6 @@ SUBDIR+=pf
 SUBDIR+=tests
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile
index 9e5b99a..3867b80 100644
--- a/share/examples/smbfs/Makefile
+++ b/share/examples/smbfs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 NO_OBJ=
-BINDIR=	/usr/share/examples/smbfs
+FILESDIR= ${SHAREDIR}/examples/smbfs
 FILES=	dot.nsmbrc
 
 .PATH: ${.CURDIR}/../../../contrib/smbfs/examples
diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile
index eb66815..67f4823 100644
--- a/share/examples/smbfs/print/Makefile
+++ b/share/examples/smbfs/print/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 NO_OBJ=
-BINDIR=	/usr/share/examples/smbfs/print
+FILESDIR= ${SHAREDIR}/examples/smbfs/print
 FILES=	lj6l ljspool printcap.sample tolj
 
 .PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print
diff --git a/share/i18n/Makefile b/share/i18n/Makefile
index 1cadd54..b166d94 100644
--- a/share/i18n/Makefile
+++ b/share/i18n/Makefile
@@ -4,5 +4,6 @@
 .include <bsd.own.mk>
 
 SUBDIR=	csmapper esdb
+SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/share/i18n/csmapper/Makefile b/share/i18n/csmapper/Makefile
index 7bca3ab..18ee8fc 100644
--- a/share/i18n/csmapper/Makefile
+++ b/share/i18n/csmapper/Makefile
@@ -5,6 +5,7 @@ FILESDIR= ${CSMAPPERDIR}
 
 SUBDIR=	APPLE AST BIG5 CNS CP EBCDIC GB GEORGIAN ISO646 ISO-8859 JIS \
 	KAZAKH KOI KS MISC TCVN
+SUBDIR_PARALLEL=
 
 mapper.dir: ${SUBDIR}
 	newfile=$$(for i in ${SUBDIR}; do \
diff --git a/share/i18n/esdb/Makefile b/share/i18n/esdb/Makefile
index 2b16d90..69d4445 100644
--- a/share/i18n/esdb/Makefile
+++ b/share/i18n/esdb/Makefile
@@ -5,6 +5,7 @@ FILESDIR= ${ESDBDIR}
 
 SUBDIR=	APPLE AST BIG5 CP DEC EUC EBCDIC GB GEORGIAN ISO-2022 ISO-8859 \
 	ISO646 KAZAKH KOI MISC TCVN UTF
+SUBDIR_PARALLEL=
 
 FILES+=	esdb.dir esdb.dir.db esdb.alias esdb.alias.db
 CLEANFILES= ${FILES}
diff --git a/share/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile
index ee0d4c9..bc8d13a 100644
--- a/share/keys/pkg/trusted/Makefile
+++ b/share/keys/pkg/trusted/Makefile
@@ -4,7 +4,7 @@ NO_OBJ=
 
 FILES=	pkg.freebsd.org.2013102301
 
-FILESDIR=	/usr/share/keys/pkg/trusted
+FILESDIR=	${SHAREDIR}/keys/pkg/trusted
 FILESMODE=	644
 
 .include <bsd.prog.mk>
diff --git a/share/man/Makefile b/share/man/Makefile
index 524235c..d2638be 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -5,6 +5,7 @@
 
 # XXX MISSING:	man3f
 SUBDIR=	man1 man3 man4 man5 man6 man7 man8 man9
+SUBDIR_PARALLEL=
 
 MAKEWHATIS?=	makewhatis
 
diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4
index c708c89..7fefa91 100644
--- a/share/man/man4/aue.4
+++ b/share/man/man4/aue.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 7, 2006
+.Dd November 24, 2015
 .Dt AUE 4
 .Os
 .Sh NAME
@@ -45,6 +45,7 @@ kernel configuration file:
 .Cd "device ohci"
 .Cd "device usb"
 .Cd "device miibus"
+.Cd "device uether"
 .Cd "device aue"
 .Ed
 .Pp
diff --git a/share/man/man4/axe.4 b/share/man/man4/axe.4
index 65e1887..5a26b64 100644
--- a/share/man/man4/axe.4
+++ b/share/man/man4/axe.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 25, 2013
+.Dd November 24, 2015
 .Dt AXE 4
 .Os
 .Sh NAME
@@ -46,6 +46,7 @@ kernel configuration file:
 .Cd "device ohci"
 .Cd "device usb"
 .Cd "device miibus"
+.Cd "device uether"
 .Cd "device axe"
 .Ed
 .Pp
diff --git a/share/man/man4/axge.4 b/share/man/man4/axge.4
index 33f7db3..4c91fcf 100644
--- a/share/man/man4/axge.4
+++ b/share/man/man4/axge.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 22, 2013
+.Dd November 24, 2015
 .Dt AXGE 4
 .Os
 .Sh NAME
@@ -47,6 +47,7 @@ kernel configuration file:
 .Cd "device ohci"
 .Cd "device usb"
 .Cd "device miibus"
+.Cd "device uether"
 .Cd "device axge"
 .Ed
 .Pp
diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4
index 9649cab..648f876 100644
--- a/share/man/man4/cdce.4
+++ b/share/man/man4/cdce.4
@@ -28,7 +28,7 @@
 .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $
 .\" $FreeBSD$
 .\"
-.Dd September 25, 2014
+.Dd November 24, 2015
 .Dt CDCE 4
 .Os
 .Sh NAME
@@ -42,6 +42,8 @@ kernel configuration file:
 .Cd "device uhci"
 .Cd "device ohci"
 .Cd "device usb"
+.Cd "device miibus"
+.Cd "device uether"
 .Cd "device cdce"
 .Ed
 .Pp
diff --git a/share/man/man4/cue.4 b/share/man/man4/cue.4
index a27653c..ddf8e75 100644
--- a/share/man/man4/cue.4
+++ b/share/man/man4/cue.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd November 24, 2015
 .Dt CUE 4
 .Os
 .Sh NAME
@@ -44,6 +44,8 @@ kernel configuration file:
 .Cd "device uhci"
 .Cd "device ohci"
 .Cd "device usb"
+.Cd "device miibus"
+.Cd "device uether"
 .Cd "device cue"
 .Ed
 .Pp
diff --git a/share/man/man4/ipheth.4 b/share/man/man4/ipheth.4
index 85801f2..64e1018 100644
--- a/share/man/man4/ipheth.4
+++ b/share/man/man4/ipheth.4
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 30, 2014
+.Dd November 24, 2015
 .Dt IPHETH 4
 .Os
 .Sh NAME
@@ -47,6 +47,8 @@ following lines in your kernel configuration file:
 .Cd "device uhci"
 .Cd "device ohci"
 .Cd "device usb"
+.Cd "device miibus"
+.Cd "device uether"
 .Cd "device ipheth"
 .Ed
 .Sh DESCRIPTION
diff --git a/share/man/man4/kue.4 b/share/man/man4/kue.4
index c9a8ad7..718b842 100644
--- a/share/man/man4/kue.4
+++ b/share/man/man4/kue.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 7, 2006
+.Dd November 24, 2015
 .Dt KUE 4
 .Os
 .Sh NAME
@@ -44,6 +44,8 @@ kernel configuration file:
 .Cd "device uhci"
 .Cd "device ohci"
 .Cd "device usb"
+.Cd "device miibus"
+.Cd "device uether"
 .Cd "device kue"
 .Ed
 .Pp
diff --git a/share/man/man4/mos.4 b/share/man/man4/mos.4
index 2656dea..e4ae8c4 100644
--- a/share/man/man4/mos.4
+++ b/share/man/man4/mos.4
@@ -15,7 +15,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 14, 2011
+.Dd November 24, 2015
 .Dt MOS 4
 .Os
 .Sh NAME
@@ -31,6 +31,7 @@ kernel configuration file:
 .Cd "device ehci"
 .Cd "device usb"
 .Cd "device miibus"
+.Cd "device uether"
 .Cd "device mos"
 .Ed
 .Pp
diff --git a/share/man/man4/rue.4 b/share/man/man4/rue.4
index 06f91e8..6b0881f 100644
--- a/share/man/man4/rue.4
+++ b/share/man/man4/rue.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 23, 2011
+.Dd November 24, 2015
 .Dt RUE 4
 .Os
 .Sh NAME
@@ -40,6 +40,7 @@ kernel configuration file:
 .Cd "device ohci"
 .Cd "device usb"
 .Cd "device miibus"
+.Cd "device uether"
 .Cd "device rue"
 .Ed
 .Pp
diff --git a/share/man/man4/smsc.4 b/share/man/man4/smsc.4
index fb37539..dac2864 100644
--- a/share/man/man4/smsc.4
+++ b/share/man/man4/smsc.4
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 26, 2014
+.Dd November 24, 2015
 .Dt SMSC 4
 .Os
 .Sh NAME
@@ -48,6 +48,7 @@ following lines in your kernel configuration file:
 .Cd "device ohci"
 .Cd "device usb"
 .Cd "device miibus"
+.Cd "device uether"
 .Cd "device smsc"
 .Ed
 .Sh DESCRIPTION
diff --git a/share/man/man4/udav.4 b/share/man/man4/udav.4
index 4d90236..818a1f0 100644
--- a/share/man/man4/udav.4
+++ b/share/man/man4/udav.4
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd November 24, 2015
 .Dt UDAV 4
 .Os
 .Sh NAME
@@ -48,6 +48,7 @@ kernel configuration file:
 .Cd "device ohci"
 .Cd "device usb"
 .Cd "device miibus"
+.Cd "device uether"
 .Cd "device udav"
 .Ed
 .Pp
diff --git a/share/man/man4/urndis.4 b/share/man/man4/urndis.4
index 33acec5..de64313 100644
--- a/share/man/man4/urndis.4
+++ b/share/man/man4/urndis.4
@@ -45,6 +45,8 @@ kernel configuration file:
 .Cd "device ohci"
 .Cd "device xhci"
 .Cd "device usb"
+.Cd "device miibus"
+.Cd "device uether"
 .Cd "device urndis"
 .Ed
 .Pp
diff --git a/share/man/man5/style.Makefile.5 b/share/man/man5/style.Makefile.5
index c3a3288..5e34b96 100644
--- a/share/man/man5/style.Makefile.5
+++ b/share/man/man5/style.Makefile.5
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 8, 2005
+.Dd October 21, 2015
 .Dt STYLE.MAKEFILE 5
 .Os
 .Sh NAME
@@ -117,6 +117,13 @@ i.e., no space between the variable name and the
 .Ic = .
 Keep values sorted alphabetically, if possible.
 .It
+Variables are expanded with
+.Sy {} ,
+not
+.Sy () .
+Such as
+.Va ${VARIABLE} .
+.It
 Do not use
 .Ic +=
 to set variables that are only set once
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index ed65ac6..1d0c7b3 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -26,7 +26,7 @@
 .\"	From: @(#)style	1.14 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd January 7, 2010
+.Dd November 22, 2015
 .Dt STYLE 9
 .Os
 .Sh NAME
@@ -503,13 +503,14 @@ Code which is unreachable for non-obvious reasons may be marked /*
 .Pp
 Space after keywords
 .Pq Ic if , while , for , return , switch .
-No braces
+Two styles of braces
 .Ql ( \&{
 and
 .Ql \&} )
-are
-used for control statements with zero or only a single statement unless that
-statement is more than a single line in which case they are permitted.
+are allowed for single line statements.
+Either they are used for all single statements, or
+they are used only where needed for clarity.
+Usage within a function should be consistent.
 Forever loops are done with
 .Ic for Ns 's ,
 not
@@ -833,7 +834,7 @@ Whenever possible, code should be run through a code checker
 (e.g.,
 .Xr lint 1
 or
-.Nm gcc Fl Wall )
+.Nm cc Fl Wall )
 and produce minimal warnings.
 .Sh SEE ALSO
 .Xr indent 1 ,
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 5f0c165..d8a707f 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -17,6 +17,7 @@ files.  In most cases it is only interesting to include bsd.prog.mk or
 bsd.lib.mk.
 
 bsd.cpu.mk		- sets CPU/arch-related variables
+bsd.crunchgen.mk	- building crunched binaries using crunchgen(1)
 bsd.dep.mk		- handle Makefile dependencies
 bsd.doc.mk		- building troff system documents
 bsd.files.mk		- install of general purpose files
diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk
index cc7f021..ce26dc5 100644
--- a/share/mk/bsd.crunchgen.mk
+++ b/share/mk/bsd.crunchgen.mk
@@ -1,5 +1,7 @@
 #################################################################
 #
+# Generate crunched binaries using crunchgen(1).
+#
 # General notes:
 #
 # A number of Make variables are used to generate the crunchgen config file.
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 49b2d9b..b8e6c34 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -133,11 +133,11 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
 		${DOC}.html ${DOC}-*.html
 
 realinstall:
-.for _dev in ${PRINTERDEVICE:Mhtml}
+.if ${PRINTERDEVICE:Mhtml}
 	cd ${SRCDIR}; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
-.endfor
+.endif
 .for _dev in ${PRINTERDEVICE:Nhtml}
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
@@ -184,7 +184,6 @@ ${DFILE.html}: ${SRCS}
 .else # unroff(1) requires a macro package as an argument
 	cd ${SRCDIR}; ${UNROFF} -ms ${UNROFFFLAGS} \
 	    document=${DOC} ${SRCS}
-.else
 .endif
 .endif
 .endfor
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk
index 474dd31..2253d8e 100644
--- a/share/mk/bsd.progs.mk
+++ b/share/mk/bsd.progs.mk
@@ -35,6 +35,9 @@ UPDATE_DEPENDFILE_PROG?= no
 # They may have asked us to build just one
 .for t in ${PROGS}
 .if make($t)
+.if ${PROGS_CXX:U:M${t}}
+PROG_CXX ?= $t
+.endif
 PROG ?= $t
 .endif
 .endfor
@@ -67,7 +70,7 @@ UPDATE_DEPENDFILE ?= NO
 # ensure that we don't clobber each other's dependencies
 DEPENDFILE?= .depend.${PROG}
 # prog.mk will do the rest
-.else
+.else # !defined(PROG)
 all: ${PROGS}
 
 # We cannot capture dependencies for meta mode here
@@ -88,10 +91,32 @@ $v =
 # handle being called [bsd.]progs.mk
 .include <bsd.prog.mk>
 
-.if !empty(PROGS) && !defined(_RECURSING_PROGS)
+.if !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG)
 # tell progs.mk we might want to install things
 PROGS_TARGETS+= checkdpadd clean cleandepend cleandir depend install
 
+# Find common sources among the PROGS and depend on them before building
+# anything.  This allows parallelization without them each fighting over
+# the same objects.
+_PROGS_COMMON_SRCS=
+_PROGS_ALL_SRCS=
+.for p in ${PROGS}
+.for s in ${SRCS.${p}}
+.if ${_PROGS_ALL_SRCS:M${s}} && !${_PROGS_COMMON_SRCS:M${s}}
+_PROGS_COMMON_SRCS+=	${s}
+.else
+_PROGS_ALL_SRCS+=	${s}
+.endif
+.endfor
+.endfor
+.if !empty(_PROGS_COMMON_SRCS)
+_PROGS_COMMON_OBJS=	${_PROGS_COMMON_SRCS:M*.[dhly]}
+.if !empty(_PROGS_COMMON_SRCS:N*.[dhly])
+_PROGS_COMMON_OBJS+=	${_PROGS_COMMON_SRCS:N*.[dhly]:R:S/$/.o/g}
+.endif
+${PROGS}: ${_PROGS_COMMON_OBJS}
+.endif
+
 .for p in ${PROGS}
 .if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p)
 # bsd.prog.mk may need to know this
@@ -100,16 +125,18 @@ x.$p= PROG_CXX=$p
 
 # Main PROG target
 $p ${p}_p: .PHONY .MAKE
-	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
-	    SUBDIR= PROG=$p \
+	(cd ${.CURDIR} && \
+	    NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
+	    PROG=$p \
 	    DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
 	    ${x.$p})
 
 # Pseudo targets for PROG, such as 'install'.
 .for t in ${PROGS_TARGETS:O:u}
 $p.$t: .PHONY .MAKE
-	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
-	    SUBDIR= PROG=$p \
+	(cd ${.CURDIR} && \
+	    NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
+	    PROG=$p \
 	    DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
 	    ${x.$p} ${@:E})
 .endfor
@@ -119,4 +146,4 @@ $p.$t: .PHONY .MAKE
 .for t in ${PROGS_TARGETS:O:u}
 $t: ${PROGS:%=%.$t}
 .endfor
-.endif
+.endif	# !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG)
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index f76d5e1..9d2eb17 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -84,7 +84,7 @@ __deps=
 .for __dep in ${SUBDIR_DEPEND_${__dir}}
 __deps+= ${__target}_subdir_${__dep}
 .endfor
-${__target}_subdir_${__dir}: .MAKE ${__deps}
+${__target}_subdir_${__dir}: .PHONY .MAKE ${__deps}
 .if !defined(NO_SUBDIR)
 	@${_+_}set -e; \
 		if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index b7f551e..ec79b5d 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -30,7 +30,7 @@ LOCALES=	UTF-8 \
 		zh_HK.Big5HKSCS \
 		zh_TW.Big5
 
-LOCALEDIR=	/usr/share/locale
+LOCALEDIR=	${SHAREDIR}/locale
 
 .SUFFIXES: .src .out
 
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index 4385d87..9ee23c1 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -90,7 +90,7 @@ LOCALES=	af_ZA.ISO8859-1 \
 		zh_HK.UTF-8 \
 		zh_TW.Big5
 
-LOCALEDIR=	/usr/share/locale
+LOCALEDIR=	${SHAREDIR}/locale
 
 .SUFFIXES: .src .out
 
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 59a5383..ec87eee 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -70,7 +70,7 @@ LOCALES=	af_ZA.ISO8859-1 \
 		zh_TW.Big5 \
 		zh_TW.UTF-8
 
-LOCALEDIR=	/usr/share/locale
+LOCALEDIR=	${SHAREDIR}/locale
 
 .SUFFIXES: .src .out
 
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index baf99de..5e691fe 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -44,7 +44,7 @@ LOCALES=	af_ZA.ISO8859-1 \
 		uk_UA.KOI8-U \
 		zh_CN.eucCN
 
-LOCALEDIR=	/usr/share/locale
+LOCALEDIR=	${SHAREDIR}/locale
 
 .SUFFIXES: .src .out
 
diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile
index 00427dc..cab9d5e 100644
--- a/share/sendmail/Makefile
+++ b/share/sendmail/Makefile
@@ -7,7 +7,7 @@ CFDIR=	cf
 CFDIRS!=	(cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print)
 CFFILES!=	(cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type f -print)
 
-DDIR=	${DESTDIR}/usr/share/sendmail
+DDIR=	${DESTDIR}${SHAREDIR}/sendmail
 
 NO_OBJ=
 
diff --git a/share/skel/Makefile b/share/skel/Makefile
index ffe8015..9f8bf2f 100644
--- a/share/skel/Makefile
+++ b/share/skel/Makefile
@@ -5,8 +5,8 @@ FILESGROUPS=	FILES1 FILES2
 FILES1=		dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
 		dot.shrc
 FILES2=		dot.mail_aliases dot.rhosts 
-FILES1DIR=	/usr/share/skel
-FILES2DIR=	/usr/share/skel
+FILES1DIR=	${SHAREDIR}/skel
+FILES2DIR=	${SHAREDIR}/skel
 FILES1MODE=	0644
 FILES2MODE=	0600
 NO_OBJ=
diff --git a/share/syscons/Makefile b/share/syscons/Makefile
index 9cbf100..c5993a8 100644
--- a/share/syscons/Makefile
+++ b/share/syscons/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 SUBDIR= fonts keymaps scrnmaps
+SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index 5a4060d..7269fb4 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -96,7 +96,7 @@ LOCALES=	am_ET.UTF-8 \
 		zh_TW.Big5 \
 		zh_TW.UTF-8
 
-LOCALEDIR=      /usr/share/locale
+LOCALEDIR=      ${SHAREDIR}/locale
 
 .SUFFIXES: .src .out