4 files changed, 95 insertions, 118 deletions

diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index 2456b4f90709..b76b0bb7f770 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -19,23 +19,11 @@ USE_IMAKE=	yes
 
 MAN1=		xearth.1
 
-# Always prep the joint marker list for every new install
-pre-install:
-	@${ECHO} "# All of FreeBSD's committers, including core :)" > \
-		${WRKDIR}/freebsd.core_and_committers.markers
-	@${GREP} -hv '^[[:space:]]*#' ${FILESDIR}/freebsd.core.markers \
-	    ${FILESDIR}/freebsd.committers.markers >> \
-		${WRKDIR}/freebsd.core_and_committers.markers
-
-# Copy the list of FreeBSD sites
+# Copy the list of FreeBSD sites & committers locations
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/xearth
-.for file in freebsd.core.markers freebsd.committers.markers \
-	freebsd.ftp.markers
+.for file in freebsd.committers.markers freebsd.ftp.markers
 	@${INSTALL_DATA} ${FILESDIR}/${file} ${PREFIX}/lib/X11/xearth
 .endfor
-	@${INSTALL_DATA} \
-		${WRKDIR}/freebsd.core_and_committers.markers \
-			${PREFIX}/lib/X11/xearth
 
 .include <bsd.port.mk>
diff --git a/astro/xearth/files/freebsd.committers.markers b/astro/xearth/files/freebsd.committers.markers
index 416bc148505c..5816d1406dc6 100644
--- a/astro/xearth/files/freebsd.committers.markers
+++ b/astro/xearth/files/freebsd.committers.markers
@@ -1,89 +1,99 @@
 #
 # BSDi, our good friends.
 #
-37.91  -122.06 "BSDi/OSD"		# BSDi Open Source Division
+37.91,		-122.06,	"BSDi/OSD"			# BSDi Open Source Division
+
 #
-# FreeBSD's committers excluding the Core
+# FreeBSD Project Committers
 #
-  39.25, -121.02 "truckman"                     # Nevada City, CA
-  38.54  -121.76 "     ,obrien,mharo"           # Davis, CA
-  37.80  -122.43 "                  ,julian"    # Downtown San Francisco, CA
-  37.77  -122.44 "                         ,archie" # Haight, San Francisco, CA 
-  37.55  -122.26 "                                ,terry" # Foster City, CA 
-  37.32  -121.94 "                                      ,jmg" # San Jose, CA
-  37.40  -121.94 "                                          ,alfred,billf" # Santa Clara
-  37.32916 -121.96222 "                                                  ,nsayer" # Santa Clara, CA
-  37.39, -122.06 "                                                        ,marcel" # Mountain View, CA
-  37.51, -122.30 "                                                               ,kbyanc" # Belmont, CA
-  37.50 -122.17 "                                                                      ,gshapiro" # Emeryville, CA
-  39.2    -77.0  "   ,gpalmer"			# Silver Spring, MD
-  34.13  -118.12 "mph"                          # Pasadena, CA
-  34.11  -118.29 "       ,kris"                     # Los Angeles, CA
-  33.83  -118.22 "             ,trevor"		# Dominguez, California
-  51.09  -114.12  "cpiazza"                     # Calgary, AB, Canada
-  40.55  -111.90 "wes"                          # South Jordan, UT
-  46.59  -112.04 "nate"                         # Helena, MT
-  40.1   -105.3  "     ,imp,ken,fsmp"           # Boulder, CO
-  43.19   -89.38 "jlemon"                       # Madison, WI
-  42.02   -93.67 "ghelmer"                      # Ames, IA
-  39.8    -86.2  "dyson"                        # Indianapolis, IN
-  40.42   -86.92 "will"				# West Lafayette, IN
-  43.37   -79.79 "hoek"                         # Burlington, ON
-  44.99   -93.26 "nectar"                       # Minneapolis, MN
-  34.8    -86.7  "steve"                        # Harvest, AL
-  38.75   -76.87 "   ,green"                    # Clinton, MD
-  35.73   -78.91 "bsd"                          # Apex, NC
-  44.99   -93.25 "mpp,mks"                      # Minneapolis, MN
-  37.23   -80.41 "jhb"				# Blacksburg, VA
-  39.00   -76.88 "         ,chuckr"		# Greenbelt, MD
-  43.09   -77.68 "jseger"			# Rochester, NY
-  29.16   -82.18 "jedgar"			# Ocala, FL
-  42.1411 -70.8453 "jeh"			# Hanover, MA
-  42.727  -73.676 "dec,jon,gad"			# RPI @ Troy, NY
-
-  59.92    10.75 "eivind,des,tegge"             # Oslo, Norway
-  52.14    21.03 "abial"                        # Warsaw, Poland
-  51.25,    5.30 "guido"			# Eindhoven, the Netherlands
-  50.70     6.2  "tg"                           # Aachen, Germany
-  52.56    13.27 "    ,chm"                     # Berlin, Germany
-  52.51    13.33 "dirk"                         # Berlin, Germany
-  50.1025   8.6841 "tomsoft"                    # Frankfurt, Hessen, Germany
-  53.33     9.59 "stb"                          # Hamburg, Germany
-  53.56    10.02 "   ,cracauer"                 # Hamburg, Germany
-  53.64     9.84 "            ,hm"		# Rellingen, Germany
-  50.92     6.95 "se"				# Cologne, Germany
-  48.36     2.99 "charnier"                     # Cannes Ecluse, France
-  48.7      2.17 "roberto"                      # Les Ulis, France
-  55.87    -4.26 "    ,roger"                   # Glasgow, UK
-  51.50    -0.48 "nik"                          # West Drayton, Middx., UK
-  51.67     0.61 "brian"                        # Amersham, Bucks, UK
-  50.84121667 0.128383333 "joe"                 # Brighton, East Sussex, UK
-  53.22    -1.29 "ben"                          # Sheffield, Yorkshire, UK
-  51.44    -2.06 "marko" align=left		# Chippenham, Wiltshire, UK
-  43.71    10.40 "luigi"                        # Pisa, Italy
-  53.20    -6.15 "dwmalone" align=left		# Dublin, Ireland
-
-  36.45   139.37 "dcs"				# ???, Japan
-  35.7    139.6  "     knu"			# Tokyo, Japan
-
- -34.14   138.77 "grog"                         # Echunga, SA Australia
- -34.53   138.35 "    ,newton"                  # Adelaide, SA Australia
- -37.7     144.9 "jb,danny,thepish,benno"       # Melbourne, Vic Australia
-
-  12.58    77.35 "jkoshy"                       # Bangalore, India
-
-  51.53    -0.18 "n_hibma"                      # London, UK
- -34       18    "markm"                        # Cape Town, South Africa
- -34       18    "     ,sheldonh"		# Cape Town, South Africa
-  29.834  -95.00 "chris"                        # Houston, TX
-  25.45   122.2 "clive,foxfair,keith,kevlo,vanilla"     # Taipei, Taiwan
-
-  44.95    34.1 "phantom"                       # Simferopol, Ukraine
-  50.4     30.5 "sobomax"                       # Kiev, Ukraine
-  47.5   -122.4 "jdp"                           # Seattle, WA
-  51.3     6.75 "alex"				# Meerbusch, Germany
-  51.98    5.96 "wilko"				# Arnhem, The Netherlands
-
-  -15.8   -47.9 "lioux"				# Brasilia, DF, Brazil
+# Style (sorted from east to west):
+# Lat,		Long,		"name"	opt			# location
 
-  37.34  126.58 "cjh"				# Seoul, South Korea
+-33.55,		151.1,		"bde"				# Sydney, Australia.
+-37.7,		144.9,		"jb,danny,thepish,benno"	# Melbourne, Vic Australia
+ 36.45,		139.37,		"dcs"				# ???, Japan
+ 35.7,		139.6		"     knu"			# Tokyo, Japan
+-34.14,		138.77,		"grog"				# Echunga, SA Australia
+-34.53,		138.35,		"    ,newton"			# Adelaide, SA Australia
+ 37.34,		126.58,		"cjh"				# Seoul, South Korea
+ 25.45,		122.2,		"clive,foxfair,keith,kevlo,vanilla"	# Taipei, Taiwan
+ 12.58,		77.35,		"jkoshy"			# Bangalore, India
+ 55.8,		37.6,		"ache"				# Moscow, Russia
+ 44.95,		34.1,		"phantom"			# Simferopol, Ukraine
+ 50.4,		30.5,		"sobomax"			# Kiev, Ukraine
+ 52.14,		21.03,		"abial"				# Warsaw, Poland
+-34,		18,		"markm, sheldonh"		# Cape Town, South Africa
+ 52.0,		13.8,		"joerg"				# Germany
+ 52.51,		13.33,		"dirk"				# Berlin, Germany
+ 52.56,		13.27,		"    ,chm"			# Berlin, Germany
+ 55.411822290,	11.336162915,	"phk"				# Slagelse, Denmark
+ 59.92,		10.75,		"eivind,des,tegge"		# Oslo, Norway
+ 43.71,		10.40,		"luigi"				# Pisa, Italy
+ 57.2,		10.2,		"sos"				# Klokkerholm, Denmark
+ 53.56,		10.02,		"   ,cracauer"			# Hamburg, Germany
+ 53.33,		9.59		"stb"				# Hamburg, Germany
+ 53.64,		9.84,		"            ,hm"		# Rellingen, Germany
+ 50.1025,	8.6841,		"tomsoft"			# Frankfurt, Hessen, Germany
+ 50.92,		6.95,		"se"				# Cologne, Germany
+ 51.3,		6.75		"alex"				# Meerbusch, Germany
+ 50.70,		6.2,		"tg"				# Aachen, Germany
+ 51.98,		5.96,		"wilko"				# Arnhem, The Netherlands
+ 51.25,		5.30,		"guido"				# Eindhoven, the Netherlands
+ 48.36,		2.99		"charnier"	align=left	# Cannes Ecluse, France
+ 48.7,		2.17,		"roberto"			# Les Ulis, France
+ 51.67,		0.61,		"brian"				# Amersham, Bucks, UK
+ 50.84121667,	0.128383333,	"joe"				# Brighton, East Sussex, UK
+ 51.5,		0.0,		"dfr"				# (CORE) London, UK
+ 51.53,		-0.18,		"n_hibma"			# London, UK
+ 51.50,		-0.48,		"nik"				# West Drayton, Middx., UK
+ 53.22,		-1.29,		"ben"				# Sheffield, Yorkshire, UK
+ 51.44,		-2.06,		"marko"		align=left	# Chippenham, Wiltshire, UK
+ 55.87,		-4.26,		"      ,roger"			# Glasgow, UK
+ 56.0,		-4.5,		"gary"				# Glasgow, UK
+ 53.20,		-6.15,		"dwmalone"	align=left	# Dublin, Ireland
+-15.8,		-47.9,		"lioux"				# Brasilia, DF, Brazil
+ 42.1411,	-70.8453,	"jeh"				# Hanover, MA, USA
+ 42.34,		-71.19,		"wollman"			# Brighton, MA, USA
+ 42.727,	-73.676,	"dec,jon,gad"			# RPI @ Troy, NY, USA
+ 45.3991,	-75.6942	"jake"				# Ottawa, ON, Canada
+ 38.75,		-76.87,		"   ,green"			# Clinton, MD, USA
+ 39.00,		-76.88,		"         ,chuckr"		# Greenbelt, MD, USA
+ 39.2,		-77.0,		"jmb,gpalmer"			# Silver Spring, MD, USA
+ 38.981024,	-77.119791,	"rwatson"			# (CORE) Bethesda, MD, USA
+ 43.09,		-77.68,		"jseger"			# Rochester, NY, USA
+ 35.73,		-78.91		"bsd"				# Apex, NC, USA
+ 43.37,		-79.79,		"hoek"				# Burlington, ON, Canada
+#37.23,		-80.41,		"jhb"				# Blacksburg, VA, USA
+ 29.16,		-82.18,		"jedgar"			# Ocala, FL, USA
+ 34.8,		-86.7,		"steve"				# Harvest, AL, USA
+ 40.425098,	-86.928511,	"will"				# West Lafayette, IN, USA
+ 43.19,		-89.38,		"jlemon"			# Madison, WI, USA
+ 44.99,		-93.25,		"mpp,mks"			# Minneapolis, MN, USA
+ 44.99,		-93.26,		"       ,nectar"		# Minneapolis, MN, USA
+ 42.02,		-93.67,		"ghelmer"			# Ames, IA, USA
+ 29.834,	-95.00		"     ,chris"			# Houston, TX, USA
+ 29.7,		-95.4,		"rich"				# Houston, TX, USA
+ 40.1,		-105.3,		"imp"				# (CORE) Boulder, CO, USA
+ 40.1,		-105.3,		"    ,gibbs,ken,fsmp"		# Boulder, CO, USA
+ 40.55,		-111.90,	"wes"				# South Jordan, UT, USA
+ 46.59,		-112.04,	"nate"				# Helena, MT, USA
+ 51.09,		-114.12,	"cpiazza"			# Calgary, AB, Canada
+ 34.13,		-118.12		"mph"				# Pasadena, CA, USA
+ 33.83,		-118.22,	"             ,trevor"		# Dominguez, CA, USA
+ 34.11,		-118.29,	"       ,kris"			# Los Angeles, CA, USA
+ 39.25,		-121.02,	"truckman"			# Nevada City, CA, USA
+ 38.54,		-121.76,	"obrien,mharo"			# Davis, CA, USA
+ 37.32,		-121.94,	"jmg"				# San Jose, CA, USA
+ 37.40,		-121.94,	"alfred,billf"			# Santa Clara, USA
+ 37.75573,	-121.947116,	"peter"				# (CORE) San Ramon, CA, USA
+ 37.32916,	-121.96222,	"nsayer"			# Santa Clara, CA, USA
+ 37.4,		-122.0,		"asami"				# (CORE) Santa Clara, CA, USA
+ 37.39,		-122.06,	"marcel"			# Mountain View, CA, USA
+ 37.50,		-122.17,	"gshapiro"			# Emeryville, CA, USA
+ 37.55,		-122.26,	"terry"				# Foster City, CA, USA
+ 37.51,		-122.30,	"kbyanc"			# Belmont, CA, USA
+ 47.5,		-122.4,		"jdp"				# Seattle, WA, USA
+#37.80,		-122.43,	"julian"			# Downtown San Francisco, CA, USA
+ 37.77,		-122.44,	"archie"			# Haight, San Francisco, CA, USA
+ 45.5,		-122.6,		"dg"				# (CORE) near Portland, OR, USA
+ 40.0,		-123.5,		"jkh"				# (CORE) Miranda, CA, USA
diff --git a/astro/xearth/files/freebsd.core.markers b/astro/xearth/files/freebsd.core.markers
deleted file mode 100644
index 1395b6aa6370..000000000000
--- a/astro/xearth/files/freebsd.core.markers
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# FreeBSD core team members
-#
-40.0, -123.5,  "jkh"                            # Miranda, CA
-37.4, -122.0,  "asami"                          # Santa Clara, CA
-40.1, -105.3,  "gibbs"                          # Boulder, CO (wow!)
-45.5, -122.6,  "dg"                             # near Portland, OR
-42.34, -71.19, "gwollman"                       # Brighton, MA
-39.2,  -77.0,  "jmb"                            # Silver Spring, MD
-51.5,    0.0,  "dfr"                            # London, UK
-56.0,   -4.5,  "gary"                           # Glasgow, UK
-55.8,   37.6,  "ache"                           # Moscow
-55.411822290,   11.336162915,  "phk"		# Slagelse, Denmark
-57.2,   10.2,  "sos"                            # Klokkerholm, Denmark
-52.0,   13.8,  "joerg"                          # Germany
-29.7,  -95.4,  "rich"                           # Houston, TX
--33.55,151.1,  "bde"                            # Sydney, Australia.
--31.58,115.49, "peter"                          # Perth, Australia.
-38.981024,	-77.119791,	"rwatson"	# Bethesda, MD, USA
diff --git a/astro/xearth/pkg-plist b/astro/xearth/pkg-plist
index 9be09b24d3dd..da04bf96daab 100644
--- a/astro/xearth/pkg-plist
+++ b/astro/xearth/pkg-plist
@@ -1,6 +1,4 @@
 bin/xearth
-lib/X11/xearth/freebsd.core.markers
 lib/X11/xearth/freebsd.committers.markers
-lib/X11/xearth/freebsd.core_and_committers.markers
 lib/X11/xearth/freebsd.ftp.markers
 @dirrm lib/X11/xearth