5 files changed, 21 insertions, 3 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 4bf8c35..1d757f7 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb
 .\" $FreeBSD$
-.Dd January 14, 2013
+.Dd January 17, 2013
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -805,7 +805,7 @@ Set to not build NLS catalogs.
 Set to not build NLS catalog support for
 .Xr csh 1 .
 .It Va WITH_NMTREE
-.\" from FreeBSD: head/tools/build/options/WITH_NMTREE 245241 2013-01-09 21:07:08Z brooks
+.\" from FreeBSD: head/tools/build/options/WITH_NMTREE 245435 2013-01-14 20:38:32Z brooks
 Set to install
 .Xr nmtree 8
 as
@@ -835,6 +835,16 @@ Infiniband software stack.
 .It Va WITHOUT_OPENSSH
 .\" from FreeBSD: head/tools/build/options/WITHOUT_OPENSSH 156932 2006-03-21 07:50:50Z ru
 Set to not build OpenSSH.
+.It Va WITH_OPENSSH_NONE_CIPHER
+.\" from FreeBSD: head/tools/build/options/WITH_OPENSSH_NONE_CIPHER 245527 2013-01-17 01:51:04Z bz
+Set to include the "None" cipher support in OpenSSH and its libraries.
+Additional adjustments may need to be done to system configuration
+files, such as
+.Xr sshd_config 5 ,
+to enable this cipher.
+Please see
+.Pa /usr/src/crypto/openssh/README.hpn
+for full details.
 .It Va WITHOUT_OPENSSL
 .\" from FreeBSD: head/tools/build/options/WITHOUT_OPENSSL 156932 2006-03-21 07:50:50Z ru
 Set to not build OpenSSL.
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 1361cc6..a733a0e 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -160,6 +160,7 @@ grog [label="Greg Lehey\ngrog@FreeBSD.org\n1998/08/30"]
 gshapiro [label="Gregory Shapiro\ngshapiro@FreeBSD.org\n2000/07/12"]
 harti [label="Hartmut Brandt\nharti@FreeBSD.org\n2003/01/29"]
 hmp [label="Hiten Pandya\nhmp@FreeBSD.org\n2004/03/23"]
+ian [label="Ian Lepore\nian@FreeBSD.org\n2013/01/07"]
 iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"]
 imp [label="Warner Losh\nimp@FreeBSD.org\n1996/09/20"]
 ivoras [label="Ivan Voras\nivoras@FreeBSD.org\n2008/06/10"]
@@ -339,6 +340,7 @@ bz -> syrinx
 
 cognet -> jceel
 cognet -> kevlo
+cognet -> ian
 
 cperciva -> eadler
 cperciva -> flz
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index f09142e..a9adc1f 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -356,6 +356,8 @@ SHLIB_LDSCRIPT	Template file to generate shared library linker script.
 		Unless used, a simple symlink is created to the real
 		shared object.
 
+LIBRARIES_ONLY	Do not build or install files other than the library.
+
 The include file <bsd.lib.mk> includes the file named "../Makefile.inc"
 if it exists, as well as the include file <bsd.man.mk>.
 
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 1335964..e39c7a5 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -331,9 +331,12 @@ _libinstall:
 .endif
 .endif # !defined(INTERNALLIB)
 
+.if !defined(LIBRARIES_ONLY)
 .include <bsd.nls.mk>
 .include <bsd.files.mk>
 .include <bsd.incs.mk>
+.endif
+
 .include <bsd.links.mk>
 
 .if ${MK_MAN} != "no"
@@ -348,7 +351,7 @@ lint: ${SRCS:M*.c}
 	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}
 .endif
 
-.if ${MK_MAN} != "no"
+.if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY)
 .include <bsd.man.mk>
 .endif
 
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 963ddf3..200cffd 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -309,6 +309,7 @@ __DEFAULT_YES_OPTIONS = \
     OPENSSH \
     OPENSSL \
     PAM \
+    PC_SYSINSTALL \
     PF \
     PKGBOOTSTRAP \
     PKGTOOLS \