Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

- Fix for possible unset uid/gid in toproto - Fix for default mtree style - Update libelf - Importing libexecinfo - Resynchronize GCC, mpc, gmp, mpfr - build.sh: Replace params with show-params. This has been done as the make target has been renamed in the same way, while a new target named params has been added. This new target generates a file containing all the parameters, instead of printing it on the console. - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org) get getservbyport() out of the inner loop Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
2014-07-28 17:05:06 +02:00
parent ff10274392
commit 84d9c625bf
4655 changed files with 379308 additions and 151050 deletions
@@ -10,17 +10,17 @@
 SUBDIR= misc mk \
 	terminfo zoneinfo

+.if ${MKNLS} != "no"
+SUBDIR+=i18n locale nls
+.endif
+.endif
+
 .if defined(__MINIX)
 .if ${MACHINE_ARCH} == "earm"
 SUBDIR+= beaglebone
 .endif # ${MACHINE_ARCH} == "earm"
 .endif # defined(__MINIX)

-.if ${MKNLS} != "no"
-SUBDIR+=i18n locale nls
-.endif
-.endif
-
 # Speedup stubs for some subtrees that don't need to run these rules
 includes-examples includes-man:
 	@true
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.209 2011/11/19 17:40:19 mbalmer Exp $
+$NetBSD: acronyms,v 1.221 2013/09/28 17:58:53 dholland Exp $
 10Q	thank you
 10X	thanks
 1337	elite ("leet")
@@ -6,16 +6,20 @@ $NetBSD: acronyms,v 1.209 2011/11/19 17:40:19 mbalmer Exp $
 31337	elite ("eleet")
 4TW	for the win
 AAMOF	as a matter of fact
+ABD	all but dissertation
 AC	audible chuckle
+ADD	attention deficit disorder
+ADHD	attention deficit (and) hyperactivity disorder
 ADN	any day now
+ADOS	attention deficit ... oh, shiny!
 AEAP	as early as possible
 AFAIAC	as far as I am concerned
 AFAIC	as far as I'm concerned
-AFAICR	as far as I can recall
+AFAICR	as far as I can {recall,remember}
 AFAICS	as far as I can see
 AFAICT	as far as I can tell
 AFAIK	as far as I know
-AFAIR	as far as I {recall, remember}
+AFAIR	as far as I {recall,remember}
 AFAIU	as far as I understand
 AFD	away from desktop
 AFK	away from keyboard
@@ -27,14 +31,15 @@ AISE	as I see it
 AIU	as I understand
 AIUI	as I understand it
 AKA	also known as
+AM	ante meridiem
 AMOL	a mountain of love
 ASAIC	as soon as I can
 ASAP	as soon as possible
 ATEOTD	at the end of the day
 ATM	at the moment
-ATM	automatic teller machine
+ATM	{automated,automatic} teller machine
 ATW	around the world
-AWK	Aho Weinberger Kernighan
+AWK	Aho, Weinberger, [and] Kernighan
 AWOL	absent without official leave
 AYBABTU	all your base are belong to us
 AYF	all your fault
@@ -45,6 +50,7 @@ B/S	bullshit
 B/W	bandwidth
 B/W	between
 BAK	back at keyboard
+BAMF	bad-ass motherfucker
 BBIAB	be back in a bit
 BBL	[I'll] be back later
 BBR	burnt beyond repair
@@ -52,9 +58,9 @@ BBS	be back soon
 BBT	be back tomorrow
 BCNU	be seeing you
 BCNUL8R	be seeing you later
+BCP	best current practice
 BF	best friend
 BF	boyfriend
-BCP	best current practice
 BFD	big fucking deal
 BFF	best friend forever
 BFH	big fucking hammer
@@ -78,6 +84,7 @@ BTFT	been there, fixed that
 BTTH	boot to the head
 BTW	by the way
 CC	credit card
+CEO	chief executive officer
 CFV	call for votes
 CFY	calling for you
 CG	center of gravity
@@ -88,14 +95,18 @@ COTS	commercial off-the-shelf
 CPC	cost per click
 CTN	can't talk now
 CU	see you
+CUL	see you later
 CYA	see you around
 CYE	check your email
+D/B/A	doing business as
 D/L	download
+DBA	doing business as
 DBEYR	don't believe everything you read
 DGAS	don't give a shit
 DIAFYO	did I ask for your opinion?
 DIY	do it yourself
 DKDC	don't know, don't care
+DM	dungeon master
 DMZ	demilitarized zone
 DND	do not disturb
 DOA	dead on arrival
@@ -103,8 +114,8 @@ DRY	don't repeat yourself
 DSTM	don't shoot the messenger
 DTRT	do the right thing
 DTWT	do the wrong thing
-DYK	do you know?
 DWIM	do what I mean
+DYK	do you know?
 ECR	electronic cash register
 EDS	eternal downward spiral
 EFT	electronic funds transfer
@@ -112,34 +123,35 @@ EG	evil grin
 EIE	enough is enough
 EMSG	email message
 EOB	end of business [day]
-EOD	end of {day, discussion}
+EOD	end of {day,discussion}
 EOL	end of life
 EOM	end of message
 EOS	end of story
-ETA	estimated time of arrival
 ETA	edited to add
+ETA	estimated time of arrival
 ETLA	extended three letter acronym
 ETR	early to rise
 EWAG	experienced wild-ass guess
 F9	fine
 FAQ	frequently asked question
 FBOW	for better or worse
+FCFS	first come, first served
 FCOL	for crying out loud
-FCFS	first come first served
 FFS	for fuck's sake
 FFS	free for shipping
 FIGJAM	fuck I'm good, just ask me
-FIIK	fuck[ed] if I know
-FIIR	fuck[ed] if I remember
+FIIK	{fuck,fucked} if I know
+FIIR	{fuck,fucked} if I {recall,remember}
 FITB	fill in the blank
 FM	fucking magic
 FML	fuck my life
-FNO	from now on
 FNO	for nerds only
-FOAD	{fuck off,fall over} and die
+FNO	from now on
+FOAD	{fall over,fuck off} and die
 FOC	free of charge
 FOS	full of shit
 FPS	first person shooter
+FPS	frames per second
 FSCK	fuck
 FSDO	for some definition of
 FSVO	for some value of
@@ -148,13 +160,14 @@ FTFA	from the fucking article
 FTFM	fuck the fuckin' manual!
 FTFY	fixed that for you
 FTHOI	for the {heck,hell} of it
+FTL	faster than light
 FTL	for the loss
 FTMFW	for the motherfucking win
 FTS	fuck that shit
 FTTT	from time to time
 FTW	for the win
 FUBAR	fucked up beyond all recognition
-FUD	fear, uncertainty and doubt
+FUD	fear, uncertainty, [and] doubt
 FWIW	for what it's worth
 FYEO	for your eyes only
 FYI	for your information
@@ -167,25 +180,26 @@ GAL	get a life
 GBTW	get back to work
 GF	girlfriend
 GFU	good for you
-GFY	good for you
 GFY	go fuck yourself
+GFY	good for you
 GG	good game
 GGWP	good game, well played
 GIGO	garbage in, garbage out
-GIYF	google is your friend
+GIYF	Google is your friend
 GJ	good job
 GL	good luck
 GLHF	good luck, have fun
 GLWT	good luck with that
+GM	game master
 GMTA	great minds think alike
-GOK	god only knows
+GOK	God only knows
 GOWI	get on with it
 GPS	global positioning system
 GR8	great
 GTFO	get the fuck out
 GTG	got to go
 GTH	go to hell
-GTSY	{good, glad} to see you
+GTSY	{glad,good} to see you
 GWS	get well soon
 H8	hate
 HAND	have a nice day
@@ -207,7 +221,7 @@ IAWTC	I agree with this comment
 IAY	I adore you
 IB	I'm back
 IC	I see
-ICBW	I could be {wrong, worse}
+ICBW	I could be {worse,wrong}
 ICCL	I couldn't care less
 ICUR	I see you are
 IDC	I don't care
@@ -222,7 +236,7 @@ IHAFC	I haven't a fucking clue
 IHBW	I have been wrong
 IHNFC	I have no fucking clue
 IIANM	if I am not mistaken
-IIRC	if I recall correctly
+IIRC	if I {recall,remember} correctly
 IIUC	if I understand correctly
 IKWYM	I know what you mean
 ILU	I love you
@@ -235,15 +249,15 @@ IMNSHO	in my not so humble opinion
 IMO	in my opinion
 INPO	in no particular order
 IOW	in other words
-IQ	intelligence quotient
 IPML	I pissed myself laughing
+IQ	intelligence quotient
 IRL	in real life
 IRT	in real time
 IRT	in regards to
 ISAGN	I see a great need
-ISBN	international standard book number
+ISBN	International Standard Book Number
 ISTM	it seems to me
-ISTR	I seem to recall
+ISTR	I seem to {recall,remember}
 ITYM	I think you mean
 IUD	insert usual disclaimers
 IUSS	if you say so
@@ -256,12 +270,14 @@ IYSWIM	if you see what I mean
 J/K	just kidding
 JAM	just a minute
 JAS	just a second
+JFGI	just fucking Google it
 JFK	John Fitzgerald Kennedy
 JFTR	just for the record
 JFW	just fucking works
-JGI	just got it
+JFYI	just for your information
 JGI	just Google it
-JHD	just hit ``delete''
+JGI	just got it
+JHD	just hit delete
 JIC	just in case
 JJA	just joking around
 JK	just kidding
@@ -272,8 +288,8 @@ JW	just wondering
 KISS	keep it simple, stupid
 KITA	kick in the ass
 KK	okay, okay
-KMA	keep moving ahead
 KMA	keep me advised
+KMA	keep moving ahead
 KMA	kill me already
 KNF	kernel normal form
 KOS	kill on sight
@@ -281,7 +297,7 @@ KTHX	okay, thanks
 KWIM	know what I mean?
 L8	late
 L8R	later
-LART	luser attitude readjustment tool (ie, hammer)
+LART	luser attitude readjustment tool
 LBNL	last but not least
 LGTM	looks good to me
 LJBF	let's just be friends
@@ -294,7 +310,7 @@ LMK	let me know
 LMNO	laughing my nuts off
 LMSO	laughing my socks off
 LOL	laughing out loud
-LP	long playing (record)
+LP	long playing [record]
 LTNS	long time no see
 LWYL	laugh with you later
 M8	mate
@@ -307,6 +323,7 @@ MOTOS	member of the opposite sex
 MOTSS	member of the same sex
 MTF	more to follow
 MYOB	mind your own business
+N/A	not {applicable,available}
 N/M	never mind
 NAFAIK	not as far as I know
 NBD	no big deal
@@ -326,9 +343,10 @@ NOOB	newbie
 NOYB	none of your business
 NOYFB	none of your fucking business
 NP	no problem
+NPC	non-player character
 NRFPT	not ready for prime time
-NRN	not right now
 NRN	no reply necessary
+NRN	not right now
 NSFW	not suitable for work
 NTN	no thanks needed
 NUNP	no users, no problems
@@ -336,14 +354,14 @@ NVM	never mind
 NW	no way
 NXT	next
 O2W	off to work
+OAO	over and out
 OH	other half
 OIC	oh, I see
-OMFG	oh my fucking god
-OMG	oh, my god
+OMFG	oh my fucking God
+OMG	oh my God
 OMW	on my way
 ONNA	oh no, not again
 ONNTA	oh no, not this again
-OAO	over and out
 OOB	out of bounds
 OOC	out of curiosity
 OOI	out of interest
@@ -351,12 +369,19 @@ OOSOOM	out of sight, out of mind
 OT	off topic
 OTL	out to lunch
 OTOH	on the other hand
+OTP	one true pairing
 OTS	off the shelf
 OTT	over the top
 OTTOMH	off the top of my head
 OWTTE	or words to that effect
+PC	player character
+PC	politically correct
+PCB	polychlorinated biphenyl(s)
+PD	police department
+PDA	public display of affection
 PDQ	pretty darn quick
 PDS	please don't shout
+PEBCAK	problem exists between chair and keyboard
 PEBKAC	problem exists between keyboard and chair
 PFI	pay for inclusion
 PFO	please fuck off
@@ -386,6 +411,7 @@ PTV	parental tunnel vision
 QED	quod erat demonstrandum
 QFT	quoted for truth
 RA	residential advisor
+REMF	rear echelon motherfucker
 RFC	request for comments
 RFD	request for discussion
 RFE	request for enhancements
@@ -395,19 +421,21 @@ RLC	rod length check
 RMS	Richard Matthew Stallman
 ROFL	rolling on floor laughing
 ROFLMAO	rolling on floor laughing my ass off
-ROTFL	rolling on the floor laughing
 ROI	return on investment
+ROTFL	rolling on the floor laughing
 RP	responsible person
 RR	railroad
 RSI	repetitive strain injury
 RSN	real soon now
-RSVP	repondez s'il vous plait (please reply)
-RTFB	read the fine/fucking book
-RTFC	read the fine/fucking code
-RTFD	read the fine/fucking documentation
-RTFM	read the fine/fucking manual
-RTFMP	read the fine/fucking man page
-RTFS	read the fine/fucking source
+RSVP	respondez s'il vous plait ("reply please")
+RTFB	read the {fine,fucking} book
+RTFC	read the {fine,fucking} code
+RTFD	read the {fine,fucking} documentation
+RTFM	read the {fine,fucking} manual
+RTFMP	read the {fine,fucking} man page
+RTFS	read the {fine,fucking} source
+S/T	self titled
+SAR	search and rescue
 SAR	some assembly required
 SCNR	sorry, could not resist
 SEP	someone else's problem
@@ -423,7 +451,6 @@ SMOP	simple matter of programming
 SNAFU	situation normal, all fucked up
 SNERT	snot-nosed egotistical rude teenager
 SNMP	sorry, not my problem
-SNR	signal to noise ratio
 SO	significant other
 SOB	son of [a] bitch
 SOL	shit out [of] luck
@@ -439,7 +466,7 @@ SUX	sucks
 SUX2BU	sucks to be you
 SWAG	silly, wild-assed guess
 SWAHBI	silly, wild-assed hare-brained idea
-SWFG	search with fucking google
+SWFG	search with fucking Google
 SWMBO	she who must be obeyed
 SYS	see you soon
 TA	teaching assistant
@@ -451,6 +478,7 @@ TBH	to be honest
 TBOMK	the best of my knowledge
 TCB	taking care of business
 TCO	taken care of
+TCO	total cost of ownership
 THNX	thanks
 THX	thanks
 TIA	thanks in advance
@@ -477,6 +505,7 @@ TOC	table of contents
 TOCTOU	time of check to time of use
 TOEFL	test of english as a foreign language
 TOH	to other half
+TP	toilet paper
 TPTB	the powers that be
 TRT	the right thing
 TTBOMK	to the best of my knowledge
@@ -512,23 +541,24 @@ WMNC	watch me not care
 WOFTAM	waste of fucking time and money
 WOMBAT	waste of money, brain, and time
 WRT	with respect to
-WTB	{want,willing,waiting} to buy
+WTB	{waiting,want,willing} to buy
 WTF	{what,when,where,who,why} the fuck
 WTFRUD	what the fuck are you doing
 WTG	way to go
 WTH	{what,when,where,who,why} the hell
-WTS	{want,willing,waiting} to sell
-WTT	{want,willing,waiting} to trade
-WYSIWYG	what you see is what you get
+WTS	{waiting,want,willing} to sell
+WTT	{waiting,want,willing} to trade
 WWJD	what would Jesus do?
-YAOTM	yet another off-topic message
 YAGNI	you ain't gonna need it
 YALIMO	you are lame, in my opinion
+YAOTM	yet another off-topic message
 YGM	you got mail
 YHBT	you have been trolled
 YHL	you have lost
 YKWIM	you know what I mean
 YMA	yo momma's ass
 YMMV	your mileage may vary
+YOLO	you only live once
+YTF	why the fuck
 YW	you're welcome
 YWSYLS	you win some, you lose some
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.40 2011/04/28 07:32:36 mbalmer Exp $
+#	$NetBSD: airport,v 1.51 2013/04/25 13:34:10 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -2650,7 +2650,7 @@ GOE:Gonaila, Papua New Guinea
 GOF:San Angelo (Goodfellow AFB), TX, USA
 GOH:Godthab, Nuuk, Greenland
 GOI:Goa, India
-GOJ:Nizhniy Novgorod (Sormavo), Russia
+GOJ:Nizhniy Novgorod (Sormovo), Russia
 GOK:Guthrie Municipal Airport, OK, USA
 GOL:Gold Beach Municipal Airport, OR, USA
 GOM:Goma, Dem. Rep. of the Congo
@@ -3411,6 +3411,7 @@ JCX:Los Angeles (Citicorp Heliport), CA, USA
 JCY:Johnson City Airport, TX, USA
 JDA:John Day State Airport, OR, USA
 JDB:Dallas (Downtown Heliport), TX, USA
+JDC:Jingdezhen-Luojia Airport
 JDF:Juiz do Fora, MG, Brazil
 JDH:Jodhpur, India
 JDM:Miami (Heliport), FL, USA
@@ -3989,7 +3990,7 @@ KUB:Kuala Belait, Brunei
 KUC:Kuria, Kiribati
 KUD:Kudat, Sabah, Malaysia
 KUE:Kukundu, Solomon Islands
-KUF:Samara, Russia
+KUF:Samara (Kurumoch), Russia
 KUG:Kubin Island, Australia
 KUH:Kushiro, Japan
 KUI:Kawau Island, New Zealand
@@ -5800,7 +5801,7 @@ PAL:Palanquero, Colombia
 PAM:Panama City (Tyndall Air Force Base), FL, USA
 PAN:Pattani, Thailand
 PAO:Palo Alto Municipal, California, USA
-PAP:Port-au-Prince, Haiti
+PAP:Aeroport international Toussaint Louverture, Port-au-Prince, Haiti
 PAQ:Palmer Municipal Airport, AK, USA
 PAR:All Airports around Paris, France
 PAS:Paros, Greece
@@ -5890,7 +5891,7 @@ PET:Pelotas, RS, Brazil
 PEU:Puerto Lenpira, Honduras
 PEW:Peshawar, Pakistan
 PEY:Penong, South Australia, Australia
-PEZ:Penza, Penza, Russia
+PEZ:Penza (Ternovka), Russia
 PFA:Paf Warren, AK, USA
 PFB:Passo Fundo, RS, Brazil
 PFC:Pacific City (State Airport), OR, USA
@@ -6125,7 +6126,7 @@ PRC:Prescott (Ernest Love Field), AZ, USA
 PRD:Pardoo, Western Australia, Australia
 PRE:Pore, Colombia
 PRF:Port Johnson, AK, USA
-PRG:Prague [Ruzyne], Czech Republic
+PRG:Prague [Ruzyne] (Vaclav Havel airport Prague), Czech Republic
 PRH:Phrae, Thailand
 PRI:Praslin Island, Seychelles
 PRJ:Capri, Italy
@@ -6705,7 +6706,7 @@ ROR:Koror (Airai), Palau
 ROS:Rosario, Argentina
 ROT:Rotorua, New Zealand
 ROU:Ruse, Bulgaria
-ROV:Rostov, Russia
+ROV:Rostov-na-Donu, Russia
 ROW:Roswell (Industrial Air Center), NM, USA
 ROX:Roseau Municipal Airport, MN, USA
 ROY:Rio Mayo, Argentina
@@ -7501,6 +7502,7 @@ TCL:Tuscaloosa Municipal Airport, AL, USA
 TCM:Tacoma (McChord Air Force), WA, USA
 TCN:Tehuacan, Mexico
 TCO:Tumaco, Colombia
+TCP:Taba International Airport, Egypt
 TCQ:Tacna (Coronel Carlos Ciriani), Peru
 TCS:Truth or Consequences, NM, USA
 TCT:Takotna Airport, AK, USA
@@ -7992,7 +7994,7 @@ ULP:Quilpie, Queensland, Australia
 ULQ:Tulua, Colombia
 ULS:Mulatos, Colombia
 ULU:Gulu, Uganda
-ULY:Simbirsk (Ulyanovsk), Russia
+ULV:Ulyanovsk (Barataevka), Russia
 UMA:Punta de Maisi, Cuba
 UMB:Umnak, AK, USA
 UMC:Umba, Papua New Guinea
@@ -8213,13 +8215,13 @@ VNS:Varanasi, India
 VNW:Van Wert County Airport, OH, USA
 VNX:Vilanculos, Mozambique
 VNY:Los Angeles (Van Nuys Airport), CA, USA
-VOG:Volgograd (Stalingrad), Russia
+VOG:Volgograd (Gumrak, Stalingrad), Russia
 VOH:Vohemar, Madagascar
 VOI:Voinjama, Liberia
 VOK:Camp Douglas (Volk Field), WI, USA
 VOL:Volos, Greece
 VOT:Votuporanga, SP, Brazil
-VOZ:Voronezh, Voronezh, Russia
+VOZ:Voronezh (Chertovitskoe), Russia
 VPC:Cartersville Airport, GA, USA
 VPE:Ondjiva (Ngiva), Angola
 VPN:Vopnafjordur, Iceland
@@ -62,9 +62,9 @@ Tenth Edition     |                      |
   |                    |                  4.4BSD            |
   |                    |                    / |             |
   |                    |   4.4BSD-Encumbered  |             |
-   |                 NetBSD 0.8                |           BSD/386 1.0
-   |                    |                      |             |
-FreeBSD 1.0          NetBSD 0.9                |           BSD/386 1.1
+   |                -NetBSD 0.8                |           BSD/386 1.0
+   |               /    |                      |             |
+FreeBSD 1.0 <-----'  NetBSD 0.9                |           BSD/386 1.1
   |                    |           .----- 4.4BSD Lite       |
 FreeBSD 1.1             |          /   /       |     \       |
   |                    |         /   /        |      \      |
@@ -216,43 +216,71 @@ FreeBSD 5.2           |      |                 |                       |
 |     |             10.5    |                 |                       |
 |     |              |      |             OpenBSD 4.2                 |
 |     |              |   NetBSD 4.0           |                       |
- | FreeBSD 6.3        |      |                 |                       |
- |            \       |      |                 |                       |
- *--FreeBSD    |      |      |                 |                DragonFly 1.12.0
- |    7.0      |      |      |                 |                       |
- |     |       |      |      |             OpenBSD 4.3                 |
- |     |       |      |      |                 |                DragonFly 2.0.0
- |     |    FreeBSD   |      |             OpenBSD 4.4                 |
+ | FreeBSD 6.3        |      |    |            |                       |
+ |            \       |      |    |            |                       |
+ *--FreeBSD    |      |      |    |            |                DragonFly 1.12.0
+ |    7.0      |      |      |    |            |                       |
+ |     |       |      |      |    |        OpenBSD 4.3                 |
+ |     |       |      |      | NetBSD          |                DragonFly 2.0.0
+ |     |    FreeBSD   |      |  4.0.1      OpenBSD 4.4                 |
 |     |      6.4     |      |                 |                       |
 |     |              |      |                 |                       |
 |  FreeBSD 7.1       |      |                 |                       |
 |     |              |      |                 |                DragonFly 2.2.0
 |  FreeBSD 7.2       |   NetBSD 5.0       OpenBSD 4.5                 |
- |             \      |      |    |            |                       |
- |              |  Mac OS X  |    |            |                       |
- |              |    10.6    |    |            |                       |
- |              |     |      |    |            |                DragonFly 2.4.0
- |              |     |      |    |        OpenBSD 4.6                 |
- |              |     |      |    |            |                       |
- *--FreeBSD     |     |      |    |            |                       |
- |    8.0       |     |      |    |            |                       |
- |     |     FreeBSD  |      |    |            |                       |
- |     |       7.3    |      |    |            |                DragonFly 2.6.0
- |     |        |     |      |    |        OpenBSD 4.7                 |
- |  FreeBSD     |     |      |    |            |                       |
- |    8.1       |     |      |    |            |                       |
- |     |        |     |      |    |            |                DragonFly 2.8.2
- |     |        |     |      |    |        OpenBSD 4.8                 |
- |     |        |     |      | NetBSD 5.1      |                       |
- |  FreeBSD  FreeBSD  |      |                 |                       |
- |    8.2      7.4    |      |                 |               DragonFly 2.10.1
- |     v              |      |             OpenBSD 4.9                 |
- |                 Mac OS X  |                 |                       |
- |                   10.7    |                 |                       |
- |                    |      |             OpenBSD 5.0                 |
- +--FreeBSD           |      |                 |                       |
- |    9.0             |      |                 |                       |
- |     v              |      |                 |                       |
+ |             \      |      | |    \          |                       |
+ |              |  Mac OS X  | |     \         |                       |
+ |              |    10.6    | |      \        |                       |
+ |              |     |      | |   NetBSD      |                DragonFly 2.4.0
+ |              |     |      | |    5.0.1  OpenBSD 4.6                 |
+ |              |     |      | |       |       |                       |
+ *--FreeBSD     |     |      | |       |       |                       |
+ |    8.0       |     |      | |       |       |                       |
+ |     |     FreeBSD  |      | |   NetBSD      |                       |
+ |     |       7.3    |      | |    5.0.2      |                DragonFly 2.6.0
+ |     |        |     |      | |           OpenBSD 4.7                 |
+ |  FreeBSD     |     |      | |               |                       |
+ |    8.1       |     |      | |               |                       |
+ |     |        |     |      | |               |                DragonFly 2.8.2
+ |     |        |     |      | |           OpenBSD 4.8                 |
+ |     |        |     |      | *--NetBSD       |                       |
+ |  FreeBSD  FreeBSD  |      | |    5.1        |                       |
+ |    8.2      7.4    |      | |      |        |               DragonFly 2.10.1
+ |     |              |      | |      |    OpenBSD 4.9                 |
+ |     `-----.     Mac OS X  | |      |        |                       |
+ |            \      10.7    | |      |        |                       |
+ |             |      |      | |      |    OpenBSD 5.0                 |
+ *--FreeBSD    |      |      | |      |        |                       |
+ |    9.0      |      |      | |   NetBSD      |               DragonFly 3.0.1
+ |     |    FreeBSD   |      | |    5.1.2      |                       |
+ |     |      8.3     |      | |      |        |                       |
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    5.1.3      |                       |
+ |     |       |      |      | |           OpenBSD 5.1                 |
+ |     |       |   Mac OS X  | `----.          |                       |
+ |     |       |     10.8    |       \         |                       |
+ |     |       |      |   NetBSD 6.0  |        |                       |
+ |     |       |      |      | | |    |    OpenBSD 5.2         DragonFly 3.2.1
+ |  FreeBSD    |      |      | | | NetBSD      |                       |
+ |    9.1      |      |      | | |   5.2       |                       |
+ |             |      |      | | |    |        |                       |
+ |             |      |      | | | NetBSD      |                       |
+ |             |      |      | | |  5.2.1      |                       |
+ |             |      |      | | |             |                       |
+ |             |      |      | |  \            |                       |
+ |             |      |      | |   NetBSD      |                       |
+ |             |      |      | |    6.0.1      |                       |
+ |             |      |      | |      |   OpenBSD 5.3          DragonFly 3.4.1
+ |             |      |      | |   NetBSD      |                       |
+ |             |      |      | |    6.0.2      |                       |
+ |             |      |      | |      |        |                       |
+ |             |      |      | |  NetBSD 6.0.3 |                       |
+ |             |      |      | |               |                       |
+ |             |      |      |  `-NetBSD 6.1   |                       |
+ |          FreeBSD   |      |     |           |                       |
+ |            8.4     |      |    NetBSD 6.1.1 |                       |
+ |                    |      |     |           |                       |
+ |                    |      |    NetBSD 6.1.2 |                       |
 |                    |      |                 |                       |
 FreeBSD 10 -current   |  NetBSD -current  OpenBSD -current             |
 |                    |      |                 |                       |
@@ -526,9 +554,11 @@ NetBSD 5.0		2009-04-29 [NBD]
 OpenBSD 4.5		2009-05-01 [OBD]
 FreeBSD 7.2		2009-05-04 [FBD]
 Mac OS X 10.6		2009-06-08 [APL]
+NetBSD 5.0.1		2009-08-02 [NBD] (security/critical release)
 DragonFly 2.4.0		2009-09-16 [DFB]
 OpenBSD 4.6		2009-10-18 [OBD]
 FreeBSD 8.0		2009-11-26 [FBD]
+NetBSD 5.0.2		2010-02-12 [NBD] (security/critical release)
 FreeBSD 7.3		2010-03-23 [FBD]
 DragonFly 2.6.0		2010-03-28 [DFB]
 OpenBSD 4.7		2010-05-19 [OBD]
@@ -543,6 +573,27 @@ OpenBSD 4.9		2011-05-01 [OBD]
 Mac OS X 10.7		2011-07-20 [APL]
 OpenBSD 5.0		2011-11-01 [OBD]
 FreeBSD 9.0		2012-01-12 [FBD]
+NetBSD 5.1.2		2012-02-02 [NBD] (security/critical release)
+DragonFly 3.0.1		2012-02-21 [DFB]
+FreeBSD 8.3		2012-04-18 [FBD]
+OpenBSD 5.1		2012-05-01 [OBD]
+Mac OS X 10.8		2012-07-25 [APL]
+NetBSD 6.0		2012-10-17 [NBD]
+OpenBSD 5.2		2012-11-01 [OBD]
+DragonFly 3.2.1		2012-11-02 [DFB]
+NetBSD 5.2		2012-12-03 [NBD]
+NetBSD 6.0.1		2012-12-26 [NBD] (security/critical release)
+FreeBSD 9.1		2012-12-30 [FBD]
+DragonFly 3.4.1		2013-04-29 [DFB]
+OpenBSD 5.3		2013-05-01 [OBD]
+NetBSD 6.0.2		2013-05-18 [NBD] (security/critical release)
+NetBSD 6.1		2013-05-18 [NBD]
+FreeBSD 8.4		2013-06-07 [FBD]
+NetBSD 6.1.1		2013-08-22 [NBD]
+NetBSD 5.1.3		2013-09-29 [NBD]
+NetBSD 5.2.1		2013-09-29 [NBD]
+NetBSD 6.0.3		2013-09-30 [NBD]
+NetBSD 6.1.2		2013-09-30 [NBD]

 Bibliography
 ------------------------
@@ -603,4 +654,4 @@ Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages.
 Copyright (c) 1997-2012 Wolfram Schneider <wosch@FreeBSD.ORG>
 URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree

-$FreeBSD: src/share/misc/bsd-family-tree,v 1.150 2012/01/13 06:18:23 maxim Exp $
+$FreeBSD$
@@ -1,4 +1,4 @@
-# $NetBSD: country,v 1.15 2009/12/15 03:39:19 christos Exp $
+# $NetBSD: country,v 1.16 2012/09/07 21:08:03 ginsbach Exp $
 #
 # ISO 3166-1 Country Codes
 #
@@ -6,8 +6,7 @@
 # <Name><TAB><Alpha-2-code><TAB><Alpha-3-code><TAB><Numeric-3-code><TAB><FIPS>
 #
 # Further information can be found at the ISO 3166 Maintenance Agency
-# (ISO 3166/MA) web site,
-# <http://www.iso.org/iso/en/prods-services/iso3166ma/index.html>.
+# (ISO 3166/MA) web site, <http://www.iso.org/iso/country_codes>.
 #
 # FIPS 10-4 codes compiled from several sources, including
 # http://www.statoids.com/wab.html
@@ -16,7 +15,7 @@
 # blank entry in the column. FIPS 10-4 codes without a corresponding
 # ISO 3166-1 entity are excluded.
 #
-# This list is up-to-date as of 2009-12-14
+# This list is up-to-date as of 2012-09-07
 #
 Aaland	AX	ALA	248	
 Afghanistan	AF	AFG	004	AF
@@ -45,6 +44,7 @@ Benin	BJ	BEN	204	BN
 Bermuda	BM	BMU	060	BD
 Bhutan	BT	BTN	064	BT
 Bolivia	BO	BOL	068	BL
+Bonaire, Sint Eustatius and Saba	BQ	BES	535	NL
 Bosnia and Herzegovina	BA	BIH	070	BK
 Botswana	BW	BWA	072	BC
 Bouvet Island	BV	BVT	074	BV
@@ -74,6 +74,7 @@ Costa Rica	CR	CRI	188	CS
 Cote d'Ivoire	CI	CIV	384	IV
 Croatia	HR	HRV	191	HR
 Cuba	CU	CUB	192	CU
+Curaçao	CW	CUW	531	UC
 Cyprus	CY	CYP	196	CY
 Czech Republic	CZ	CZE	203	EZ
 Denmark	DK	DNK	208	DA
@@ -172,7 +173,6 @@ Namibia	NA	NAM	516	WA
 Nauru	NR	NRU	520	NR
 Nepal	NP	NPL	524	NP
 Netherlands	NL	NLD	528	NL
-Netherlands Antilles	AN	ANT	530	NT
 New Caledonia	NC	NCL	540	NC
 New Zealand	NZ	NZL	554	NZ
 Nicaragua	NI	NIC	558	NU
@@ -216,15 +216,17 @@ Serbia	RS	SRB	688	RI KV
 Seychelles	SC	SYC	690	SE
 Sierra Leone	SL	SLE	694	SL
 Singapore	SG	SGP	702	SN
+Sint Maarten	SX	SXM	534	NN
 Slovakia	SK	SVK	703	LO
 Slovenia	SI	SVN	705	SI
 Solomon Islands	SB	SLB	090	BP
 Somalia	SO	SOM	706	SO
 South Africa	ZA	ZAF	710	SF
 South Georgia and South Sandwich Islands	GS	SGS	239	SX
+South Sudan	SS	SSD	728	OD
 Spain	ES	ESP	724	SP
 Sri Lanka	LK	LKA	144	CE
-Sudan	SD	SDN	736	SU
+Sudan	SD	SDN	729	SU
 Suriname	SR	SUR	740	NS
 Svalbard and Jan Mayen Islands	SJ	SJM	744	SV JN
 Swaziland	SZ	SWZ	748	WZ
@@ -1,4 +1,4 @@
-# $NetBSD: domains,v 1.7 2007/09/29 15:40:58 hubertf Exp $
+# $NetBSD: domains,v 1.8 2013/06/02 16:37:37 rodent Exp $
 # ISO 3166 country codes, from http://www.iana.org/root-whois/index.html
 # Last update: Sat Sep 29 17:40:22 CEST 2007
 #
@@ -211,6 +211,7 @@ sr Suriname
 st Sao Tome and Principe
 su Soviet Union (being phased out)
 sv El Salvador
+sx Sint Maarten
 sy Syrian Arab Republic
 sz Swaziland
 tc Turks and Caicos Islands
@@ -248,7 +249,6 @@ wf Wallis and Futuna Islands
 ws Samoa
 ye Yemen
 yt Mayotte
-yu Yugoslavia (being phased out)
 za South Africa
 zm Zambia
 zw Zimbabwe
@@ -1,5 +1,5 @@
 # Flower : Meaning
-#	$NetBSD: flowers,v 1.2 1997/03/26 06:30:56 mikel Exp $
+#	$NetBSD: flowers,v 1.3 2012/11/17 13:15:25 mbalmer Exp $
 #	@(#)flowers	8.1 (Berkeley) 6/8/93
 #
 # Upside down reverses the meaning.
@@ -7,7 +7,7 @@ African violet:Such worth is rare.
 Apple blossom:Preference.
 Bachelor's button:Celibacy.
 Bay leaf:I change but in death.
-Camelia:Reflected loveliness.
+Camellia:Reflected loveliness.
 Chrysanthemum, other color:Slighted love.
 Chrysanthemum, red:I love.
 Chrysanthemum, white:Truth.
@@ -22,8 +22,8 @@ Ivy:Friendship, fidelity, marriage.
 Jasmine:Amiablity, transports of joy, sensuality.
 Leaves (dead):Melancholy.
 Lilac:Youthful innocence.
-Lilly of the valley:Return of happiness.
-Lilly:Purity, sweetness.
+Lily of the valley:Return of happiness.
+Lily:Purity, sweetness.
 Magnolia:Dignity, perseverance.
 Marigold:Jealousy.
 Mint:Virtue.
@@ -1,5 +1,5 @@
 # Country Code : City Code : City : Country
-#	$NetBSD: inter.phone,v 1.26 2011/05/27 17:12:47 drochner Exp $
+#	$NetBSD: inter.phone,v 1.27 2012/03/06 17:11:15 mbalmer Exp $
 #	@(#)inter.phone	8.1 (Berkeley) 6/9/93
 20:2:Cairo:Egypt, Arab Rep. of
 20:3:Alexandria:Egypt, Arab Rep. of
@@ -91,10 +91,12 @@
 40:0:Bucharest:Romania
 41:22:Geneva:Switzerland
 41:31:Berne:Switzerland
+41:32:Jura:Switzerland
 41:43:Zurich:Switzerland
 41:44:Zurich (before March 2005):Switzerland
 41:52:Winterthur:Switzerland
 41:61:Basel:Switzerland
+41:62:Argovia:Switzerland
 423:::Liechtenstein
 43:1:Vienna:Austria
 43:316:Graz:Austria
@@ -10,8 +10,7 @@ cat << _EOF
 # <Name><TAB><Alpha-2-code><TAB><Alpha-3-code><TAB><Numeric-3-code><TAB><FIPS>
 #
 # Further information can be found at the ISO 3166 Maintenance Agency
-# (ISO 3166/MA) web site,
-# <http://www.iso.org/iso/en/prods-services/iso3166ma/index.html>.
+# (ISO 3166/MA) web site, <http://www.iso.org/iso/country_codes>.
 #
 # FIPS 10-4 codes compiled from several sources, including
 # http://www.statoids.com/wab.html
@@ -25,15 +24,17 @@ cat << _EOF
 _EOF
 }

-I1=http://www.statoids.com/wab.html
+I1=wab.html
+U1=http://www.statoids.com/$I1
 O1=/tmp/wab.$$
-I2=http://www.iso.org/iso/list-en1-semic-3.txt
+I2=country_names_and_code_elements_txt
+U2=http://www.iso.org/iso/$I2
 O2=/tmp/list.$$
-trap "rm -f wab.html list-en1-semic-3.txt $O1 $O2" 0 1 2 3 15
-ftp $I1
-ftp $I2
+trap "rm -f $I1 $I2 $O1 $O2" 0 1 2 3 15
+ftp $U1
+ftp $U2

-grep '<tr class="[oe]">' wab.html |
+grep '<tr class="[oe]">' $I1 |
 sed -e 's,<tr class="."><td>,,g' \
    -e 's,\&nbsp;,,g' \
    -e 's,<code>,,g' \
@@ -47,7 +48,7 @@ awk -F'\t' '{ printf("%s\t%s\t%s\t%s\t%s\n", $2, $3, $4, $6, $1); }' |
 grep -v href= |
 sort > $O1

-grep ';[A-Z][A-Z]' list-en1-semic-3.txt |
+grep ';[A-Z][A-Z]' $I2 |
 tr -d '\015' |
 awk -F ';' '{ print $2 }' |
 sort > $O2
@@ -1,4 +1,4 @@
-/* $NetBSD: style,v 1.49 2011/09/01 09:33:01 christos Exp $ */
+/* $NetBSD: style,v 1.51 2013/03/08 16:50:02 christos Exp $ */

 /*
 * The revision control tag appears first, with a blank line after it.
@@ -30,7 +30,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
 The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: style,v 1.49 2011/09/01 09:33:01 christos Exp $");
+__RCSID("$NetBSD: style,v 1.51 2013/03/08 16:50:02 christos Exp $");

 /*
 * VERY important single-line comments look like this.
@@ -77,7 +77,12 @@ __RCSID("$NetBSD: style,v 1.49 2011/09/01 09:33:01 christos Exp $");
 /*
 * Kernel include files come first.
 */
-#include <sys/types.h>		/* Non-local includes in brackets. */
+#include <sys/param.h>		/* <sys/param.h> first, */
+#include <sys/types.h>		/*   <sys/types.h> next, */
+#include <sys/ioctl.h>		/*   and then the rest, */
+#include <sys/socket.h>		/*   sorted lexicographically.  */
+#include <sys/stat.h>
+#include <sys/wait.h>		/* Non-local includes in brackets.  */

 /*
 * If it's a network program, put the network include files next.
@@ -91,7 +96,7 @@ __RCSID("$NetBSD: style,v 1.49 2011/09/01 09:33:01 christos Exp $");

 /*
 * Then there's a blank line, followed by the /usr include files.
- * The /usr include files should be sorted!
+ * The /usr include files should be sorted lexicographically!
 */
 #include <assert.h>
 #include <errno.h>
@@ -354,7 +359,7 @@ function(int a1, int a2, float fl, int a4)
 	 * not:
 	 *	!(p = f())
 	 *
-	 * The notable exception here is varyadic functions. Since our
+	 * The notable exception here is variadic functions. Since our
 	 * code is designed to compile and work on different environments
 	 * where we don't have control over the NULL definition (on NetBSD
 	 * it is defined as ((void *)0), but on other systems it can be
@@ -1,5 +1,5 @@
 # Zip Code : Location
-#	$NetBSD: zipcodes,v 1.6 2003/05/11 01:55:18 wiz Exp $
+#	$NetBSD: zipcodes,v 1.8 2012/03/06 17:20:38 pgoyette Exp $
 #	@(#)zipcodes	8.1 (Berkeley) 6/8/93
 00401:Pleasantville, NY
 00501:Holtsville, NY
@@ -39430,6 +39430,7 @@
 94074:San Gregorio, CA
 94080:South San Francisco, CA
 94083:South San Francisco, CA
+94085:Sunnyvale, CA
 94086:Sunnyvale, CA
 94087:Sunnyvale, CA
 94088:Sunnyvale, CA
@@ -42157,3 +42158,4 @@
 99645:Palmer, AK
 99647:Pedro Bay, AK
 99648:Perryville, AK
+CH-5073:Gipf-Oberfrick, Switzerland
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.46 2011/10/07 16:29:40 plunky Exp $
+#	$NetBSD: Makefile,v 1.47 2012/11/15 23:51:53 joerg Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93

 NOOBJ=	# defined
@@ -6,8 +6,8 @@ NOOBJ=	# defined
 .include <bsd.own.mk>

 .if ${MKSHARE} != "no"
-FILES=	bsd.README bsd.clang-analyze.mk bsd.clean.mk bsd.dep.mk bsd.doc.mk \
-	bsd.endian.mk bsd.files.mk \
+FILES=	bsd.README bsd.buildinstall.mk bsd.clang-analyze.mk bsd.clean.mk \
+	bsd.dep.mk bsd.doc.mk bsd.endian.mk bsd.files.mk \
 	bsd.gcc.mk bsd.hostlib.mk bsd.hostprog.mk bsd.inc.mk bsd.info.mk \
 	bsd.init.mk bsd.ioconf.mk bsd.kernobj.mk bsd.kinc.mk bsd.klinks.mk \
 	bsd.kmodule.mk bsd.lib.mk bsd.links.mk bsd.lua.mk \
@@ -15,8 +15,10 @@ FILES=	bsd.README bsd.clang-analyze.mk bsd.clean.mk bsd.dep.mk bsd.doc.mk \
 	bsd.obj.mk bsd.own.mk bsd.prog.mk bsd.rpc.mk bsd.shlib.mk \
 	bsd.subdir.mk bsd.sys.mk bsd.test.mk bsd.x11.mk sys.mk

+.if defined(__MINIX)
 # MINIX-specific files
 FILES+= minix.service.mk minix.gcov.mk
+.endif # defined(__MINIX)

 FILESDIR=/usr/share/mk
 .endif
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.318 2013/06/02 11:02:40 mbalmer Exp $
+#	$NetBSD: bsd.README,v 1.322 2013/11/11 10:24:53 joerg Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94

 This is the README file for the make "include" files for the NetBSD
@@ -352,7 +352,7 @@ MKSKEY		If "no", disables building of S/key authentication
 		infrastructure (libraries and support programs).
 		Default: yes

-MKSLJIT		If "no", disables buildin of sljit (stack-less platform
+MKSLJIT		If "no", disables building of sljit (stack-less platform
 		independent JIT compiler) private library and tests.
 		Default: yes on amd64, i386 and sparc, no elsewhere.

@@ -1485,6 +1485,7 @@ DPADD		Additional dependencies for the program.  Usually used for
 		LIBCOMPAT?=	${DESTDIR}/usr/lib/libcompat.a
 		LIBCOM_ERR?=	${DESTDIR}/usr/lib/libcom_err.a
 		LIBCRT0?=	${DESTDIR}/usr/lib/crt0.o
+		LIBCRTI?=	${DESTDIR}/usr/lib/crti.o
 		LIBCRYPT?=	${DESTDIR}/usr/lib/libcrypt.a
 		LIBCRYPTO?=	${DESTDIR}/usr/lib/libcrypto.a
 		LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a
@@ -1594,6 +1595,7 @@ DPADD		Additional dependencies for the program.  Usually used for
 		LIBXTRAP?=	${DESTDIR}/usr/X11R7/lib/libXTrap.a
 		LIBXAU?=	${DESTDIR}/usr/X11R7/lib/libXau.a
 		LIBXAW?=	${DESTDIR}/usr/X11R7/lib/libXaw.a
+		LIBXCB?=	${DESTDIR}/usr/X11R7/lib/libxcb.a
 		LIBXDMCP?=	${DESTDIR}/usr/X11R7/lib/libXdmcp.a
 		LIBXEXT?=	${DESTDIR}/usr/X11R7/lib/libXext.a
 		LIBXFONT?=	${DESTDIR}/usr/X11R7/lib/libXfont.a
@@ -1808,6 +1810,8 @@ MAKE		make(1).  [make]

 MKDEP		Construct Makefile dependency list.  [mkdep]

+MKDEPCXX	Construct Makefile dependency list for C++ files.  [mkdep]
+
 NM		List symbols from object files.  [nm]

 PC		Pascal compiler.  [pc]  (Not present)
@@ -0,0 +1,29 @@
+#	$NetBSD: bsd.buildinstall.mk,v 1.1 2012/11/15 23:51:53 joerg Exp $
+
+#
+# build_install logic for src/Makefile
+# Used by src/lib/Makefile and src/tools/Makefile.
+#
+# Compute a list of subdirectories delimited by .WAIT.
+# Run "make dependall && make install" for all subdirectories in a group
+# concurrently, but wait after each group.
+#
+SUBDIR_GROUPS=	1
+CUR_GROUP:=	1
+.for dir in ${SUBDIR}
+.  if ${dir} == ".WAIT"
+CUR_GROUP:=	${CUR_GROUP}1
+SUBDIR_GROUPS:=	${SUBDIR_GROUPS} ${CUR_GROUP}
+.  else
+SUBDIR_GROUP.${CUR_GROUP}+=	${dir}
+.endif
+
+.endfor
+
+build_install:
+.for group in ${SUBDIR_GROUPS}
+.  if !empty(SUBDIR_GROUP.${group})
+	${MAKEDIRTARGET} . ${SUBDIR_GROUP.${group}:C/^/dependall-/}
+	${MAKEDIRTARGET} . ${SUBDIR_GROUP.${group}:C/^/install-/}
+.  endif
+.endfor
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.clean.mk,v 1.5 2011/11/22 18:25:48 apb Exp $
+# $NetBSD: bsd.clean.mk,v 1.8 2012/11/19 16:04:54 apb Exp $

 # <bsd.clean.mk>
 #
@@ -15,10 +15,16 @@
 #		the clean target.
 #
 # MKCLEANSRC	Whether or not to clean the source directory
-# 		in addition to the object directory.
+# 		in addition to the object directory.  Defaults to "yes".
 #
 # MKCLEANVERIFY	Whether or not to verify that the file deletion worked.
+#		Defaults to "yes".
 #
+# The files listed in CLEANFILES and CLEANDIRFILES must not be
+# directories, because the potential risk from running "rm -rf" commands
+# in bsd.clean.mk is considered too great.  If you want to recursively
+# delete a directory as part of "make clean" or "make cleandir" then you
+# need to provide your own target.

 .if !defined(_BSD_CLEAN_MK_)
 _BSD_CLEAN_MK_=1
@@ -65,10 +71,12 @@ __cleanuse: .USE
 	    (cd ${_d} && rm -f ${.ALLSRC:@v@${${v}}@} || true) }
 .if "${MKCLEANVERIFY}" == "yes"
 	@${"${.ALLSRC:@v@${${v}:M*}@:Q}" == "":?true: \
-	    bad="\$(cd ${_d} && ls -d ${.ALLSRC:@v@${${v}}@} 2>/dev/null)"; \
+	    bad="\$(cd ${_d} && ls -1d ${.ALLSRC:@v@${${v}}@} 2>/dev/null)"; \
 	    if test -n "\$bad"; then \
-	        echo "Failed to remove files from ${_d}:" ; \
-	        echo "\$bad" ; \
+	        echo "Failed to remove the following files from ${_d}:" ; \
+	        echo "\$bad" | while read file ; do \
+		    echo "	\$file" ; \
+		done ; \
 	        false ; \
 	    fi }
 .endif
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.dep.mk,v 1.74 2012/02/19 23:19:37 matt Exp $
+#	$NetBSD: bsd.dep.mk,v 1.79 2013/10/31 01:55:03 mrg Exp $

 ##### Basic targets
 realdepend:	beforedepend .depend afterdepend
@@ -8,12 +8,13 @@ beforedepend .depend afterdepend: # ensure existence

 ##### Default values
 MKDEP?=			mkdep
+MKDEPCXX?=		mkdep
 MKDEP_SUFFIXES?=	.o

 ##### Build rules
 # some of the rules involve .h sources, so remove them from mkdep line

-.if defined(SRCS)							# {
+.if defined(SRCS) && !empty(SRCS)
 __acpp_flags=	${_ASM_TRADITIONAL_CPP}

 .if defined(NODPSRCS)
@@ -41,11 +42,28 @@ __DPSRCS.d+=	${__DPSRCS.bcd}
 ${__DPSRCS.d}: ${__DPSRCS.notd} ${DPSRCS}
 .endif									# }

+MKDEPSUFFLAGS=-s ${MKDEP_SUFFIXES:Q}
+
+.if defined(MKDEPINCLUDES) && ${MKDEPINCLUDES} != "no"
+.STALE:
+	@echo Rebuilding dependency file: ${.ALLSRC}
+	@rm -f ${.ALLSRC}
+	@(cd ${.CURDIR} && ${MAKE} depend)
+_MKDEP_MERGEFLAGS=-i
+_MKDEP_FILEFLAGS=${MKDEPSUFFLAGS}
+.else
+_MKDEP_MERGEFLAGS=${MKDEPSUFFLAGS}
+_MKDEP_FILEFLAGS=
+.endif
+
 .depend: ${__DPSRCS.d}
 	${_MKTARGET_CREATE}
 	rm -f .depend
-	${MKDEP} -d -f ${.TARGET} -s ${MKDEP_SUFFIXES:Q} ${__DPSRCS.d}
+	${MKDEP} ${_MKDEP_MERGEFLAGS} -d -f ${.TARGET} ${__DPSRCS.d}

+.if !defined(__MINIX)
+.SUFFIXES: .d .s .S .c .C .cc .cpp .cxx .m
+.else
 .SUFFIXES: .bcd .d .s .S .c .C .cc .cpp .cxx .m

 .if ${USE_BITCODE:Uno} == "yes"
@@ -54,43 +72,52 @@ ${__DPSRCS.d}: ${__DPSRCS.notd} ${DPSRCS}
 	${MKDEP} -f ${.TARGET} -s .bc -- ${MKDEPFLAGS} \
 	    ${CFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
 	    ${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-.endif
+.endif # ${USE_BITCODE:Uno} == "yes"
+.endif # !defined(__MINIX)

 .c.d:
 	${_MKTARGET_CREATE}
-	${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} \
+	${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
 	    ${CFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+	    ${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
+	    ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
+	    mv ${.TARGET}.tmp ${.TARGET}

 .m.d:
 	${_MKTARGET_CREATE}
-	${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} \
+	${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
 	    ${OBJCFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+	    ${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
+	    ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
+	    mv ${.TARGET}.tmp ${.TARGET}

 .s.d .S.d:
 	${_MKTARGET_CREATE}
-	${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} \
+	${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
 	    ${AFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${__acpp_flags} ${.IMPSRC}
+	    ${CPPFLAGS} ${AFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} \
+	    ${__acpp_flags} ${.IMPSRC} && \
+	    mv ${.TARGET}.tmp ${.TARGET}

 .C.d .cc.d .cpp.d .cxx.d:
 	${_MKTARGET_CREATE}
-	${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} \
+	${MKDEPCXX} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
 	    ${CXXFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+	    ${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
+	    ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
+	    mv ${.TARGET}.tmp ${.TARGET}

-.endif # defined(SRCS)							# }
+.endif # defined(SRCS) && !empty(SRCS)					# }

 ##### Clean rules
-.if defined(SRCS)
-CLEANDIRFILES+= .depend ${__DPSRCS.d} ${.CURDIR}/tags ${CLEANDEPEND}
+.if defined(SRCS) && !empty(SRCS)
+CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} ${.CURDIR}/tags ${CLEANDEPEND}
 .endif

 ##### Custom rules
 .if !target(tags)
 tags: ${SRCS}
-.if defined(SRCS)
+.if defined(SRCS) && !empty(SRCS)
 	-cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
 	    ${TOOL_SED} "s;\${.CURDIR}/;;" > tags
 .endif
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.endian.mk,v 1.16 2012/08/05 04:11:35 matt Exp $
+#	$NetBSD: bsd.endian.mk,v 1.19 2013/08/05 15:33:07 matt Exp $

 .if !defined(_BSD_ENDIAN_MK_)
 _BSD_ENDIAN_MK_=1
@@ -7,14 +7,15 @@ _BSD_ENDIAN_MK_=1

 .if ${MACHINE_ARCH} == "alpha" || \
    ${MACHINE_ARCH} == "arm" || \
-    ${MACHINE_ARCH} == "earm" || \
+    (!empty(MACHINE_ARCH:Mearm*) && empty(MACHINE_ARCH:Mearm*eb)) || \
    ${MACHINE_ARCH} == "i386" || \
    ${MACHINE_ARCH} == "ia64" || \
    ${MACHINE_ARCH} == "vax" || \
    ${MACHINE_ARCH} == "x86_64" || \
    ${MACHINE_ARCH:C/^.*el$/el/} == "el"
 TARGET_ENDIANNESS=	1234
-.elif ${MACHINE_ARCH} == "hppa" || \
+.elif ${MACHINE_ARCH} == "coldfire" || \
+      ${MACHINE_ARCH} == "hppa" || \
      ${MACHINE_ARCH} == "m68000" || \
      ${MACHINE_ARCH} == "m68k" || \
      ${MACHINE_ARCH} == "powerpc" || \
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.files.mk,v 1.42 2011/09/10 16:57:35 apb Exp $
+#	$NetBSD: bsd.files.mk,v 1.43 2013/04/06 15:39:19 uebayasi Exp $

 .if !defined(_BSD_FILES_MK_)
 _BSD_FILES_MK_=1
@@ -136,13 +136,17 @@ CLEANDIRFILES+= ${BUILDSYMLINKS.t}

 .uue:
 	${_MKTARGET_CREATE}
-	rm -f ${.TARGET} ${.TARGET}.tmp
-	${TOOL_UUDECODE} -p ${.IMPSRC} > ${.TARGET}.tmp \
-	    && mv ${.TARGET}.tmp ${UUDECODE_FILES_RENAME_${.TARGET}:U${.TARGET}}
+	rm -f ${.TARGET}
+	${TOOL_UUDECODE} -p ${.IMPSRC} > ${.TARGET}
+
+.if defined(UUDECODE_FILES_RENAME_${UUDECODE_FILES})
+${UUDECODE_FILES_RENAME_${UUDECODE_FILES}}: ${UUDECODE_FILES}
+	cp ${.ALLSRC} ${.TARGET}
+.endif

 realall: ${UUDECODE_FILES}

-CLEANUUDECODE_FILES=${UUDECODE_FILES} ${UUDECODE_FILES:=.tmp}
+CLEANUUDECODE_FILES=${UUDECODE_FILES}
 .for i in ${UUDECODE_FILES}
 CLEANUUDECODE_FILES+=${UUDECODE_FILES_RENAME_${i}}
 .endfor
@@ -1,15 +1,23 @@
-#	$NetBSD: bsd.gcc.mk,v 1.4 2012/07/19 19:42:45 christos Exp $
+#	$NetBSD: bsd.gcc.mk,v 1.10 2012/12/10 23:49:39 pooka Exp $

 .if !defined(_BSD_GCC_MK_)
 _BSD_GCC_MK_=1

 .if defined(EXTERNAL_TOOLCHAIN)
 _GCC_CRTBEGIN!=		${CC} --print-file-name=crtbegin.o
+.ifndef _GCC_CRTBEGINS
 _GCC_CRTBEGINS!=	${CC} --print-file-name=crtbeginS.o
+.endif
 _GCC_CRTEND!=		${CC} --print-file-name=crtend.o
+.ifndef _GCC_CRTENDS
 _GCC_CRTENDS!=		${CC} --print-file-name=crtendS.o
+.endif
+.ifndef _GCC_CRTI
 _GCC_CRTI!=		${CC} --print-file-name=crti.o
+.endif
+.ifndef _GCC_CRTN
 _GCC_CRTN!=		${CC} --print-file-name=crtn.o
+.endif
 _GCC_CRTDIR!=		dirname ${_GCC_CRTBEGIN}
 _GCC_LIBGCCDIR!=	dirname `${CC} --print-libgcc-file-name`
 .else
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.hostlib.mk,v 1.16 2011/09/10 16:57:35 apb Exp $
+#	$NetBSD: bsd.hostlib.mk,v 1.17 2013/10/29 16:11:46 joerg Exp $

 .include <bsd.init.mk>
 .include <bsd.sys.mk>
@@ -8,10 +8,12 @@
 ##### Default values
 CFLAGS+=	${COPTS}
 HOST_MKDEP?=	CC=${HOST_CC:Q} mkdep
+HOST_MKDEPCXX?=	CC=${HOST_CXX:Q} mkdep
 MKDEP_SUFFIXES?=	.o .lo

 # Override these:
 MKDEP:=		${HOST_MKDEP}
+MKDEPCXX:=	${HOST_MKDEPCXX}

 .if ${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN)
 OBJHOSTMACHINE=	# set
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.hostprog.mk,v 1.71 2013/06/14 16:10:02 tsutsui Exp $
+#	$NetBSD: bsd.hostprog.mk,v 1.72 2013/10/29 16:11:46 joerg Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94

 .include <bsd.init.mk>
@@ -82,11 +82,13 @@ LIBRUMPFS_UDF?=		/usr/lib/librumpfs_udf.a
 LIBRUMPFS_UFS?=		/usr/lib/librumpfs_ufs.a

 HOST_MKDEP?=	CC=${HOST_CC:Q} mkdep
+HOST_MKDEPCXX?=	CC=${HOST_CXX:Q} mkdep
 MKDEP_SUFFIXES?=	.lo .ln

 # Override these:
 INSTALL:=	${INSTALL:NSTRIP=*}
 MKDEP:=		${HOST_MKDEP}
+MKDEPCXX:=	${HOST_MKDEPCXX}

 .if ${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN)
 OBJHOSTMACHINE=	# set
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.ioconf.mk,v 1.3 2010/03/25 20:37:36 pooka Exp $
+#	$NetBSD: bsd.ioconf.mk,v 1.4 2013/09/20 16:39:14 pooka Exp $
 #

 .include <bsd.own.mk>
@@ -18,7 +18,7 @@
 CONFIGDEP=${TOOL_CONFIG}
 .endif
 ioconf.c: ${IOCONF} ${CONFIGDEP}
-	${TOOL_CONFIG} -b ${.OBJDIR} -s ${S} ${.CURDIR}/${IOCONF}
+	${TOOL_CONFIG} -b ${.OBJDIR} -s ${S} ${IOCONFDIR:U${.CURDIR}}/${IOCONF}
 	# config doesn't change the files if they're unchanged.  however,
 	# here we want to satisfy our make dependency, so force a
 	# timestamp update
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kernobj.mk,v 1.13 2010/01/25 00:43:00 christos Exp $
+#	$NetBSD: bsd.kernobj.mk,v 1.14 2013/06/03 07:39:07 mrg Exp $

 # KERNSRCDIR	Is the location of the top of the kernel src.
 # 		It defaults to `${NETBSDSRCDIR}/sys'.
@@ -7,9 +7,14 @@
 #		It defaults to `arch/${MACHINE}', but may be overridden
 #		in case ${MACHINE} is not correct.
 #
-# KERNCONFDIR	Is where the configuration files for kernels are found.
+# KERNCONFDIRDEFAULT	Is the default for ${KERNCONFDIR}.
 #		It defaults to `${KERNSRCDIR}/${KERNARCHDIR}/conf'.
 #
+# KERNCONFDIR	Is where the configuration files for kernels are found.
+#		Users can set this to have build.sh find kernel
+#		configurations in another directory.
+#		It defaults to `${KERNCONFDIRDEFAULT}'.
+#
 # KERNOBJDIR	Is the kernel build directory.  The kernel GENERIC for
 # 		instance will be compiled in ${KERNOBJDIR}/GENERIC.
 # 		The default is the .OBJDIR of
@@ -18,9 +23,11 @@

 .include <bsd.own.mk>

-KERNSRCDIR?=	${NETBSDSRCDIR}/sys
-KERNARCHDIR?=	arch/${MACHINE}
-KERNCONFDIR?=	${KERNSRCDIR}/${KERNARCHDIR}/conf
+KERNSRCDIR?=		${NETBSDSRCDIR}/sys
+KERNARCHDIR?=		arch/${MACHINE}
+KERNCONFDIRDEFAULT?=	${KERNSRCDIR}/${KERNARCHDIR}/conf
+KERNCONFDIR?=		${KERNCONFDIRDEFAULT}
+
 .if !defined(KERNOBJDIR) && exists(${KERNSRCDIR}/${KERNARCHDIR}/compile)
 KERNOBJDIR!=	cd "${KERNSRCDIR}/${KERNARCHDIR}/compile" && ${PRINTOBJDIR}
 .endif
@@ -1,8 +1,10 @@
-#	$NetBSD: bsd.klinks.mk,v 1.9 2011/07/10 23:50:24 matt Exp $
+#	$NetBSD: bsd.klinks.mk,v 1.11 2013/08/21 15:26:44 matt Exp $
 #

 .include <bsd.own.mk>

+KLINK_MACHINE?=	${MACHINE}
+
 ##### Default values
 .if !defined(S)
 .if defined(NETBSDSRCDIR)
@@ -14,20 +16,20 @@ S=	/sys
 .endif
 .endif

-CLEANFILES+=	machine ${MACHINE_CPU} ${MACHINE}
-.if ${MACHINE} == "sun2" || ${MACHINE} == "sun3"
+CLEANFILES+=	machine ${MACHINE_CPU} ${KLINK_MACHINE}
+.if ${KLINK_MACHINE} == "sun2" || ${KLINK_MACHINE} == "sun3"
 CLEANFILES+=	sun68k
-.elif ${MACHINE} == "sparc64"
+.elif ${KLINK_MACHINE} == "sparc64"
 CLEANFILES+=	sparc
-.elif ${MACHINE} == "i386"
+.elif ${KLINK_MACHINE} == "i386"
 CLEANFILES+=	x86
-.elif ${MACHINE} == "amd64"
+.elif ${KLINK_MACHINE} == "amd64"
 CLEANFILES+=	x86 i386
-.elif ${MACHINE} == "evbmips"
+.elif ${KLINK_MACHINE} == "evbmips"
 CLEANFILES+=	algor sbmips
 .endif

-.if defined(XEN_BUILD) || ${MACHINE} == "xen"
+.if defined(XEN_BUILD) || ${KLINK_MACHINE} == "xen"
 CLEANFILES+=	xen xen-ma/machine # xen-ma
 CPPFLAGS+=	-I${.OBJDIR}/xen-ma
 .if ${MACHINE_CPU} == "i386"
@@ -40,39 +42,37 @@ CLEANFILES+=	x86
 .if !make(obj) && !make(clean) && !make(cleandir)
 .BEGIN:
 	@rm -f machine && \
-	    ln -s $S/arch/${MACHINE}/include machine
-	@rm -f ${MACHINE} && \
-	    ln -s $S/arch/${MACHINE}/include ${MACHINE}
+	    ln -s $S/arch/${KLINK_MACHINE}/include machine
+	@rm -f ${KLINK_MACHINE} && \
+	    ln -s $S/arch/${KLINK_MACHINE}/include ${KLINK_MACHINE}
 	@if [ -d $S/arch/${MACHINE_CPU} ]; then \
 	    rm -f ${MACHINE_CPU} && \
 	    ln -s $S/arch/${MACHINE_CPU}/include ${MACHINE_CPU}; \
 	 fi
 # XXX. it gets worse..
-.if ${MACHINE} == "sun2" || ${MACHINE} == "sun3"
+.if ${KLINK_MACHINE} == "sun2" || ${KLINK_MACHINE} == "sun3"
 	@rm -f sun68k && \
 	    ln -s $S/arch/sun68k/include sun68k
 .endif
-.if ${MACHINE} == "sparc64"
+.if ${KLINK_MACHINE} == "sparc64"
 	@rm -f sparc && \
 	    ln -s $S/arch/sparc/include sparc
 .endif
-.if ${MACHINE} == "amd64"
-	@rm -f x86 && \
-	    ln -s $S/arch/x86/include x86
+.if ${KLINK_MACHINE} == "amd64"
 	@rm -f i386 && \
 	    ln -s $S/arch/i386/include i386
 .endif
-.if ${MACHINE_CPU} == "i386"
+.if ${MACHINE_CPU} == "i386" || ${MACHINE_CPU} == "x86_64"
 	@rm -f x86 && \
 	    ln -s $S/arch/x86/include x86
 .endif
-.if defined(XEN_BUILD) || ${MACHINE} == "xen"
+.if defined(XEN_BUILD) || ${KLINK_MACHINE} == "xen"
 	@rm -f xen && \
 	    ln -s $S/arch/xen/include xen
 	@rm -rf xen-ma && mkdir xen-ma && \
 	    ln -s ../${XEN_BUILD:U${MACHINE_ARCH}} xen-ma/machine
 .endif
-.if ${MACHINE} == "evbmips"
+.if ${KLINK_MACHINE} == "evbmips"
 	@rm -f algor && \
 	    ln -s $S/arch/algor/include algor
 	@rm -f sbmips && \
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kmodule.mk,v 1.37 2012/08/10 16:34:23 joerg Exp $
+#	$NetBSD: bsd.kmodule.mk,v 1.41 2013/11/09 22:40:15 jmcneill Exp $

 # We are not building this with PIE
 MKPIE=no
@@ -27,6 +27,8 @@ CFLAGS+=	-fno-strict-aliasing -Wno-pointer-sign
 # relocations inside the loader and removing this workaround, as the
 # resulting code would be much faster.
 .if ${MACHINE_CPU} == "arm"
+CFLAGS+=	-fno-common -fno-unwind-tables
+.elif ${MACHINE_CPU} == "hppa"
 CFLAGS+=	-mlong-calls
 .elif ${MACHINE_CPU} == "powerpc"
 CFLAGS+=	-mlongcall
@@ -34,6 +36,11 @@ CFLAGS+=	-mlongcall
 CFLAGS+=	-fno-pic
 .endif

+.if ${MACHINE} == "sparc64"
+# force same memory model as rest of the kernel
+CFLAGS+=	-mcmodel=medlow
+.endif
+
 # evbppc needs some special help
 .if ${MACHINE} == "evbppc"

@@ -102,11 +109,46 @@ OBJS+=		${SRCS:N*.h:N*.sh:R:S/$/.o/g}

 ${OBJS} ${LOBJS}: ${DPSRCS}

+.if ${MACHINE_CPU} == "arm"
+# The solution to limited branch space involves generating trampolines for
+# those relocations while creating the module, as the resulting code will
+# be much faster and simplifies the loader.
+ARCHDIR=	$S/modules/arch/${MACHINE_CPU}
+ASM_H=		$S/arch/${MACHINE_CPU}/include/asm.h
+CLEANFILES+=	tmp.o tmp.S ${KMOD}_tmp.o ${KMOD}_tramp.o ${KMOD}_tramp.S
+${KMOD}_tmp.o: ${OBJS} ${DPADD}
+	${_MKTARGET_LINK}
+	${LD} -r -o tmp.o ${OBJS}
+	${LD} -r \
+		`${OBJDUMP} --syms --reloc tmp.o | \
+			${TOOL_AWK} -f ${ARCHDIR}/kmodwrap.awk` \
+		 -o ${.TARGET} tmp.o
+
+${KMOD}_tramp.S: ${KMOD}_tmp.o ${ARCHDIR}/kmodtramp.awk ${ASM_H}
+	${_MKTARGET_CREATE}
+	${OBJDUMP} --syms --reloc ${KMOD}_tmp.o | \
+		 ${TOOL_AWK} -f ${ARCHDIR}/kmodtramp.awk \
+		 > tmp.S && \
+	mv tmp.S ${.TARGET}
+
+${PROG}: ${KMOD}_tmp.o ${KMOD}_tramp.o
+	${_MKTARGET_LINK}
+.if exists(${ARCHDIR}/kmodhide.awk)
+	${LD} -r -o tmp.o ${KMOD}_tmp.o ${KMOD}_tramp.o
+	${OBJCOPY} \
+		`${NM} tmp.o | ${TOOL_AWK} -f ${ARCHDIR}/kmodhide.awk` \
+		tmp.o ${.TARGET} && \
+	rm tmp.o
+.else
+	${LD} -r -o ${.TARGET} ${KMOD}_tmp.o ${KMOD}_tramp.o
+.endif
+.else
 ${PROG}: ${OBJS} ${DPADD}
 	${_MKTARGET_LINK}
 	${CC} ${LDFLAGS} -nostdlib -r -Wl,-T,${KMODSCRIPT},-d \
 		-o ${.TARGET} ${OBJS}
 .endif
+.endif

 ##### Install rules
 .if !target(kmodinstall)
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.324 2012/08/23 21:21:16 joerg Exp $
+#	$NetBSD: bsd.lib.mk,v 1.342 2013/10/18 16:06:52 christos Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94

 .include <bsd.init.mk>
@@ -11,15 +11,15 @@ LIBISMODULE?=	no
 LIBISPRIVATE?=	no
 LIBISCXX?=	no

-_LIB_PREFIX=	lib
-
 .if ${LIBISMODULE} != "no"
-_LIB_PREFIX=	# empty
+_LIB_PREFIX?=	# empty
 MKDEBUGLIB:=	no
 MKLINT:=	no
 MKPICINSTALL:=	no
 MKPROFILE:=	no
 MKSTATICLIB:=	no
+.else
+_LIB_PREFIX?=	lib
 .endif

 .if ${LIBISPRIVATE} != "no"
@@ -54,8 +54,12 @@ AFLAGS+=        ${PIE_AFLAGS}
 LIBDO.${_lib}!=	cd "${_dir}" && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=LIBDO.${_lib}
 .endif
+.if ${LIBDO.${_lib}} == "_external"
+LDADD+=		-l${_lib}
+.else
 LDADD+=		-L${LIBDO.${_lib}} -l${_lib}
-DPADD+=		${LIBDO.${_lib}}/lib${_lib}.so
+DPADD+=		${LIBDO.${_lib}}/lib${_lib}.so	# Don't use _LIB_PREFIX
+.endif
 .endfor
 .endif									# }

@@ -76,7 +80,7 @@ checkver:
 	@(cd "${.CURDIR}" && \
 	    HOST_SH=${HOST_SH:Q} AWK=${TOOL_AWK:Q} \
 	    ${HOST_SH} ${NETBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
-		    -d ${DESTDIR}${_LIBSODIR} ${LIB})
+		    -d ${_DEST.OBJ} ${LIB})
 .endif
 .endif									# }

@@ -125,7 +129,7 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}


 # Set PICFLAGS to cc flags for producing position-independent code,
-# if not already set.  Includes -DPIC, if required.
+# if not already set.

 # Data-driven table using make variables to control how shared libraries
 # are built for different platforms and object formats.
@@ -139,48 +143,11 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
 #			with ELF, also set shared-lib version for ld.so.
 # SHLIB_LDSTARTFILE:	support .o file, call C++ file-level constructors
 # SHLIB_LDENDFILE:	support .o file, call C++ file-level destructors
-# FPICFLAGS:		flags for ${FC} to compile .[fF] files to .pico objects.
-# CPPPICFLAGS:		flags for ${CPP} to preprocess .[sS] files for ${AS}
-# CPICFLAGS:		flags for ${CC} to compile .[cC] files to pic objects.
-# CSHLIBFLAGS:		flags for ${CC} to compile .[cC] files to .pico objects.
-#			(usually includes ${CPICFLAGS})
-# CAPICFLAGS:		flags for ${CC} to compiling .[Ss] files
-#		 	(usually just ${CPPPICFLAGS} ${CPICFLAGS})
-# APICFLAGS:		flags for ${AS} to assemble .[sS] to .pico objects.

-.if ${MACHINE_ARCH} == "alpha"						# {
-
-FPICFLAGS ?= -fPIC
-CPICFLAGS ?= -fPIC -DPIC
-CPPPICFLAGS?= -DPIC
-CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
-APICFLAGS ?=
-
-.elif (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") 	# } {
-
-# If you use -fPIC you need to define BIGPIC to turn on 32-bit
-# relocations in asm code
-FPICFLAGS ?= -fPIC
-CPICFLAGS ?= -fPIC -DPIC
-CPPPICFLAGS?= -DPIC -DBIGPIC
-CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
-APICFLAGS ?= -KPIC
-
-.else									# } {
-
-# Platform-independent flags for NetBSD shared libraries
-SHLIB_SOVERSION=${SHLIB_FULLVERSION}
-SHLIB_SHFLAGS=
-FPICFLAGS ?= -fPIC
-CPICFLAGS?= -fPIC -DPIC
-CPPPICFLAGS?= -DPIC
-CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
-APICFLAGS?= -k
-
-.endif									# }
+PICFLAGS ?= -fPIC

 .if ${MKPICLIB} != "no"
-CSHLIBFLAGS+= ${CPICFLAGS}
+CSHLIBFLAGS+= ${PICFLAGS}
 .endif

 .if defined(CSHLIBFLAGS) && !empty(CSHLIBFLAGS)
@@ -189,13 +156,24 @@ MKSHLIBOBJS= yes
 MKSHLIBOBJS= no
 .endif

+.if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \
+    (defined(CFLAGS) && !empty(CFLAGS:M*-g*))
+# We only add -g to the shared library objects
+# because we don't currently split .a archives.
+CSHLIBFLAGS+=	-g
+.if ${LIBISPRIVATE} == "yes"
+CFLAGS+=	-g
+.endif
+.endif
+
 # Platform-independent linker flags for ELF shared libraries
 SHLIB_SOVERSION=	${SHLIB_MAJOR}
-SHLIB_SHFLAGS=		-Wl,-soname,${_LIB_PREFIX}${LIB}.so.${SHLIB_SOVERSION}
+SHLIB_SHFLAGS=		-Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}
 SHLIB_SHFLAGS+=		-Wl,--warn-shared-textrel
-.if defined(__MINIX)
-SHLIB_SHFLAGS+=		${${HAVE_GOLD:Uno} != "no":? -Wl,--script,${LDS_SHARED_LIB}:}
-.endif # defined(__MINIX)
+.if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != "no"
+SHLIB_SHFLAGS+=		-Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map
+.endif
+CLEANFILES+=		${_LIB}.so.${SHLIB_SOVERSION}.map
 SHLIB_LDSTARTFILE?=	${_GCC_CRTI} ${_GCC_CRTBEGINS}
 SHLIB_LDENDFILE?=	${_GCC_CRTENDS} ${_GCC_CRTN}

@@ -210,23 +188,42 @@ CTFFLAGS+=	-g
 .endif
 .endif

-.if ${USE_BITCODE:Uno} == "yes"
+LIBSTRIPAOBJS=	yes
+.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+LIBSTRIPCOBJS=	yes
+.endif
+.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+LIBSTRIPOBJCOBJS=	yes
+.endif
+.if !defined(FFLAGS) || empty(FFLAGS:M*-g*)
+LIBSTRIPFOBJS=	yes
+.endif
+.if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*) 
+LIBSTRIPSHLIBOBJS=	yes
+.endif
+
+.if defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
+
+SHLIB_SHFLAGS+=		${${HAVE_GOLD:Uno} != "no":? -Wl,--script,${LDS_SHARED_LIB}:}
+
 .S.bc: ${.TARGET:.bc=.o}
 	rm -f ${.TARGET}
 	ln ${.TARGET:.bc=.o} ${.TARGET}
 .c.bc:
 	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o - -Qunused-arguments -E -D"__weak_alias(X, Y)=__weak_alias2( __WEAK__ ## X, __WEAK__ ## Y)" \
+	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o - \
+		-Qunused-arguments -E -D"__weak_alias(X, Y)=__weak_alias2( __WEAK__ ## X, __WEAK__ ## Y)" \
 	| sed 's/__WEAK__//g' \
-	| ${COMPILE.c} -flto ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -x c - -o ${.TARGET} -D"STRINGIFY(a)=#a" -D"__weak_alias2(X, Y)=_Pragma(STRINGIFY(weak X = Y))"
-.endif # ${USE_BITCODE:Uno} == "yes"
+	| ${COMPILE.c} -flto ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -x c - \
+		-o ${.TARGET} -D"STRINGIFY(a)=#a" -D"__weak_alias2(X, Y)=_Pragma(STRINGIFY(weak X = Y))"
+.endif # defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
 .c.o:
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

@@ -236,7 +233,7 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

@@ -247,21 +244,21 @@ CTFFLAGS+=	-g
 .c.pico:
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPSHLIBOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

 .cc.o .cpp.o .cxx.o .C.o:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

 .cc.po .cpp.po .cxx.po .C.po:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

@@ -272,7 +269,7 @@ CTFFLAGS+=	-g
 .cc.pico .cpp.pico .cxx.pico .C.pico:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPSHLIBOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

@@ -282,7 +279,7 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(FOPTS) || empty(FOPTS:M*-g*)
+.if defined(LIBSTRIPFOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

@@ -292,7 +289,7 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(FOPTS) || empty(FOPTS:M*-g*)
+.if defined(LIBSTRIPFOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

@@ -302,8 +299,8 @@ CTFFLAGS+=	-g

 .f.pico:
 	${_MKTARGET_COMPILE}
-	${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(FOPTS) || empty(FOPTS:M*-g*)
+	${COMPILE.f} ${PICFLAGS} ${.IMPSRC} -o ${.TARGET}
+.if defined(LIBSTRIPFOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

@@ -317,7 +314,7 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

@@ -327,21 +324,21 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

 .m.go:
 	${_MKTARGET_COMPILE}
 	${COMPILE.m} ${DEBUGFLAGS} -g ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

 .m.pico:
 	${_MKTARGET_COMPILE}
 	${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif

@@ -351,7 +348,9 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif

 .S.o:
 	${_MKTARGET_COMPILE}
@@ -359,7 +358,9 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif

 .s.po:
 	${_MKTARGET_COMPILE}
@@ -367,7 +368,9 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif

 .S.po:
 	${_MKTARGET_COMPILE}
@@ -375,7 +378,9 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif

 .s.go:
 	${_MKTARGET_COMPILE}
@@ -387,18 +392,48 @@ CTFFLAGS+=	-g

 .s.pico:
 	${_MKTARGET_COMPILE}
-	${COMPILE.s} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+	${COMPILE.s} ${PICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif

 .S.pico:
 	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+	${COMPILE.S} ${PICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
+
+# Declare a few variables to make our life easier later.
+_LIB:=${_LIB_PREFIX}${LIB}
+_LIB.a:=${_LIB}.a
+_LIB_p.a:=${_LIB}_p.a
+_LIB_g.a:=${_LIB}_g.a
+_LIB_pic.a:=${_LIB}_pic.a
+_LIB.ln:=llib-l${LIB}.ln
+.if defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
+_LIB_bc.a:=${_LIB}_bc.a
+.endif # defined(__MINIX)
+
+.if ${MKPIC} != "no" && defined(SHLIB_FULLVERSION)
+_LIB.so:=${_LIB}.so
+_LIB.so.major:=${_LIB}.so.${SHLIB_MAJOR}
+_LIB.so.full:=${_LIB}.so.${SHLIB_FULLVERSION}
+.if ${MKDEBUG} != "no"
+_LIB.so.debug:=${_LIB.so.full}.debug
+.endif
+.endif
+
+_DEST.LIB:=${DESTDIR}${LIBDIR}
+_DEST.OBJ:=${DESTDIR}${_LIBSODIR}
+_DEST.LINT:=${DESTDIR}${LINTLIBDIR}
+_DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
+_DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}

 .if defined(LIB)							# {
 .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
 	|| ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no"
-_LIBS=lib${LIB}.a
+_LIBS=${_LIB.a}
 .else
 _LIBS=
 .endif
@@ -417,18 +452,18 @@ OBJS+=  	${f:R:S/$/.o/}
 .endfor

 .if !empty(COMBINESRCS)
-OBJS+=		lib${LIB}_combine.o
-lib${LIB}_combine.o: ${COMBINESRCS}
+OBJS+=		${_LIB}_combine.o
+${_LIB}_combine.o: ${COMBINESRCS}
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJS)
 	${OBJCOPY} -x ${.TARGET}
 .endif

-CLEANFILES+=	lib${LIB}_combine.d
+CLEANFILES+=	${_LIB}_combine.d

-.if exists("lib${LIB}_combine.d")
-.include "lib${LIB}_combine.d"
+.if exists("${_LIB}_combine.d")
+.include "${_LIB}_combine.d"
 .endif
 .endif   # empty(XSRCS.${LIB})
 .else							# } {
@@ -445,13 +480,13 @@ libinstall::
 .endif

 .if ${MKDEBUGLIB} != "no"
-_LIBS+=lib${LIB}_g.a
+_LIBS+=${_LIB_g.a}
 GOBJS+=${OBJS:.o=.go}
 DEBUGFLAGS?=-DDEBUG
 .endif

 .if ${MKPROFILE} != "no"
-_LIBS+=lib${LIB}_p.a
+_LIBS+=${_LIB_p.a}
 POBJS+=${OBJS:.o=.po}
 PROFFLAGS?=-DGPROF -DPROF
 .endif
@@ -462,27 +497,23 @@ PROFFLAGS?=-DGPROF -DPROF
 # make _pic.a, which isn't really pic,
 # since it's needed for making shared lib.
 # but don't install it.
-SOLIB=lib${LIB}_pic.a
+SOLIB=${_LIB_pic.a}
 SOBJS+=${OBJS:.o=.pico}
 .else
-SOLIB=lib${LIB}.a
+SOLIB=${_LIB.a}
 .endif
 .else
-SOLIB=lib${LIB}_pic.a
+SOLIB=${_LIB_pic.a}
 _LIBS+=${SOLIB}
 SOBJS+=${OBJS:.o=.pico}
 .endif
 .if defined(SHLIB_FULLVERSION)
-_LIB.so:=lib${LIB}.so.${SHLIB_FULLVERSION}
-.if ${MKDEBUG} != "no"
-_LIB.debug:=${_LIB.so}.debug
-.endif
-_LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
+_LIBS+=${_LIB.so.full}
 .endif
 .endif									# }

 .if ${MKLINT} != "no" && !empty(LOBJS)
-_LIBS+=llib-l${LIB}.ln
+_LIBS+=${_LIB.ln}
 .endif

 ALLOBJS=
@@ -502,12 +533,12 @@ SOBJS=
 _YLSRCS=	${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}

 .if ${USE_BITCODE:Uno} == "yes"
-_LIBS+=lib${LIB}_bc.a
-.endif
+_LIBS+=${_LIB_bc.a}
+.endif # ${USE_BITCODE:Uno} == "yes"

 .NOPATH: ${ALLOBJS} ${_LIBS} ${_YLSRCS}

-realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.debug}
+realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}

 MKARZERO?=no

@@ -548,19 +579,19 @@ ${STOBJS} ${POBJS} ${GOBJS} ${SOBJS} ${LOBJS}: ${DPSRCS}

 .if ${USE_BITCODE:Uno} == "yes"
 BCOBJS+=${OBJS:.o=.bc}
-lib${LIB}_bc.a:: ${BCOBJS}
+${LIB_bc.a}:: ${BCOBJS}
 	${_MKTARGET_BUILD}
 	rm -f ${.TARGET}
 	${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*bc} | ${TSORT}`
-.endif
+.endif # ${USE_BITCODE:Uno} == "yes"

-lib${LIB}.a:: ${STOBJS} __archivebuild
+${_LIB.a}:: ${STOBJS} __archivebuild

-lib${LIB}_p.a:: ${POBJS} __archivebuild
+${_LIB_p.a}:: ${POBJS} __archivebuild

-lib${LIB}_pic.a:: ${SOBJS} __archivebuild
+${_LIB_pic.a}:: ${SOBJS} __archivebuild

-lib${LIB}_g.a:: ${GOBJS} __archivebuild
+${_LIB_g.a}:: ${GOBJS} __archivebuild


 _LIBLDOPTS=
@@ -589,73 +620,73 @@ DPLIBC ?= ${DESTDIR}${LIBC_SO}
 .endif
 .else
 LDLIBC ?= -nodefaultlibs
-.if ${LIB} == "c" || ${LIB} == "minc"
-LDADD+= ${${ACTIVE_CC} == "gcc":?-lgcc:}
-LDADD+= ${${ACTIVE_CC} == "clang":?-L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic:}
+.if ${HAVE_LIBGCC} == "yes" && (${LIB} == "c" || ${LIB} == "minc")
+.if !defined(__MINIX)
+LDADD+= -lgcc
+.else
+LDADD+= ${${ACTIVE_CC} == "gcc":? -lgcc:}
+LDADD+= ${${ACTIVE_CC} == "clang":?-lCompilerRT-Generic:}
+.if ${MACHINE_ARCH} == "earm"
+LDADD+= ${${ACTIVE_CC} == "gcc":? -lgcc_eh:}
+.endif # ${MACHINE_ARCH} == "earm"
+.endif # !defined(__MINIX)
 .endif
 .endif
-
-.if defined(__MINIX)
-
-.if ${LIB} == "m" || ${LIB} == "vtreefs"
-# LSC: gcc generate calls to its runtime library for some floating point
-#      operations and convertions, which are not included in libc.
-LDADD+= ${${ACTIVE_CC} == "gcc":?-lgcc:}
-.endif # ${LIB} == "m" || ${LIB} == "vtreefs"
-
-.if ${LIB} == "stdc++"
-# LSC we can't build this library without compiling gcc
-LDADD+= -lgcc_s
-DPADD+= ${DESTDIR}/usr/lib/libgcc_s.a
-.endif # ${LIB} == "stdc++"
-.endif #defined(__MINIX)
 .endif

 .if ${LIBISCXX} != "no"
 LIBCC:=	${CXX}
+. if ${MKLIBCXX} == "yes"
+LIBDPLIBS+=     c++	${.CURDIR}/../../../../../external/bsd/libc++/lib
+. elif defined(HAVE_GCC) && ${HAVE_GCC} == 4
+LIBDPLIBS+=     stdc++	${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
+. else
+LIBDPLIBS+=     stdc++	${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
+. endif
 .else
 LIBCC:=	${CC}
 .endif

-_LDADD.lib${LIB}=	${LDADD} ${LDADD.lib${LIB}}
-_LDFLAGS.lib${LIB}=	${LDFLAGS} ${LDFLAGS.lib${LIB}}
+_LDADD.${_LIB}=	${LDADD} ${LDADD.${_LIB}}
+_LDFLAGS.${_LIB}=	${LDFLAGS} ${LDFLAGS.${_LIB}}

-lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \
+${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPLIBC} \
    ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
 	${_MKTARGET_BUILD}
-	rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
-	${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${_LDFLAGS.lib${LIB}} \
-	    -o ${.TARGET} ${_LIBLDOPTS} \
-	    -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${_LDADD.lib${LIB}} \
-		${${USE_BITCODE:Uno} == "yes":? -Wl,-plugin=/usr/pkg/lib/bfd-plugins/LLVMgold.so -Wl,-plugin-opt=-disable-opt:}
+	rm -f ${.TARGET}
+	${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \
+	    ${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \
+	    ${${USE_BITCODE:Uno} == "yes":? -Wl,-plugin=/usr/pkg/lib/bfd-plugins/LLVMgold.so -Wl,-plugin-opt=-disable-opt:} \
+	    -Wl,--whole-archive ${SOLIB} \
+	    -Wl,--no-whole-archive ${_LDADD.${_LIB}}
 #  We don't use INSTALL_SYMLINK here because this is just
 #  happening inside the build directory/objdir. XXX Why does
 #  this spend so much effort on libraries that aren't live??? XXX
 .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \
    "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"
-	${HOST_LN} -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp
-	mv -f lib${LIB}.so.${SHLIB_MAJOR}.tmp lib${LIB}.so.${SHLIB_MAJOR}
+	${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so.major}.tmp
+	mv -f ${_LIB.so.major}.tmp ${_LIB.so.major}
 .endif
-	${HOST_LN} -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.tmp
-	mv -f lib${LIB}.so.tmp lib${LIB}.so
+	${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so}.tmp
+	mv -f ${_LIB.so}.tmp ${_LIB.so}
 .if ${MKSTRIPIDENT} != "no"
 	${OBJCOPY} -R .ident ${.TARGET}
 .endif

-.if defined(_LIB.debug)
-${_LIB.debug}: ${_LIB.so}
+.if defined(_LIB.so.debug)
+${_LIB.so.debug}: ${_LIB.so.full}
 	${_MKTARGET_CREATE}
-	(  ${OBJCOPY} --only-keep-debug ${_LIB.so} ${_LIB.debug} \
+	(  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \
 	&& ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
-		--add-gnu-debuglink=${_LIB.debug} ${_LIB.so} \
-	) || (rm -f ${_LIB.debug}; false)
+		--add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \
+	) || (rm -f ${.TARGET}; false)
 .endif

 .if !empty(LOBJS)							# {
 LLIBS?=		-lc
-llib-l${LIB}.ln: ${LOBJS}
+${_LIB.ln}: ${LOBJS}
 	${_MKTARGET_COMPILE}
-	rm -f llib-l${LIB}.ln
+	rm -f ${.TARGET}
 .if defined(DESTDIR)
 	${LINT} -C${LIB} ${.ALLSRC} -L${DESTDIR}/usr/libdata ${LLIBS}
 .else
@@ -668,6 +699,7 @@ lint: ${LOBJS}
 	${LINT} ${LINTFLAGS} ${LOBJS}
 .endif

+
 # If the number of entries in CLEANFILES is too large, then the
 # commands in bsd.clean.mk encounter errors like "exec(/bin/sh)
 # failed (Argument list too long)".  Avoid that by splitting the
@@ -676,200 +708,203 @@ lint: ${LOBJS}
 # use it here mimics the way it's used by the clean target in
 # bsd.clean.mk.
 #
-clean: libclean1 libclean2 libclean3 libclean4 libclean5 libclean6
+clean: libclean1 libclean2 libclean3 libclean4 libclean5
 libclean1: .PHONY .MADE __cleanuse LIBCLEANFILES1
 libclean2: .PHONY .MADE __cleanuse LIBCLEANFILES2
 libclean3: .PHONY .MADE __cleanuse LIBCLEANFILES3
 libclean4: .PHONY .MADE __cleanuse LIBCLEANFILES4
 libclean5: .PHONY .MADE __cleanuse LIBCLEANFILES5
-libclean6: .PHONY .MADE __cleanuse LIBCLEANFILES6
+.if defined(__MINIX)
+# MINIX: core conflicts with core/ in lib/liblwip
 CLEANFILES+= a.out [Ee]rrs mklog *.core
-# core conflicts with core/ in lib/liblwip
-.if !defined(__MINIX)
-CLEANFILES+=core
-LIBCLEANFILES6+= lib${LIB}_bc.a ${BCOBJS} ${BCOBJS:=.tmp}
+.else
+CLEANFILES+= a.out [Ee]rrs mklog core *.core
+.endif # defined(__MINIX)
+LIBCLEANFILES1+= ${_LIB.a}   ${STOBJS} ${STOBJS:=.tmp}
+LIBCLEANFILES2+= ${_LIB_p.a} ${POBJS}  ${POBJS:=.tmp}
+LIBCLEANFILES3+= ${_LIB_g.a} ${GOBJS}  ${GOBJS:=.tmp}
+LIBCLEANFILES4+= ${_LIB_pic.a}
+.if ${MKPIC} != "no" && defined(SHLIB_FULLVERSION)
+LIBCLEANFILES4+= ${_LIB.so}.* ${_LIB.so} ${_LIB.so.debug}
 .endif
-LIBCLEANFILES1+= lib${LIB}.a   ${STOBJS} ${STOBJS:=.tmp}
-LIBCLEANFILES2+= lib${LIB}_p.a ${POBJS}  ${POBJS:=.tmp}
-LIBCLEANFILES3+= lib${LIB}_g.a ${GOBJS}  ${GOBJS:=.tmp}
-LIBCLEANFILES4+= lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${_LIB.debug}
 LIBCLEANFILES4+= ${SOBJS} ${SOBJS:=.tmp}
-LIBCLEANFILES5+= llib-l${LIB}.ln ${LOBJS}
+LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
+
+.if defined(__MINIX)
+clean: libclean6
+libclean6: .PHONY .MADE __cleanuse LIBCLEANFILES6
+LIBCLEANFILES6+= ${_LIB_bc.a} ${BCOBJS} ${BCOBJS:=.tmp}
+.endif

 .if !target(libinstall)							# {
 # Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
 libinstall::

 .if ${USE_BITCODE:Uno} == "yes"
-libinstall:: ${DESTDIR}${LIBDIR}/bc/lib${LIB}.a
-.PRECIOUS: ${DESTDIR}${LIBDIR}/bc/lib${LIB}.a
+libinstall:: ${_DEST.LIB}/bc/${_LIB_bc.a}
+.PRECIOUS: ${_DEST.LIB}/bc/${_LIB_bc.a}

 .if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_bc.a)
-${DESTDIR}${LIBDIR}/bc/lib${LIB}.a! .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB_bc.a})
+${_DEST.LIB}/bc/${_LIB_bc.a}! .MADE
 .endif
-${DESTDIR}${LIBDIR}/bc/lib${LIB}.a! lib${LIB}_bc.a __archiveinstall
+${_DEST.LIB}/bc/${_LIB_bc.a}! ${_LIB_bc.a} __archiveinstall
 .else
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_bc.a)
-${DESTDIR}${LIBDIR}/bc/lib${LIB}.a: .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB_bc.a})
+${_DEST.LIB}/bc/${_LIB_bc.a}: .MADE
 .endif
-${DESTDIR}${LIBDIR}/bc/lib${LIB}.a: lib${LIB}_bc.a __archiveinstall
+${_DEST.LIB}/bc/${_LIB_bc.a}: ${_LIB_bc.a} __archiveinstall
 .endif
 .endif # ${USE_BITCODE:Uno} == "yes"

 .if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
-libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a
-.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.a
+libinstall:: ${_DEST.LIB}/${_LIB.a}
+.PRECIOUS: ${_DEST.LIB}/${_LIB.a}

 .if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}.a)
-${DESTDIR}${LIBDIR}/lib${LIB}.a! .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB.a})
+${_DEST.LIB}/${_LIB.a}! .MADE
 .endif
-${DESTDIR}${LIBDIR}/lib${LIB}.a! lib${LIB}.a __archiveinstall
+${_DEST.LIB}/${_LIB.a}! ${_LIB.a} __archiveinstall
 .else
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}.a)
-${DESTDIR}${LIBDIR}/lib${LIB}.a: .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB.a})
+${_DEST.LIB}/${_LIB.a}: .MADE
 .endif
-${DESTDIR}${LIBDIR}/lib${LIB}.a: lib${LIB}.a __archiveinstall
+${_DEST.LIB}/${_LIB.a}: ${_LIB.a} __archiveinstall
 .endif
 .endif

 .if ${MKPROFILE} != "no"
-libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
-.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
+libinstall:: ${_DEST.LIB}/${_LIB_p.a}
+.PRECIOUS: ${_DEST.LIB}/${_LIB_p.a}

 .if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_p.a)
-${DESTDIR}${LIBDIR}/lib${LIB}_p.a! .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB_p.a})
+${_DEST.LIB}/${_LIB_p.a}! .MADE
 .endif
-${DESTDIR}${LIBDIR}/lib${LIB}_p.a! lib${LIB}_p.a __archiveinstall
+${_DEST.LIB}/${_LIB_p.a}! ${_LIB_p.a} __archiveinstall
 .else
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_p.a)
-${DESTDIR}${LIBDIR}/lib${LIB}_p.a: .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB_p.a})
+${_DEST.LIB}/${_LIB_p.a}: .MADE
 .endif
-${DESTDIR}${LIBDIR}/lib${LIB}_p.a: lib${LIB}_p.a __archiveinstall
+${_DEST.LIB}/${_LIB_p.a}: ${_LIB_p.a} __archiveinstall
 .endif
 .endif

 .if ${MKDEBUGLIB} != "no"
-libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_g.a
-.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_g.a
+libinstall:: ${_DEST.LIB}/${_LIB_g.a}
+.PRECIOUS: ${_DEST.LIB}/${_LIB_g.a}

 .if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_g.a)
-${DESTDIR}${LIBDIR}/lib${LIB}_g.a! .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB_g.a})
+${_DEST.LIB}/${_LIB_g.a}! .MADE
 .endif
-${DESTDIR}${LIBDIR}/lib${LIB}_g.a! lib${LIB}_g.a __archiveinstall
+${_DEST.LIB}/${_LIB_g.a}! ${_LIB_g.a} __archiveinstall
 .else
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_g.a)
-${DESTDIR}${LIBDIR}/lib${LIB}_g.a: .MADE
+.if !defined(BUILD) && !make(all) && !make(${LIB_g.a})
+${_DEST.LIB}/${_LIB_g.a}: .MADE
 .endif
-${DESTDIR}${LIBDIR}/lib${LIB}_g.a: lib${LIB}_g.a __archiveinstall
+${_DEST.LIB}/${_LIB_g.a}: ${_LIB_g.a} __archiveinstall
 .endif
 .endif

 .if ${MKPIC} != "no" && ${MKPICINSTALL} != "no"
-libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
-.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
+libinstall:: ${_DEST.LIB}/${_LIB_pic.a}
+.PRECIOUS: ${_DEST.LIB}/${_LIB_pic.a}

 .if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_pic.a)
-${DESTDIR}${LIBDIR}/lib${LIB}_pic.a! .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB_pic.a})
+${_DEST.LIB}/${_LIB_pic.a}! .MADE
 .endif
 .if ${MKPICLIB} == "no"
-${DESTDIR}${LIBDIR}/lib${LIB}_pic.a! lib${LIB}.a __archivesymlinkpic
+${_DEST.LIB}/${_LIB_pic.a}! ${_LIB.a} __archivesymlinkpic
 .else
-${DESTDIR}${LIBDIR}/lib${LIB}_pic.a! lib${LIB}_pic.a __archiveinstall
+${_DEST.LIB}/${_LIB_pic.a}! ${_LIB_pic.a} __archiveinstall
 .endif
 .else
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_pic.a)
-${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB_pic.a})
+${_DEST.LIB}/${_LIB_pic.a}: .MADE
 .endif
 .if ${MKPICLIB} == "no"
-${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: lib${LIB}.a __archivesymlinkpic
+${_DEST.LIB}/${_LIB_pic.a}: ${_LIB.a} __archivesymlinkpic
 .else
-${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: lib${LIB}_pic.a __archiveinstall
+${_DEST.LIB}/${_LIB_pic.a}: ${_LIB_pic.a} __archiveinstall
 .endif
 .endif
 .endif

 .if ${MKPIC} != "no" && defined(SHLIB_FULLVERSION)
-_LIB_SO_TGT=		${DESTDIR}${_LIBSODIR}/${_LIB_PREFIX}${LIB}.so
-_LIB_SO_TGTLIBDIR=	   ${DESTDIR}${LIBDIR}/${_LIB_PREFIX}${LIB}.so

-libinstall:: ${_LIB_SO_TGT}.${SHLIB_FULLVERSION}
-.PRECIOUS: ${_LIB_SO_TGT}.${SHLIB_FULLVERSION}
+libinstall:: ${_DEST.OBJ}/${_LIB.so.full}
+.PRECIOUS: ${_DEST.OBJ}/${_LIB.so.full}

 .if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}.so.${SHLIB_FULLVERSION})
-${_LIB_SO_TGT}.${SHLIB_FULLVERSION}! .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB.so.full})
+${_DEST.OBJ}/${_LIB.so.full}! .MADE
 .endif
-${_LIB_SO_TGT}.${SHLIB_FULLVERSION}! lib${LIB}.so.${SHLIB_FULLVERSION}
+${_DEST.OBJ}/${_LIB.so.full}! ${_LIB.so.full}
 .else
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}.so.${SHLIB_FULLVERSION})
-${_LIB_SO_TGT}.${SHLIB_FULLVERSION}: .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB.so.full})
+${_DEST.OBJ}/${_LIB.so.full}: .MADE
 .endif
-${_LIB_SO_TGT}.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_FULLVERSION}
+${_DEST.OBJ}/${_LIB.so.full}: ${_LIB.so.full}
 .endif
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.ALLSRC} ${.TARGET}
+	    ${.ALLSRC} ${.TARGET}
 .if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} -l r \
-		${_LIB_SO_TGT}.${SHLIB_FULLVERSION} \
-		${_LIB_SO_TGTLIBDIR}.${SHLIB_FULLVERSION}
+	${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
+	    ${_DEST.LIB}/${_LIB.so.full} 
 .endif
 .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \
    "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"
-	${INSTALL_SYMLINK} \
-		${_LIB_PREFIX}${LIB}.so.${SHLIB_FULLVERSION} \
-		${_LIB_SO_TGT}.${SHLIB_MAJOR}
+	${INSTALL_SYMLINK} ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so.major}
 .if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} -l r \
-		${_LIB_SO_TGT}.${SHLIB_FULLVERSION} \
-		${_LIB_SO_TGTLIBDIR}.${SHLIB_MAJOR}
+	${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
+	    ${_DEST.LIB}/${_LIB.so.major}
 .endif
 .endif
 .if ${MKLINKLIB} != "no"
-	${INSTALL_SYMLINK} \
-		${_LIB_PREFIX}${LIB}.so.${SHLIB_FULLVERSION} \
-		${_LIB_SO_TGT}
+	${INSTALL_SYMLINK}  ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so}
 .if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} -l r \
-		${_LIB_SO_TGT}.${SHLIB_FULLVERSION} \
-		${_LIB_SO_TGTLIBDIR}
+	${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
+	    ${_DEST.LIB}/${_LIB.so}
 .endif
 .endif
 .endif

-.if defined(_LIB.debug)
-libinstall:: ${DESTDIR}${DEBUGDIR}${LIBDIR}/${_LIB.debug}
-.PRECIOUS: ${DESTDIR}${DEBUGDIR}${LIBDIR}/${_LIB.debug}
+.if defined(_LIB.so.debug)
+libinstall:: ${_DEST.DEBUG}/${_LIB.so.debug}
+.PRECIOUS: ${_DEST.DEBUG}/${_LIB.so.debug}

-${DESTDIR}${DEBUGDIR}${LIBDIR}/${_LIB.debug}: ${_LIB.debug}
+${_DEST.DEBUG}/${_LIB.so.debug}: ${_LIB.so.debug}
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \
-		${.ALLSRC} ${.TARGET}
+	    ${.ALLSRC} ${.TARGET}
+.if ${_LIBSODIR} != ${LIBDIR}
+	${INSTALL_SYMLINK} -l r ${_DEST.DEBUG}/${_LIB.so.debug} \
+	    ${_DEST.ODEBUG}/${_LIB.so.debug} 
+.endif
 .endif

 .if ${MKLINT} != "no" && !empty(LOBJS)
-libinstall:: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
-.PRECIOUS: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
+libinstall:: ${_DEST.LINT}/${_LIB.ln}
+.PRECIOUS: ${_DEST.LINT}/${_LIB.ln}

 .if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(llib-l${LIB}.ln)
-${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln! .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB.ln})
+${_DEST.LINT}/${_LIB.ln}! .MADE
 .endif
-${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln! llib-l${LIB}.ln
+${_DEST.LINT}/${_LIB.ln}! ${_LIB.ln}
 .else
-.if !defined(BUILD) && !make(all) && !make(llib-l${LIB}.ln)
-${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: .MADE
+.if !defined(BUILD) && !make(all) && !make(${_LIB.ln})
+${_DEST.LINT}/${_LIB.ln}: .MADE
 .endif
-${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln
+${_DEST.LINT}/${_LIB.ln}: ${_LIB.ln}
 .endif
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
+		${.ALLSRC} ${_DEST.LINT}
 .endif
 .endif	# !target(libinstall)						# }

@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lua.mk,v 1.4 2011/10/16 00:45:09 mbalmer Exp $
+#	$NetBSD: bsd.lua.mk,v 1.6 2013/09/12 15:36:16 joerg Exp $
 #
 # Build rules and definitions for Lua modules

@@ -72,7 +72,7 @@ LUAC?=		/usr/bin/luac
 ##### Build rules

 # XX should these always be on?
-CFLAGS+=	-fPIC -DPIC
+CFLAGS+=	-fPIC

 .SUFFIXES:	.lua .luac
 .lua.luac:
@@ -144,6 +144,9 @@ ${LUA_TARG.${_M}}:	${LUA_OBJS.${_M}} ${DPADD} ${DPADD.${_M}}

 .endif

+DPADD+=	${LIBLUA}
+LDADD+=	-llua
+
 ##
 ## module install rules
 lua-install:		${DESTDIR}${LUA_DEST.${_M}}/${LUA_NAME.${_M}}
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.man.mk,v 1.109 2011/09/10 16:57:35 apb Exp $
+#	$NetBSD: bsd.man.mk,v 1.114 2013/10/25 22:16:29 apb Exp $
 #	@(#)bsd.man.mk	8.1 (Berkeley) 6/8/93

 .include <bsd.init.mk>
@@ -17,18 +17,24 @@ TMACDEPDIR?=	/usr/share/tmac
 .endif

 HTMLDIR?=	${DESTDIR}${MANDIR}
+.if ${MKMANDOC} == yes && !defined(NOMANDOC)
+CATDEPS?=
+.else
 CATDEPS?=	${TMACDEPDIR}/andoc.tmac \
 		${TMACDEPDIR}/doc.tmac \
 		${TMACDEPDIR}/mdoc/doc-common \
 		${TMACDEPDIR}/mdoc/doc-ditroff \
 		${TMACDEPDIR}/mdoc/doc-nroff \
 		${TMACDEPDIR}/mdoc/doc-syms
+.endif
 MANTARGET?=	cat

 MAN?=
 MLINKS?=
-_MNUMBERS=	1 2 3 4 5 6 7 8 9
-.SUFFIXES:	${_MNUMBERS:@N@.$N@}
+_MSECTIONS=	1 2 3 4 5 6 7 8 9
+_MSECTIONS+=	3lua 9lua
+_MSECTIONREGEX=	${_MSECTIONS:ts|} # e.g. 1|2|3|...
+.SUFFIXES:	${_MSECTIONS:@N@.$N@}

 .if ${MKMANZ} == "no"
 MANCOMPRESS?=
@@ -69,9 +75,9 @@ MANPAGES=	${MAN:C/.$/&${MANSUFFIX}/}
 realall:	${MANPAGES}
 .if !empty(MANSUFFIX)
 .NOPATH:	${MANPAGES}
-.SUFFIXES:	${_MNUMBERS:@N@.$N${MANSUFFIX}@}
+.SUFFIXES:	${_MSECTIONS:@N@.$N${MANSUFFIX}@}

-${_MNUMBERS:@N@.$N.$N${MANSUFFIX}@}:			# build rule
+${_MSECTIONS:@N@.$N.$N${MANSUFFIX}@}:			# build rule
 	${_MKTARGET_FORMAT}
 	cat ${.IMPSRC} ${MANCOMPRESS} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
 .endif # !empty(MANSUFFIX)
@@ -119,14 +125,14 @@ manlinks::	${_t}
 .if (${MKCATPAGES} != "no") && (${MKMAN} != "no")
 catinstall:	catpages catlinks
 catpages::	# ensure target exists
-CATPAGES=	${MAN:C/\.([1-9])$/.cat\1${MANSUFFIX}/}
+CATPAGES=	${MAN:C/\.(${_MSECTIONREGEX})\$/.cat\1${MANSUFFIX}/}

 realall:	${CATPAGES}
 .NOPATH:	${CATPAGES}
-.SUFFIXES:	${_MNUMBERS:@N@.cat$N${MANSUFFIX}@}
+.SUFFIXES:	${_MSECTIONS:@N@.cat$N${MANSUFFIX}@}
 .MADE:	${CATDEPS}

-${_MNUMBERS:@N@.$N.cat$N${MANSUFFIX}@}: ${CATDEPS}	# build rule
+${_MSECTIONS:@N@.$N.cat$N${MANSUFFIX}@}: ${CATDEPS}	# build rule
 	${_MKTARGET_FORMAT}
 .if ${MKMANDOC} == yes && !defined(NOMANDOC)
 	if test ""${NOMANDOC.${.IMPSRC:T}:tl:Q} != "yes"; then \
@@ -187,20 +193,33 @@ catlinks::	${_t}
 .if (${MKHTML} != "no") && (${MKMAN} != "no")		# {
 htmlinstall:	htmlpages htmllinks
 htmlpages::	# ensure target exists
-HTMLPAGES=	${MAN:C/\.([1-9])$/.html\1/}
+HTMLPAGES=	${MAN:C/\.(${_MSECTIONREGEX})\$/.html\1/}

 HTMLLINKS=	${MANSUBDIR:?../:}../html%S/%N.html
 HTMLSTYLE=	${MANSUBDIR:?../:}../style.css

 realall:	${HTMLPAGES}
 .NOPATH:	${HTMLPAGES}
-.SUFFIXES:	${_MNUMBERS:@N@.html$N@}
+.SUFFIXES:	${_MSECTIONS:@N@.html$N@}

-${_MNUMBERS:@N@.$N.html$N@}: 				# build rule
+${_MSECTIONS:@N@.$N.html$N@}: 				# build rule
 	${_MKTARGET_FORMAT}
-	${TOOL_MANDOC_HTML} -Oman=${HTMLLINKS} -Ostyle=${HTMLSTYLE} \
-	    ${.IMPSRC} > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
+.if ${MKMANDOC} == yes && !defined(NOMANDOC)
+	if test ""${NOMANDOC.${.IMPSRC:T}:tl:Q} != "yes"; then \
+	    ${TOOL_MANDOC_HTML} -Oman=${HTMLLINKS} -Ostyle=${HTMLSTYLE} \
+		${.IMPSRC} > ${.TARGET}.tmp && \
+		mv ${.TARGET}.tmp ${.TARGET}; \
+	else \
+		${TOOL_ROFF_HTML} ${.IMPSRC} ${MANCOMPRESS} \
+		    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
+	fi
+.elif defined(USETBL)
+	${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_HTML} ${MANCOMPRESS} \
+	    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+.else
+	${TOOL_ROFF_HTML} ${.IMPSRC} ${MANCOMPRESS} \
+	    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+.endif

 .for F in ${HTMLPAGES:O:u}
 # construct installed path
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.706 2012/08/16 05:30:55 matt Exp $
+#	$NetBSD: bsd.own.mk,v 1.755 2013/10/29 16:11:46 joerg Exp $

 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -23,9 +23,11 @@ MANGRP?=	operator
 INFOGRP?=	operator
 DOCGRP?=	operator

-MKBINUTILS?=	no
+MKKYUA?=	yes
+
 MKGCC?=		no
 MKGCCCMDS?=	no
+MKLIBSTDCXX?=	no
 MKPROFILE?=	no
 MKSLJIT?=	no

@@ -58,7 +60,6 @@ MKRUMP:=	no
 MKSKEY:=	no
 MKYP:=		no

-# LSC MINIX SMP Support?
 .ifdef CONFIG_SMP
 SMP_FLAGS += -DCONFIG_SMP
 .ifdef CONFIG_MAX_CPUS
@@ -72,6 +73,8 @@ __uname_s!= uname -s
 .if ${__uname_s:Uunknown} == "Minix" 
 USETOOLS?=	never
 .  if ${USETOOLS:Uno} != "yes"
+# LSC: We have to use a temporary variable, as some test are done simply on the
+#      definition (ifdef) of it.
 .    if ${_HAVE_LLVM:U} == ""
       _HAVE_LLVM!= (exec 2>&1; clang --version || echo "")
       _HAVE_LLVM:= ${_HAVE_LLVM:M[0-9]\.[0-9]}
@@ -103,6 +106,8 @@ USETOOLS?=	never
          LDFLAGS+= -L${DESTDIR}/usr/lib
 .	endif
 .    endif # ${DESTDIR:U} != ""
+
+     MKTOOLS?=no
 .  endif # ${USETOOLS:Uno} != "yes"

 .  if !defined(HOSTPROG) && !defined(HOSTLIB)
@@ -111,9 +116,48 @@ USETOOLS?=	never
 .    if ${MACHINE_ARCH} == "i386"
       MACHINE:= i386
 .    endif
+# LSC FIXME: On a native ARM system MACHINE_ARCH is earmv7 instead of earm...
+.    if !empty(${MACHINE_ARCH:Mearm*})
+       MACHINE_ARCH:= earm
+.    endif
 .  endif # !defined(HOSTPROG) && !defined(HOSTLIB)
 .endif # __uname_s == "Minix"

+.if ${MKKYUA:Uno} == "yes" || ${MKATF:Uyes} == "yes"
+.  if ${MKLIBCXX:Uno} == "no" && ${HAVE_GCC:Dyes} != "yes"
+# No libc++ available, so we have to fallback on libstdc++.
+# This implies that the compiler is GCC on a native system, or we are building
+# GCC.
+# If HAVE_GCC is not defined, then it is a crossbuild, and we have to build
+# LIBSTDC++, otherwise we will simply use the system one.
+MKLIBSTDCXX:=	yes # required for Kyua / ATF
+.  endif # ${MKLIBCXX:Uno} == "no" && ${HAVE_GCC:Dyes} != "yes"
+
+# If we need LIBSTDC++, then we are using the in-tree GCC.
+.  if ${MKLIBSTDCXX} == "yes"
+CXXFLAGS+=	-I${DESTDIR}/usr/include/g++
+MKGCCCMDS:=	yes
+.  endif # ${MKLIBSTDCXX} == "yes"
+
+.  if ${HAVE_GCC:Dyes} == "yes" && ${MKLIBCXX:Uno} != "yes"
+# Specify the C++ system header for libstdc++
+CXXFLAGS+=	-I/usr/include/g++
+.  endif # ${HAVE_GCC:Dyes} == "yes" && ${MKLIBCXX:Uno} != "yes"
+.endif # ${MKKYUA:Uno} == "yes" || ${MKATF:Uyes} == "yes"
+
+# MKGCCCMDS == yes implies MKGCC == yes
+.if ${MKGCCCMDS} == "yes"
+MKGCC:=		yes
+MKBINUTILS?=	yes # We are installing GCC, so trigger binutils.
+.endif # ${MKGCCCMDS} == "yes"
+
+# The default value of MKBINUTILS cannot be set before the previous test.
+MKBINUTILS?=	no
+
+.if ${MKGCC} == "yes"
+HAVE_GCC:=	45 # The in-tree gcc version is 4.5
+.endif # ${MKGCC} == "yes"
+
 #
 # linker script files that have to be specified explicitely for the gold linker
 #
@@ -125,18 +169,6 @@ LDS_RELOC=		${LDS_PATH}/elf_${MACHINE_ARCH}_minix.xr
 LDS_SHARED_LIB=		${LDS_PATH}/elf_${MACHINE_ARCH}_minix.xsc
 LDS_N=			${LDS_PATH}/elf_${MACHINE_ARCH}_minix.xbn

-AFLAGS+=	-D__ASSEMBLY__
-CFLAGS+=	-fno-builtin
-
-# Compile Kyua only if we have MKGCCCMDS, as we need libstdc++ from GCC
-.if ${MKGCCCMDS:Uno} == "no"
-MKATF:=		no
-.else
-# For C++ programs, only if we have the GCC sources
-CXXFLAGS+=	-I${DESTDIR}/usr/include/g++
-MKKYUA?=	yes
-.endif #  ${MKGCCCMDS:Uno} == "no"
-
 #LSC FIXME: Needed by clang for now
 .if ${MACHINE_ARCH} == "i386"
 CPUFLAGS+=	-march=i586
@@ -149,7 +181,7 @@ MAKECONF?=	/etc/mk.conf
 #
 # CPU model, derived from MACHINE_ARCH
 #
-MACHINE_CPU=	${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/:S/earm/arm/:S/earmeb/arm/:S/powerpc64/powerpc/}
+MACHINE_CPU=	${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/}

 #
 # Subdirectory used below ${RELEASEDIR} when building a release
@@ -193,32 +225,25 @@ HAVE_GCC?=    45
 .endif
 .endif

-.if \
-    ${MACHINE_CPU} == "arm" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE_CPU} == "sh3" || \
-    ${MACHINE_ARCH} == "x86_64"
+
+.if ${MACHINE_ARCH} == "ia64"
+USE_COMPILERCRTSTUFF?=	yes
+.else
 USE_COMPILERCRTSTUFF?=	no
 .endif
-USE_COMPILERCRTSTUFF?=	yes

-
-#
-# Platforms still using GDB 6
-#
-.if ${MACHINE_CPU}  == "mips"
-HAVE_GDB?= 6
+.if ${MKLLVM:Uno} == "yes" && (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
+HAVE_LIBGCC?=	no
 .else
-# Otherwise, default to GDB7
-HAVE_GDB?=	7
+HAVE_LIBGCC?=	yes
 .endif

+HAVE_GDB?=	7
+
 .if (${MACHINE_ARCH} == "alpha") || \
    (${MACHINE_ARCH} == "hppa") || \
    (${MACHINE_ARCH} == "ia64") || \
-    (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") || \
-    (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+    (${MACHINE_CPU} == "mips")
 HAVE_SSP?=	no
 .else
 HAVE_SSP?=	yes
@@ -227,15 +252,14 @@ USE_SSP?=	yes
 .endif
 .endif

-
-.if empty(.MAKEFLAGS:M-V*)
+.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
 .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
 PRINTOBJDIR=	${MAKE} -r -V .OBJDIR -f /dev/null xxx
 .else
 PRINTOBJDIR=	${MAKE} -V .OBJDIR
 .endif
 .else
-PRINTOBJDIR=	echo # prevent infinite recursion
+PRINTOBJDIR=	echo /error/bsd.own.mk/PRINTOBJDIR # avoid infinite recursion
 .endif

 #
@@ -255,8 +279,11 @@ _SRC_TOP_!= cd "${.CURDIR}"; while :; do \
 .endif					# }

 #
-# If _SRC_TOP_ != "", we're within the NetBSD source tree, so set
-# defaults for NETBSDSRCDIR and _SRC_TOP_OBJ_.
+# If _SRC_TOP_ != "", we're within the NetBSD source tree.
+# * Set defaults for NETBSDSRCDIR and _SRC_TOP_OBJ_.
+# * Define _NETBSD_VERSION_DEPENDS.  Targets that depend on the
+#   NetBSD version, or on variables defined at build time, can
+#   declare a dependency on ${_NETBSD_VERSION_DEPENDS}.
 #
 .if (${_SRC_TOP_} != "")		# {

@@ -267,6 +294,12 @@ _SRC_TOP_OBJ_!=		cd "${_SRC_TOP_}" && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=	_SRC_TOP_OBJ_
 .endif

+_NETBSD_VERSION_DEPENDS=	${_SRC_TOP_OBJ_}/params
+_NETBSD_VERSION_DEPENDS+=	${NETBSDSRCDIR}/sys/sys/param.h
+_NETBSD_VERSION_DEPENDS+=	${NETBSDSRCDIR}/sys/conf/newvers.sh
+_NETBSD_VERSION_DEPENDS+=	${NETBSDSRCDIR}/sys/conf/osrelease.sh
+${_SRC_TOP_OBJ_}/params: .NOTMAIN .OPTIONAL # created by top level "make build"
+
 .endif	# _SRC_TOP_ != ""		# }


@@ -341,6 +374,11 @@ TOOL_CPP.gcc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-cpp
 TOOL_CXX.gcc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-c++
 TOOL_FC.gcc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-g77
 TOOL_OBJC.gcc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-gcc
+
+TOOL_CC.clang=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-clang
+TOOL_CPP.clang=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-clang-cpp
+TOOL_CXX.clang=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-clang++
+TOOL_OBJC.clang=	${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-clang
 .else									# } {
 # Define default locations for common tools.
 .if ${USETOOLS_BINUTILS:Uyes} == "yes"					#  {
@@ -391,6 +429,7 @@ LDFLAGS+=	--sysroot=/
 .endif	# EXTERNAL_TOOLCHAIN						# }

 HOST_MKDEP=	${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
+HOST_MKDEPCXX=	${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep

 DBSYM=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-dbsym
 ELF2AOUT=	${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
@@ -400,6 +439,7 @@ LEX=		${TOOLDIR}/bin/${_TOOL_PREFIX}lex
 LINT=		CC=${CC:Q} ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-lint
 LORDER=		NM=${NM:Q} MKTEMP=${TOOL_MKTEMP:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}lorder
 MKDEP=		CC=${CC:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}mkdep
+MKDEPCXX=	CC=${CXX:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}mkdep
 PAXCTL=		${TOOLDIR}/bin/${_TOOL_PREFIX}paxctl
 TSORT=		${TOOLDIR}/bin/${_TOOL_PREFIX}tsort -q
 YACC=		${TOOLDIR}/bin/${_TOOL_PREFIX}yacc
@@ -420,7 +460,7 @@ TOOL_CTAGS=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctags
 TOOL_CTFCONVERT=	${TOOLDIR}/bin/${_TOOL_PREFIX}ctfconvert
 TOOL_CTFMERGE=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
 TOOL_DB=		${TOOLDIR}/bin/${_TOOL_PREFIX}db
-TOOL_DISKLABEL=		${TOOLDIR}/bin/nbdisklabel-${MAKEWRAPPERMACHINE}
+TOOL_DISKLABEL=		${TOOLDIR}/bin/nbdisklabel
 TOOL_EQN=		${TOOLDIR}/bin/${_TOOL_PREFIX}eqn
 TOOL_FDISK=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-fdisk
 TOOL_FGEN=		${TOOLDIR}/bin/${_TOOL_PREFIX}fgen
@@ -454,8 +494,10 @@ TOOL_MKESDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}mkesdb
 TOOL_MKFSMFS=		${TOOLDIR}/bin/${_TOOL_PREFIX}mkfs.mfs
 TOOL_MKLOCALE=		${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale
 TOOL_MKMAGIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}file
+TOOL_MKNOD=		${TOOLDIR}/bin/${_TOOL_PREFIX}mknod
 TOOL_MKTEMP=		${TOOLDIR}/bin/${_TOOL_PREFIX}mktemp
 TOOL_MKUBOOTIMAGE=	${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
+TOOL_ELFTOSB=		${TOOLDIR}/bin/${_TOOL_PREFIX}elftosb
 TOOL_MSGC=		MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
 TOOL_MTREE=		${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
 TOOL_NBPERF=		${TOOLDIR}/bin/${_TOOL_PREFIX}perf
@@ -544,7 +586,7 @@ TOOL_MAKEFS=		makefs
 TOOL_MAKEINFO=		makeinfo
 TOOL_MAKEWHATIS=	/usr/libexec/makewhatis
 TOOL_MANDOC_ASCII=	mandoc -Tascii
-TOOL_MANDOC_HTML=	mandoc -Thtml -Oman=../html%S/%N.html -Ostyle=../style.css
+TOOL_MANDOC_HTML=	mandoc -Thtml
 TOOL_MANDOC_LINT=	mandoc -Tlint
 TOOL_MDSETIMAGE=	mdsetimage
 TOOL_MENUC=		menuc
@@ -555,8 +597,10 @@ TOOL_MKESDB=		mkesdb
 TOOL_MKFSMFS=		mkfs.mfs
 TOOL_MKLOCALE=		mklocale
 TOOL_MKMAGIC=		file
+TOOL_MKNOD=		mknod
 TOOL_MKTEMP=		mktemp
 TOOL_MKUBOOTIMAGE=	mkubootimage
+TOOL_ELFTOSB=		elftosb
 TOOL_MSGC=		msgc
 TOOL_MTREE=		mtree
 TOOL_NBPERF=		nbperf
@@ -608,6 +652,11 @@ CXX=		${TOOL_CXX.${ACTIVE_CXX}}
 FC=		${TOOL_FC.${ACTIVE_FC}}
 OBJC=		${TOOL_OBJC.${ACTIVE_OBJC}}

+.if exists(/usr/bin/${TOOL_CTFCONVERT}) || exists(${TOOL_CTFCONVERT})
+CTFCONVERT=	${TOOL_CTFCONVERT}
+CTFMERGE=	${TOOL_CTFMERGE}
+.endif
+
 # OBJCOPY flags to create a.out binaries for old firmware
 # shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
 .if ${MACHINE_CPU} == "arm"
@@ -616,17 +665,19 @@ OBJCOPY_ELF2AOUT_FLAGS?=	\
 	-R .ident		\
 	-R .ARM.attributes	\
 	-R .ARM.exidx		\
+	-R .ARM.extab		\
 	-R .arm.atpcs		\
 	-R .comment		\
 	-R .debug_abbrev	\
+	-R .debug_aranges	\
 	-R .debug_info		\
 	-R .debug_line		\
 	-R .debug_frame		\
 	-R .debug_loc		\
 	-R .debug_pubnames	\
-	-R .debug_aranges	\
-	-R .debug_str		\
 	-R .debug_pubtypes	\
+	-R .debug_str		\
+	-R .eh_frame		\
 	-R .note.netbsd.ident
 .endif

@@ -809,28 +860,49 @@ SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_version
 #
 # GNU sources and packages sometimes see architecture names differently.
 #
-GNU_ARCH.coldfire=m68k
-# MINIX/arm default
+GNU_ARCH.coldfire=m5407
 GNU_ARCH.earm=arm
-GCC_CONFIG_ARCH.earm=armv7-a
+GNU_ARCH.earmhf=arm
 GNU_ARCH.earmeb=armeb
-# MINIX/intel default
-GNU_ARCH.i386=i586
-GCC_CONFIG_ARCH.i386=i586
+GNU_ARCH.earmhfeb=armeb
+GNU_ARCH.earmv4=armv4
+GNU_ARCH.earmv4eb=armv4eb
+GNU_ARCH.earmv5=arm
+GNU_ARCH.earmv5eb=armeb
+GNU_ARCH.earmv6=armv6
+GNU_ARCH.earmv6hf=armv6
+GNU_ARCH.earmv6eb=armv6eb
+GNU_ARCH.earmv6hfeb=armv6eb
+GNU_ARCH.earmv7=armv7
+GNU_ARCH.earmv7hf=armv7
+GNU_ARCH.earmv7eb=armv7eb
+GNU_ARCH.earmv7hfeb=armv7eb
+GNU_ARCH.i386=i486
+GCC_CONFIG_ARCH.i386=i486
 GCC_CONFIG_TUNE.i386=nocona
 GCC_CONFIG_TUNE.x86_64=nocona
 GNU_ARCH.m68000=m68010
 GNU_ARCH.sh3eb=sh
 GNU_ARCH.sh3el=shle
 GNU_ARCH.mips64eb=mips64
+
+.if defined(__MINIX)
+# MINIX/arm default
+GCC_CONFIG_ARCH.earm=armv7-a
+
+# MINIX/intel default
+GNU_ARCH.i386=i586
+GCC_CONFIG_ARCH.i386=i586
+.endif # defined(__MINIX)
+
 MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}}

 #
 # In order to identify NetBSD to GNU packages, we sometimes need
 # an "elf" tag for historically a.out platforms.
 #
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
-MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-eabi
+.if (!empty(MACHINE_ARCH:Mearm*))
+MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-${MACHINE_ARCH:C/eb//:C/v[4-7]//:S/earm/eabi/}
 .elif (${MACHINE_GNU_ARCH} == "arm" || \
     ${MACHINE_GNU_ARCH} == "armeb" || \
     ${MACHINE_ARCH} == "i386" || \
@@ -927,6 +999,8 @@ MK${var}:=	yes
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" || \
    ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
 MKCOMPAT?=	yes
+.elif !empty(MACHINE_ARCH:Mearm*)
+MKCOMPAT?=	no
 .else
 # Don't let this build where it really isn't supported.
 MKCOMPAT:=	no
@@ -942,9 +1016,13 @@ MKCOMPATMODULES:=	no

 #
 # Default mips64 to softfloat now.
+# arm is always softfloat unless it isn't
 # emips is always softfloat.
+# coldfire is always softfloat
 #
 .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" || \
+    (${MACHINE_CPU} == "arm" && ${MACHINE_ARCH:M*hf*} == "") || \
+    ${MACHINE_ARCH} == "coldfire" || \
    ${MACHINE} == "emips"
 MKSOFTFLOAT?=	yes
 .endif
@@ -975,9 +1053,6 @@ MKBINUTILS?=	${MKBFD}
 MKZFS?=		yes
 .endif

-# LSC: MINIX: Has to be here, otherwise libgcc_s.a is not found!?
-MKSTATICLIB:=	yes
-
 #
 # MK* options which default to "yes".
 #
@@ -991,7 +1066,7 @@ _MKVARS.yes= \
 	MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
 	MKKERBEROS \
 	MKKMOD \
-	MKLDAP MKLINKLIB MKLINT MKLVM \
+	MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \
 	MKMAN MKMANDOC \
 	MKMDNS \
 	MKMAKEMANDB \
@@ -1032,18 +1107,18 @@ _MKVARS.no= \
 	MKBSDGREP MKBSDTAR \
 	MKCATPAGES MKCRYPTO_RC5 MKDEBUG \
 	MKDEBUGLIB MKDTRACE MKEXTSRC \
-	MKKYUA \
-	MKMANZ MKOBJDIRS \
-	MKLLVM MKPCC \
+	MKKYUA MKLLD MKLLDB MKLINT \
+	MKMANZ MKMCLINKER MKOBJDIRS \
+	MKLIBCXX MKLLVM MKPCC \
 	MKPIGZGZIP \
 	MKREPRO \
-	MKSOFTFLOAT MKSTRIPIDENT \
-	MKUNPRIVED MKUPDATE MKX11 MKZFS
+	MKSOFTFLOAT MKSTRIPIDENT MKTPM \
+	MKUNPRIVED MKUPDATE MKX11 MKX11MOTIF MKZFS

 #MINIX-specific vars
 _MKVARS.no+= \
 	MKIMAGEONLY MKSMALL MKBITCODE
-.if (${MACHINE_ARCH} == "earm")
+.if !empty(MACHINE_ARCH:Mearm*)
 _MKVARS.no+= \
 	MKWATCHDOG MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
 .endif
@@ -1070,6 +1145,41 @@ X11FLAVOUR?=	XFree86
 X11FLAVOUR?=	Xorg
 .endif

+#
+# Which platforms build the xorg-server drivers (as opposed
+# to just Xnest and Xvfb.)
+#
+.if ${X11FLAVOUR} == "Xorg"	&& \
+    ${MACHINE} == "alpha"	|| \
+    ${MACHINE} == "amd64"	|| \
+    ${MACHINE} == "bebox"	|| \
+    ${MACHINE} == "cats"	|| \
+    ${MACHINE} == "dreamcast"	|| \
+    ${MACHINE} == "ews4800mips"	|| \
+    ${MACHINE} == "evbarm"	|| \
+    ${MACHINE} == "evbmips"	|| \
+    ${MACHINE} == "hp300"	|| \
+    ${MACHINE} == "hpcarm"	|| \
+    ${MACHINE} == "hpcmips"	|| \
+    ${MACHINE} == "hpcsh"	|| \
+    ${MACHINE} == "i386"	|| \
+    ${MACHINE} == "luna68k"	|| \
+    ${MACHINE} == "macppc"	|| \
+    ${MACHINE} == "netwinder"	|| \
+    ${MACHINE} == "newsmips"	|| \
+    ${MACHINE} == "prep"	|| \
+    ${MACHINE} == "ofppc"	|| \
+    ${MACHINE} == "sgimips"	|| \
+    ${MACHINE} == "shark"	|| \
+    ${MACHINE} == "sparc"	|| \
+    ${MACHINE} == "sparc64"	|| \
+    ${MACHINE} == "vax"		|| \
+    ${MACHINE} == "zaurus"
+MKXORG_SERVER?=yes
+.else
+MKXORG_SERVER?=no
+.endif
+
 #
 # Force some options off if their dependencies are off.
 #
@@ -1288,7 +1398,7 @@ X11SRCDIR.${_proto}proto?=		${X11SRCDIRMIT}/${_proto}proto/dist
 	xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \
 	xwininfo xwud xprehashprinterlist xplsprinters xkbprint xkbevd \
 	xterm xwd xfs xfsinfo xphelloworld xtrap xkbutils xkbcomp \
-	xkeyboard-config xinput xcb-util \
+	xkeyboard-config xinput xcb-util xorg-docs \
 	font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi \
 	font-adobe-utopia-75dpi font-adobe-utopia-type1 \
 	font-alias \
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.278 2012/08/24 20:26:24 jmmv Exp $
+#	$NetBSD: bsd.prog.mk,v 1.286 2013/11/11 10:24:53 joerg Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94

 .ifndef HOSTPROG
@@ -34,12 +34,18 @@ CLEANFILES+=strings
 .c.o:
 	${CC} -E ${CPPFLAGS} ${CFLAGS} ${.IMPSRC} | xstr -c -
 	@${CC} ${CPPFLAGS} ${CFLAGS} -c x.c -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 	@rm -f x.c

 .cc.o .cpp.o .cxx.o .C.o:
 	${CXX} -E ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC} | xstr -c -
 	@mv -f x.c x.cc
 	@${CXX} ${CPPFLAGS} ${CXXFLAGS} -c x.cc -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 	@rm -f x.cc
 .endif

@@ -50,6 +56,9 @@ LDFLAGS+=	${PIE_LDFLAGS}
 .endif

 CFLAGS+=	${COPTS}
+.if defined(MKDEBUG) && (${MKDEBUG} != "no")
+CFLAGS+=	-g
+.endif
 OBJCFLAGS+=	${OBJCOPTS}
 MKDEP_SUFFIXES?=	.o .ln

@@ -75,6 +84,11 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 .MADE: ${LIBCRT0}
 .endif

+.ifndef LIBCRTI
+LIBCRTI=	${DESTDIR}/usr/lib/crti.o
+.MADE: ${LIBCRTI}
+.endif
+
 ##### Installed system library definitions
 #
 #	E.g.
@@ -85,26 +99,108 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o

 .for _lib in \
 	archive \
+	asn1 \
 	atf_c \
 	atf_cxx \
+	bind9 \
+	bluetooth \
+	bsdmalloc \
 	bz2 \
 	c \
 	c_pic \
-	crt0 \
+	com_err \
+	compat \
 	crypt \
+	crypto \
+	crypto_idea \
+	crypto_mdc2 \
+	crypto_rc5 \
 	curses \
+	dbm \
+	des \
+	dns \
 	edit \
+	event \
 	expat \
+	fetch \
+	fl \
+	form \
+	g2c \
+	gcc \
+	gnumalloc \
+	gssapi \
+	hdb \
+	heimbase \
+	heimntlm \
+	hx509 \
+	intl \
+	ipsec \
+	isc \
+	isccc \
+	isccfg \
+	kadm5clnt \
+	kadm5srv \
+	kafs \
+	krb5 \
+	kvm \
 	l \
+	lber \
+	ldap \
+	ldap_r \
 	lua \
+	lwres \
 	m \
 	magic \
+	menu \
 	objc \
+	ossaudio \
+	pam \
+	pcap \
+	pci \
+	pmc \
+	posix \
+	pthread \
+	pthread_dbg \
+	puffs \
+	quota \
+	radius \
+	resolv \
 	rmt \
+	roken \
+	rpcsvc \
+	rt \
+	rump \
+	rumpfs_cd9660fs \
+	rumpfs_efs \
+	rumpfs_ext2fs \
+	rumpfs_ffs \
+	rumpfs_hfs \
+	rumpfs_lfs \
+	rumpfs_msdosfs \
+	rumpfs_nfs \
+	rumpfs_ntfs \
+	rumpfs_syspuffs \
+	rumpfs_tmpfs \
+	rumpfs_udf \
+	rumpfs_ufs \
+	rumpuser \
+	saslc \
+	skey \
+	sl \
 	sqlite3 \
+	ss \
+	ssh \
+	ssl \
+	ssp \
 	stdcxx \
+	supcxx \
 	terminfo \
+	tre \
+	usbhid \
 	util \
+	wind \
+	wrap \
+	y \
 	z 

 .ifndef LIB${_lib:tu}
@@ -159,6 +255,11 @@ PAM_STATIC_LDADD=
 PAM_STATIC_DPADD=
 .endif

+.if defined(__MINIX) && ${MACHINE_ARCH} == "earm"
+# LSC: On ARM, when compiling statically, with gcc, lgcc_eh is required
+LDFLAGS+= ${${ACTIVE_CC} == "gcc":? -lgcc_eh:}
+.endif # defined(__MINIX) && ${MACHINE_ARCH} == "earm"
+
 #	NB:	If you are a library here, add it in bsd.README
 .for _lib in \
 	FS \
@@ -202,6 +303,10 @@ LIB${_lib:tu}=	${DESTDIR}${X11USRLIBDIR}/lib${_lib}.a
 .endif
 .endfor

+# Ugly one-offs
+LIBX11_XCB=	${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
+LIBXCB=	${DESTDIR}${X11USRLIBDIR}/libxcb.a
+
 .if defined(RESCUEDIR)
 CPPFLAGS+=	-DRESCUEDIR=\"${RESCUEDIR}\"
 .endif
@@ -246,10 +351,6 @@ _APPEND_SRCS=yes
 _CCLINKFLAGS=

 .if defined(PROG_CXX)
-#.if defined(__MINIX) # LSC: Can't test as bsd.own.mk may not have been sourced
-LDADD+=	-lgcc_s
-DPADD+=	${DESTDIR}/usr/lib/libgcc_s.a
-#.endif # defined(__MINIX)
 PROG=		${PROG_CXX}
 _CCLINK=	${CXX} ${_CCLINKFLAGS}
 .endif
@@ -314,6 +415,23 @@ PROGS=		${PROG}
 .  endif
 .endif

+##### Libraries that this may depend upon.
+.if defined(PROGDPLIBS) 						# {
+.for _lib _dir in ${PROGDPLIBS}
+.if !defined(BINDO.${_lib})
+PROGDO.${_lib}!=	cd "${_dir}" && ${PRINTOBJDIR}
+.MAKEOVERRIDES+=PROGDO.${_lib}
+.endif
+LDADD+=		-L${PROGDO.${_lib}} -l${_lib}
+.if exists(${PROGDO.${_lib}}/lib${_lib}_pic.a)
+DPADD+=		${PROGDO.${_lib}}/lib${_lib}_pic.a
+.elif exists(${PROGDO.${_lib}}/lib${_lib}.so)
+DPADD+=		${PROGDO.${_lib}}/lib${_lib}.so
+.else
+DPADD+=		${PROGDO.${_lib}}/lib${_lib}.a
+.endif
+.endfor
+.endif									# }
 #
 # Per-program definitions and targets.
 #
@@ -338,12 +456,6 @@ _CCLINK.${_P}=	${CXX} ${_CCLINKFLAGS}
 # Language-independent definitions.
 .if defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
 CFLAGS+= -flto
-.endif
-
-.for _P in ${PROGS} ${PROGS_CXX}					# {
-
-.if defined(__MINIX) && ${HAVE_GOLD:U} != ""
-

 .  if ${LD_STATIC:U} != "-static"
 GOLDLINKERSCRIPT?= ${LDS_DYNAMIC_BIN}
@@ -351,6 +463,11 @@ GOLDLINKERSCRIPT?= ${LDS_DYNAMIC_BIN}
 GOLDLINKERSCRIPT?= ${LDS_STATIC_BIN}
 .  endif

+.endif
+
+.for _P in ${PROGS} ${PROGS_CXX}					# {
+
+.if defined(__MINIX) && ${HAVE_GOLD:U} != ""
 GOLDLINKERSCRIPT.${_P}?= ${GOLDLINKERSCRIPT}

 .  if ${GOLDLINKERSCRIPT.${_P}:U} != ""
@@ -412,7 +529,8 @@ NODPSRCS+=	${f}
 .endif
 .endfor

-${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
+${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${XOBJS.${_P}} ${SRCS.${_P}} \
+    ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
 	${_MKTARGET_LINK}
 .if defined(DESTDIR)
 	${_CCLINK.${_P}} -Wl,-nostdlib \
@@ -445,21 +563,20 @@ CLEANFILES+=	${_P}.d

 ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}

-.if defined(__MINIX)
+.if defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
 CLEANFILES+= ${_P}.opt.bcl ${_P}.bcl ${_P}.bcl.o
-.endif # defined(__MINIX)

-.if !commands(${_P})
-.if ${USE_BITCODE:Uno} == "yes"
-
-.if ${LLVM_PASS:UNO_PASS} != "NO_PASS"
+# We may (or not) be using a pass.
+. if ${LLVM_PASS:UNO_PASS} != "NO_PASS"
 _LLVM_PASS_ARGS=	-load ${LLVM_PASS} ${LLVM_PASS_ARGS}
 _TARGET_BCL=	${_P}.opt.bcl
-.else
+.  else
 _TARGET_BCL=	${_P}.bcl
-.endif # ${LLVM_PASS:UNO_PASS} != "NO_PASS"
+. endif # ${LLVM_PASS:UNO_PASS} != "NO_PASS"

-${_P}.bcl: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
+
+${_P}.bcl: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
+    ${LIBCRTEND} ${_DPADD.${_P}}
 	${_MKTARGET_LINK}
 	${_CCLINK.${_P}} \
 		-o ${.TARGET} \
@@ -489,13 +606,13 @@ ${_P}: ${_P}.bcl.o
 		-Wl,-plugin=/usr/pkg/lib/bfd-plugins/LLVMgold.so,-plugin-opt=-disable-opt,-plugin-opt=-disable-inlining

 .else
-${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
+${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
+    ${LIBCRTEND} ${_DPADD.${_P}}
+.if !commands(${_P})
 	${_MKTARGET_LINK}
 	${_CCLINK.${_P}} \
 	    ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \
-	    ${OBJS.${_P}} ${_LDADD.${_P}} \
-	    ${_PROGLDOPTS}
-.endif # ${USE_BITCODE:Uno} == "yes"
+	    ${OBJS.${_P}} ${_PROGLDOPTS} ${_LDADD.${_P}}
 .if defined(CTFMERGE)
 	${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
 .endif
@@ -505,9 +622,8 @@ ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_
 .if ${MKSTRIPIDENT} != "no"
 	${OBJCOPY} -R .ident ${.TARGET}
 .endif
-.else
-${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
 .endif	# !commands(${_P})
+.endif  # defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
 .endif	# USE_COMBINE

 ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.220 2012/09/23 19:20:44 joerg Exp $
+#	$NetBSD: bsd.sys.mk,v 1.230 2013/11/06 19:57:17 christos Exp $
 #
 # Build definitions used for NetBSD source tree builds.

@@ -38,9 +38,7 @@ CFLAGS+=	-Wno-sign-compare
 CFLAGS+=	${${ACTIVE_CC} != "clang":? -Wno-traditional :}
 .if !defined(NOGCCERROR)
 # Set assembler warnings to be fatal
-#CFLAGS+=	-Wa,--fatal-warnings
-# LSC Clang version 2.9 those not support this flag
-CFLAGS+=       ${${HAVE_LLVM:U"0.0"} != "2.9":? -Wa,--fatal-warnings:}
+CFLAGS+=	-Wa,--fatal-warnings
 .endif
 # Set linker warnings to be fatal
 # XXX no proper way to avoid "FOO is a patented algorithm" warnings
@@ -71,6 +69,9 @@ CXXFLAGS+=	${${ACTIVE_CXX} == "gcc":? -Wno-non-template-friend -Wno-pmf-conversi
 .if ${WARNS} > 4
 CFLAGS+=	-Wold-style-definition
 .endif
+.if ${WARNS} > 5 && !(defined(HAVE_GCC) && ${HAVE_GCC} <= 45)
+CFLAGS+=	-Wconversion
+.endif
 CFLAGS+=	-Wsign-compare -Wformat=2
 CFLAGS+=	${${ACTIVE_CC} == "clang":? -Wno-error=format-nonliteral :}
 CFLAGS+=	${${ACTIVE_CC} == "gcc":? -Wno-format-zero-length :}
@@ -78,14 +79,18 @@ CFLAGS+=	${${ACTIVE_CC} == "gcc":? -Wno-format-zero-length :}
 .if ${WARNS} > 3 && defined(HAVE_LLVM)
 CFLAGS+=	${${ACTIVE_CC} == "clang":? -Wpointer-sign -Wmissing-noreturn :}
 .endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 45 \
-     && (${MACHINE_ARCH} == "sh3eb" || \
+.if (defined(HAVE_GCC) && ${HAVE_GCC} >= 45 \
+     && (${MACHINE_ARCH} == "coldfire" || \
+	 ${MACHINE_ARCH} == "sh3eb" || \
 	 ${MACHINE_ARCH} == "sh3el" || \
 	 ${MACHINE_ARCH} == "m68k" || \
 	 ${MACHINE_ARCH} == "m68000"))
 # XXX GCC 4.5 for sh3 and m68k (which we compile with -Os) is extra noisy for
 # cases it should be better with
 CFLAGS+=	-Wno-uninitialized
+.if ${HAVE_GCC} >= 48
+CFLAGS+=	-Wno-maybe-uninitialized
+.endif
 .endif
 .endif

@@ -96,38 +101,21 @@ _NOWERROR=	${defined(NOGCCERROR) || (${ACTIVE_CC} == "clang" && defined(NOCLANGE
 CFLAGS+=	${${_NOWERROR} == "no" :?-Werror:} ${CWARNFLAGS}
 LINTFLAGS+=	${DESTDIR:D-d ${DESTDIR}/usr/include}

-.if (${MACHINE_ARCH} == "alpha") || \
-    (${MACHINE_ARCH} == "hppa") || \
-    (${MACHINE_ARCH} == "ia64") || \
-    (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") || \
-    (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-HAS_SSP=	no
-.else
-HAS_SSP=	yes
-.endif
-
-.if ${USE_FORT:Uno} != "no"
-USE_SSP?=	yes
+.if (${USE_SSP:Uno} != "no") && (${BINDIR:Ux} != "/usr/mdec")
 .if !defined(KERNSRCDIR) && !defined(KERN) # not for kernels nor kern modules
 CPPFLAGS+=	-D_FORTIFY_SOURCE=2
 .endif
-.endif
-
-.if (${USE_SSP:Uno} != "no") && (${BINDIR:Ux} != "/usr/mdec")
-.if ${HAS_SSP} == "yes"
 COPTS+=	-fstack-protector -Wstack-protector 
-.if defined(__MINIX)
-COPTS+=	${${ACTIVE_CC} == "clang":? -mllvm -stack-protector-buffer-size=1 :}
-.else
 COPTS+=	${${ACTIVE_CC} == "clang":? --param ssp-buffer-size=1 :}
-.endif # defined(__MINIX)
 COPTS+=	${${ACTIVE_CC} == "gcc":? --param ssp-buffer-size=1 :}
 .endif
-.endif

 .if ${MKSOFTFLOAT:Uno} != "no"
 COPTS+=		-msoft-float
 FOPTS+=		-msoft-float
+.elif ${MACHINE_ARCH} == "coldfire"
+COPTS+=		-mhard-float
+FOPTS+=		-mhard-float
 .endif

 .if ${MKIEEEFP:Uno} != "no"
@@ -160,9 +148,9 @@ AFLAGS+=	${CPUFLAGS}

 .if !defined(LDSTATIC) || ${LDSTATIC} != "-static"
 # Position Independent Executable flags
-PIE_CFLAGS?=        -fPIC -DPIC
+PIE_CFLAGS?=        -fPIC
 PIE_LDFLAGS?=       -Wl,-pie -shared-libgcc
-PIE_AFLAGS?=	    -fPIC -DPIC
+PIE_AFLAGS?=	    -fPIC
 .endif

 # Helpers for cross-compiling
@@ -170,8 +158,9 @@ HOST_CC?=	cc
 HOST_CFLAGS?=	-O
 HOST_COMPILE.c?=${HOST_CC} ${HOST_CFLAGS} ${HOST_CPPFLAGS} -c
 HOST_COMPILE.cc?=      ${HOST_CXX} ${HOST_CXXFLAGS} ${HOST_CPPFLAGS} -c
-.if defined(HOSTPROG_CXX) 
-HOST_LINK.c?=	${HOST_CXX} ${HOST_CXXFLAGS} ${HOST_CPPFLAGS} ${HOST_LDFLAGS}
+HOST_LINK.cc?=  ${HOST_CXX} ${HOST_CXXFLAGS} ${HOST_CPPFLAGS} ${HOST_LDFLAGS}
+.if defined(HOSTPROG_CXX)
+HOST_LINK.c?=   ${HOST_LINK.cc}
 .else
 HOST_LINK.c?=	${HOST_CC} ${HOST_CFLAGS} ${HOST_CPPFLAGS} ${HOST_LDFLAGS}
 .endif
@@ -195,6 +184,7 @@ HOST_SH?=	/bin/sh

 ELF2ECOFF?=	elf2ecoff
 MKDEP?=		mkdep
+MKDEPCXX?=	mkdep
 OBJCOPY?=	objcopy
 OBJDUMP?=	objdump
 PAXCTL?=	paxctl
@@ -30,11 +30,6 @@ BINDIR.${_T}=	${TESTSDIR}
 LDADD.${_T}+=	-latf-c++ -latf-c
 DPADD.${_T}+=	${LIBATF_CXX} ${LIBATF_C}
 MAN.${_T}?=	# empty
-#.if defined(__MINIX) # LSC: Can't test as bsd.own.mk may not have been sourced
-# Somehow it resets / ignore the settings in bsd.prog.mk, so duplicate here
-LDADD.${_T}+= -lgcc_s
-DPADD.${_T}+= ${DESTDIR}/usr/lib/libgcc_s.a
-#.endif # defined(__MINIX)
 .  endfor
 .endif

@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.106 2012/04/04 10:59:47 joerg Exp $
+#	$NetBSD: bsd.x11.mk,v 1.108 2013/06/05 23:14:13 mrg Exp $

 .include <bsd.init.mk>

@@ -130,13 +130,13 @@ X11FLAGS.LOADABLE=	-DXFree86LOADER -DIN_MODULE -DXFree86Module \
 .if ${X11FLAVOUR} == "Xorg"
 XVENDORNAMESHORT=	'"X.Org"'
 XVENDORNAME=		'"The X.Org Foundation"'
-XORG_RELEASE=		'"Release 1.10.3"'
+XORG_RELEASE=		'"Release 1.10.6"'
 __XKBDEFRULES__=	'"xorg"'
 XLOCALE.DEFINES=	-DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
 			-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"

 # XXX oh yeah, fix me later
-XORG_VERSION_CURRENT="(((1) * 10000000) + ((10) * 100000) + ((3) * 1000) + 0)"
+XORG_VERSION_CURRENT="(((1) * 10000000) + ((10) * 100000) + ((6) * 1000) + 0)"
 .endif

 PRINT_PACKAGE_VERSION=	awk '/^PACKAGE_VERSION=/ {			\
@@ -229,7 +229,8 @@ pkgconfig-install:
 realall:	${_PKGCONFIG_FILES:O:u}
 realinstall:	pkgconfig-install

-.for _pkg in ${PKGCONFIG:O:u}
+.for _pkg in ${PKGCONFIG:O:u}	# {
+
 PKGDIST.${_pkg}?=	${X11SRCDIR.${PKGDIST:U${_pkg}}}
 _PKGDEST.${_pkg}=	${DESTDIR}${X11USRLIBDIR}/pkgconfig/${_pkg}.pc

@@ -241,7 +242,14 @@ FILESMODE_${_pkg}.pc=	${NONBINMODE}

 ${_PKGDEST.${_pkg}}: ${_pkg}.pc __fileinstall
 pkgconfig-install: ${_PKGDEST.${_pkg}}
-.endfor
+
+# Add a dependancy on the configure file if it exists; this way we
+# will rebuild the .pc file if the version in configure changes.
+.if exists(${PKGDIST.${_pkg}}/configure)
+${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
+.endif
+
+.endfor				# }

 # XXX
 # The sed script is very, very ugly.  What we actually need is a
@@ -1,6 +1,12 @@
 # MINIX-specific servers/drivers options
 .include <bsd.own.mk>

+# LSC: Our minimal c library has no putchar, which is called by the builtin
+#      functions of the compiler, so prevent using them.
+
+AFLAGS+= -D__ASSEMBLY__
+COPTS+= -fno-builtin
+
 # LSC Static linking, order matters!
 # We can't use --start-group/--end-group as they are not supported by our
 # version of clang.
@@ -18,4 +24,15 @@ LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Gener
 # 3. Minimal C library
 LDADD+= -lminc

+.if ${MACHINE_ARCH} == "earm"
+LDADD+= -lc_vfp
+
+# LSC: On ARM, when compiling statically, with gcc, lgcc_eh is required
+.if ${PROG:U} != "kernel" && !empty(CC:M*gcc)
+# gcc_eh uses abort(), which is provided by minc
+LDFLAGS+= ${${ACTIVE_CC} == "gcc":? -lgcc_eh:}
+.endif # ${PROG:U} != "kernel" && !empty(CC:M*gcc)
+
+.endif # ${MACHINE_ARCH} == "earm"
+
 .include <bsd.prog.mk>
@@ -1,22 +1,29 @@
-#	$NetBSD: sys.mk,v 1.110 2012/10/06 20:54:58 christos Exp $
+#	$NetBSD: sys.mk,v 1.118 2013/11/01 17:07:37 christos Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
+#
+# This file contains the basic rules for make(1) and is read first
+# Do not put conditionals that are set on different files here and
+# expect them to work.

 # This variable should be used to differentiate Minix builds in Makefiles.
 __MINIX=	yes

-.if defined(__MINIX)
+.if !defined(__MINIX)
+unix?=		We run NetBSD.
+
+.SUFFIXES: .a .o .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh
+.else
+unix?=		We run MINIX.
+
+.SUFFIXES: .a .o .bc .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh
+
 .if ${MKSMALL:U} == "yes"
 CPPFLAGS+= -DNDEBUG
 DBG=	-Os
 .endif

-unix?=		We run MINIX.
-
 CPP?=	/usr/lib/cpp
 .endif # defined(__MINIX)
-unix?=		We run NetBSD.
-
-.SUFFIXES: .a .o .bc .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh

 .LIBS:		.a

@@ -39,6 +46,8 @@ DBG?=	-Os -freorder-blocks
 .elif ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m68000"
 # see src/doc/HACKS for details
 DBG?=	-Os
+.elif ${MACHINE_ARCH} == "coldfire"
+DBG?=	-O1
 .elif ${MACHINE_ARCH} == "vax"
 DBG?=	-O1 -fgcse -fstrength-reduce -fgcse-after-reload
 .else
@@ -50,23 +59,15 @@ COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}

 # C Type Format data is required for DTrace
-# XXX TBD VERSION is not defined
-CTFFLAGS	?=	-L VERSION
-CTFMFLAGS	?=	-t -L VERSION
+CTFFLAGS	?=	-g -L VERSION
+CTFMFLAGS	?=	-g -t -L VERSION

-.if defined(MKDTRACE) && ${MKDTRACE} != "no"
-CTFCONVERT	?=	${TOOL_CTFCONVERT}
-CTFMERGE	?=	${TOOL_CTFMERGE}
-.if defined(CFLAGS) && (${CFLAGS:M-g} != "")
-CTFFLAGS	+=	-g
-CTFMFLAGS	+=	-g
-.else
-CFLAGS		+=	-g
-.endif
-.endif
+# We don't define these here, we let the bsd.own.mk to do it
+#CTFCONVERT	?=	ctfconvert
+#CTFMERGE	?=	ctfmerge

 CXX?=		c++
-CXXFLAGS?=	${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu99:N-Wold-style-definition:N-Wno-format-zero-length}
+CXXFLAGS?=	${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu[0-9][0-9]:N-Wold-style-definition:N-Wno-format-zero-length}

 __ALLSRC1=	${empty(DESTDIR):?${.ALLSRC}:${.ALLSRC:S|^${DESTDIR}|^destdir|}}
 __ALLSRC2=	${empty(MAKEOBJDIR):?${__ALLSRC1}:${__ALLSRC1:S|^${MAKEOBJDIR}|^obj|}}
@@ -162,6 +163,9 @@ YACC.y?=	${YACC} ${YFLAGS}
 	${LINK.f} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .f.o:
 	${COMPILE.f} ${.IMPSRC}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 .f.a:
 	${COMPILE.f} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
@@ -186,6 +190,9 @@ YACC.y?=	${YACC} ${YFLAGS}
 	${LINK.r} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .r.o:
 	${COMPILE.r} ${.IMPSRC}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 .r.a:
 	${COMPILE.r} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
@@ -248,6 +255,9 @@ YACC.y?=	${YACC} ${YFLAGS}
 .l.o:
 	${LEX.l} ${.IMPSRC}
 	${COMPILE.c} -o ${.TARGET} lex.yy.c
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 	rm -f lex.yy.c

 # Yacc
@@ -261,6 +271,9 @@ YACC.y?=	${YACC} ${YFLAGS}
 .y.o:
 	${YACC.y} ${.IMPSRC}
 	${COMPILE.c} -o ${.TARGET} y.tab.c
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 	rm -f y.tab.c

 # Shell
@@ -13,8 +13,5 @@ FILESDIR=${BINDIR}/misc
 terminfo.cdb: terminfo ${TOOL_TIC}
 	${_MKTARGET_CREATE}
 	${TOOL_TIC} -ax -o ${.TARGET} "${.CURDIR}/terminfo" 
-#LSC FIXME: Hack, on some platform TOOL_TIC automatically add 
-#           .db to the filename...
-	test -e ${.TARGET}.db && mv ${.TARGET}.db ${.TARGET}

 .include <bsd.prog.mk>
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.43 2009/04/10 16:16:12 apb Exp $
+#	$NetBSD: Makefile,v 1.44 2013/03/06 17:32:51 christos Exp $

 .include <bsd.own.mk>

@@ -97,9 +97,16 @@ afterinstall: ${DATA} ${REDO} ${TABDATA}
 	    find . -type f -print | xargs ${TOOL_STAT} -qf '%d,%i %N' | sort \
 	| while read devino tzfile; do \
 		destfile=${DESTDIR}${TZDIR}/$${tzfile#./}; \
+		destdir=$$(dirname $${destfile}); \
+		if [ ! -d "$$destdir" ]; then \
+			${_MKSHMSG_INSTALL} $$destdir; \
+			${_MKSHECHO} ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} \
+			$$destdir; \
+			${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} $$destdir; \
+		fi; \
 		if [ "$$devino" = "$$lastdevino" ]; then \
-			if  ldevino=`${TOOL_STAT} -qf '%d %i' $$lastfile` && \
-			    tdevino=`${TOOL_STAT} -qf '%d %i' $$destfile` && \
+			if  ldevino=$$(${TOOL_STAT} -qf '%d %i' $$lastfile) && \
+			    tdevino=$$(${TOOL_STAT} -qf '%d %i' $$destfile) && \
 			    [ "$$ldevino" = "$$tdevino" ]; then \
 				continue; \
 			fi; \
@@ -1,13 +1,12 @@
 # <pre>
-# @(#)africa	8.33
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz@elsie.nci.nih.gov for general use in the future).
+# tz@iana.org for general use in the future).

-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2013-02-21):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -26,6 +25,10 @@
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+# <http://www.jstor.org/stable/1774359>.
+#
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
@@ -117,8 +120,12 @@ Zone Africa/Porto-Novo	0:10:28	-	LMT	1912
 			1:00	-	WAT

 # Botswana
+# From Paul Eggert (2013-02-21):
+# Milne says they were regulated by the Cape Town Signal in 1899;
+# assume they switched to 2:00 when Cape Town did.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Gaborone	1:43:40 -	LMT	1885
+			1:30	-	SAST	1903 Mar
 			2:00	-	CAT	1943 Sep 19 2:00
 			2:00	1:00	CAST	1944 Mar 19 2:00
 			2:00	-	CAT
@@ -190,6 +197,11 @@ Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul

 # Egypt

+# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh
+# observatory; round to nearest.  Milne also says that the official time for
+# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
+# did not apply to Cairo, Alexandria, or Port Said.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Egypt	1940	only	-	Jul	15	0:00	1:00	S
 Rule	Egypt	1940	only	-	Oct	 1	0:00	0	-
@@ -238,7 +250,7 @@ Rule	Egypt	2006	only	-	Sep	21	23:00s	0	-
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
 # From Jesper Norgaard Welen (2007-08-15): [The following agree:]
-# http://www.nentjes.info/Bill/bill5.htm 
+# http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
@@ -292,18 +304,18 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
 # in September.

 # From Steffen Thorsen (2009-08-11):
-# We have been able to confirm the August change with the Egyptian Cabinet 
+# We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
 # <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html">
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
 # </a>
-# 
+#
 # The Middle East News Agency
 # <a href="http://www.mena.org.eg/index.aspx">
 # http://www.mena.org.eg/index.aspx
 # </a>
 # also reports "Egypt starts winter time on August 21"
-# today in article numbered "71, 11/08/2009 12:25 GMT." 
+# today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
 # and can be found by searching for "winter" in their search engine
 # (at least today).
@@ -330,7 +342,7 @@ Rule	Egypt	2010	only	-	Sep	10	0:00	1:00	S
 Rule	Egypt	2010	only	-	Sep	lastThu	23:00s	0	-

 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
+Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 			2:00	Egypt	EE%sT

 # Equatorial Guinea
@@ -425,6 +437,20 @@ Zone	Africa/Monrovia	-0:43:08 -	LMT	1882

 # Libya

+# From Even Scharning (2012-11-10):
+# Libya set their time one hour back at 02:00 on Saturday November 10.
+# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
+# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
+#
+# Steffen Thorsen forwarded a translation (2012-11-10) in
+# http://mm.icann.org/pipermail/tz/2012-November/018451.html
+#
+# From Tim Parenti (2012-11-11):
+# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
+# The DST rules planned for 2013 and onward roughly mirror those of Europe
+# (either two days before them or five days after them, so as to fall on
+# lastFri instead of lastSun).
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
 Rule	Libya	1952	only	-	Jan	 1	0:00	0	-
@@ -439,17 +465,21 @@ Rule	Libya	1986	only	-	Apr	 4	0:00	1:00	S
 Rule	Libya	1986	only	-	Oct	 3	0:00	0	-
 Rule	Libya	1987	1989	-	Apr	 1	0:00	1:00	S
 Rule	Libya	1987	1989	-	Oct	 1	0:00	0	-
+Rule	Libya	1997	only	-	Apr	 4	0:00	1:00	S
+Rule	Libya	1997	only	-	Oct	 4	0:00	0	-
+Rule	Libya	2013	max	-	Mar	lastFri	1:00	1:00	S
+Rule	Libya	2013	max	-	Oct	lastFri	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			1:00	Libya	CE%sT	1959
 			2:00	-	EET	1982
 			1:00	Libya	CE%sT	1990 May  4
-# The following entries are from Shanks & Pottenger;
+# The 1996 and 1997 entries are from Shanks & Pottenger;
 # the IATA SSIM data contain some obvious errors.
 			2:00	-	EET	1996 Sep 30
-			1:00	-	CET	1997 Apr  4
-			1:00	1:00	CEST	1997 Oct  4
-			2:00	-	EET
+			1:00	Libya	CE%sT	1997 Oct  4
+			2:00	-	EET	2012 Nov 10 2:00
+			1:00	Libya	CE%sT

 # Madagascar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -482,7 +512,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
 # From Steffen Thorsen (2008-06-25):
 # Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial
 # basis....
-# It seems that Mauritius observed daylight saving time from 1982-10-10 to 
+# It seems that Mauritius observed daylight saving time from 1982-10-10 to
 # 1983-03-20 as well, but that was not successful....
 # http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html

@@ -506,12 +536,12 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
 # given, but it is probably at either 2 or 3 wall clock time).
-# 
-# A little strange though, since the article says that they moved the date 
-# to align itself with Europe and USA which also change time on that date, 
-# but that means they have not paid attention to what happened in 
-# USA/Canada last year (DST ends first Sunday in November). I also wonder 
-# why that they end on a Friday, instead of aligning with Europe which 
+#
+# A little strange though, since the article says that they moved the date
+# to align itself with Europe and USA which also change time on that date,
+# but that means they have not paid attention to what happened in
+# USA/Canada last year (DST ends first Sunday in November). I also wonder
+# why that they end on a Friday, instead of aligning with Europe which
 # changes two days later.

 # From Alex Krivenyshev (2008-07-11):
@@ -570,7 +600,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
 # </a>

 # From Arthur David Olson (2009-07-11):
-# The "mauritius-dst-will-not-repeat" wrapup includes this: 
+# The "mauritius-dst-will-not-repeat" wrapup includes this:
 # "The trial ended on March 29, 2009, when the clocks moved back by one hour
 # at 2am (or 02:00) local time..."

@@ -664,8 +694,8 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 # XXX--guess that it is only Morocco for now; guess only 2008 for now.

 # From Steffen Thorsen (2008-08-27):
-# Morocco will change the clocks back on the midnight between August 31 
-# and September 1. They originally planned to observe DST to near the end 
+# Morocco will change the clocks back on the midnight between August 31
+# and September 1. They originally planned to observe DST to near the end
 # of September:
 #
 # One article about it (in French):
@@ -768,6 +798,95 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 # wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
 # also been like that in the past.

+# From Alexander Krivenyshev (2012-03-09):
+# According to Infom&eacute;diaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure l&eacute;gale:
+# Le Maroc adopte officiellement l'heure d'&eacute;t&eacute;
+# <a href="http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9">
+# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
+# </a>
+# Governing Council adopted draft decree, that Morocco DST starts on
+# the last Sunday of March (March 25, 2012) and ends on
+# last Sunday of September (September 30, 2012)
+# except the month of Ramadan.
+# or (brief)
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco06.html">
+# http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
+# </a>
+
+# From Arthur David Olson (2012-03-10):
+# The infomediaire.ma source indicates that the system is to be in
+# effect every year. It gives 03H00 as the "fall back" time of day;
+# it lacks a "spring forward" time of day; assume 2:00 XXX.
+# Wait on specifying the Ramadan exception for details about
+# start date, start time of day, end date, and end time of day XXX.
+
+# From Christophe Tropamer (2012-03-16):
+# Seen Morocco change again:
+# <a href="http://www.le2uminutes.com/actualite.php">
+# http://www.le2uminutes.com/actualite.php
+# </a>
+# "...&agrave; partir du dernier dimance d'avril et non fins mars,
+# comme annonc&eacute; pr&eacute;c&eacute;demment."
+
+# From Milamber Space Network (2012-07-17):
+# The official return to GMT is announced by the Moroccan government:
+# <a href="http://www.mmsp.gov.ma/fr/actualites.aspx?id=288">
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
+# </a>
+#
+# Google translation, lightly edited:
+# Back to the standard time of the Kingdom (GMT)
+# Pursuant to Decree No. 2-12-126 issued on 26 Jumada (I) 1433 (April 18,
+# 2012) and in accordance with the order of Mr. President of the
+# Government No. 3-47-12 issued on 24 Sha'ban (11 July 2012), the Ministry
+# of Public Service and Administration Modernization announces the return
+# of the legal time of the Kingdom (GMT) from Friday, July 20, 2012 until
+# Monday, August 20, 2012.  So the time will be delayed by 60 minutes from
+# 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes
+# August 20, 2012 from 2:00 am.
+
+# From Paul Eggert (2013-03-06):
+# Morocco's daylight-saving transitions due to Ramadan seem to be
+# announced a bit in advance.  On 2012-07-11 the Moroccan government
+# announced that year's Ramadan daylight-saving transitions would be
+# 2012-07-20 and 2012-08-20; see
+# <http://www.mmsp.gov.ma/fr/actualites.aspx?id=288>.
+
+# From Andrew Paprocki (2013-07-02):
+# Morocco announced that the year's Ramadan daylight-savings
+# transitions would be 2013-07-07 and 2013-08-10; see:
+# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
+
+# From Paul Eggert (2013-07-03):
+# To estimate what the Moroccan government will do in future years,
+# transition dates for 2014 through 2021 were determined by running
+# the following program under GNU Emacs 24.3:
+#
+# (let ((islamic-year 1435))
+#   (while (< islamic-year 1444)
+#     (let ((a
+#	     (calendar-gregorian-from-absolute
+#	      (calendar-islamic-to-absolute (list 9 1 islamic-year))))
+#	    (b
+#	     (calendar-gregorian-from-absolute
+#	      (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
+#	(insert
+#	 (format
+#	  (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
+#		  "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
+#	  (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+#	  (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+#     (setq islamic-year (+ 1 islamic-year))))
+#
+# with the results hand-edited for 2020-2022, when the normal spring-forward
+# date falls during the estimated Ramadan.
+#
+# From 2023 through 2038 Ramadan is not predicted to overlap with
+# daylight saving time.  Starting in 2039 there will be overlap again,
+# but 32-bit time_t values roll around in 2038 so for now do not worry
+# about dates after 2038.
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S

 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
@@ -793,6 +912,29 @@ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
 Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
 Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
 Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
+Rule	Morocco	2012	2019	-	Apr	 lastSun 2:00	1:00	S
+Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
+Rule	Morocco	2012	only	-	Jul	 20	 3:00	0	-
+Rule	Morocco	2012	only	-	Aug	 20	 2:00	1:00	S
+Rule	Morocco	2013	only	-	Jul	  7	 3:00	0	-
+Rule	Morocco	2013	only	-	Aug	 10	 2:00	1:00	S
+Rule	Morocco	2014	only	-	Jun	 29	 3:00	0	-
+Rule	Morocco	2014	only	-	Jul	 29	 2:00	1:00	S
+Rule	Morocco	2015	only	-	Jun	 18	 3:00	0	-
+Rule	Morocco	2015	only	-	Jul	 18	 2:00	1:00	S
+Rule	Morocco	2016	only	-	Jun	  7	 3:00	0	-
+Rule	Morocco	2016	only	-	Jul	  7	 2:00	1:00	S
+Rule	Morocco	2017	only	-	May	 27	 3:00	0	-
+Rule	Morocco	2017	only	-	Jun	 26	 2:00	1:00	S
+Rule	Morocco	2018	only	-	May	 16	 3:00	0	-
+Rule	Morocco	2018	only	-	Jun	 15	 2:00	1:00	S
+Rule	Morocco	2019	only	-	May	  6	 3:00	0	-
+Rule	Morocco	2019	only	-	Jun	  5	 2:00	1:00	S
+Rule	Morocco	2020	only	-	May	 24	 2:00	1:00	S
+Rule	Morocco	2021	only	-	May	 13	 2:00	1:00	S
+Rule	Morocco	2022	only	-	May	  3	 2:00	1:00	S
+Rule	Morocco	2023	max	-	Apr	 lastSun 2:00	1:00	S
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
@@ -820,7 +962,7 @@ Zone	Africa/Maputo	2:10:20 -	LMT	1903 Mar
 # Forecasting Riaan van Zyl explained that the far eastern parts of
 # the country are close to 40 minutes earlier in sunrise than the rest
 # of the country.
-# 
+#
 # From Paul Eggert (2007-03-31):
 # Apparently the Caprivi Strip informally observes Botswana time, but
 # we have no details.  In the meantime people there can use Africa/Gaborone.
@@ -1,5 +1,4 @@
 # <pre>
-# @(#)antarctica	8.9
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -42,36 +41,17 @@ Rule	ChileAQ	1997	only	-	Mar	30	3:00u	0	-
 Rule	ChileAQ	1998	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	ChileAQ	1998	only	-	Sep	27	4:00u	1:00	S
 Rule	ChileAQ	1999	only	-	Apr	 4	3:00u	0	-
-Rule	ChileAQ	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	2000	max	-	Mar	Sun>=9	3:00u	0	-
-
-# These rules are stolen from the `australasia' file.
-Rule	AusAQ	1917	only	-	Jan	 1	0:01	1:00	-
-Rule	AusAQ	1917	only	-	Mar	25	2:00	0	-
-Rule	AusAQ	1942	only	-	Jan	 1	2:00	1:00	-
-Rule	AusAQ	1942	only	-	Mar	29	2:00	0	-
-Rule	AusAQ	1942	only	-	Sep	27	2:00	1:00	-
-Rule	AusAQ	1943	1944	-	Mar	lastSun	2:00	0	-
-Rule	AusAQ	1943	only	-	Oct	 3	2:00	1:00	-
-Rule	ATAQ	1967	only	-	Oct	Sun>=1	2:00s	1:00	-
-Rule	ATAQ	1968	only	-	Mar	lastSun	2:00s	0	-
-Rule	ATAQ	1968	1985	-	Oct	lastSun	2:00s	1:00	-
-Rule	ATAQ	1969	1971	-	Mar	Sun>=8	2:00s	0	-
-Rule	ATAQ	1972	only	-	Feb	lastSun	2:00s	0	-
-Rule	ATAQ	1973	1981	-	Mar	Sun>=1	2:00s	0	-
-Rule	ATAQ	1982	1983	-	Mar	lastSun	2:00s	0	-
-Rule	ATAQ	1984	1986	-	Mar	Sun>=1	2:00s	0	-
-Rule	ATAQ	1986	only	-	Oct	Sun>=15	2:00s	1:00	-
-Rule	ATAQ	1987	1990	-	Mar	Sun>=15	2:00s	0	-
-Rule	ATAQ	1987	only	-	Oct	Sun>=22	2:00s	1:00	-
-Rule	ATAQ	1988	1990	-	Oct	lastSun	2:00s	1:00	-
-Rule	ATAQ	1991	1999	-	Oct	Sun>=1	2:00s	1:00	-
-Rule	ATAQ	1991	2005	-	Mar	lastSun	2:00s	0	-
-Rule	ATAQ	2000	only	-	Aug	lastSun	2:00s	1:00	-
-Rule	ATAQ	2001	max	-	Oct	Sun>=1	2:00s	1:00	-
-Rule	ATAQ	2006	only	-	Apr	Sun>=1	2:00s	0	-
-Rule	ATAQ	2007	only	-	Mar	lastSun	2:00s	0	-
-Rule	ATAQ	2008	max	-	Apr	Sun>=1	2:00s	0	-
+Rule	ChileAQ	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	ChileAQ	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+# N.B.: the end of March 29 in Chile is March 30 in Universal time,
+# which is used below in specifying the transition.
+Rule	ChileAQ	2008	only	-	Mar	30	3:00u	0	-
+Rule	ChileAQ	2009	only	-	Mar	Sun>=9	3:00u	0	-
+Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
+Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
+Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+Rule	ChileAQ	2012	max	-	Apr	Sun>=23	3:00u	0	-
+Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u	1:00	S

 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
@@ -114,10 +94,7 @@ Rule	ATAQ	2008	max	-	Apr	Sun>=1	2:00s	0	-
 # </a>

 # From Steffen Thorsen (2010-03-10):
-# We got these changes from the Australian Antarctic Division:
-# - Macquarie Island will stay on UTC+11 for winter and therefore not
-# switch back from daylight savings time when other parts of Australia do
-# on 4 April.
+# We got these changes from the Australian Antarctic Division: ...
 #
 # - Casey station reverted to its normal time of UTC+8 on 5 March 2010.
 # The change to UTC+11 is being considered as a regular summer thing but
@@ -128,9 +105,6 @@ Rule	ATAQ	2008	max	-	Apr	Sun>=1	2:00s	0	-
 #
 # - Mawson station stays on UTC+5.
 #
-# In addition to the Rule changes for Casey/Davis, it means that Macquarie
-# will no longer be like Hobart and will have to have its own Zone created.
-#
 # Background:
 # <a href="http://www.timeanddate.com/news/time/antartica-time-changes-2010.html">
 # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
@@ -142,23 +116,21 @@ Zone Antarctica/Casey	0	-	zzz	1969
 						# Western (Aus) Standard Time
 			11:00	-	CAST	2010 Mar 5 2:00
 						# Casey Time
+			8:00	-	WST	2011 Oct 28 2:00
+			11:00	-	CAST	2012 Feb 21 17:00u
 			8:00	-	WST
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
 			7:00	-	DAVT	2009 Oct 18 2:00
 			5:00	-	DAVT	2010 Mar 10 20:00u
+			7:00	-	DAVT	2011 Oct 28 2:00
+			5:00	-	DAVT	2012 Feb 21 20:00u
 			7:00	-	DAVT
 Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
 			6:00	-	MAWT	2009 Oct 18 2:00
 						# Mawson Time
 			5:00	-	MAWT
-Zone Antarctica/Macquarie 0	-	zzz	1911
-			10:00	-	EST	1916 Oct 1 2:00
-			10:00	1:00	EST	1917 Feb
-			10:00	AusAQ	EST	1967
-			10:00	ATAQ	EST	2010 Apr 4 3:00
-			11:00	-	MIST	# Macquarie Island Time
 # References:
 # <a href="http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html">
 # Casey Weather (1998-02-26)
@@ -1,12 +1,12 @@
-# @(#)asia	8.69
+# <pre>
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz@elsie.nci.nih.gov for general use in the future).
+# tz@iana.org for general use in the future).

-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2013-02-21):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -25,6 +25,10 @@
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+# <http://www.jstor.org/stable/1774359>.
+#
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
@@ -77,10 +81,6 @@ Rule RussiaAsia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
 Rule RussiaAsia	1993	1995	-	Sep	lastSun	 2:00s	0	-
 Rule RussiaAsia	1996	max	-	Oct	lastSun	 2:00s	0	-

-# From Arthur David Olson (2011-06-15):
-# While Russia abandoned DST in 2011, Armenia may choose to
-# follow Russia's "old" rules.
-
 # Afghanistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Kabul	4:36:48 -	LMT	1890
@@ -97,6 +97,21 @@ Zone	Asia/Kabul	4:36:48 -	LMT	1890
 # in 1996, though it did use DST in 1995.  IATA SSIM (1991/1998) reports that
 # Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991,
 # but started switching at 3:00s in 1998.
+
+# From Arthur David Olson (2011-06-15):
+# While Russia abandoned DST in 2011, Armenia may choose to
+# follow Russia's "old" rules.
+
+# From Alexander Krivenyshev (2012-02-10):
+# According to News Armenia, on Feb 9, 2012,
+# http://newsarmenia.ru/society/20120209/42609695.html
+#
+# The Armenia National Assembly adopted final reading of Amendments to the
+# Law "On procedure of calculation time on the territory of the Republic of
+# Armenia" according to which Armenia [is] abolishing Daylight Saving Time.
+# or
+# (brief)
+# http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
 			3:00	-	YERT	1957 Mar    # Yerevan Time
@@ -104,7 +119,8 @@ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
 			3:00	1:00	YERST	1991 Sep 23 # independence
 			3:00 RussiaAsia	AM%sT	1995 Sep 24 2:00s
 			4:00	-	AMT	1997
-			4:00 RussiaAsia	AM%sT
+			4:00 RussiaAsia	AM%sT	2012 Mar 25 2:00s
+			4:00	-	AMT

 # Azerbaijan
 # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
@@ -169,15 +185,15 @@ Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Al Manamah
 # </a>

 # From A. N. M. Kamrus Saadat (2009-06-15):
-# Finally we've got the official mail regarding DST start time where DST start 
-# time is mentioned as Jun 19 2009, 23:00 from BTRC (Bangladesh 
-# Telecommunication Regulatory Commission). 
+# Finally we've got the official mail regarding DST start time where DST start
+# time is mentioned as Jun 19 2009, 23:00 from BTRC (Bangladesh
+# Telecommunication Regulatory Commission).
 #
 # No DST end date has been announced yet.

 # From Alexander Krivenyshev (2009-09-25):
-# Bangladesh won't go back to Standard Time from October 1, 2009, 
-# instead it will continue DST measure till the cabinet makes a fresh decision. 
+# Bangladesh won't go back to Standard Time from October 1, 2009,
+# instead it will continue DST measure till the cabinet makes a fresh decision.
 #
 # Following report by same newspaper-"The Daily Star Friday":
 # "DST change awaits cabinet decision-Clock won't go back by 1-hr from Oct 1"
@@ -191,8 +207,8 @@ Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Al Manamah

 # From Steffen Thorsen (2009-10-13):
 # IANS (Indo-Asian News Service) now reports:
-# Bangladesh has decided that the clock advanced by an hour to make 
-# maximum use of daylight hours as an energy saving measure would 
+# Bangladesh has decided that the clock advanced by an hour to make
+# maximum use of daylight hours as an energy saving measure would
 # "continue for an indefinite period."
 #
 # One of many places where it is published:
@@ -220,7 +236,7 @@ Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Al Manamah

 # From Alexander Krivenyshev (2010-03-22):
 # According to Bangladesh newspaper "The Daily Star,"
-# Cabinet cancels Daylight Saving Time 
+# Cabinet cancels Daylight Saving Time
 # <a href="http://www.thedailystar.net/newDesign/latest_news.php?nid=22817">
 # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
 # </a>
@@ -267,9 +283,12 @@ Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar   # Bandar Seri Begawan
 			8:00	-	BNT

 # Burma / Myanmar
+
+# Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Rangoon	6:24:40 -	LMT	1880		# or Yangon
-			6:24:36	-	RMT	1920	   # Rangoon Mean Time?
+			6:24:40	-	RMT	1920	   # Rangoon Mean Time?
 			6:30	-	BURT	1942 May   # Burma Time
 			9:00	-	JST	1945 May 3
 			6:30	-	MMT		   # Myanmar Time
@@ -348,11 +367,11 @@ Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
 # observing daylight saving time in 1986.
 #
 # From Thomas S. Mullaney (2008-02-11):
-# I think you're combining two subjects that need to treated 
-# separately: daylight savings (which, you're correct, wasn't 
-# implemented until the 1980s) and the unified time zone centered near 
-# Beijing (which was implemented in 1949). Briefly, there was also a 
-# "Lhasa Time" in Tibet and "Urumqi Time" in Xinjiang. The first was 
+# I think you're combining two subjects that need to treated
+# separately: daylight savings (which, you're correct, wasn't
+# implemented until the 1980s) and the unified time zone centered near
+# Beijing (which was implemented in 1949). Briefly, there was also a
+# "Lhasa Time" in Tibet and "Urumqi Time" in Xinjiang. The first was
 # ceased, and the second eventually recognized (again, in the 1980s).
 #
 # From Paul Eggert (2008-06-30):
@@ -372,7 +391,8 @@ Zone	Asia/Harbin	8:26:44	-	LMT	1928 # or Haerbin
 			8:00	PRC	C%sT
 # Zhongyuan Time ("Central plain Time")
 # most of China
-Zone	Asia/Shanghai	8:05:52	-	LMT	1928
+# Milne gives 8:05:56.7; round to nearest.
+Zone	Asia/Shanghai	8:05:57	-	LMT	1928
 			8:00	Shang	C%sT	1949
 			8:00	PRC	C%sT
 # Long-shu Time (probably due to Long and Shu being two names of that area)
@@ -469,6 +489,10 @@ Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # or Kashi or Kaxgar
 			8:00	PRC	C%sT


+# Hong Kong (Xianggang)
+
+# Milne gives 7:36:41.7; round this.
+
 # From Lee Yiu Chung (2009-10-24):
 # I found there are some mistakes for the...DST rule for Hong
 # Kong. [According] to the DST record from Hong Kong Observatory (actually,
@@ -489,7 +513,7 @@ Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # or Kashi or Kaxgar
 # as of 2009-10-28:
 # Year        Period
 # 1941        1 Apr to 30 Sep
-# 1942        Whole year 
+# 1942        Whole year
 # 1943        Whole year
 # 1944        Whole year
 # 1945        Whole year
@@ -535,7 +559,6 @@ Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # or Kashi or Kaxgar
 # The Japanese surrender of Hong Kong was signed 1945-09-15.
 # For lack of anything better, use start of those days as the transition times.

-# Hong Kong (Xianggang)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	HK	1941	only	-	Apr	1	3:30	1:00	S
 Rule	HK	1941	only	-	Sep	30	3:30	0	-
@@ -557,7 +580,7 @@ Rule	HK	1973	only	-	Dec	30	3:30	1:00	S
 Rule	HK	1979	only	-	May	Sun>=8	3:30	1:00	S
 Rule	HK	1979	only	-	Oct	Sun>=16	3:30	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
+Zone	Asia/Hong_Kong	7:36:42 -	LMT	1904 Oct 30
 			8:00	HK	HK%sT	1941 Dec 25
 			9:00	-	JST	1945 Sep 15
 			8:00	HK	HK%sT
@@ -580,16 +603,16 @@ Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
 # From Arthur David Olson (2010-04-07):
 # Here's Google's translation of the table at the bottom of the "summert.htm" page:
 # Decade 	                                                    Name                      Start and end date
-# Republic of China 34 years to 40 years (AD 1945-1951 years) Summer Time               May 1 to September 30 
-# 41 years of the Republic of China (AD 1952)                 Daylight Saving Time      March 1 to October 31 
-# Republic of China 42 years to 43 years (AD 1953-1954 years) Daylight Saving Time      April 1 to October 31 
-# In the 44 years to 45 years (AD 1955-1956 years)            Daylight Saving Time      April 1 to September 30 
-# Republic of China 46 years to 48 years (AD 1957-1959)       Summer Time               April 1 to September 30 
-# Republic of China 49 years to 50 years (AD 1960-1961)       Summer Time               June 1 to September 30 
-# Republic of China 51 years to 62 years (AD 1962-1973 years) Stop Summer Time 
-# Republic of China 63 years to 64 years (1974-1975 AD)       Daylight Saving Time      April 1 to September 30 
-# Republic of China 65 years to 67 years (1976-1978 AD)       Stop Daylight Saving Time 
-# Republic of China 68 years (AD 1979)                        Daylight Saving Time      July 1 to September 30 
+# Republic of China 34 years to 40 years (AD 1945-1951 years) Summer Time               May 1 to September 30
+# 41 years of the Republic of China (AD 1952)                 Daylight Saving Time      March 1 to October 31
+# Republic of China 42 years to 43 years (AD 1953-1954 years) Daylight Saving Time      April 1 to October 31
+# In the 44 years to 45 years (AD 1955-1956 years)            Daylight Saving Time      April 1 to September 30
+# Republic of China 46 years to 48 years (AD 1957-1959)       Summer Time               April 1 to September 30
+# Republic of China 49 years to 50 years (AD 1960-1961)       Summer Time               June 1 to September 30
+# Republic of China 51 years to 62 years (AD 1962-1973 years) Stop Summer Time
+# Republic of China 63 years to 64 years (1974-1975 AD)       Daylight Saving Time      April 1 to September 30
+# Republic of China 65 years to 67 years (1976-1978 AD)       Stop Daylight Saving Time
+# Republic of China 68 years (AD 1979)                        Daylight Saving Time      July 1 to September 30
 # Republic of China since 69 years (AD 1980)                  Stop Daylight Saving Time

 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -634,6 +657,9 @@ Zone	Asia/Macau	7:34:20 -	LMT	1912
 ###############################################################################

 # Cyprus
+#
+# Milne says the Eastern Telegraph Company used 2:14:00.  Stick with LMT.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S
 Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-
@@ -1158,15 +1184,15 @@ Rule	Zion	2004	only	-	Sep	22	1:00	0	S
 #
 #	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps

-# From Paul Eggert (2005-02-22):
+# From Paul Eggert (2012-10-26):
 # I used Ephraim Silverberg's dst-israel.el program
 # <ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el> (2005-02-20)
 # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions in this list.
+# to generate the transitions from 2005 through 2012.
 # (I replaced "lastFri" with "Fri>=26" by hand.)
-# The spring transitions below all correspond to the following Rule:
+# The spring transitions all correspond to the following Rule:
 #
-# Rule	Zion	2005	max	-	Mar	Fri>=26	2:00	1:00	D
+# Rule	Zion	2005	2012	-	Mar	Fri>=26	2:00	1:00	D
 #
 # but older zic implementations (e.g., Solaris 8) do not support
 # "Fri>=26" to mean April 1 in years like 2005, so for now we list the
@@ -1183,42 +1209,24 @@ Rule	Zion	2009	only	-	Sep	27	2:00	0	S
 Rule	Zion	2010	only	-	Sep	12	2:00	0	S
 Rule	Zion	2011	only	-	Apr	 1	2:00	1:00	D
 Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2012	2015	-	Mar	Fri>=26	2:00	1:00	D
+Rule	Zion	2012	only	-	Mar	Fri>=26	2:00	1:00	D
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
-Rule	Zion	2013	only	-	Sep	 8	2:00	0	S
-Rule	Zion	2014	only	-	Sep	28	2:00	0	S
-Rule	Zion	2015	only	-	Sep	20	2:00	0	S
-Rule	Zion	2016	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2016	only	-	Oct	 9	2:00	0	S
-Rule	Zion	2017	2021	-	Mar	Fri>=26	2:00	1:00	D
-Rule	Zion	2017	only	-	Sep	24	2:00	0	S
-Rule	Zion	2018	only	-	Sep	16	2:00	0	S
-Rule	Zion	2019	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2020	only	-	Sep	27	2:00	0	S
-Rule	Zion	2021	only	-	Sep	12	2:00	0	S
-Rule	Zion	2022	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2022	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2023	2032	-	Mar	Fri>=26	2:00	1:00	D
-Rule	Zion	2023	only	-	Sep	24	2:00	0	S
-Rule	Zion	2024	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2025	only	-	Sep	28	2:00	0	S
-Rule	Zion	2026	only	-	Sep	20	2:00	0	S
-Rule	Zion	2027	only	-	Oct	10	2:00	0	S
-Rule	Zion	2028	only	-	Sep	24	2:00	0	S
-Rule	Zion	2029	only	-	Sep	16	2:00	0	S
-Rule	Zion	2030	only	-	Oct	 6	2:00	0	S
-Rule	Zion	2031	only	-	Sep	21	2:00	0	S
-Rule	Zion	2032	only	-	Sep	12	2:00	0	S
-Rule	Zion	2033	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2033	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2034	2037	-	Mar	Fri>=26	2:00	1:00	D
-Rule	Zion	2034	only	-	Sep	17	2:00	0	S
-Rule	Zion	2035	only	-	Oct	 7	2:00	0	S
-Rule	Zion	2036	only	-	Sep	28	2:00	0	S
-Rule	Zion	2037	only	-	Sep	13	2:00	0	S
+
+# From Ephraim Silverberg (2013-06-27):
+# On June 23, 2013, the Israeli government approved changes to the
+# Time Decree Law.  The next day, the changes passed the First Reading
+# in the Knesset.  The law is expected to pass the Second and Third
+# (final) Readings by the beginning of September 2013.
+#
+# As of 2013, DST starts at 02:00 on the Friday before the last Sunday
+# in March.  DST ends at 02:00 on the last Sunday of October.
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Zion	2013	max	-	Mar	Fri>=23	2:00	1:00	D
+Rule	Zion	2013	max	-	Oct	lastSun	2:00	0	S

 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Jerusalem	2:20:56 -	LMT	1880
+Zone	Asia/Jerusalem	2:20:54 -	LMT	1880
 			2:20:40	-	JMT	1918	# Jerusalem Mean Time?
 			2:00	Zion	I%sT

@@ -1350,6 +1358,16 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
 # From Arthur David Olson (2009-04-06):
 # We still have Jordan switching to DST on Thursdays in 2000 and 2001.

+# From Steffen Thorsen (2012-10-25):
+# Yesterday the government in Jordan announced that they will not
+# switch back to standard time this winter, so the will stay on DST
+# until about the same time next year (at least).
+# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
+#
+# From Paul Eggert (2012-10-25):
+# For now, assume this is just a one-year measure.  If it becomes
+# permanent, we should move Jordan from EET to AST effective tomorrow.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
 Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
@@ -1378,7 +1396,8 @@ Rule	Jordan	2002	max	-	Mar	lastThu	24:00	1:00	S
 Rule	Jordan	2003	only	-	Oct	24	0:00s	0	-
 Rule	Jordan	2004	only	-	Oct	15	0:00s	0	-
 Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
-Rule	Jordan	2006	max	-	Oct	lastFri	0:00s	0	-
+Rule	Jordan	2006	2011	-	Oct	lastFri	0:00s	0	-
+Rule	Jordan	2013	max	-	Oct	lastFri	0:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Amman	2:23:44 -	LMT	1931
 			2:00	Jordan	EE%sT
@@ -1781,8 +1800,11 @@ Zone	Asia/Kathmandu	5:41:16 -	LMT	1920
 			5:45	-	NPT	# Nepal Time

 # Oman
+
+# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Muscat	3:54:20 -	LMT	1920
+Zone	Asia/Muscat	3:54:24 -	LMT	1920
 			4:00	-	GST

 # Pakistan
@@ -1823,15 +1845,15 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 # shown 8 per cent higher consumption of electricity.

 # From Alex Krivenyshev (2008-05-15):
-# 
-# Here is an article that Pakistan plan to introduce Daylight Saving Time 
+#
+# Here is an article that Pakistan plan to introduce Daylight Saving Time
 # on June 1, 2008 for 3 months.
-# 
-# "... The federal cabinet on Wednesday announced a new conservation plan to help 
-# reduce load shedding by approving the closure of commercial centres at 9pm and 
-# moving clocks forward by one hour for the next three months. 
+#
+# "... The federal cabinet on Wednesday announced a new conservation plan to help
+# reduce load shedding by approving the closure of commercial centres at 9pm and
+# moving clocks forward by one hour for the next three months.
 # ...."
-# 
+#
 # <a href="http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html">
 # http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html
 # </a>
@@ -1891,7 +1913,7 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 # Government has decided to restore the previous time by moving the
 # clocks backward by one hour from October 1. A formal announcement to
 # this effect will be made after the Prime Minister grants approval in
-# this regard." 
+# this regard."
 # <a href="http://www.thenews.com.pk/updates.asp?id=87168">
 # http://www.thenews.com.pk/updates.asp?id=87168
 # </a>
@@ -2029,8 +2051,7 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # occurred before our cutoff date of 1970.
 # However, as we get more information, we may need to add entries
 # for parts of the West Bank as they transitioned from Israel's rules
-# to Palestine's rules.  If you have more info about this, please
-# send it to tz@elsie.nci.nih.gov for incorporation into future editions.
+# to Palestine's rules.

 # From IINS News Service - Israel - 1998-03-23 10:38:07 Israel time,
 # forwarded by Ephraim Silverberg:
@@ -2187,7 +2208,7 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=306795">
 # http://www.maannews.net/eng/ViewDetails.aspx?ID=306795
 # </a>
-# the clocks were set back one hour at 2010-08-11 00:00:00 local time in 
+# the clocks were set back one hour at 2010-08-11 00:00:00 local time in
 # Gaza and the West Bank.
 # Some more background info:
 # <a href="http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html">
@@ -2226,7 +2247,7 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # The rules for Egypt are stolen from the `africa' file.

 # From Steffen Thorsen (2011-09-30):
-# West Bank did end Daylight Saving Time this morning/midnight (2011-09-30 
+# West Bank did end Daylight Saving Time this morning/midnight (2011-09-30
 # 00:00).
 # So West Bank and Gaza now have the same time again.
 #
@@ -2235,6 +2256,38 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # http://www.maannews.net/eng/ViewDetails.aspx?ID=424808
 # </a>

+# From Steffen Thorsen (2012-03-26):
+# Palestinian news sources tell that both Gaza and West Bank will start DST
+# on Friday (Thursday midnight, 2012-03-29 24:00).
+# Some of many sources in Arabic:
+# <a href="http://www.samanews.com/index.php?act=Show&id=122638">
+# http://www.samanews.com/index.php?act=Show&id=122638
+# </a>
+#
+# <a href="http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html">
+# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html
+# </a>
+#
+# Our brief summary:
+# <a href="http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html">
+# http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
+# </a>
+
+# From Steffen Thorsen (2013-03-26):
+# The following news sources tells that Palestine will "start daylight saving
+# time from midnight on Friday, March 29, 2013" (translated).
+# [These are in Arabic and are for Gaza and for Ramallah, respectively.]
+# http://www.samanews.com/index.php?act=Show&id=154120
+# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
+
+# From Paul Eggert (2013-04-15):
+# For future dates, guess the last Thursday in March at 24:00 through
+# the first Friday on or after September 21 at 01:00.  This is consistent with
+# the predictions in today's editions of the following URLs,
+# which are for Gaza and Hebron respectively:
+# http://www.timeanddate.com/worldclock/timezone.html?n=702
+# http://www.timeanddate.com/worldclock/timezone.html?n=2364
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
 Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
@@ -2247,17 +2300,20 @@ Rule Palestine	1999	2005	-	Apr	Fri>=15	0:00	1:00	S
 Rule Palestine	1999	2003	-	Oct	Fri>=15	0:00	0	-
 Rule Palestine	2004	only	-	Oct	 1	1:00	0	-
 Rule Palestine	2005	only	-	Oct	 4	2:00	0	-
-Rule Palestine	2006	2008	-	Apr	 1	0:00	1:00	S
+Rule Palestine	2006	2007	-	Apr	 1	0:00	1:00	S
 Rule Palestine	2006	only	-	Sep	22	0:00	0	-
 Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-Rule Palestine	2008	only	-	Aug	lastFri	0:00	0	-
-Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
-Rule Palestine	2009	only	-	Sep	Fri>=1	2:00	0	-
-Rule Palestine	2010	only	-	Mar	lastSat	0:01	1:00	S
+Rule Palestine	2008	2009	-	Mar	lastFri	0:00	1:00	S
+Rule Palestine	2008	only	-	Sep	 1	0:00	0	-
+Rule Palestine	2009	only	-	Sep	Fri>=1	1:00	0	-
+Rule Palestine	2010	only	-	Mar	26	0:00	1:00	S
 Rule Palestine	2010	only	-	Aug	11	0:00	0	-
-
-# From Arthur David Olson (2011-09-20):
-# 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
+Rule Palestine	2011	only	-	Apr	 1	0:01	1:00	S
+Rule Palestine	2011	only	-	Aug	 1	0:00	0	-
+Rule Palestine	2011	only	-	Aug	30	0:00	1:00	S
+Rule Palestine	2011	only	-	Sep	30	0:00	0	-
+Rule Palestine	2012	max	-	Mar	lastThu	24:00	1:00	S
+Rule Palestine	2012	max	-	Sep	Fri>=21	1:00	0	-

 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
@@ -2265,22 +2321,20 @@ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
 			2:00 EgyptAsia	EE%sT	1967 Jun  5
 			2:00	Zion	I%sT	1996
 			2:00	Jordan	EE%sT	1999
-			2:00 Palestine	EE%sT	2011 Apr  2 12:01
-			2:00	1:00	EEST	2011 Aug  1
-			2:00	-	EET
+			2:00 Palestine	EE%sT	2008 Aug 29 0:00
+			2:00	-	EET	2008 Sep
+			2:00 Palestine	EE%sT	2010
+			2:00	-	EET	2010 Mar 27 0:01
+			2:00 Palestine	EE%sT	2011 Aug  1
+			2:00	-	EET	2012
+			2:00 Palestine	EE%sT

 Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
 			2:00	Zion	EET	1948 May 15
 			2:00 EgyptAsia	EE%sT	1967 Jun  5
 			2:00	Zion	I%sT	1996
 			2:00	Jordan	EE%sT	1999
-			2:00 Palestine	EE%sT	2008 Aug
-			2:00 	1:00	EEST	2008 Sep
-			2:00 Palestine	EE%sT	2011 Apr  1 12:01
-			2:00	1:00	EEST	2011 Aug  1
-			2:00	-	EET	2011 Aug 30
-			2:00	1:00	EEST	2011 Sep 30 3:00
-			2:00	-	EET
+			2:00 Palestine	EE%sT

 # Paracel Is
 # no information
@@ -2349,6 +2403,13 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
 # no information

 # Sri Lanka
+
+# From Paul Eggert (2013-02-21):
+# Milne says "Madras mean time use from May 1, 1898.  Prior to this Colombo
+# mean time, 5h. 4m. 21.9s. F., was used."  But 5:04:21.9 differs considerably
+# from Colombo's meridian 5:19:24, so for now ignore Milne and stick with
+# Shanks and Pottenger.
+
 # From Paul Eggert (1996-09-03):
 # "Sri Lanka advances clock by an hour to avoid blackout"
 # (www.virtual-pc.com/lankaweb/news/items/240596-2.html, 1996-05-24,
@@ -2468,24 +2529,24 @@ Rule	Syria	2006	only	-	Sep	22	0:00	0	-
 Rule	Syria	2007	only	-	Mar	lastFri	0:00	1:00	S
 # From Jesper Norgard (2007-10-27):
 # The sister center ICARDA of my work CIMMYT is confirming that Syria DST will
-# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or
-# rather Midnight between Thursday and Friday. This does make more sence than
+# not take place 1st November at 0:00 o'clock but 1st November at 24:00 or
+# rather Midnight between Thursday and Friday. This does make more sense than
 # having it between Wednesday and Thursday (two workdays in Syria) since the
 # weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now
 # it is implemented at midnight of the last workday before weekend...
-# 
+#
 # From Steffen Thorsen (2007-10-27):
 # Jesper Norgaard Welen wrote:
-# 
+#
 # > "Winter local time in Syria will be observed at midnight of Thursday 1
 # > November 2007, and the clock will be put back 1 hour."
-# 
+#
 # I found confirmation on this in this gov.sy-article (Arabic):
 # http://wehda.alwehda.gov.sy/_print_veiw.asp?FileName=12521710520070926111247
-# 
+#
 # which using Google's translate tools says:
-# Council of Ministers also approved the commencement of work on 
-# identifying the winter time as of Friday, 2/11/2007 where the 60th 
+# Council of Ministers also approved the commencement of work on
+# identifying the winter time as of Friday, 2/11/2007 where the 60th
 # minute delay at midnight Thursday 1/11/2007.
 Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	0	-

@@ -2551,8 +2612,8 @@ Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	0	-
 # </a>

 # From Steffen Thorsen (2009-10-27):
-# The Syrian Arab News Network on 2009-09-29 reported that Syria will 
-# revert back to winter (standard) time on midnight between Thursday 
+# The Syrian Arab News Network on 2009-09-29 reported that Syria will
+# revert back to winter (standard) time on midnight between Thursday
 # 2009-10-29 and Friday 2009-10-30:
 # <a href="http://www.sana.sy/ara/2/2009/09/29/247012.htm">
 # http://www.sana.sy/ara/2/2009/09/29/247012.htm (Arabic)
@@ -2571,10 +2632,28 @@ Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	0	-
 # http://sns.sy/sns/?path=news/read/11421 (Arabic)
 # </a>

+# From Steffen Thorsen (2012-03-26):
+# Today, Syria's government announced that they will start DST early on Friday
+# (00:00). This is a bit earlier than the past two years.
+#
+# From Syrian Arab News Agency, in Arabic:
+# <a href="http://www.sana.sy/ara/2/2012/03/26/408215.htm">
+# http://www.sana.sy/ara/2/2012/03/26/408215.htm
+# </a>
+#
+# Our brief summary:
+# <a href="http://www.timeanddate.com/news/time/syria-dst-2012.html">
+# http://www.timeanddate.com/news/time/syria-dst-2012.html
+# </a>
+
+# From Arthur David Olson (2012-03-27):
+# Assume last Friday in March going forward XXX.
+
 Rule	Syria	2008	only	-	Apr	Fri>=1	0:00	1:00	S
 Rule	Syria	2008	only	-	Nov	1	0:00	0	-
 Rule	Syria	2009	only	-	Mar	lastFri	0:00	1:00	S
-Rule	Syria	2010	max	-	Apr	Fri>=1	0:00	1:00	S
+Rule	Syria	2010	2011	-	Apr	Fri>=1	0:00	1:00	S
+Rule	Syria	2012	max	-	Mar	lastFri	0:00	1:00	S
 Rule	Syria	2009	max	-	Oct	lastFri	0:00	0	-

 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -2630,6 +2709,12 @@ Zone	Asia/Tashkent	4:37:12 -	LMT	1924 May  2

 # Vietnam

+# From Paul Eggert (2013-02-21):
+# Milne gives 7:16:56 for the meridian of Saigon in 1899, as being
+# used in Lower Laos, Cambodia, and Annam.  But this is quite a ways
+# from Saigon's location.  For now, ignore this and stick with Shanks
+# and Pottenger.
+
 # From Arthur David Olson (2008-03-18):
 # The English-language name of Vietnam's most populous city is "Ho Chi Min City";
 # we use Ho_Chi_Minh below to avoid a name of more than 14 characters.
@@ -2643,6 +2728,10 @@ Zone	Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906 Jun  9
 			7:00	-	ICT

 # Yemen
+
+# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
+# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Aden	3:00:48	-	LMT	1950
+Zone	Asia/Aden	2:59:54	-	LMT	1950
 			3:00	-	AST
@@ -1,5 +1,4 @@
 # <pre>
-# @(#)australasia	8.29
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -219,9 +218,32 @@ Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
 # no times are set
 #
 # Macquarie
-# permanent occupation (scientific station) since 1948;
-# sealing and penguin oil station operated 1888/1917
-# like Australia/Hobart
+# Permanent occupation (scientific station) 1911-1915 and since 25 March 1948;
+# sealing and penguin oil station operated Nov 1899 to Apr 1919.  See the
+# Tasmania Parks & Wildlife Service history of sealing at Macquarie Island
+# <http://www.parks.tas.gov.au/index.aspx?base=1828>
+# <http://www.parks.tas.gov.au/index.aspx?base=1831>.
+# Guess that it was like Australia/Hobart while inhabited before 2010.
+#
+# From Steffen Thorsen (2010-03-10):
+# We got these changes from the Australian Antarctic Division:
+# - Macquarie Island will stay on UTC+11 for winter and therefore not
+# switch back from daylight savings time when other parts of Australia do
+# on 4 April.
+#
+# From Arthur David Olson (2013-05-23):
+# The 1919 transition is overspecified below so pre-2013 zics
+# will produce a binary file with an EST-type as the first 32-bit type;
+# this is required for correct handling of times before 1916 by
+# pre-2013 versions of localtime.
+Zone Antarctica/Macquarie 0	-	zzz	1899 Nov
+			10:00	-	EST	1916 Oct 1 2:00
+			10:00	1:00	EST	1917 Feb
+			10:00	Aus	EST	1919 Apr 1 0:00s
+			0	-	zzz	1948 Mar 25
+			10:00	Aus	EST	1967
+			10:00	AT	EST	2010 Apr 4 3:00
+			11:00	-	MIST	# Macquarie I Standard Time

 # Christmas
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -247,6 +269,9 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 			6:30	-	CCT	# Cocos Islands Time

 # Fiji
+
+# Milne gives 11:55:44 for Suva.
+
 # From Alexander Krivenyshev (2009-11-10):
 # According to Fiji Broadcasting Corporation,  Fiji plans to re-introduce DST
 # from November 29th 2009  to April 25th 2010.
@@ -284,9 +309,9 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # </a>

 # From Alexander Krivenyshev (2010-10-24):
-# According to Radio Fiji and Fiji Times online, Fiji will end DST 3 
+# According to Radio Fiji and Fiji Times online, Fiji will end DST 3
 # weeks earlier than expected - on March 6, 2011, not March 27, 2011...
-# Here is confirmation from Government of the Republic of the Fiji Islands, 
+# Here is confirmation from Government of the Republic of the Fiji Islands,
 # Ministry of Information (fiji.gov.fj) web site:
 # <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155">
 # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155
@@ -297,15 +322,15 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # </a>

 # From Steffen Thorsen (2011-10-03):
-# Now the dates have been confirmed, and at least our start date 
+# Now the dates have been confirmed, and at least our start date
 # assumption was correct (end date was one week wrong).
 #
 # <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155">
 # www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155
 # </a>
 # which says
-# Members of the public are reminded to change their time to one hour in 
-# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to 
+# Members of the public are reminded to change their time to one hour in
+# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to
 # 2am on February 26 next year.

 # From Ken Rylander (2011-10-24)
@@ -322,17 +347,34 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # The commencement of daylight saving will remain unchanged and start
 # on the  23rd of October, 2011.

+# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen:
+# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate
+# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
+# October 2012 and end at 3 am on Sunday 20th January 2013.
+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
+
+# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
+# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
+# on Sunday 19th January, 2014....  move clocks forward by one hour from 2am
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
+#
+# From Paul Eggert (2013-09-09):
+# For now, guess that Fiji springs forward the Sunday before the fourth
+# Monday in October.  This matches both recent practice and
+# timeanddate.com's current spring-forward prediction.
+# For the January 2014 transition we guessed right while timeanddate.com
+# guessed wrong, so leave the fall-back prediction alone.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
+Rule	Fiji	2010	max	-	Oct	Sun>=21	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
-Rule	Fiji	2011	only	-	Oct	23	2:00	1:00	S
-Rule	Fiji	2012	only	-	Jan	22	3:00	0	-
+Rule	Fiji	2012	max	-	Jan	Sun>=18	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
+Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time

 # French Polynesia
@@ -559,7 +601,7 @@ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5

 # From David Zuelke (2011-05-09):
 # Subject: Samoa to move timezone from east to west of international date line
-# 
+#
 # <a href="http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963">
 # http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963
 # </a>
@@ -616,6 +658,28 @@ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
 # Dateline Change skip Friday 30th Dec 2011
 # Thursday 29th December 2011	23:59:59 Hours
 # Saturday 31st December 2011	00:00:00 Hours
+#
+# Clarification by Tim Parenti (2012-01-03):
+# Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012
+# seasons, there is not yet any indication that this trend will continue on
+# a regular basis. For now, we have explicitly listed the transitions below.
+#
+# From Nicky (2012-09-10):
+# Daylight Saving Time commences on Sunday 30th September 2012 and
+# ends on Sunday 7th of April 2013.
+#
+# Please find link below for more information.
+# http://www.mcil.gov.ws/mcil_publications.html
+#
+# That publication also includes dates for Summer of 2013/4 as well
+# which give the impression of a pattern in selecting dates for the
+# future, so for now, we will guess this will continue.
+
+# Western Samoa
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	WS	2012	max	-	Sep	lastSun	3:00	1	D
+Rule	WS	2012	max	-	Apr	Sun>=1	4:00	0	-
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
 			-11:26:56 -	LMT	1911
 			-11:30	-	SAMT	1950		# Samoa Time
@@ -623,8 +687,8 @@ Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
 			-11:00	1:00	WSDT	2011 Apr 2 4:00
 			-11:00	-	WST	2011 Sep 24 3:00
 			-11:00	1:00	WSDT	2011 Dec 30
-			 13:00	1:00	WSDT	2012 Apr 1 4:00
-			 13:00	-	WST
+			 13:00	1:00	WSDT	2012 Apr Sun>=1 4:00
+			 13:00	WS	WS%sT

 # Solomon Is
 # excludes Bougainville, for which see Papua New Guinea
@@ -633,9 +697,28 @@ Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct	# Honiara
 			11:00	-	SBT	# Solomon Is Time

 # Tokelau Is
+#
+# From Gwillim Law (2011-12-29)
+# A correspondent informed me that Tokelau, like Samoa, will be skipping
+# December 31 this year ...
+#
+# From Steffen Thorsen (2012-07-25)
+# ... we double checked by calling hotels and offices based in Tokelau asking
+# about the time there, and they all told a time that agrees with UTC+13....
+# Shanks says UTC-10 from 1901 [but] ... there is a good chance the change
+# actually was to UTC-11 back then.
+#
+# From Paul Eggert (2012-07-25)
+# A Google Books snippet of Appendix to the Journals of the House of
+# Representatives of New Zealand, Session 1948,
+# <http://books.google.com/books?id=ZaVCAQAAIAAJ>, page 65, says Tokelau
+# was "11 hours slow on G.M.T."  Go with Thorsen and assume Shanks & Pottenger
+# are off by an hour starting in 1901.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
-			-10:00	-	TKT	# Tokelau Time
+			-11:00	-	TKT 2011 Dec 30	# Tokelau Time
+			13:00	-	TKT

 # Tonga
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -732,9 +815,9 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901

 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz@elsie.nci.nih.gov for general use in the future).
+# tz@iana.org for general use in the future).

-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2013-02-21):
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
@@ -752,6 +835,10 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+# <http://www.jstor.org/stable/1774359>.
+#
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
@@ -1316,22 +1403,22 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # See "southeast Australia" above for 2008 and later.

 # From Steffen Thorsen (2009-04-28):
-# According to the official press release, South Australia's extended daylight 
-# saving period will continue with the same rules as used during the 2008-2009 
+# According to the official press release, South Australia's extended daylight
+# saving period will continue with the same rules as used during the 2008-2009
 # summer (southern hemisphere).
-# 
+#
 # From
 # <a href="http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf">
 # http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf
 # </a>
-# The extended daylight saving period that South Australia has been trialling 
+# The extended daylight saving period that South Australia has been trialling
 # for over the last year is now set to be ongoing.
-# Daylight saving will continue to start on the first Sunday in October each 
+# Daylight saving will continue to start on the first Sunday in October each
 # year and finish on the first Sunday in April the following year.
-# Industrial Relations Minister, Paul Caica, says this provides South Australia 
-# with a consistent half hour time difference with NSW, Victoria, Tasmania and 
+# Industrial Relations Minister, Paul Caica, says this provides South Australia
+# with a consistent half hour time difference with NSW, Victoria, Tasmania and
 # the ACT for all 52 weeks of the year...
-# 
+#
 # We have a wrap-up here:
 # <a href="http://www.timeanddate.com/news/time/south-australia-extends-dst.html">
 # http://www.timeanddate.com/news/time/south-australia-extends-dst.html
@@ -1403,12 +1490,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # From Paul Eggert (2000-01-08):
 # IATA SSIM (1999-09) says DST ends 0100 local time.  Go with McDow.

-# From the BBC World Service (1998-10-31 11:32 UTC):
+# From the BBC World Service in
+# http://news.bbc.co.uk/2/hi/asia-pacific/205226.stm (1998-10-31 16:03 UTC):
 # The Fijiian government says the main reasons for the time change is to
-# improve productivity and reduce road accidents.  But correspondents say it
-# also hopes the move will boost Fiji's ability to compete with other pacific
-# islands in the effort to attract tourists to witness the dawning of the new
-# millenium.
+# improve productivity and reduce road accidents.... [T]he move is also
+# intended to boost Fiji's ability to attract tourists to witness the dawning
+# of the new millennium.

 # http://www.fiji.gov.fj/press/2000_09/2000_09_13-05.shtml (2000-09-13)
 # reports that Fiji has discontinued DST.
@@ -1553,7 +1640,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Shanks & Pottenger say the transition was on 1968-10-01; go with Mundell.

 # From Eric Ulevik (1999-05-03):
-# Tonga's director of tourism, who is also secretary of the National Millenium
+# Tonga's director of tourism, who is also secretary of the National Millennium
 # Committee, has a plan to get Tonga back in front.
 # He has proposed a one-off move to tropical daylight saving for Tonga from
 # October to March, which has won approval in principle from the Tongan
@@ -1,5 +1,4 @@
 # <pre>
-# @(#)backward	8.11
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -1,5 +1,4 @@
 # <pre>
-# @(#)etcetera	8.3
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -1,11 +1,10 @@
 # <pre>
-# @(#)europe	8.40
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz@elsie.nci.nih.gov for general use in the future).
+# tz@iana.org for general use in the future).

 # From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is
@@ -31,6 +30,12 @@
 #	William Willett, The Waste of Daylight, 19th edition
 #	</a> (1914-03)
 #
+#	Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+#	<http://www.jstor.org/stable/1774359>.  He writes:
+#	"It is requested that corrections and additions to these tables
+#	may be sent to Mr. John Milne, Royal Geographical Society,
+#	Savile Row, London."  Nowadays please email them to tz@iana.org.
+#
 #	Brazil's Departamento Servico da Hora (DSH),
 #	<a href="http://pcdsh01.on.br/HISTHV.htm">
 #	History of Summer Time
@@ -211,9 +216,15 @@
 # the history of summer time legislation in the United Kingdom.
 # Since 1998 Joseph S. Myers has been updating
 # and extending this list, which can be found in
-# <a href="http://student.cusu.cam.ac.uk/~jsm28/british-time/">
+# http://student.cusu.cam.ac.uk/~jsm28/british-time/
+# <a href="http://www.polyomino.org.uk/british-time/">
 # History of legal time in Britain
 # </a>
+# Rob Crowther (2012-01-04) reports that that URL no longer
+# exists, and the article can now be found at:
+# <a href="http://www.polyomino.org.uk/british-time/">
+# http://www.polyomino.org.uk/british-time/
+# </a>

 # From Joseph S. Myers (1998-01-06):
 #
@@ -512,7 +523,7 @@ Rule	C-Eur	1944	only	-	Oct	 2	 2:00s	0	-
 # It seems that Paris, Monaco, Rule France, Rule Belgium all agree on
 # 2:00 standard time, e.g. 3:00 local time.  However there are no
 # countries that use C-Eur rules in September 1945, so the only items
-# affected are apparently these ficticious zones that translates acronyms
+# affected are apparently these fictitious zones that translate acronyms
 # CET and MET:
 #
 # Zone CET  1:00 C-Eur CE%sT
@@ -569,12 +580,12 @@ Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
 # According to Kremlin press service, Russian President Dmitry Medvedev
 # signed a federal law "On calculation of time" on June 9, 2011.
 # According to the law Russia is abolishing daylight saving time.
-# 
-# Medvedev signed a law "On the Calculation of Time" (in russian): 
+#
+# Medvedev signed a law "On the Calculation of Time" (in russian):
 # <a href="http://bmockbe.ru/events/?ID=7583">
 # http://bmockbe.ru/events/?ID=7583
 # </a>
-# 
+#
 # Medvedev signed a law on the calculation of the time (in russian):
 # <a href="http://www.regnum.ru/news/polit/1413906.html">
 # http://www.regnum.ru/news/polit/1413906.html
@@ -661,6 +672,8 @@ Zone	Europe/Andorra	0:06:04 -	LMT	1901

 # Austria

+# Milne says Vienna time was 1:05:21.
+
 # From Paul Eggert (2006-03-22): Shanks & Pottenger give 1918-06-16 and
 # 1945-11-18, but the Austrian Federal Office of Metrology and
 # Surveying (BEV) gives 1918-09-16 and for Vienna gives the "alleged"
@@ -678,7 +691,7 @@ Rule	Austria	1948	only	-	Apr	18	2:00s	1:00	S
 Rule	Austria	1980	only	-	Apr	 6	0:00	1:00	S
 Rule	Austria	1980	only	-	Sep	28	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Vienna	1:05:20 -	LMT	1893 Apr
+Zone	Europe/Vienna	1:05:21 -	LMT	1893 Apr
 			1:00	C-Eur	CE%sT	1920
 			1:00	Austria	CE%sT	1940 Apr  1 2:00s
 			1:00	C-Eur	CE%sT	1945 Apr  2 2:00s
@@ -1151,10 +1164,10 @@ Rule	France	1940	only	-	Feb	25	 2:00	1:00	S
 # write that they were used in Monaco and in many French locations.
 # Le Corre writes that the upper limit of the free zone was Arneguy, Orthez,
 # Mont-de-Marsan, Bazas, Langon, Lamotte-Montravel, Marouil, La
-# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Decartes,
+# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Descartes,
 # Loches, Montrichard, Vierzon, Bourges, Moulins, Digoin,
 # Paray-le-Monial, Montceau-les-Mines, Chalons-sur-Saone, Arbois,
-# Dole, Morez, St-Claude, and Collognes (Haute-Savioe).
+# Dole, Morez, St-Claude, and Collonges (Haute-Savoie).
 Rule	France	1941	only	-	May	 5	 0:00	2:00	M # Midsummer
 # Shanks & Pottenger say this transition occurred at Oct 6 1:00,
 # but go with Denis Excoffier (1997-12-12),
@@ -1234,6 +1247,21 @@ Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
 			1:00	Germany	CE%sT	1980
 			1:00	EU	CE%sT

+# From Tobias Conradi (2011-09-12):
+# Busingen <http://www.buesingen.de>, surrounded by the Swiss canton
+# Schaffhausen, did not start observing DST in 1980 as the rest of DE
+# (West Germany at that time) and DD (East Germany at that time) did.
+# DD merged into DE, the area is currently covered by code DE in ISO 3166-1,
+# which in turn is covered by the zone Europe/Berlin.
+#
+# Source for the time in Busingen 1980:
+# http://www.srf.ch/player/video?id=c012c029-03b7-4c2b-9164-aa5902cd58d3
+
+# From Arthur David Olson (2012-03-03):
+# Busingen and Zurich have shared clocks since 1970.
+
+Link	Europe/Zurich	Europe/Busingen
+
 # Georgia
 # Please see the "asia" file for Asia/Tbilisi.
 # Herodotus (Histories, IV.45) says Georgia north of the Phasis (now Rioni)
@@ -1682,7 +1710,7 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2 0:00s # Valletta
 # From Alexander Krivenyshev (2011-10-26)
 # NO need to divide Moldova into two timezones at this point.
 # As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own
-# decision to abolish DST this winter. 
+# decision to abolish DST this winter.
 # Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)-
 # Tiraspol will go back to winter time on October 30, 2011.
 # News from Moldova (in russian):
@@ -2038,6 +2066,70 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct

 # Russia

+# From Alexander Krivenyshev (2011-09-15):
+# Based on last Russian Government Decree # 725 on August 31, 2011
+# (Government document
+# <a href="http://www.government.ru/gov/results/16355/print/">
+# http://www.government.ru/gov/results/16355/print/
+# </a>
+# in Russian)
+# there are few corrections have to be made for some Russian time zones...
+# All updated Russian Time Zones were placed in table and translated to English
+# by WorldTimeZone.com at the link below:
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_russia36.htm">
+# http://www.worldtimezone.com/dst_news/dst_news_russia36.htm
+# </a>
+
+# From Sanjeev Gupta (2011-09-27):
+# Scans of [Decree #23 of January 8, 1992] are available at:
+# <a href="http://government.consultant.ru/page.aspx?1223966">
+# http://government.consultant.ru/page.aspx?1223966
+# They are in Cyrillic letters (presumably Russian).
+
+# From Arthur David Olson (2012-05-09):
+# Regarding the instant when clocks in time-zone-shifting parts of Russia
+# changed in September 2011:
+#
+# One source is
+# < a href="http://government.ru/gov/results/16355/>
+# http://government.ru/gov/results/16355/
+# </a>
+# which, according to translate.google.com, begins "Decree of August 31,
+# 2011 No 725" and contains no other dates or "effective date" information.
+#
+# Another source is
+# <a href="http://www.rg.ru/2011/09/06/chas-zona-dok.html">
+# http://www.rg.ru/2011/09/06/chas-zona-dok.html
+# </a>
+# which, according to translate.google.com, begins "Resolution of the
+# Government of the Russian Federation on August 31, 2011 N 725" and also
+# contains "Date first official publication: September 6, 2011 Posted on:
+# in the 'RG' - Federal Issue number 5573 September 6, 2011" but which
+# does not contain any "effective date" information.
+#
+# Another source is
+# <a href="http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7">
+# http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
+# </a>
+# which, in note 8, contains "Resolution #725 of August 31, 2011...
+# Effective as of after 7 days following the day of the official publication"
+# but which does not contain any reference to September 6, 2011.
+#
+# The Wikipedia article refers to
+# <a href="http://base.consultant.ru/cons/cgi/online.cgi?req=doc;base=LAW;n=118896">
+# http://base.consultant.ru/cons/cgi/online.cgi?req=doc;base=LAW;n=118896
+# </a>
+# which seems to copy the text of the government.ru page.
+#
+# Tobias Conradi combines Wikipedia's
+# "as of after 7 days following the day of the official publication"
+# with www.rg.ru's "Date of first official publication: September 6, 2011" to get
+# September 13, 2011 as the cutover date (unusually, a Tuesday, as Tobias Conradi notes).
+#
+# None of the sources indicates a time of day for changing clocks.
+#
+# Go with 2011-09-13 0:00s.
+
 # From Paul Eggert (2006-03-22):
 # Except for Moscow after 1919-07-01, I invented the time zone abbreviations.
 # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
@@ -2265,14 +2357,32 @@ Zone Asia/Yakutsk	 8:38:40 -	LMT	1919 Dec 15
 # [parts of] Respublika Sakha (Yakutiya).

 # From Oscar van Vlijmen (2009-11-29):
-# The Sakha districts are: Bulunskij, Verkhoyanskij, Tomponskij, Ust'-Majskij,
-# Ust'-Yanskij.
+# The Sakha districts are: Bulunskij, Verkhoyanskij, ... Ust'-Yanskij.
 Zone Asia/Vladivostok	 8:47:44 -	LMT	1922 Nov 15
 			 9:00	-	VLAT	1930 Jun 21 # Vladivostok Time
 			10:00	Russia	VLA%sT	1991 Mar 31 2:00s
 			 9:00	Russia	VLA%sST	1992 Jan 19 2:00s
 			10:00	Russia	VLA%sT	2011 Mar 27 2:00s
 			11:00	-	VLAT
+
+# From Arthur David Olson (2012-05-09):
+# Tomponskij and Ust'-Majskij switched from Vladivostok time to Yakutsk time
+# in 2011.
+#
+# From Paul Eggert (2012-11-25):
+# Shanks and Pottenger (2003) has Khandyga on Yakutsk time.
+# Make a wild guess that it switched to Vladivostok time in 2004.
+# This transition is no doubt wrong, but we have no better info.
+#
+Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
+			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+			 9:00	Russia	YAK%sT	1991 Mar 31 2:00s
+			 8:00	Russia	YAK%sT	1992 Jan 19 2:00s
+			 9:00	Russia	YAK%sT	2004
+			10:00	Russia	VLA%sT	2011 Mar 27 2:00s
+			11:00	-	VLAT	2011 Sep 13 0:00s # Decree 725?
+			10:00	-	YAKT
+
 #
 # Sakhalinskaya oblast'.
 # The Zone name should be Yuzhno-Sakhalinsk, but that's too long.
@@ -2291,14 +2401,26 @@ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23

 # From Oscar van Vlijmen (2009-11-29):
 # The Sakha districts are: Abyjskij, Allaikhovskij, Verkhhhnekolymskij, Momskij,
-# Nizhnekolymskij, Ojmyakonskij, Srednekolymskij.
+# Nizhnekolymskij, ... Srednekolymskij.
 Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
 			10:00	-	MAGT	1930 Jun 21 # Magadan Time
 			11:00	Russia	MAG%sT	1991 Mar 31 2:00s
 			10:00	Russia	MAG%sT	1992 Jan 19 2:00s
 			11:00	Russia	MAG%sT	2011 Mar 27 2:00s
 			12:00	-	MAGT
-#
+
+# From Arthur David Olson (2012-05-09):
+# Ojmyakonskij and the Kuril Islands switched from
+# Magadan time to Vladivostok time in 2011.
+Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
+			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
+			 9:00	Russia	YAKT	1981 Apr  1
+			11:00	Russia	MAG%sT	1991 Mar 31 2:00s
+			10:00	Russia	MAG%sT	1992 Jan 19 2:00s
+			11:00	Russia	MAG%sT	2011 Mar 27 2:00s
+			12:00	-	MAGT	2011 Sep 13 0:00s # Decree 725?
+			11:00	-	VLAT
+
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
 # Kamchatskaya oblast', Koryakskij avtonomnyj okrug.
 #
@@ -2572,11 +2694,11 @@ Zone	Europe/Zurich	0:34:08 -	LMT	1848 Sep 12
 # http://www.alomaliye.com/bkk_2002_3769.htm

 # From G&ouml;kdeniz Karada&#x011f; (2011-03-10):
-# 
+#
 # According to the articles linked below, Turkey will change into summer
 # time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27.
 # This change is due to a nationwide exam on 27th.
-# 
+#
 # <a href="http://www.worldbulletin.net/?aType=haber&ArticleID=70872">
 # http://www.worldbulletin.net/?aType=haber&ArticleID=70872
 # </a>
@@ -2657,9 +2779,9 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.

 # Ukraine
 #
-# From Igor Karpov, who works for the Ukranian Ministry of Justice,
+# From Igor Karpov, who works for the Ukrainian Ministry of Justice,
 # via Garrett Wollman (2003-01-27):
-# BTW, I've found the official document on this matter. It's goverment
+# BTW, I've found the official document on this matter. It's government
 # regulations number 509, May 13, 1996. In my poor translation it says:
 # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday
 # of March at 3am the time is changing to 4am and each last Sunday of
@@ -2693,7 +2815,7 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 # time this year after all.
 #
 # From Udo Schwedt (2011-10-18):
-# As far as I understand, the recent change to the Ukranian time zone 
+# As far as I understand, the recent change to the Ukrainian time zone
 # (Europe/Kiev) to introduce permanent daylight saving time (similar
 # to Russia) was reverted today:
 #
@@ -1,5 +1,4 @@
 # <pre>
-# @(#)factory	8.2
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -1,17 +1,14 @@
-# <pre>
-# @(#)iso3166.tab	8.11
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
 # ISO 3166 alpha-2 country codes
 #
-# From Paul Eggert (2006-09-27):
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+#
+# From Paul Eggert (2013-05-27):
 #
 # This file contains a table with the following columns:
 # 1.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO 3166-1 Newsletter VI-1 (2007-09-21).  See:
-#     <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html">
-#     ISO 3166 Maintenance agency (ISO 3166/MA)
-#     </a>.
+#     ISO 3166-1 Newsletter VI-15 (2013-05-10).  See: Updates on ISO 3166
+#   http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
 # 2.  The usual English name for the country,
 #     chosen so that alphabetic sorting of subsets produces helpful lists.
 #     This is not the same as the English name in the ISO 3166 tables.
@@ -21,8 +18,9 @@
 #
 # Lines beginning with `#' are comments.
 #
-# From Arthur David Olson (2011-08-17):
-# Resynchronized today with the ISO 3166 site (adding SS for South Sudan).
+# This table is intended as an aid for users, to help them select time
+# zone data appropriate for their practical needs.  It is not intended
+# to take or endorse any position on legal or territorial claims.
 #
 #country-
 #code	country name
@@ -55,7 +53,7 @@ BL	St Barthelemy
 BM	Bermuda
 BN	Brunei
 BO	Bolivia
-BQ	Bonaire Sint Eustatius & Saba
+BQ	Bonaire, St Eustatius & Saba
 BR	Brazil
 BS	Bahamas
 BT	Bhutan
@@ -236,7 +234,7 @@ SR	Suriname
 SS	South Sudan
 ST	Sao Tome & Principe
 SV	El Salvador
-SX	Sint Maarten
+SX	St Maarten (Dutch part)
 SY	Syria
 SZ	Swaziland
 TC	Turks & Caicos Is
@@ -1,5 +1,4 @@
 # <pre>
-# @(#)leapseconds	8.11
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -48,40 +47,54 @@ Leap	1997	Jun	30	23:59:60	+	S
 Leap	1998	Dec	31	23:59:60	+	S
 Leap	2005	Dec	31	23:59:60	+	S
 Leap	2008	Dec	31	23:59:60	+	S
+Leap	2012	Jun	30	23:59:60	+	S

 # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
 #
 # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
 #
+#
 # SERVICE DE LA ROTATION TERRESTRE
 # OBSERVATOIRE DE PARIS
 # 61, Av. de l'Observatoire 75014 PARIS (France)
-# Tel.      : 33 (0) 1 40 51 22 29
+# Tel.      : 33 (0) 1 40 51 22 26
 # FAX       : 33 (0) 1 40 51 22 91
-# Internet  : services.iers@obspm.fr
+# e-mail    : (E-Mail Removed)
+# http://hpiers.obspm.fr/eop-pc
 #
-# Paris, 2 February 2011
+# Paris, 5 January 2012
 #
-# Bulletin C 41
+#
+# Bulletin C 43
 #
 # To authorities responsible
 # for the measurement and
 # distribution of time
 #
-# INFORMATION ON UTC - TAI
 #
-# NO positive leap second will be introduced at the end of June 2011.
-# The difference between Coordinated Universal Time UTC and the
-# International Atomic Time TAI is :		
+# UTC TIME STEP
+# on the 1st of July 2012
 #
-# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+#
+# A positive leap second will be introduced at the end of June 2012.
+# The sequence of dates of the UTC second markers will be:
+#
+#                          2012 June 30,     23h 59m 59s
+#                          2012 June 30,     23h 59m 60s
+#                          2012 July  1,      0h  0m  0s
+#
+# The difference between UTC and the International Atomic Time TAI is:
+#
+# from 2009 January 1, 0h UTC, to 2012 July 1  0h UTC  : UTC-TAI = - 34s
+# from 2012 July 1,    0h UTC, until further notice    : UTC-TAI = - 35s
 #
 # Leap seconds can be introduced in UTC at the end of the months of December
-# or June,  depending on the evolution of UT1-TAI. Bulletin C is mailed every
-# six months, either to announce a time step in UTC, or to confirm that there
+# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
+# six months, either to announce a time step in UTC or to confirm that there
 # will be no time step at the next possible date.
 #
+#
 # Daniel GAMBIS
-# Head			
-# Earth Orientation Center of the IERS
+# Head
+# Earth Orientation Center of IERS
 # Observatoire de Paris, France
@@ -1,5 +1,4 @@
 # <pre>
-# @(#)northamerica	8.51
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -7,7 +6,7 @@

 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz@elsie.nci.nih.gov for general use in the future).
+# tz@iana.org for general use in the future).

 # From Paul Eggert (1999-03-22):
 # A reliable and entertaining source about time zones is
@@ -479,7 +478,7 @@ Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
 			 -8:00	US	P%sT	1946
 			 -8:00	-	PST	1969
 			 -8:00	US	P%sT	1980 Apr 27 2:00
-			 -9:00	US	Y%sT	1980 Oct 26 2:00	
+			 -9:00	US	Y%sT	1980 Oct 26 2:00
 			 -8:00	US	P%sT	1983 Oct 30 2:00
 			 -9:00	US	Y%sT	1983 Nov 30
 			 -9:00	US	AK%sT
@@ -1020,6 +1019,9 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 #	William Willett, The Waste of Daylight, 19th edition
 #	</a> (1914-03)
 #
+#	Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+#	<http://www.jstor.org/stable/1774359>.
+#
 # See the `europe' file for Greenland.

 # Canada
@@ -1120,9 +1122,26 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 # For now, assume all of DST-observing Canada will fall into line with the
 # new US DST rules,

+# From Chris Walton (2011-12-01)
+# In the first of Tammy Hardwick's articles
+# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260">
+# http://www.ilovecreston.com/?p=articles&t=spec&ar=260
+# </a>
+# she quotes the Friday November 1/1918 edition of the Creston Review.
+# The quote includes these two statements:
+# 'Sunday the CPR went back to the old system of time...'
+# '... The daylight saving scheme was dropped all over Canada at the same time,'
+# These statements refer to a transition from daylight time to standard time
+# that occurred nationally on Sunday October 27/1918.  This transition was
+# also documented in the Saturday October 26/1918 edition of the Toronto Star.
+
+# In light of that evidence, we alter the date from the earlier believed
+# Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day
+# than Thursday) in all Canadian rulesets.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Canada	1918	only	-	Apr	14	2:00	1:00	D
-Rule	Canada	1918	only	-	Oct	31	2:00	0	S
+Rule	Canada	1918	only	-	Oct	27	2:00	0	S
 Rule	Canada	1942	only	-	Feb	 9	2:00	1:00	W # War
 Rule	Canada	1945	only	-	Aug	14	23:00u	1:00	P # Peace
 Rule	Canada	1945	only	-	Sep	30	2:00	0	S
@@ -1645,7 +1664,7 @@ Zone America/Atikokan	-6:06:28 -	LMT	1895
 Rule	Winn	1916	only	-	Apr	23	0:00	1:00	D
 Rule	Winn	1916	only	-	Sep	17	0:00	0	S
 Rule	Winn	1918	only	-	Apr	14	2:00	1:00	D
-Rule	Winn	1918	only	-	Oct	31	2:00	0	S
+Rule	Winn	1918	only	-	Oct	27	2:00	0	S
 Rule	Winn	1937	only	-	May	16	2:00	1:00	D
 Rule	Winn	1937	only	-	Sep	26	2:00	0	S
 Rule	Winn	1942	only	-	Feb	 9	2:00	1:00	W # War
@@ -1728,7 +1747,7 @@ Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16

 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Regina	1918	only	-	Apr	14	2:00	1:00	D
-Rule	Regina	1918	only	-	Oct	31	2:00	0	S
+Rule	Regina	1918	only	-	Oct	27	2:00	0	S
 Rule	Regina	1930	1934	-	May	Sun>=1	0:00	1:00	D
 Rule	Regina	1930	1934	-	Oct	Sun>=1	0:00	0	S
 Rule	Regina	1937	1941	-	Apr	Sun>=8	0:00	1:00	D
@@ -1765,7 +1784,7 @@ Zone America/Swift_Current -7:11:20 -	LMT	1905 Sep

 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Edm	1918	1919	-	Apr	Sun>=8	2:00	1:00	D
-Rule	Edm	1918	only	-	Oct	31	2:00	0	S
+Rule	Edm	1918	only	-	Oct	27	2:00	0	S
 Rule	Edm	1919	only	-	May	27	2:00	0	S
 Rule	Edm	1920	1923	-	Apr	lastSun	2:00	1:00	D
 Rule	Edm	1920	only	-	Oct	lastSun	2:00	0	S
@@ -1795,9 +1814,68 @@ Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
 # Dawson Creek uses MST.  Much of east BC is like Edmonton.
 # Matthews and Vincent (1998) write that Creston is like Dawson Creek.

+# It seems though that (re: Creston) is not entirely correct:
+
+# From Chris Walton (2011-12-01):
+# There are two areas within the Canadian province of British Columbia
+# that do not currently observe daylight saving:
+# a) The Creston Valley (includes the town of Creston and surrounding area)
+# b) The eastern half of the Peace River Regional District
+# (includes the cities of Dawson Creek and Fort St. John)
+
+# Earlier this year I stumbled across a detailed article about the time
+# keeping history of Creston; it was written by Tammy Hardwick who is the
+# manager of the Creston & District Museum. The article was written in May 2009.
+# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260">
+# http://www.ilovecreston.com/?p=articles&t=spec&ar=260
+# </a>
+# According to the article, Creston has not changed its clocks since June 1918.
+# i.e. Creston has been stuck on UTC-7 for 93 years.
+# Dawson Creek, on the other hand, changed its clocks as recently as April 1972.
+
+# Unfortunately the exact date for the time change in June 1918 remains
+# unknown and will be difficult to ascertain.  I e-mailed Tammy a few months
+# ago to ask if Sunday June 2 was a reasonable guess.  She said it was just
+# as plausible as any other date (in June).  She also said that after writing the
+# article she had discovered another time change in 1916; this is the subject
+# of another article which she wrote in October 2010.
+# <a href="http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56">
+# http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56
+# </a>
+
+# Here is a summary of the three clock change events in Creston's history:
+# 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7)
+# Exact date unknown
+# 2. Oct 1916: switch to Pacific Standard Time (GMT-8)
+# Exact date in October unknown;  Sunday October 1 is a reasonable guess.
+# 3. June 1918: switch to Pacific Daylight Time (GMT-7)
+# Exact date in June unknown; Sunday June 2 is a reasonable guess.
+# note#1:
+# On Oct 27/1918 when daylight saving ended in the rest of Canada,
+# Creston did not change its clocks.
+# note#2:
+# During WWII when the Federal Government legislated a mandatory clock change,
+# Creston did not oblige.
+# note#3:
+# There is no guarantee that Creston will remain on Mountain Standard Time
+# (UTC-7) forever.
+# The subject was debated at least once this year by the town Council.
+# <a href="http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html">
+# http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html
+# </a>
+
+# During a period WWII, summer time (Daylight saying) was mandatory in Canada.
+# In Creston, that was handled by shifting the area to PST (-8:00) then applying
+# summer time to cause the offset to be -7:00, the same as it had been before
+# the change.  It can be argued that the timezone abbreviation during this
+# period should be PDT rather than MST, but that doesn't seem important enough
+# (to anyone) to further complicate the rules.
+
+# The transition dates (and times) are guesses.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Vanc	1918	only	-	Apr	14	2:00	1:00	D
-Rule	Vanc	1918	only	-	Oct	31	2:00	0	S
+Rule	Vanc	1918	only	-	Oct	27	2:00	0	S
 Rule	Vanc	1942	only	-	Feb	 9	2:00	1:00	W # War
 Rule	Vanc	1945	only	-	Aug	14	23:00u	1:00	P # Peace
 Rule	Vanc	1945	only	-	Sep	30	2:00	0	S
@@ -1813,7 +1891,10 @@ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
 			-8:00	Canada	P%sT	1947
 			-8:00	Vanc	P%sT	1972 Aug 30 2:00
 			-7:00	-	MST
-
+Zone America/Creston	-7:46:04 -	LMT	1884
+			-7:00	-	MST	1916 Oct 1
+			-8:00	-	PST	1918 Jun 2
+			-7:00	-	MST

 # Northwest Territories, Nunavut, Yukon

@@ -2476,6 +2557,8 @@ Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2

 # Bahamas
 #
+# For 1899 Milne gives -5:09:29.5; round that.
+#
 # From Sue Williams (2006-12-07):
 # The Bahamas announced about a month ago that they plan to change their DST
 # rules to sync with the U.S. starting in 2007....
@@ -2485,11 +2568,14 @@ Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
 Rule	Bahamas	1964	1975	-	Oct	lastSun	2:00	0	S
 Rule	Bahamas	1964	1975	-	Apr	lastSun	2:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Nassau	-5:09:24 -	LMT	1912 Mar 2
+Zone	America/Nassau	-5:09:30 -	LMT	1912 Mar 2
 			-5:00	Bahamas	E%sT	1976
 			-5:00	US	E%sT

 # Barbados
+
+# For 1899 Milne gives -3:58:29.2; round that.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Barb	1977	only	-	Jun	12	2:00	1:00	D
 Rule	Barb	1977	1978	-	Oct	Sun>=1	2:00	0	S
@@ -2497,8 +2583,8 @@ Rule	Barb	1978	1980	-	Apr	Sun>=15	2:00	1:00	D
 Rule	Barb	1979	only	-	Sep	30	2:00	0	S
 Rule	Barb	1980	only	-	Sep	25	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Barbados	-3:58:28 -	LMT	1924		# Bridgetown
-			-3:58:28 -	BMT	1932	  # Bridgetown Mean Time
+Zone America/Barbados	-3:58:29 -	LMT	1924		# Bridgetown
+			-3:58:29 -	BMT	1932	  # Bridgetown Mean Time
 			-4:00	Barb	A%sT

 # Belize
@@ -2516,6 +2602,9 @@ Zone	America/Belize	-5:52:48 -	LMT	1912 Apr

 # Bermuda

+# For 1899 Milne gives -4:19:18.3 as the meridian of the clock tower,
+# Bermuda dockyard, Ireland I; round that.
+
 # From Dan Jones, reporting in The Royal Gazette (2006-06-26):

 # Next year, however, clocks in the US will go forward on the second Sunday
@@ -2525,7 +2614,7 @@ Zone	America/Belize	-5:52:48 -	LMT	1912 Apr
 # http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135

 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Bermuda	-4:19:04 -	LMT	1930 Jan  1 2:00    # Hamilton
+Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1 2:00    # Hamilton
 			-4:00	-	AST	1974 Apr 28 2:00
 			-4:00	Bahamas	A%sT	1976
 			-4:00	US	A%sT
@@ -2537,6 +2626,9 @@ Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
 			-5:00	-	EST

 # Costa Rica
+
+# Milne gives -5:36:13.3 as San Jose mean time; round to nearest.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	CR	1979	1980	-	Feb	lastSun	0:00	1:00	D
 Rule	CR	1979	1980	-	Jun	Sun>=1	0:00	0	S
@@ -2547,14 +2639,19 @@ Rule	CR	1991	only	-	Jul	 1	0:00	0	S
 Rule	CR	1992	only	-	Mar	15	0:00	0	S
 # There are too many San Joses elsewhere, so we'll use `Costa Rica'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
-			-5:36:20 -	SJMT	1921 Jan 15 # San Jose Mean Time
+Zone America/Costa_Rica	-5:36:13 -	LMT	1890		# San Jose
+			-5:36:13 -	SJMT	1921 Jan 15 # San Jose Mean Time
 			-6:00	CR	C%sT
 # Coco
 # no information; probably like America/Costa_Rica

 # Cuba

+# From Paul Eggert (2013-02-21):
+# Milne gives -5:28:50.45 for the observatory at Havana, -5:29:23.57
+# for the port, and -5:30 for meteorological observations.
+# For now, stick with Shanks & Pottenger.
+
 # From Arthur David Olson (1999-03-29):
 # The 1999-03-28 exhibition baseball game held in Havana, Cuba, between
 # the Cuban National Team and the Baltimore Orioles was carried live on
@@ -2595,20 +2692,20 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
 # except that it switches at midnight standard time as usual.
 #
 # From Steffen Thorsen (2007-10-25):
-# Carlos Alberto Fonseca Arauz informed me that Cuba will end DST one week 
+# Carlos Alberto Fonseca Arauz informed me that Cuba will end DST one week
 # earlier - on the last Sunday of October, just like in 2006.
-# 
+#
 # He supplied these references:
-# 
+#
 # http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES
 # http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm
-# 
+#
 # From Alex Kryvenishev (2007-10-25):
 # Here is also article from Granma (Cuba):
-# 
+#
 # [Regira] el Horario Normal desde el [proximo] domingo 28 de octubre
 # http://www.granma.cubaweb.cu/2007/10/24/nacional/artic07.html
-# 
+#
 # http://www.worldtimezone.com/dst_news/dst_news_cuba03.html

 # From Arthur David Olson (2008-03-09):
@@ -2692,7 +2789,7 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
 # </a>
 #
 # From Steffen Thorsen (2011-10-30)
-# Cuba will end DST two weeks later this year. Instead of going back 
+# Cuba will end DST two weeks later this year. Instead of going back
 # tonight, it has been delayed to 2011-11-13 at 01:00.
 #
 # One source (Spanish)
@@ -2704,6 +2801,27 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
 # <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html">
 # http://www.timeanddate.com/news/time/cuba-time-changes-2011.html
 # </a>
+#
+# From Steffen Thorsen (2012-03-01)
+# According to Radio Reloj, Cuba will start DST on Midnight between March
+# 31 and April 1.
+#
+# Radio Reloj has the following info (Spanish):
+# <a href="http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril">
+# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril
+# </a>
+#
+# Our info on it:
+# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html">
+# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
+# </a>
+
+# From Steffen Thorsen (2012-11-03):
+# Radio Reloj and many other sources report that Cuba is changing back
+# to standard time on 2012-11-04:
+# http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-regira-horario-normal-en-cuba-desde-el-domingo-cuatro-de-noviembre
+# From Paul Eggert (2012-11-03):
+# For now, assume the future rule is first Sunday in November.

 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
@@ -2741,8 +2859,9 @@ Rule	Cuba	2008	only	-	Mar	Sun>=15	0:00s	1:00	D
 Rule	Cuba	2009	2010	-	Mar	Sun>=8	0:00s	1:00	D
 Rule	Cuba	2011	only	-	Mar	Sun>=15	0:00s	1:00	D
 Rule	Cuba	2011	only	-	Nov	13	0:00s	0	S
-Rule	Cuba	2012	max	-	Mar	Sun>=8	0:00s	1:00	D
-Rule	Cuba	2012	max	-	Oct	lastSun	0:00s	0	S
+Rule	Cuba	2012	only	-	Apr	1	0:00s	1:00	D
+Rule	Cuba	2012	max	-	Nov	Sun>=1	0:00s	0	S
+Rule	Cuba	2013	max	-	Mar	Sun>=8	0:00s	1:00	D

 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Havana	-5:29:28 -	LMT	1890
@@ -2876,6 +2995,26 @@ Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
 # From Stephen Colebourne (2007-02-22):
 # Some IATA info: Haiti won't be having DST in 2007.

+# From Steffen Thorsen (2012-03-11):
+# According to several news sources, Haiti will observe DST this year,
+# apparently using the same start and end date as USA/Canada.
+# So this means they have already changed their time.
+#
+# http://www.alterpresse.org/spip.php?article12510
+# http://radiovision2000haiti.net/home/?p=13253
+#
+# From Arthur David Olson (2012-03-11):
+# The alterpresse.org source seems to show a US-style leap from 2:00 a.m. to
+# 3:00 a.m. rather than the traditional Haitian jump at midnight.
+# Assume a US-style fall back as well.
+
+# From Steffen Thorsen (2013-03-10):
+# It appears that Haiti is observing DST this year as well, same rules
+# as US/Canada.  They did it last year as well, and it looks like they
+# are going to observe DST every year now...
+#
+# http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
+# http://www.canalplushaiti.net/?p=6714

 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
@@ -2887,6 +3026,8 @@ Rule	Haiti	1988	1997	-	Apr	Sun>=1	1:00s	1:00	D
 Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
 Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
 Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
+Rule	Haiti	2012	max	-	Mar	Sun>=8	2:00	1:00	D
+Rule	Haiti	2012	max	-	Nov	Sun>=1	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Port-au-Prince -4:49:20 -	LMT	1890
 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
@@ -1,5 +1,4 @@
 # <pre>
-# @(#)pacificnew	8.2
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -1,5 +1,4 @@
 # <pre>
-# @(#)solar87	8.2
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -1,5 +1,4 @@
 # <pre>
-# @(#)solar88	8.2
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -1,5 +1,4 @@
 # <pre>
-# @(#)solar89	8.2
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -1,17 +1,20 @@
 # <pre>
-# @(#)southamerica	8.52
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz@elsie.nci.nih.gov for general use in the future).
+# tz@iana.org for general use in the future).

 # From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
 #
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+# <http://www.jstor.org/stable/1774359>.
+#
 # Gwillim Law writes that a good source
 # for recent time zone data is the International Air Transport
 # Association's Standard Schedules Information Manual (IATA SSIM),
@@ -232,7 +235,7 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
 Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
 Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
- 
+
 # From Mariano Absatz (2004-05-21):
 # Today it was officially published that the Province of Mendoza is changing
 # its timezone this winter... starting tomorrow night....
@@ -322,9 +325,9 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # confirms what Alex Krivenyshev has earlier sent to the tz
 # emailing list about that San Luis plans to return to standard
 # time much earlier than the rest of the country. It also
-# confirms that upon request the provinces San Juan and Mendoza 
-# refused to follow San Luis in this change. 
-# 
+# confirms that upon request the provinces San Juan and Mendoza
+# refused to follow San Luis in this change.
+#
 # The change is supposed to take place Monday the 21.st at 0:00
 # hours. As far as I understand it if this goes ahead, we need
 # a new timezone for San Luis (although there are also documented
@@ -382,21 +385,11 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # <a/>
 # is the official page for the Province Government).
 #
-# There's also a note in only one of the major national papers (La Nación) at
-# <a href="http://www.lanacion.com.ar/nota.asp?nota_id=1107912">
+# There's also a note in only one of the major national papers ...
 # http://www.lanacion.com.ar/nota.asp?nota_id=1107912
-# </a>
-# 
-# The press release says:
-#  (...) anunció que el próximo domingo a las 00:00 los puntanos deberán
-# atrasar una hora sus relojes.
 #
-# A partir de entonces, San Luis establecerá el huso horario propio de
-# la Provincia. De esta manera, durante el periodo del calendario anual
-# 2009, el cambio horario quedará comprendido entre las 00:00 del tercer
-# domingo de marzo y las 24:00 del segundo sábado de octubre.
-# Quick&dirty translation
-# (...) announced that next Sunday, at 00:00, Puntanos (the San Luis
+# The press release says [quick and dirty translation]:
+# ... announced that next Sunday, at 00:00, Puntanos (the San Luis
 # inhabitants) will have to turn back one hour their clocks
 #
 # Since then, San Luis will establish its own Province timezone. Thus,
@@ -458,6 +451,9 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # rules...San Luis is still using "Western ARgentina Time" and it got
 # stuck on Summer daylight savings time even though the summer is over.

+# From Paul Eggert (2013-02-21):
+# Milne says Cordoba time was -4:16:48.2.  Round to the nearest second.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Buenos Aires (BA), Capital Federal (CF),
@@ -800,8 +796,8 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 #
 # From Alexander Krivenyshev (2011-10-04):
 # State Bahia will return to Daylight savings time this year after 8 years off.
-# The announcement was made by Governor Jaques Wagner in an interview to a 
-# television station in Salvador. 
+# The announcement was made by Governor Jaques Wagner in an interview to a
+# television station in Salvador.

 # In Portuguese:
 # <a href="http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html">
@@ -813,9 +809,9 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890

 # From Guilherme Bernardes Rodrigues (2011-10-07):
 # There is news in the media, however there is still no decree about it.
-# I just send a e-mail to Zulmira Brandão at
+# I just send a e-mail to Zulmira Brandao at
 # <a href="http://pcdsh01.on.br/">http://pcdsh01.on.br/</a> the
-# oficial agency about time in Brazil, and she confirmed that the old rule is
+# official agency about time in Brazil, and she confirmed that the old rule is
 # still in force.

 # From Guilherme Bernardes Rodrigues (2011-10-14)
@@ -830,6 +826,15 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
 # </a>

+# From Kelley Cook (2012-10-16):
+# The governor of state of Bahia in Brazil announced on Thursday that
+# due to public pressure, he is reversing the DST policy they implemented
+# last year and will not be going to Summer Time on October 21st....
+# http://www.correio24horas.com.br/r/artigo/apos-pressoes-wagner-suspende-horario-de-verao-na-bahia
+
+# From Rodrigo Severo (2012-10-16):
+# Tocantins state will have DST.
+# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html

 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
@@ -966,7 +971,7 @@ Rule	Brazil	2007	only	-	Feb	25	 0:00	0	-
 # adopted by the same states as before.
 Rule	Brazil	2007	only	-	Oct	Sun>=8	 0:00	1:00	S
 # From Frederico A. C. Neves (2008-09-10):
-# Acording to this decree
+# According to this decree
 # <a href="http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm">
 # http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
 # </a>
@@ -1049,7 +1054,8 @@ Zone America/Araguaina	-3:12:48 -	LMT	1914
 			-3:00	Brazil	BR%sT	1990 Sep 17
 			-3:00	-	BRT	1995 Sep 14
 			-3:00	Brazil	BR%sT	2003 Sep 24
-			-3:00	-	BRT
+			-3:00	-	BRT	2012 Oct 21
+			-3:00	Brazil	BR%sT
 #
 # Alagoas (AL), Sergipe (SE)
 Zone America/Maceio	-2:22:52 -	LMT	1914
@@ -1068,7 +1074,8 @@ Zone America/Maceio	-2:22:52 -	LMT	1914
 Zone America/Bahia	-2:34:04 -	LMT	1914
 			-3:00	Brazil	BR%sT	2003 Sep 24
 			-3:00	-	BRT	2011 Oct 16
-			-3:00	Brazil	BR%sT
+			-3:00	Brazil	BR%sT	2012 Oct 21
+			-3:00	-	BRT
 #
 # Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
 # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
@@ -1160,7 +1167,7 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # Due to drought, Chile extends Daylight Time in three weeks.  This
 # is one-time change (Saturday 3/29 at 24:00 for America/Santiago
 # and Saturday 3/29 at 22:00 for Pacific/Easter)
-# The Supreme Decree is located at 
+# The Supreme Decree is located at
 # <a href="http://www.shoa.cl/servicios/supremo316.pdf">
 # http://www.shoa.cl/servicios/supremo316.pdf
 # </a>
@@ -1171,7 +1178,7 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914

 # From Jose Miguel Garrido (2008-03-05):
 # ...
-# You could see the announces of the change on 
+# You could see the announces of the change on
 # <a href="http://www.shoa.cl/noticias/2008/04hora/hora.htm">
 # http://www.shoa.cl/noticias/2008/04hora/hora.htm
 # </a>.
@@ -1196,7 +1203,7 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
 # </a>
 #
-# This is not yet reflected in the offical "cambio de hora" site, but
+# This is not yet reflected in the official "cambio de hora" site, but
 # probably will be soon:
 # <a href="http://www.horaoficial.cl/cambio.htm">
 # http://www.horaoficial.cl/cambio.htm
@@ -1218,6 +1225,32 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # August, not in October as they have since 1968. This is a pilot plan
 # which will be reevaluated in 2012.

+# From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23):
+# As stated in the website of the Chilean Energy Ministry
+# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
+# The Chilean Government has decided to postpone the entrance into winter time
+# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not
+# been yet formalized but it will within the next days.
+# Quote from the website communication:
+#
+# 6. For the year 2012, the dates of entry into winter time will be as follows:
+# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at
+# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00
+# of the same day.
+# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is,
+# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be
+# 01:00 on September 2.
+
+# From Steffen Thorsen (2013-02-15):
+# According to several news sources, Chile has extended DST this year,
+# they will end DST later and start DST earlier than planned.  They
+# hope to save energy.  The new end date is 2013-04-28 00:00 and new
+# start date is 2013-09-08 00:00....
+# http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm
+
+# NOTE: ChileAQ rules for Antarctic bases are stored separately in the
+# 'antarctica' file.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1248,8 +1281,6 @@ Rule	Chile	1998	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
 Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
 Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
 Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
 # N.B.: the end of March 29 in Chile is March 30 in Universal time,
 # which is used below in specifying the transition.
@@ -1257,7 +1288,9 @@ Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
 Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
 Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
-Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+Rule	Chile	2012	max	-	Apr	Sun>=23	3:00u	0	-
+Rule	Chile	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1279,17 +1312,23 @@ Zone Pacific/Easter	-7:17:44 -	LMT	1890
 # San Felix, and Antarctic bases, are like America/Santiago.

 # Colombia
+
+# Milne gives 4:56:16.4 for Bogota time in 1899; round to nearest.  He writes,
+# "A variation of fifteen minutes in the public clocks of Bogota is not rare."
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	CO	1992	only	-	May	 3	0:00	1:00	S
 Rule	CO	1993	only	-	Apr	 4	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Bogota	-4:56:20 -	LMT	1884 Mar 13
-			-4:56:20 -	BMT	1914 Nov 23 # Bogota Mean Time
+Zone	America/Bogota	-4:56:16 -	LMT	1884 Mar 13
+			-4:56:16 -	BMT	1914 Nov 23 # Bogota Mean Time
 			-5:00	CO	CO%sT	# Colombia Time
 # Malpelo, Providencia, San Andres
 # no information; probably like America/Bogota

 # Curacao
+
+# Milne gives 4:35:46.9 for Curacao mean time; round to nearest.
 #
 # From Paul Eggert (2006-03-22):
 # Shanks & Pottenger say that The Bottom and Philipsburg have been at
@@ -1306,7 +1345,7 @@ Zone	America/Bogota	-4:56:20 -	LMT	1884 Mar 13
 # though, as far as we know.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Curacao	-4:35:44 -	LMT	1912 Feb 12	# Willemstad
+Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12	# Willemstad
 			-4:30	-	ANT	1965 # Netherlands Antilles Time
 			-4:00	-	AST

@@ -1320,6 +1359,8 @@ Link	America/Curacao	America/Kralendijk # Bonaire, Sint Estatius and Saba

 # Ecuador
 #
+# Milne says the Sentral and South American Telegraph Company used -5:24:15.
+#
 # From Paul Eggert (2007-03-04):
 # Apparently Ecuador had a failed experiment with DST in 1992.
 # <http://midena.gov.ec/content/view/1261/208/> (2007-02-27) and
@@ -1403,6 +1444,21 @@ Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
 # will not revert to local mean time, but clocks will remain on Summer
 # time (UTC/GMT - 3 hours) throughout the whole of 2011.  Any long term
 # change to local time following the trial period will be notified.
+#
+# From Andrew Newman (2012-02-24)
+# A letter from Justin McPhee, Chief Executive,
+# Cable & Wireless Falkland Islands (dated 2012-02-22)
+# states...
+#   The current Atlantic/Stanley entry under South America expects the
+#   clocks to go back to standard Falklands Time (FKT) on the 15th April.
+#   The database entry states that in 2011 Stanley was staying on fixed
+#   summer time on a trial basis only.  FIG need to contact IANA and/or
+#   the maintainers of the database to inform them we're adopting
+#   the same policy this year and suggest recommendations for future years.
+#
+# For now we will assume permanent summer time for the Falklands
+# until advised differently (to apply for 2012 and beyond, after the 2011
+# experiment was apparently successful.)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Falk	1937	1938	-	Sep	lastSun	0:00	1:00	S
 Rule	Falk	1938	1942	-	Mar	Sun>=19	0:00	0	-
@@ -1415,14 +1471,14 @@ Rule	Falk	1984	only	-	Sep	16	0:00	1:00	S
 Rule	Falk	1985	2000	-	Sep	Sun>=9	0:00	1:00	S
 Rule	Falk	1986	2000	-	Apr	Sun>=16	0:00	0	-
 Rule	Falk	2001	2010	-	Apr	Sun>=15	2:00	0	-
-Rule	Falk	2012	max	-	Apr	Sun>=15	2:00	0	-
-Rule	Falk	2001	max	-	Sep	Sun>=1	2:00	1:00	S
+Rule	Falk	2001	2010	-	Sep	Sun>=1	2:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
 			-3:51:24 -	SMT	1912 Mar 12  # Stanley Mean Time
 			-4:00	Falk	FK%sT	1983 May     # Falkland Is Time
 			-3:00	Falk	FK%sT	1985 Sep 15
-			-4:00	Falk	FK%sT
+			-4:00	Falk	FK%sT	2010 Sep 5 02:00
+			-3:00	-	FKST

 # French Guiana
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1510,7 +1566,16 @@ Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	-
 # forward 60 minutes, in all the territory of the Paraguayan Republic.
 # ...
 Rule	Para	2010	max	-	Oct	Sun>=1	0:00	1:00	S
-Rule	Para	2010	max	-	Apr	Sun>=8	0:00	0	-
+Rule	Para	2010	2012	-	Apr	Sun>=8	0:00	0	-
+#
+# From Steffen Thorsen (2013-03-07):
+# Paraguay will end DST on 2013-03-24 00:00....
+# http://www.ande.gov.py/interna.php?id=1075
+#
+# From Carlos Raul Perasso (2013-03-15):
+# The change in Paraguay is now final.  Decree number 10780
+# http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf
+Rule	Para	2013	max	-	Mar	Sun>=22	0:00	0	-

 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Asuncion	-3:50:40 -	LMT	1890
@@ -1,5 +1,4 @@
 # <pre>
-# @(#)systemv	8.2
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.

@@ -1,13 +1,11 @@
 #! /bin/sh
 #
-#	$NetBSD: yearistype.sh,v 1.6 2006/09/23 17:34:36 kleink Exp $
+#	$NetBSD: yearistype.sh,v 1.7 2012/07/22 10:40:29 apb Exp $
 #

 : 'This file is in the public domain, so clarified as of'
 : '2006-07-17 by Arthur David Olson.'

-: '@(#)yearistype.sh	8.2'
-
 case $#-$1 in
 	2-|2-0*|2-*[!0-9]*)
 		echo "$0: wild year - $1" >&2
@@ -1,19 +1,21 @@
-# <pre>
-# @(#)zone.tab	8.52
+# TZ zone descriptions
+#
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# TZ zone descriptions
-#
-# From Paul Eggert (1996-08-05):
+# From Paul Eggert (2013-05-27):
 #
 # This file contains a table with the following columns:
 # 1.  ISO 3166 2-character country code.  See the file `iso3166.tab'.
+#     This identifies a country that overlaps the zone.  The country may
+#     overlap other zones and the zone may overlap other countries.
 # 2.  Latitude and longitude of the zone's principal location
 #     in ISO 6709 sign-degrees-minutes-seconds format,
 #     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
 #     first latitude (+ is north), then longitude (+ is east).
+#     This location need not lie within the column-1 country.
 # 3.  Zone name used in value of TZ environment variable.
+#     Please see the 'Theory' file for how zone names are chosen.
 # 4.  Comments; present if and only if the country has multiple rows.
 #
 # Columns are separated by a single tab.
@@ -23,6 +25,10 @@
 #
 # Lines beginning with `#' are comments.
 #
+# This table is intended as an aid for users, to help them select time
+# zone data appropriate for their practical needs.  It is not intended
+# to take or endorse any position on legal or territorial claims.
+#
 #country-
 #code	coordinates	TZ			comments
 AD	+4230+00131	Europe/Andorra
@@ -43,7 +49,6 @@ AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
 AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
 AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
 AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
-AQ	-5430+15857	Antarctica/Macquarie	Macquarie Island Station, Macquarie Island
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
 AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
 AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
@@ -59,6 +64,7 @@ AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
 AS	-1416-17042	Pacific/Pago_Pago
 AT	+4813+01620	Europe/Vienna
 AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
 AU	-4253+14719	Australia/Hobart	Tasmania - most locations
 AU	-3956+14352	Australia/Currie	Tasmania - King Island
 AU	-3749+14458	Australia/Melbourne	Victoria
@@ -131,6 +137,7 @@ CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia &
 CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
 CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
 CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
 CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
 CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
 CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
@@ -159,7 +166,8 @@ CW	+1211-06900	America/Curacao
 CX	-1025+10543	Indian/Christmas
 CY	+3510+03322	Asia/Nicosia
 CZ	+5005+01426	Europe/Prague
-DE	+5230+01322	Europe/Berlin
+DE	+5230+01322	Europe/Berlin	most locations
+DE	+4742+00841	Europe/Busingen	Busingen
 DJ	+1136+04309	Africa/Djibouti
 DK	+5540+01235	Europe/Copenhagen
 DM	+1518-06124	America/Dominica
@@ -215,7 +223,7 @@ ID	-0002+10920	Asia/Pontianak	west & central Borneo
 ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
 ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
 IE	+5320-00615	Europe/Dublin
-IL	+3146+03514	Asia/Jerusalem
+IL	+314650+0351326	Asia/Jerusalem
 IM	+5409-00428	Europe/Isle_of_Man
 IN	+2232+08822	Asia/Kolkata
 IO	-0720+07225	Indian/Chagos
@@ -333,7 +341,7 @@ RS	+4450+02030	Europe/Belgrade
 RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
 RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
 RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
-RU	+5312+05009	Europe/Samara	Moscow - Samara, Udmurtia
+RU	+5312+05009	Europe/Samara	Moscow+00 - Samara, Udmurtia
 RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
 RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
 RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
@@ -341,8 +349,10 @@ RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 - Novokuznetsk
 RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
 RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
 RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
 RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
 RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
 RU	+5934+15048	Asia/Magadan	Moscow+08 - Magadan
 RU	+5301+15839	Asia/Kamchatka	Moscow+08 - Kamchatka
 RU	+6445+17729	Asia/Anadyr	Moscow+08 - Bering Sea