3 files changed, 28 insertions, 16 deletions

diff --git a/astro/xrmap/Makefile b/astro/xrmap/Makefile
index d9cdefdbb941..7f0891eec209 100644
--- a/astro/xrmap/Makefile
+++ b/astro/xrmap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrmap
 PORTVERSION=	2.33
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/:data \
 		ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/:src
@@ -31,7 +31,7 @@ CIAFILE=	CIA_WDB2.jpd.bz2
 POPFILE=	population.dat.bz2
 SRCFILE=	xrmap-${PORTVERSION}.tar.bz2
 DATAFILES=	anthems-1.2.tar.bz2 earthdata_med_res.tar.bz2 \
-		factbook_text_2005.tar.bz2 factbook_html_2005.tar.bz2 \
+		factbook_text_2006.tar.bz2 factbook_html_2006.tar.bz2 \
 		flags-2.9-eps.tar.bz2 hymns-1.3.tar.bz2 pdfmaps-1.3.tar.bz2
 
 MAN1=		emx.1 xrmap.1
diff --git a/astro/xrmap/distinfo b/astro/xrmap/distinfo
index 8ede55702815..be2acc797d21 100644
--- a/astro/xrmap/distinfo
+++ b/astro/xrmap/distinfo
@@ -7,12 +7,12 @@ SIZE (xrmap/anthems-1.2.tar.bz2) = 106164
 MD5 (xrmap/earthdata_med_res.tar.bz2) = d1754a7bf81d97c3338da30db467598c
 SHA256 (xrmap/earthdata_med_res.tar.bz2) = 42556f286b11e2408f164a5c49cfa12e9ccde2b4cecd6689a054a3a580080990
 SIZE (xrmap/earthdata_med_res.tar.bz2) = 50589431
-MD5 (xrmap/factbook_text_2005.tar.bz2) = f455f3c6bbd4fe3a77ab0e0c04c19eeb
-SHA256 (xrmap/factbook_text_2005.tar.bz2) = 3aa85fc814065dc8b34341baa1b870cd15cf9530bef8ec5f3aa368a97009e1a8
-SIZE (xrmap/factbook_text_2005.tar.bz2) = 745471
-MD5 (xrmap/factbook_html_2005.tar.bz2) = 237d7fdd1e98174fe8f5886be597248e
-SHA256 (xrmap/factbook_html_2005.tar.bz2) = 03d2c2ef16fb9c4617a519d0ef1b74719f62fa85301e807d69cdcb0940069aa9
-SIZE (xrmap/factbook_html_2005.tar.bz2) = 27193880
+MD5 (xrmap/factbook_text_2006.tar.bz2) = de6282e74556b4eb82266036fdbba8a8
+SHA256 (xrmap/factbook_text_2006.tar.bz2) = 5089be3081bdb7a662fdec1ec2d0b3bca580ee650301a680982308bb940c378b
+SIZE (xrmap/factbook_text_2006.tar.bz2) = 768743
+MD5 (xrmap/factbook_html_2006.tar.bz2) = 42ea275ec1118b820c8e59706892c3c5
+SHA256 (xrmap/factbook_html_2006.tar.bz2) = e0240c2ac2ddd2409a6dc03b43f1695082b3b227655980b922c935ec60048049
+SIZE (xrmap/factbook_html_2006.tar.bz2) = 27894247
 MD5 (xrmap/flags-2.9-eps.tar.bz2) = 9df0819ef558796442cfc72784c9b92e
 SHA256 (xrmap/flags-2.9-eps.tar.bz2) = b4c2f5dd7c6bd5a451353a1d48145fcfc535658fa7961eaee5af244a2948caea
 SIZE (xrmap/flags-2.9-eps.tar.bz2) = 4910461
diff --git a/astro/xrmap/pkg-plist b/astro/xrmap/pkg-plist
index 8fc0ae5de040..363023bcb3f3 100644
--- a/astro/xrmap/pkg-plist
+++ b/astro/xrmap/pkg-plist
@@ -274,6 +274,8 @@ share/rmap/factbook/covers/cover2004back.html
 share/rmap/factbook/covers/cover2004front.html
 share/rmap/factbook/covers/cover2005back.html
 share/rmap/factbook/covers/cover2005front.html
+share/rmap/factbook/covers/cover2006back.html
+share/rmap/factbook/covers/cover2006front.html
 share/rmap/factbook/covers/index.html
 share/rmap/factbook/covers/large/00-back.jpg
 share/rmap/factbook/covers/large/00-front.jpg
@@ -287,6 +289,8 @@ share/rmap/factbook/covers/large/04-back.jpg
 share/rmap/factbook/covers/large/04-front.jpg
 share/rmap/factbook/covers/large/05-back.jpg
 share/rmap/factbook/covers/large/05-front.jpg
+share/rmap/factbook/covers/large/06-back.jpg
+share/rmap/factbook/covers/large/06-front.jpg
 share/rmap/factbook/covers/large/86-front.jpg
 share/rmap/factbook/covers/large/87-back.jpg
 share/rmap/factbook/covers/large/87-front.jpg
@@ -327,6 +331,8 @@ share/rmap/factbook/covers/thumbnails/04-back.jpg
 share/rmap/factbook/covers/thumbnails/04-front.jpg
 share/rmap/factbook/covers/thumbnails/05-back.jpg
 share/rmap/factbook/covers/thumbnails/05-front.jpg
+share/rmap/factbook/covers/thumbnails/06-back.jpg
+share/rmap/factbook/covers/thumbnails/06-front.jpg
 share/rmap/factbook/covers/thumbnails/86-front.jpg
 share/rmap/factbook/covers/thumbnails/87-back.jpg
 share/rmap/factbook/covers/thumbnails/87-front.jpg
@@ -371,7 +377,6 @@ share/rmap/factbook/extra/Akrotiri
 share/rmap/factbook/extra/Arctic_Ocean
 share/rmap/factbook/extra/Ashmore_and_Cartier_Islands
 share/rmap/factbook/extra/Atlantic_Ocean
-share/rmap/factbook/extra/Baker_Island
 share/rmap/factbook/extra/Clipperton_Island
 share/rmap/factbook/extra/Coral_Sea_Islands
 share/rmap/factbook/extra/Dhekelia
@@ -379,20 +384,15 @@ share/rmap/factbook/extra/Europa_Island
 share/rmap/factbook/extra/European_Union
 share/rmap/factbook/extra/Gaza_Strip
 share/rmap/factbook/extra/Glorioso_Islands
-share/rmap/factbook/extra/Howland_Island
 share/rmap/factbook/extra/Jan_Mayen
-share/rmap/factbook/extra/Jarvis_Island
-share/rmap/factbook/extra/Johnston_Atoll
 share/rmap/factbook/extra/Juan_de_Nova_Island
-share/rmap/factbook/extra/Kingman_Reef
-share/rmap/factbook/extra/Midway_Islands
 share/rmap/factbook/extra/Navassa_Island
 share/rmap/factbook/extra/Pacific_Ocean
-share/rmap/factbook/extra/Palmyra_Atoll
 share/rmap/factbook/extra/Serbia_and_Montenegro
 share/rmap/factbook/extra/Southern_Ocean
 share/rmap/factbook/extra/Spratly_Islands
 share/rmap/factbook/extra/Tromelin_Island
+share/rmap/factbook/extra/US_Pacific_Islands
 share/rmap/factbook/extra/Wake_Island
 share/rmap/factbook/extra/West_Bank
 share/rmap/factbook/extra/World
@@ -515,7 +515,6 @@ share/rmap/factbook/fields/2154.html
 share/rmap/factbook/fields/2155.html
 share/rmap/factbook/fields/2156.html
 share/rmap/factbook/fields/2157.html
-share/rmap/factbook/fields/2158.html
 share/rmap/factbook/fields/2172.html
 share/rmap/factbook/fields/2173.html
 share/rmap/factbook/fields/2174.html
@@ -535,6 +534,7 @@ share/rmap/factbook/fields/2187.html
 share/rmap/factbook/fields/2188.html
 share/rmap/factbook/fields/2193.html
 share/rmap/factbook/fields/2194.html
+share/rmap/factbook/fields/2195.html
 share/rmap/factbook/flags/aa-flag.gif
 share/rmap/factbook/flags/aa-flag.html
 share/rmap/factbook/flags/aa-lgflag.gif
@@ -1253,6 +1253,9 @@ share/rmap/factbook/flags/ug-lgflag.gif
 share/rmap/factbook/flags/uk-flag.gif
 share/rmap/factbook/flags/uk-flag.html
 share/rmap/factbook/flags/uk-lgflag.gif
+share/rmap/factbook/flags/um-flag.gif
+share/rmap/factbook/flags/um-flag.html
+share/rmap/factbook/flags/um-lgflag.gif
 share/rmap/factbook/flags/up-flag.gif
 share/rmap/factbook/flags/up-flag.html
 share/rmap/factbook/flags/up-lgflag.gif
@@ -1557,6 +1560,7 @@ share/rmap/factbook/geos/tx.html
 share/rmap/factbook/geos/tz.html
 share/rmap/factbook/geos/ug.html
 share/rmap/factbook/geos/uk.html
+share/rmap/factbook/geos/um.html
 share/rmap/factbook/geos/up.html
 share/rmap/factbook/geos/us.html
 share/rmap/factbook/geos/uv.html
@@ -1859,6 +1863,7 @@ share/rmap/factbook/maps/tx-map.gif
 share/rmap/factbook/maps/tz-map.gif
 share/rmap/factbook/maps/ug-map.gif
 share/rmap/factbook/maps/uk-map.gif
+share/rmap/factbook/maps/um-map.gif
 share/rmap/factbook/maps/up-map.gif
 share/rmap/factbook/maps/us-map.gif
 share/rmap/factbook/maps/uv-map.gif
@@ -2130,6 +2135,7 @@ share/rmap/factbook/print/tx.html
 share/rmap/factbook/print/tz.html
 share/rmap/factbook/print/ug.html
 share/rmap/factbook/print/uk.html
+share/rmap/factbook/print/um.html
 share/rmap/factbook/print/up.html
 share/rmap/factbook/print/us.html
 share/rmap/factbook/print/uv.html
@@ -2169,6 +2175,8 @@ share/rmap/factbook/rankorder/2038rank.html
 share/rmap/factbook/rankorder/2038rank.txt
 share/rmap/factbook/rankorder/2042rank.html
 share/rmap/factbook/rankorder/2042rank.txt
+share/rmap/factbook/rankorder/2053rank.html
+share/rmap/factbook/rankorder/2053rank.txt
 share/rmap/factbook/rankorder/2054rank.html
 share/rmap/factbook/rankorder/2054rank.txt
 share/rmap/factbook/rankorder/2066rank.html
@@ -2189,10 +2197,14 @@ share/rmap/factbook/rankorder/2091rank.html
 share/rmap/factbook/rankorder/2091rank.txt
 share/rmap/factbook/rankorder/2092rank.html
 share/rmap/factbook/rankorder/2092rank.txt
+share/rmap/factbook/rankorder/2093rank.html
+share/rmap/factbook/rankorder/2093rank.txt
 share/rmap/factbook/rankorder/2095rank.html
 share/rmap/factbook/rankorder/2095rank.txt
 share/rmap/factbook/rankorder/2102rank.html
 share/rmap/factbook/rankorder/2102rank.txt
+share/rmap/factbook/rankorder/2108rank.html
+share/rmap/factbook/rankorder/2108rank.txt
 share/rmap/factbook/rankorder/2119rank.html
 share/rmap/factbook/rankorder/2119rank.txt
 share/rmap/factbook/rankorder/2121rank.html