summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/doc/psd/03.iosys/iosys2
-rw-r--r--share/doc/psd/23.rpc/rpc.prog.ms4
-rw-r--r--share/doc/psd/24.xdr/xdr.nts.ms2
-rw-r--r--share/doc/psd/27.nfsrpc/nfs.rfc.ms2
-rw-r--r--share/man/man4/dc.42
-rw-r--r--share/man/man4/em.48
-rw-r--r--share/man/man4/igb.46
-rw-r--r--share/man/man4/man4.powerpc/Makefile1
-rw-r--r--share/man/man4/man4.powerpc/abtn.4115
-rw-r--r--share/man/man4/man4.powerpc/akbd.429
-rw-r--r--share/man/man7/build.72
-rw-r--r--share/man/man9/Makefile3
-rw-r--r--share/man/man9/memguard.978
-rw-r--r--share/man/man9/psignal.918
-rw-r--r--share/man/man9/sleepqueue.92
-rw-r--r--share/misc/committers-doc.dot4
-rw-r--r--share/misc/committers-ports.dot4
-rw-r--r--share/misc/committers-src.dot7
-rw-r--r--share/misc/iso316612
-rw-r--r--share/mk/bsd.dep.mk4
-rw-r--r--share/mk/bsd.own.mk5
-rw-r--r--share/mk/bsd.port.mk12
22 files changed, 272 insertions, 50 deletions
diff --git a/share/doc/psd/03.iosys/iosys b/share/doc/psd/03.iosys/iosys
index ce63bc2..1459f14 100644
--- a/share/doc/psd/03.iosys/iosys
+++ b/share/doc/psd/03.iosys/iosys
@@ -813,7 +813,7 @@ which have a separate argument
which indicates read or write.
.IP B_DONE 10
This bit is set
-to 0 when a block is handed to the the device strategy
+to 0 when a block is handed to the device strategy
routine and is turned on when the operation completes,
whether normally as the result of an error.
It is also used as part of the return argument of
diff --git a/share/doc/psd/23.rpc/rpc.prog.ms b/share/doc/psd/23.rpc/rpc.prog.ms
index 54fd2d5..0bc8743 100644
--- a/share/doc/psd/23.rpc/rpc.prog.ms
+++ b/share/doc/psd/23.rpc/rpc.prog.ms
@@ -317,7 +317,7 @@ look up the appropriate program, version and procedure numbers
in a manual, just as you look up the name of a memory allocator
when you want to allocate memory.
.LP
-The simplest way of making remote procedure calls is with the the RPC
+The simplest way of making remote procedure calls is with the RPC
library routine
.I callrpc()
It has eight parameters. The first is the name of the remote server
@@ -1105,7 +1105,7 @@ Note that, after being used, the character array can be freed with
.I svc_freeargs()
.I svc_freeargs()
will not attempt to free any memory if the variable indicating it
-is NULL. For example, in the the routine
+is NULL. For example, in the routine
.I xdr_finalexample (),
given earlier, if
.I finalp->string
diff --git a/share/doc/psd/24.xdr/xdr.nts.ms b/share/doc/psd/24.xdr/xdr.nts.ms
index 260c7f3..f7c495d 100644
--- a/share/doc/psd/24.xdr/xdr.nts.ms
+++ b/share/doc/psd/24.xdr/xdr.nts.ms
@@ -721,7 +721,7 @@ it must not exceed
.I maxlength .
Next
.I sp
-is dereferenced; if the the value is
+is dereferenced; if the value is
.I NULL ,
then a string of the appropriate length is allocated and
.I *sp
diff --git a/share/doc/psd/27.nfsrpc/nfs.rfc.ms b/share/doc/psd/27.nfsrpc/nfs.rfc.ms
index 13d7619..5a2d949 100644
--- a/share/doc/psd/27.nfsrpc/nfs.rfc.ms
+++ b/share/doc/psd/27.nfsrpc/nfs.rfc.ms
@@ -961,7 +961,7 @@ call to get more entries starting at a
given point in the directory. The special cookie zero (all bits
zero) can be used to get the entries starting at the beginning of
the directory. The "fileid" field should be the same number as the
-"fileid" in the the attributes of the file. (See the
+"fileid" in the attributes of the file. (See the
.I "Basic Data Types"
section.)
The "eof" flag has a value of
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index 3a565fc..b8b6b0f 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -55,7 +55,7 @@ if_dc_load="YES"
The
.Nm
driver provides support for several PCI Fast Ethernet adapters and
-embedded controllers based on the the DEC/Intel 21143 chipset and clones.
+embedded controllers based on the DEC/Intel 21143 chipset and clones.
.Pp
All of supported chipsets have the same general register layout, DMA
descriptor format and method of operation.
diff --git a/share/man/man4/em.4 b/share/man/man4/em.4
index 842f9ee..8213b98 100644
--- a/share/man/man4/em.4
+++ b/share/man/man4/em.4
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 14, 2010
+.Dd October 11, 2011
.Dt EM 4
.Os
.Sh NAME
@@ -199,12 +199,14 @@ prompt before booting the kernel or stored in
.Bl -tag -width indent
.It Va hw.em.rxd
Number of receive descriptors allocated by the driver.
-The default value is 256.
+The default value is 1024 for adapters newer than 82547,
+and 256 for older ones.
The 82542 and 82543-based adapters can handle up to 256 descriptors,
while others can have up to 4096.
.It Va hw.em.txd
Number of transmit descriptors allocated by the driver.
-The default value is 256.
+The default value is 1024 for adapters newer than 82547,
+and 256 for older ones.
The 82542 and 82543-based adapters can handle up to 256 descriptors,
while others can have up to 4096.
.It Va hw.em.rx_int_delay
diff --git a/share/man/man4/igb.4 b/share/man/man4/igb.4
index 70db340..dc72725 100644
--- a/share/man/man4/igb.4
+++ b/share/man/man4/igb.4
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 14, 2010
+.Dd October 11, 2011
.Dt IGB 4
.Os
.Sh NAME
@@ -151,11 +151,11 @@ prompt before booting the kernel or stored in
.Bl -tag -width indent
.It Va hw.igb.rxd
Number of receive descriptors allocated by the driver.
-The default value is 256.
+The default value is 1024.
The minimum is 80, and the maximum is 4096.
.It Va hw.igb.txd
Number of transmit descriptors allocated by the driver.
-The default value is 256.
+The default value is 1024.
The minimum is 80, and the maximum is 4096.
.It Va hw.igb.enable_aim
If set to 1, enable Adaptive Interrupt Moderation.
diff --git a/share/man/man4/man4.powerpc/Makefile b/share/man/man4/man4.powerpc/Makefile
index 57196a3..09d8b70 100644
--- a/share/man/man4/man4.powerpc/Makefile
+++ b/share/man/man4/man4.powerpc/Makefile
@@ -2,6 +2,7 @@
MAN= adb.4 \
akbd.4 \
+ abtn.4 \
ams.4 \
bm.4 \
cuda.4 \
diff --git a/share/man/man4/man4.powerpc/abtn.4 b/share/man/man4/man4.powerpc/abtn.4
new file mode 100644
index 0000000..8aab9a7
--- /dev/null
+++ b/share/man/man4/man4.powerpc/abtn.4
@@ -0,0 +1,115 @@
+.\"-
+.\" Copyright (c) 2011 Justin Hibbits
+.\" Copyright (c) 2009 Nathan Whitehorn <nwhitehorn@FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 16, 2011
+.Dt ABTN 4
+.Os
+.Sh NAME
+.Nm abtn
+.Nd ADB Keyboard Special Keys Driver
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device adb"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the extended Fn keys on Apple notebooks with an ADB
+interface.
+.Sh HARDWARE
+The
+.Nm
+driver supports extended keyboard keys (special F-keys) on the following devices:
+.Pp
+.Bl -bullet -compact
+.It
+Apple iBook Keyboard
+.It
+Apple PowerBook Keyboard
+.El
+.Sh EVENTS
+The
+.Nm
+driver sends events to
+.Xr devd 8
+for the following events under the
+.Cd PMU
+system, and
+.Cd keys
+subsystem:
+.Pp
+.Bl -bullet -compact
+.It
+.Cd brightness
+- Generates
+.Cd up
+and
+.Cd down
+notify types matching the pressed key.
+.It
+.Cd mute
+.It
+.Cd volume
+- Generates
+.Cd up
+and
+.Cd down
+notify types matching the pressed key.
+.It
+.Cd eject
+.El
+.Pp
+Examples are included in /etc/devd/apple.conf.
+.Sh SEE ALSO
+.Xr adb 4 ,
+.Xr akbd 4 ,
+.Xr cuda 4 ,
+.Xr pmu 4,
+.Xr devd 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Nx 5.0
+and was ported to
+.Fx 10.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Tsubai Masanari
+for
+.Nx
+and ported to
+.Fx
+by
+.An Justin Hibbits .
diff --git a/share/man/man4/man4.powerpc/akbd.4 b/share/man/man4/man4.powerpc/akbd.4
index aea2fa0..d4f3aa1 100644
--- a/share/man/man4/man4.powerpc/akbd.4
+++ b/share/man/man4/man4.powerpc/akbd.4
@@ -58,7 +58,36 @@ Apple iBook Keyboard
.It
Apple PowerBook Keyboard
.El
+.Sh EVENTS
+The
+.Nm
+driver sends events to
+.Xr devd 8
+for the following events under the
+.Cd PMU
+system:
+.Pp
+.Bl -bullet -compact
+.It
+Power button -
+.Cd "Button"
+subsystem,
+.Cd "pressed"
+type.
+.El
+.Sh SYSCTL VARIABLES
+The
+.Nm
+driver supports the following sysctl variable for configuring the Fn keys:
+.Bl -tag -width indent
+.It Va dev.akbd.%d.fn_keys_function_as_primary
+Set the Fn keys to be their F-key type as default. A value of 0 causes the
+F-keys keys to work as special keys by default (
+.Xr abtn 4 )
+and a value of 1 sets them to behave as F-keys by default.
+.El
.Sh SEE ALSO
+.Xr abtn 4 ,
.Xr adb 4 ,
.Xr cuda 4 ,
.Xr pmu 4
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 6195bc6..f168958 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 16, 2011
+.Dd September 29, 2011
.Dt BUILD 7
.Os
.Sh NAME
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 7d34c31..3026ef8 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -972,7 +972,8 @@ MLINKS+=printf.9 log.9 \
MLINKS+=priv.9 priv_check.9 \
priv.9 priv_check_cred.9
MLINKS+=psignal.9 gsignal.9 \
- psignal.9 pgsignal.9
+ psignal.9 pgsignal.9 \
+ psignal.9 tdsignal.9
MLINKS+=random.9 arc4rand.9 \
random.9 arc4random.9 \
random.9 read_random.9 \
diff --git a/share/man/man9/memguard.9 b/share/man/man9/memguard.9
index ed833ba..072d30b 100644
--- a/share/man/man9/memguard.9
+++ b/share/man/man9/memguard.9
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 2, 2010
+.Dd October 21, 2011
.Dt MEMGUARD 9
.Os
.Sh NAME
@@ -39,7 +39,6 @@ to help detect tamper-after-free scenarios.
These problems are more and more common and likely with
multithreaded kernels where race conditions are more prevalent.
.Pp
-Currently,
.Nm
can take over
.Fn malloc ,
@@ -47,8 +46,19 @@ can take over
and
.Fn free
for a single malloc type.
+Alternatively
.Nm
-can also guard all allocations larger than
+can take over
+.Fn uma_zalloc ,
+.Fn uma_zalloc_arg
+and
+.Fn uma_free
+for a single
+.Xr uma
+zone.
+Also
+.Nm
+can guard all allocations larger than
.Dv PAGE_SIZE ,
and can guard a random fraction of all allocations.
There is also a knob to prevent allocations smaller than a specified
@@ -72,7 +82,10 @@ sysctl vm.memguard.desc=<memory_type>
.Pp
Where
.Ar memory_type
-is a short description of the memory type to monitor.
+can be either a short description of the memory type to monitor,
+either name of
+.Xr uma 9
+zone.
Only allocations from that
.Ar memory_type
made after
@@ -86,13 +99,28 @@ will potentially be guarded once the
.Xr sysctl 8
is set.
Existing guarded allocations will still be properly released by
-.Xr free 9 .
+either
+.Xr free 9
+or
+.Xr uma_zfree 9 ,
+depending on what kind of allocation was taken over.
.Pp
-The short description of a
+To determine short description of a
.Xr malloc 9
-type is the second argument to
-.Xr MALLOC_DEFINE 9 ,
-so one has to find it in the kernel source.
+type one can either take it from the first column of
+.Xr vmstat 8 Fl m
+output, or to find it in the kernel source.
+It is the second argument to
+.Xr MALLOC_DEFINE 9
+macro.
+To determine name of
+.Xr uma 9
+zone one can either take it from the first column of
+.Xr vmstat 8 Fl z
+output, or to find it in the kernel source.
+It is the first argument to the
+.Xr uma_zcreate 9
+function.
.Pp
The
.Va vm.memguard.divisor
@@ -142,12 +170,24 @@ or larger if
.Va vm.memguard.options
has the 2 bit set.
This option is off by default.
+By default
+.Nm
+doesn't guard those
+.Xr uma 9
+zones that have been initialized with the
+.Dv UMA_ZONE_NOFREE
+flag set, since it can produce false positives on them.
+However, this safety measure can be turned off by setting bit 3
+of the
+.Va vm.memguard.options
+tunable.
.Sh SEE ALSO
.Xr sysctl 8 ,
.Xr vmstat 8 ,
.Xr contigmalloc 9 ,
.Xr malloc 9 ,
-.Xr redzone 9
+.Xr redzone 9 ,
+.Xr uma 9
.Sh HISTORY
.Nm
first appeared in
@@ -161,8 +201,20 @@ This manual page was originally written by
.An Christian Brueffer Aq brueffer@FreeBSD.org .
Additions have been made by
.An Matthew Fleming Aq mdf@FreeBSD.org
+and
+.An Gleb Smirnoff Aq glebius@FreeBSD.org
to both the implementation and the documentation.
.Sh BUGS
-Currently, it is not possible to override UMA
-.Xr zone 9
-allocations.
+It is not possible to guard allocations that really expect themselves to be
+allocated from
+.Xr uma 9 ,
+utilizing additional interfaces apart from
+.Fn uma_zalloc
+and
+.Fn uma_free ,
+for example
+.Fn uma_find_refcnt .
+For the moment of writing only
+.Xr mbuf 9
+cluster zones belong to that kind of allocations.
+Attempt to guard them would lead to kernel panic.
diff --git a/share/man/man9/psignal.9 b/share/man/man9/psignal.9
index dd282a6..4193bcb 100644
--- a/share/man/man9/psignal.9
+++ b/share/man/man9/psignal.9
@@ -28,14 +28,15 @@
.\" $NetBSD: psignal.9,v 1.1 1996/06/22 22:57:35 pk Exp $
.\" $FreeBSD$
.\"
-.Dd June 22, 1996
+.Dd October 8, 2011
.Dt PSIGNAL 9
.Os
.Sh NAME
.Nm psignal ,
.Nm pgsignal ,
-.Nm gsignal
-.Nd post signal to a process or process group
+.Nm gsignal ,
+.Nm tdsignal
+.Nd post signal to a thread, process, or process group
.Sh SYNOPSIS
.In sys/types.h
.In sys/signalvar.h
@@ -45,8 +46,10 @@
.Fn pgsignal "struct pgrp *pgrp" "int signum" "int checkctty"
.Ft void
.Fn gsignal "int pgid" "int signum"
+.Ft void
+.Fn tdsignal "struct thread *td" "int signum"
.Sh DESCRIPTION
-These functions post a signal to one or more processes.
+These functions post a signal to a thread or one or more processes.
The argument
.Fa signum
common to all three functions should be in the range
@@ -135,6 +138,13 @@ set to zero.
If
.Fa pgid
is zero no action is taken.
+.Pp
+The
+.Fn tdsignal
+function posts signal number
+.Fa signum
+to the thread represented by the thread structure
+.Fa td .
.Sh SEE ALSO
.Xr sigaction 2 ,
.Xr signal 9 ,
diff --git a/share/man/man9/sleepqueue.9 b/share/man/man9/sleepqueue.9
index 3c0e9a5..22971d8 100644
--- a/share/man/man9/sleepqueue.9
+++ b/share/man/man9/sleepqueue.9
@@ -351,7 +351,7 @@ argument specifies the thread to awaken and the
argument specifies the wait channel to awaken it from.
If the thread
.Fa td
-is not blocked on the the wait channel
+is not blocked on the wait channel
.Fa wchan
then this function will not do anything,
even if the thread is asleep on a different wait channel.
diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot
index 3754bb7..278ccb9 100644
--- a/share/misc/committers-doc.dot
+++ b/share/misc/committers-doc.dot
@@ -79,12 +79,14 @@ ryusuke [label="Ryusuke Suzuki\nryusuke@FreeBSD.org\n2009/12/21"]
simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2003/07/20"]
taras [label="Taras Korenko\ntaras@FreeBSD.org\n2010/06/25"]
trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/03/25"]
+wblock [label="Warren Block\nwblock@FreeBSD.org\n2011/09/12"]
# Here are the mentor/mentee relationships.
# Group together all the mentees for a particular mentor.
# Keep the list sorted by mentor login.
bcr -> gavin
+bcr -> wblock
blackend -> ale
@@ -105,6 +107,8 @@ gabor -> pgj
gabor -> manolis
gabor -> taras
+gjb -> wblock
+
hrs -> ryusuke
jesusr -> jcamou
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index faae5c6..2569169 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -154,6 +154,7 @@ pgj [label="Gabor Pali\npgj@FreeBSD.org\n2009/04/12"]
philip [label="Philip Paeps\nphilip@FreeBSD.org\n2005/10/19"]
pgollucci [label="Philip M. Gollucci\npgollucci@FreeBSD.org\n2008/07/21"]
rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23"]
+rakuco [label="Raphael Kubo da Costa\nrakuco@FreeBSD.org\n2011/08/22"]
rene [label="Rene Ladan\nrene@FreeBSD.org\n2010/04/11"]
rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21"]
romain [label="Romain Tartiere\nromain@FreeBSD.org\n2010/01/24"]
@@ -210,6 +211,8 @@ arved -> stefan
asami -> obrien
+avilla -> rakuco
+
bapt -> eadler
bapt -> jlaffaye
@@ -327,6 +330,7 @@ marcus -> eik
marcus -> jmallett
makc -> bf
+makc -> rakuco
mat -> thierry
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 4a9badd..8f97775 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -141,6 +141,7 @@ gad [label="Garance A. Drosehn\ngad@FreeBSD.org\n2000/10/27"]
gallatin [label="Andrew Gallatin\ngallatin@FreeBSD.org\n????/??/??"]
gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2009/12/07"]
gibbs [label="Justin T. Gibbs\ngibbs@FreeBSD.org\n????/??/??"]
+gleb [label="Gleb Kurtsou\ngleb@FreeBSD.org\n2011/09/19"]
glebius [label="Gleb Smirnoff\nglebius@FreeBSD.org\n2004/07/14"]
gnn [label="George V. Neville-Neil\ngnn@FreeBSD.org\n2004/10/11"]
gordon [label="Gordon Tetlow\ngordon@FreeBSD.org\n2002/05/17"]
@@ -153,6 +154,7 @@ 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"]
jamie [label="Jamie Gritton\njamie@FreeBSD.org\n2009/01/28"]
+jceel [label="Jakub Klama\njceel@FreeBSD.org\n2011/09/25"]
jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"]
jeff [label="Jeff Roberson\njeff@FreeBSD.org\n2002/02/21"]
jh [label="Jaakko Heinonen\njh@FreeBSD.org\n2009/10/02"]
@@ -306,6 +308,7 @@ bz -> anchie
bz -> jamie
bz -> syrinx
+cognet -> jceel
cognet -> kevlo
cperciva -> flz
@@ -462,6 +465,8 @@ markm -> sheldonh
mav -> ae
+mdf -> gleb
+
mdodd -> jake
mike -> das
@@ -573,6 +578,8 @@ ume -> tshiozak
wes -> scf
+wkoszek -> jceel
+
wollman -> gad
zml -> mdf
diff --git a/share/misc/iso3166 b/share/misc/iso3166
index 23c9bd6..8b7533b 100644
--- a/share/misc/iso3166
+++ b/share/misc/iso3166
@@ -46,7 +46,7 @@ BJ BEN 204 Benin
BM BMU 060 Bermuda
BT BTN 064 Bhutan
BO BOL 068 Bolivia, Plurinational State of
-BQ BES 535 Bonaire, Saint Eustatius and Saba
+BQ BES 535 Bonaire, Sint Eustatius and Saba
BA BIH 070 Bosnia and Herzegovina
BW BWA 072 Botswana
BV BVT 074 Bouvet Island
@@ -224,11 +224,12 @@ SB SLB 090 Solomon Islands
SO SOM 706 Somalia
ZA ZAF 710 South Africa
GS SGS 239 South Georgia and the South Sandwich Islands
+SS SSD 728 South Sudan
ES ESP 724 Spain
LK LKA 144 Sri Lanka
SH SHN 654 Saint Helena, Ascension and Tristan da Cunha
PM SPM 666 Saint Pierre and Miquelon
-SD SDN 736 Sudan
+SD SDN 729 Sudan
SR SUR 740 Suriname
SJ SJM 744 Svalbard and Jan Mayen
SZ SWZ 748 Swaziland
@@ -547,3 +548,10 @@ ZW ZWE 716 Zimbabwe
# BONAIRE, SAINT EUSTATIUS AND SABA (BQ), CURACAO (CW) and
# SINT MAARTEN (DUTCH PART) (SX) added as new entries.
# NETHERLANDS ANTILLES (AN) removed.
+#
+# Newsletter VI-9 2011-06-12
+# Name changes for Fiji and Myanmar as well as other minor corrections
+#
+# Newsletter VI-10 2011-08-09
+# Code elements for South Sudan.
+#
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index c452528..1d4a2c5 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -125,8 +125,8 @@ depend: beforedepend ${DEPENDFILE} afterdepend
# Different types of sources are compiled with slightly different flags.
# Split up the sources, and filter out headers and non-applicable flags.
-MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*}
-MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*}
+MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*} ${CFLAGS:M-std=*} ${CFLAGS:M-ansi}
+MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*} ${CXXFLAGS:M-std=*} ${CXXFLAGS:M-ansi}
DPSRCS+= ${SRCS}
${DEPENDFILE}: ${DPSRCS}
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index ee78619..3058970 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -434,8 +434,9 @@ __DEFAULT_YES_OPTIONS+=CLANG
.else
__DEFAULT_NO_OPTIONS+=CLANG
.endif
-# FDT is needed only for arm and powerpc (and not powerpc64)
-.if ${__T} == "arm" || ${__T} == "armeb" || ${__T} == "powerpc"
+# FDT is needed only for arm, mips and powerpc (and not powerpc64)
+.if ${__T} == "arm" || ${__T} == "armeb" || ${__T} == "powerpc" || \
+ ${__T:Mmips*}
__DEFAULT_YES_OPTIONS+=FDT
.else
__DEFAULT_NO_OPTIONS+=FDT
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index f5b98e2..87e4935 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -14,15 +14,3 @@ _WITHOUT_SRCCONF=
.include <bsd.own.mk>
.include "${BSDPORTMK}"
-
-.if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK)
-# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x.
-run-autotools-fixup:
- find ${WRKSRC} -type f \( -name config.libpath -o \
- -name config.rpath -o -name configure -o -name libtool.m4 \) \
- -exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \
- -e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} +
-
-.ORDER: run-autotools run-autotools-fixup do-configure
-do-configure: run-autotools-fixup
-.endif
OpenPOWER on IntegriCloud