MFhead@r321960

4 files changed, 14 insertions, 5 deletions

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index a3361a1b2c74..ef81fca06ddd 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd July 5, 2017
+.Dd August 2, 2017
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -1156,6 +1156,12 @@ and remove
 entries.
 .It Va WITHOUT_NLS
 Set to not build NLS catalogs.
+When set, it enforces these options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_NLS_CATALOGS
+.El
 .It Va WITHOUT_NLS_CATALOGS
 Set to not build NLS catalog support for
 .Xr csh 1 .
diff --git a/share/misc/organization.dot b/share/misc/organization.dot
index 16d89fa82485..5fa6c2773a4a 100644
--- a/share/misc/organization.dot
+++ b/share/misc/organization.dot
@@ -57,7 +57,7 @@ webmaster [label="Webmaster Team\nwebmaster@FreeBSD.org\ngjb, wblock, blackend,\
 # Misc hats go here alphabetically sorted
 
 donations [label="Donations Team\ndonations@FreeBSD.org\nwilko, gahr, pgolluci,\nobrien, trhodes, ds,\nrwatson"]
-marketing [label="Marketing Team\nmarketing@FreeBSD.org\nSteven Beedle, Denise Ebery, deb,\njkoshy, Dru Lavigne, mwlucas, imp,\nKris Moore, murray, mattt,\nJeremy C. Reed, rwatson"]
+marketing [label="Marketing Team\nmarketing@FreeBSD.org\nSteven Beedle, Denise Ebery, deb,\njkoshy, dru, mwlucas, imp,\nKris Moore, murray, mattt,\nJeremy C. Reed, rwatson"]
 vendorrelations [label="Vendor Relations\nvendor-relations@FreeBSD.org\ncore, FreeBSD Foundation"]
 
 # Here are the team relationships.
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 5ecddeac957c..c69e4d532224 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -4,7 +4,7 @@
 #
 # Users define WITH_FOO and WITHOUT_FOO on the command line or in /etc/src.conf
 # and /etc/make.conf files. These translate in the build system to MK_FOO={yes,no}
-# with sensible (usually) defaults.
+# with (usually) sensible defaults.
 #
 # Makefiles must include bsd.opts.mk after defining specific MK_FOO options that
 # are applicable for that Makefile (typically there are none, but sometimes there
@@ -41,7 +41,7 @@ __<bsd.opts.mk>__:
 #
 
 # Only these options are used by bsd.*.mk. KERBEROS and OPENSSH are
-# unforutnately needed to support statically linking the entire
+# unfortunately needed to support statically linking the entire
 # tree. su(1) wouldn't link since it depends on PAM which depends on
 # ssh libraries when building with OPENSSH, and likewise for KERBEROS.
 
@@ -74,7 +74,6 @@ __DEFAULT_NO_OPTIONS = \
     INSTALL_AS_USER \
     STALE_STAGED
 
-# meta mode related
 __DEFAULT_DEPENDENT_OPTIONS = \
     MAKE_CHECK_USE_SANDBOX/TESTS \
     STAGING_MAN/STAGING \
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 73ec2aff0c3d..1c100af191ab 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -375,6 +375,10 @@ MK_ATM:=	no
 MK_BLUETOOTH:=	no
 .endif
 
+.if ${MK_NLS} == "no"
+MK_NLS_CATALOGS:= no
+.endif
+
 .if ${MK_OPENSSL} == "no"
 MK_OPENSSH:=	no
 MK_KERBEROS:=	no