From 8ab7717e288b7ee92b94499b85a61b53eaece449 Mon Sep 17 00:00:00 2001 From: brooks Date: Wed, 9 Jan 2013 21:07:08 +0000 Subject: Always install our mtree as /usr/sbin/fmtree and link it as /usr/sbin/mtree by default. Add a src.conf option WITH_NMTREE that causes NetBSD's mtree to be linked as /usr/sbin/mtree as well as /usr/sbin/nmtree. --- share/man/man5/src.conf.5 | 12 +++++++++++- share/mk/bsd.own.mk | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index faa117f..16f01ea 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 November 5, 2012 +.Dd January 9, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -804,6 +804,16 @@ Set to not build NLS catalogs. .\" from FreeBSD: head/tools/build/options/WITHOUT_NLS_CATALOGS 156932 2006-03-21 07:50:50Z ru Set to not build NLS catalog support for .Xr csh 1 . +.It Va WITH_NMTREE +\" $FreeBSD$ +Set to install +.Xr nmtree 8 +as +.Xr mtree 8 . +By default +.Xr fmtree 8 +is installed as +.Xr mtree 8 . .It Va WITHOUT_NS_CACHING .\" from FreeBSD: head/tools/build/options/WITHOUT_NS_CACHING 172803 2007-10-19 14:01:25Z ru Set to disable name caching in the diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 78af8fb..bb99388 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -431,6 +431,7 @@ __DEFAULT_NO_OPTIONS = \ ICONV \ IDEA \ INSTALL_AS_USER \ + NMTREE \ NAND \ OFED \ SHARED_TOOLCHAIN -- cgit v1.1 From 7aba5649405b3a4a015471e42981705bae090148 Mon Sep 17 00:00:00 2001 From: brooks Date: Thu, 10 Jan 2013 19:46:08 +0000 Subject: Rather than using zic to both compile and install zoneinfo files, generate the files during the build and install them with install(1). This was the one place in installworld where files (vs links) were installed by a tool other than install. Reviewed by: edwin, jilles --- share/zoneinfo/Makefile | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 6de8ef5..97181da 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -29,6 +29,7 @@ # CLEANFILES+= yearistype +CLEANDIRS+= builddir CONTRIBDIR= ${.CURDIR}/../../contrib/tzdata/ .PATH: ${CONTRIBDIR} @@ -48,13 +49,39 @@ TZFILES+= backward systemv TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/} -all: yearistype +TZBUILDDIR= ${.OBJDIR}/builddir +TZBUILDSUBDIRS= \ + Africa \ + America/Argentina \ + America/Indiana \ + America/Kentucky \ + America/North_Dakota \ + Antarctica \ + Arctic \ + Asia \ + Atlantic \ + Australia \ + Etc \ + Europe \ + Indian \ + Pacific \ + SystemV -beforeinstall: +all: zoneinfo + +.PHONY: zoneinfo +zoneinfo: yearistype ${TDATA} + mkdir -p ${TZBUILDDIR} + cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS} umask 022; cd ${.CURDIR}; \ - zic -D -d ${DESTDIR}/usr/share/zoneinfo -p ${POSIXRULES} \ - -u ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \ ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES} + +beforeinstall: + cd ${TZBUILDDIR} && \ + find . -type f -print | xargs -I _FILE_ ${INSTALL} \ + -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + _FILE_ ${DESTDIR}/usr/share/zoneinfo/_FILE_ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ -- cgit v1.1 From e604fa387cc413ad8eb4973128011283eef9f1c7 Mon Sep 17 00:00:00 2001 From: pluknet Date: Thu, 10 Jan 2013 22:36:30 +0000 Subject: The Giant lock is no longer used in the vm_map(9) part of the VM. While here, document that the process lock is acquired in vm_map_stack, too. MFC after: 1 week --- share/man/man9/vm_map_insert.9 | 5 +---- share/man/man9/vm_map_stack.9 | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'share') diff --git a/share/man/man9/vm_map_insert.9 b/share/man/man9/vm_map_insert.9 index 3a6a51f..8f3b52e 100644 --- a/share/man/man9/vm_map_insert.9 +++ b/share/man/man9/vm_map_insert.9 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 19, 2003 +.Dd January 11, 2013 .Dt VM_MAP_INSERT 9 .Os .Sh NAME @@ -73,9 +73,6 @@ This function implicitly creates a new .Vt vm_map_entry by calling the internal function .Fn vm_map_entry_create . -This function may use the -.Va Giant -lock to ensure that only a single thread is present in the function. .Sh RETURN VALUES The .Fn vm_map_insert diff --git a/share/man/man9/vm_map_stack.9 b/share/man/man9/vm_map_stack.9 index dabe937..e237c06 100644 --- a/share/man/man9/vm_map_stack.9 +++ b/share/man/man9/vm_map_stack.9 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 19, 2003 +.Dd January 11, 2013 .Dt VM_MAP_STACK 9 .Os .Sh NAME @@ -81,11 +81,11 @@ function calls to create its mappings. .Pp The +.Fn vm_map_stack +and .Fn vm_map_growstack -function acquires the -.Va Giant -lock, and the process lock on -.Fa p , +functions acquire the process lock on +.Fa p for the duration of the call. .Sh RETURN VALUES The -- cgit v1.1 From caf94f2ccaa8e9b68db9cc260ba5fb4a26b038f4 Mon Sep 17 00:00:00 2001 From: des Date: Thu, 10 Jan 2013 22:44:19 +0000 Subject: Remove all support for legacy NOFOO and NO_FOO build options. --- share/mk/Makefile | 1 - share/mk/bsd.compat.mk | 41 ---------------------------- share/mk/bsd.init.mk | 1 - share/mk/bsd.own.mk | 74 -------------------------------------------------- share/mk/sys.mk | 1 - 5 files changed, 118 deletions(-) delete mode 100644 share/mk/bsd.compat.mk (limited to 'share') diff --git a/share/mk/Makefile b/share/mk/Makefile index 81f943c..2110b26 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -6,7 +6,6 @@ FILES= \ bsd.README \ bsd.arch.inc.mk \ - bsd.compat.mk \ bsd.compiler.mk \ bsd.cpu.mk \ bsd.crunchgen.mk \ diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk deleted file mode 100644 index 6a86871..0000000 --- a/share/mk/bsd.compat.mk +++ /dev/null @@ -1,41 +0,0 @@ -# $FreeBSD$ - -.if !defined(BURN_BRIDGES) -.for oldnew in \ - NOATM:NO_ATM \ - NOCLEANDIR:NO_CLEANDIR \ - NOCRYPT:NO_CRYPT \ - NODOCCOMPRESS:NO_DOCCOMPRESS \ - NOEXTRADEPEND:NO_EXTRADEPEND \ - NOFORTH:NO_FORTH \ - NOFSCHG:NO_FSCHG \ - NOGAMES:NO_GAMES \ - NOHTML:NO_HTML \ - NOINET6:NO_INET6 \ - NOINFO:NO_INFO \ - NOINFOCOMPRESS:NO_INFOCOMPRESS \ - NOINSTALLLIB:NO_INSTALLLIB \ - NOLIBPTHREAD:NO_LIBPTHREAD \ - NOLIBTHR:NO_LIBTHR \ - NOLINT:NO_LINT \ - NOMAN:NO_MAN \ - NOMANCOMPRESS:NO_MANCOMPRESS \ - NOMLINKS:NO_MLINKS \ - NOOBJ:NO_OBJ \ - NOPAM:NO_PAM \ - NOPIC:NO_PIC \ - NOPROFILE:NO_PROFILE \ - NO_RCMNDS:NO_RCMDS \ - NOSHARE:NO_SHARE \ - NOSHARED:NO_SHARED \ - NOTAGS:NO_TAGS -.for old in ${oldnew:C/:.*//} -.for new in ${oldnew:C/.*://} -.if defined(${old}) && !defined(${new}) -.warning ${old} is deprecated in favour of ${new} -${new}= ${${old}} -.endif -.endfor -.endfor -.endfor -.endif diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk index 72a6de0..f5f4c66 100644 --- a/share/mk/bsd.init.mk +++ b/share/mk/bsd.init.mk @@ -9,7 +9,6 @@ ____: .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif -.include .include .MAIN: all .endif # !target(____) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index bb99388..24a0f92 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -216,80 +216,6 @@ WITHOUT_${var}= .endfor # -# Compat NO_* options (same as above, except their use is deprecated). -# -.if !defined(BURN_BRIDGES) -.for var in \ - ACPI \ - ATM \ - AUDIT \ - AUTHPF \ - BIND \ - BIND_DNSSEC \ - BIND_ETC \ - BIND_LIBS_LWRES \ - BIND_MTREE \ - BIND_NAMED \ - BIND_UTILS \ - BLUETOOTH \ - BOOT \ - CALENDAR \ - CPP \ - CRYPT \ - CVS \ - CXX \ - DICT \ - DYNAMICROOT \ - EXAMPLES \ - FORTH \ - FP_LIBC \ - GAMES \ - GCOV \ - GDB \ - GNU \ - GPIB \ - GROFF \ - HTML \ - INET6 \ - INFO \ - IPFILTER \ - IPX \ - KDUMP \ - KERBEROS \ - LIB32 \ - LIBPTHREAD \ - LIBTHR \ - LOCALES \ - LPR \ - MAILWRAPPER \ - NETCAT \ - NIS \ - NLS \ - NLS_CATALOGS \ - NS_CACHING \ - OPENSSH \ - OPENSSL \ - PAM \ - PF \ - RCMDS \ - RCS \ - RESCUE \ - SENDMAIL \ - SETUID_LOGIN \ - SHAREDOCS \ - SYSCONS \ - TCSH \ - TOOLCHAIN \ - USB \ - WPA_SUPPLICANT_EAPOL -.if defined(NO_${var}) -#.warning NO_${var} is deprecated in favour of WITHOUT_${var}= -WITHOUT_${var}= -.endif -.endfor -.endif # !defined(BURN_BRIDGES) - -# # Older-style variables that enabled behaviour when set. # .if defined(YES_HESIOD) diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 2f67903..8b8a5ce 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -346,5 +346,4 @@ OBJFORMAT?= elf .endif -.include .include -- cgit v1.1 From 29b3d8996d7dcf7db3443c3be67174f6eb4c89c9 Mon Sep 17 00:00:00 2001 From: brooks Date: Fri, 11 Jan 2013 18:37:51 +0000 Subject: Use find -exec to install zoneinfo instead of requiring xargs to be an install tool. Suggested by: delphij --- share/zoneinfo/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 97181da..bccea5e 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -79,9 +79,9 @@ zoneinfo: yearistype ${TDATA} beforeinstall: cd ${TZBUILDDIR} && \ - find . -type f -print | xargs -I _FILE_ ${INSTALL} \ + find . -type f -print -exec ${INSTALL} \ -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - _FILE_ ${DESTDIR}/usr/share/zoneinfo/_FILE_ + \{} ${DESTDIR}/usr/share/zoneinfo/\{} \; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ -- cgit v1.1 From 1521a9209ea4a4aefabdb1a2de3c09c842bab24c Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 12 Jan 2013 08:44:54 +0000 Subject: Remove EOL whitespace. --- share/man/man4/stf.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4 index 5e32763..5e210df 100644 --- a/share/man/man4/stf.4 +++ b/share/man/man4/stf.4 @@ -190,8 +190,8 @@ The default value is shown next to each variable. .It Va net.link.stf.permit_rfc1918 : No 0 The RFC3056 requires the use of globally unique 32-bit IPv4 addresses. This sysctl variable controls the behaviour of this -requirement. When it set to not 0, -.Nm stf +requirement. When it set to not 0, +.Nm stf allows the use of private IPv4 addresses described in the RFC1918. This may be useful for an Intranet environment or when some mechanisms of network address translation (NAT) are used. -- cgit v1.1 From 3386d88ffd8645a281dc469254815414cff93cd7 Mon Sep 17 00:00:00 2001 From: brooks Date: Mon, 14 Jan 2013 20:38:32 +0000 Subject: Remember the . in .\" in the WITH_NMTREE file and regenerate the output. Reported by: joeld --- share/man/man5/src.conf.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 16f01ea..4bf8c35 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 9, 2013 +.Dd January 14, 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 -\" $FreeBSD$ +.\" from FreeBSD: head/tools/build/options/WITH_NMTREE 245241 2013-01-09 21:07:08Z brooks Set to install .Xr nmtree 8 as -- cgit v1.1 From ebb2442f5c00bf65a8da703a31d2cefe40d67fe2 Mon Sep 17 00:00:00 2001 From: dbn Date: Tue, 15 Jan 2013 05:33:40 +0000 Subject: Add myself as a port committer (with eadler@ and bdrewery@ as mentors). While in the repository, add myself to calendar.freebsd. Approved by: eadler/bdrewery (mentor) --- share/misc/committers-ports.dot | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index af20fc0..cf48d6a 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -77,6 +77,7 @@ culot [label="Frederic Culot\nculot@FreeBSD.org\n2010/10/16"] daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17"] danfe [label="Alexey Dokuchaev\ndanfe@FreeBSD.org\n2004/08/20"] db [label="Diane Bruce\ndb@FreeBSD.org\n2007/01/18"] +dbn [label="David Naylor\ndbn@FreeBSD.org\n2013/01/14"] decke [label="Bernhard Froehlich\ndecke@FreeBSD.org\n2010/03/21"] delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/01"] demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"] @@ -233,6 +234,8 @@ asami -> obrien avilla -> jhale avilla -> rakuco +bdrewery -> dbn + bapt -> bdrewery bapt -> eadler bapt -> jlaffaye @@ -274,6 +277,7 @@ delphij -> rafan demon -> mat eadler -> ak +eadler -> dbn eadler -> bdrewery eadler -> gjb eadler -> tj -- cgit v1.1 From ad78d0986c5ee7ae0a29014180985eeddd916acd Mon Sep 17 00:00:00 2001 From: rene Date: Tue, 15 Jan 2013 17:17:54 +0000 Subject: Add gjb as my co-mentor now that I have a full doc/www bit. Approved by: remko (mentor) --- share/misc/committers-doc.dot | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 0d896b3..35286e3 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -116,6 +116,7 @@ gabor -> issyl0 gabor -> ebrandi gjb -> wblock +gjb -> rene hrs -> ryusuke -- cgit v1.1 From 40c33626ef547f26a97f80a5032fc062dce202a9 Mon Sep 17 00:00:00 2001 From: yongari Date: Wed, 16 Jan 2013 02:22:56 +0000 Subject: Add D-Link DFE-520TX (rev. C1) to HARDWARE section. MFC After: 1 week --- share/man/man4/rl.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4 index 4cbf6e9..583274b 100644 --- a/share/man/man4/rl.4 +++ b/share/man/man4/rl.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 22, 2010 +.Dd January 16, 2013 .Dt RL 4 .Os .Sh NAME @@ -155,6 +155,8 @@ Corega FEther CB-TXD .It Corega FEtherII CB-TXD .It +D-Link DFE-520TX (rev. C1) +.It D-Link DFE-528TX .It D-Link DFE-530TX+ -- cgit v1.1 From fab38d959133fad71c6f3fd4f90d3872e2c7885c Mon Sep 17 00:00:00 2001 From: carl Date: Wed, 16 Jan 2013 19:05:49 +0000 Subject: Add myself and my mentor relationship. Approved by: jimharris (mentor) --- share/misc/committers-src.dot | 3 +++ 1 file changed, 3 insertions(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index f3756e8..1361cc6 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -117,6 +117,7 @@ bruno [label="Bruno Ducrot\nbruno@FreeBSD.org\n2005/07/18"] bryanv [label="Bryan Venteicher\nbryanv@FreeBSD.org\n2012/11/03"] bschmidt [label="Bernhard Schmidt\nbschmidt@FreeBSD.org\n2010/02/06"] bz [label="Bjoern A. Zeeb\nbz@FreeBSD.org\n2004/07/27"] +carl [label="Carl Delsey\ncarl@FreeBSD.org\n2013/01/14"] cognet [label="Olivier Houchard\ncognet@FreeBSD.org\n2002/10/09"] cokane [label="Coleman Kane\ncokane@FreeBSD.org\n2000/06/19"] cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2004/01/20"] @@ -454,6 +455,8 @@ jhb -> peterj jhb -> pfg jhb -> rnoland +jimharris -> carl + jkh -> grog jkh -> imp jkh -> jlemon -- cgit v1.1