svn commit: r298253 - head/usr.bin/units

[Eitan Adler]

Author: eadler
Date: Tue Apr 19 05:17:59 2016
New Revision: 298253
URL: https://svnweb.freebsd.org/changeset/base/298253

Log:
  Rename units.lib -> definitions.units
  - this matches GNU units 2.12
  add ISO country codes from units 2.12

Added:
  head/usr.bin/units/definitions.units
     - copied, changed from r298252, head/usr.bin/units/units.lib
Deleted:
  head/usr.bin/units/units.lib
Modified:
  head/usr.bin/units/units.1
  head/usr.bin/units/units.c

Copied and modified: head/usr.bin/units/definitions.units (from r298252, head/usr.bin/units/units.lib)
==============================================================================
--- head/usr.bin/units/units.lib	Tue Apr 19 05:17:43 2016	(r298252, copy source)
+++ head/usr.bin/units/definitions.units	Tue Apr 19 05:17:59 2016	(r298253)
@@ -363,6 +363,170 @@ lithuanianlitas		1|3.45280 euro
 pacificfrancexchange	1|0.00838 euro
 westafricancfafranc	1|655.957 euro
 
+# ISO Currency Codes
+
+AED                    uaedirham
+AFN                    afghanafghani
+ALL                    albanialek
+AMD                    armeniadram
+AOA                    angolakwanza
+ARS                    argentinapeso
+AUD                    australiadollar
+AWG                    arubaflorin
+AZN                    azerbaijanmanat
+BAM                    bosniaconvertiblemark
+BBD                    barbadosdollar
+BDT                    bangladeshtaka
+BGN                    bulgarialev
+BHD                    bahraindinar
+BIF                    burundifranc
+BMD                    bermudadollar
+BND                    bruneidollar
+BOB                    boliviaboliviano
+BRL                    brazilreal
+BSD                    bahamasdollar
+BTN                    bhutanngultrum
+BWP                    botswanapula
+BYR                    belarusruble
+BZD                    belizedollar
+CAD                    canadadollar
+CDF                    drcfranccongolais
+CHF                    swissfranc
+CLP                    chilepeso
+CMG                    sintmaartencaribbeanguilder
+CNY                    chinayuan
+COP                    colombiapeso
+CRC                    costaricacolon
+CUP                    cubapeso
+CVE                    capeverdeescudo
+CZK                    czechkoruna
+DJF                    djiboutifranc
+DKK                    denmarkkrona
+DOP                    dominicanrepublicpeso
+DZD                    algeriadinar
+EGP                    egyptpound
+ERN                    eritreanakfa
+ETB                    ethiopianbirr
+EUR                    euro
+FJD                    fijidollar
+FKP                    falklandislandspound
+GBP                    ukpound
+GEL                    georgialari
+GGP                    guernseypound
+GHS                    ghanacedi
+GIP                    gibraltarpound
+GMD                    gambiadalasi
+GNF                    guineafranc
+GTQ                    guatemalaquetzal
+GYD                    guyanadollar
+HKD                    hongkongdollar
+HNL                    honduraslempira
+HRK                    croatiakuna
+HTG                    haitigourde
+HUF                    hungariaforint
+IDR                    indonesiarupiah
+ILS                    israelnewshekel
+IMP                    manxpound
+INR                    indiarupee
+IQD                    iraqdinar
+IRR                    iranrial
+ISK                    icelandkrona
+JEP                    jerseypound
+JMD                    jamaicadollar
+JOD                    jordandinar
+JPY                    japanyen
+KES                    kenyaschilling
+KGS                    kyrgyzstansom
+KHR                    cambodiariel
+KMF                    comorosfranc
+KPW                    northkoreawon
+KRW                    southkoreawon
+KWD                    kuwaitdinar
+KYD                    caymanislandsdollar
+KZT                    kazakhstantenge
+LAK                    laokip
+LBP                    lebanonpound
+LKR                    srilankanrupee
+LRD                    liberiadollar
+LTL                    lithuanialita
+LVL                    latvialat
+LYD                    libyadinar
+MAD                    moroccodirham
+MDL                    moldovaleu
+MGA                    madagascarariary
+MKD                    macedoniadenar
+MMK                    myanmarkyat
+MNT                    mongoliatugrik
+MOP                    macaupataca
+MRO                    mauritaniaouguiya
+MUR                    mauritiusrupee
+MVR                    maldiverufiyaa
+MWK                    malawikwacha
+MXN                    mexicopeso
+MYR                    malaysiaringgit
+MZN                    mozambicanmetical
+NAD                    namibiadollar
+NGN                    nigerianaira
+NIO                    nicaraguacordobaoro
+NOK                    norwaykrone
+NPR                    nepalrupee
+NZD                    newzealanddollar
+OMR                    omanrial
+PAB                    panamabalboa
+PEN                    perunuevosol
+PGK                    papuanewguineakina
+PHP                    philippinepeso
+PKR                    pakistanrupee
+PLN                    polandzloty
+PYG                    paraguayguarani
+QAR                    qatarrial
+RON                    romanianewlei
+RSD                    serbiadinar
+RUB                    russiarouble
+RWF                    rwandafranc
+SAR                    saudiarabiariyal
+SBD                    solomonislandsdollar
+SCR                    seychellesrupee
+SDG                    sudanpound
+SEK                    swedenkrona
+SGD                    singaporedollar
+SHP                    sainthelenapound
+SLL                    sierraleoneleone
+SOS                    somaliaschilling
+SRD                    surinamedollar
+STD                    saotome&principedobra
+SVC                    elsalvadorcolon
+SYP                    syriapound
+SZL                    swazilandlilangeni
+THB                    thailandbaht
+TJS                    tajikistansomoni
+TMT                    turkmenistanmanat
+TND                    tunisiadinar
+TOP                    tongapa'anga
+TRY                    turkeylira
+TTD                    trinidadandtobagodollar
+TVD                    tuvaludollar
+TWD                    taiwandollar
+TZS                    tanzaniashilling
+UAH                    ukrainehryvnia
+UGX                    ugandaschilling
+USD                    usdollar
+UYU                    uruguaypeso
+UZS                    uzbekistansum
+VEF                    venezuelabolivar
+VND                    vietnamdong
+VUV                    vanuatuvatu
+WST                    samoatala
+XAF                    centralafricancfafranc
+XCD                    eastcaribbeandollar
+XDR                    specialdrawingrights
+XOF                    westafricanfranc
+XPF                    cfpfranc
+YER                    yemenrial
+ZAR                    southafricarand
+ZMW                    zambiakwacha
+ZWL                    zimbabwedollar
+
 # These ones are pegged on the US Dollar
 # See http://en.wikipedia.org/wiki/USD for details.
 dollar			usdollar

Modified: head/usr.bin/units/units.1
==============================================================================
--- head/usr.bin/units/units.1	Tue Apr 19 05:17:43 2016	(r298252)
+++ head/usr.bin/units/units.1	Tue Apr 19 05:17:59 2016	(r298253)
@@ -177,8 +177,8 @@ units.
 .It "mile	5280 ft"
 .El
 .Sh FILES
-.Bl -tag -width /usr/share/misc/units.lib -compact
-.It Pa /usr/share/misc/units.lib
+.Bl -tag -width /usr/share/misc/definitions.units -compact
+.It Pa /usr/share/misc/definitions.units
 the standard units library
 .El
 .Sh AUTHORS

Modified: head/usr.bin/units/units.c
==============================================================================
--- head/usr.bin/units/units.c	Tue Apr 19 05:17:43 2016	(r298252)
+++ head/usr.bin/units/units.c	Tue Apr 19 05:17:59 2016	(r298253)
@@ -33,7 +33,7 @@ static const char rcsid[] =
 
 #include <sys/capsicum.h>
 
-#define	_PATH_UNITSLIB	"/usr/share/misc/units.lib"
+#define	_PATH_UNITSLIB	"/usr/share/misc/definitions.units"
 
 #ifndef UNITSFILE
 #define UNITSFILE _PATH_UNITSLIB