Put jdp's entry in the proper place.

Scoot asami's entry's name over to be able to fit with similarly
located people.

Create a new file: freebsd.core_and_committers.markers.  I separated
the two more, so now I'm recombining them :)  This file is generated
upon installation from the freebsd.{core,committers}.markers files,
so it's a nice set-up now, I think!

Change pkg/DESCR to reflect what the marker files are now (overhaul
the last paragraph completely).

5 files changed, 16 insertions, 5 deletions

diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index 711292c83e72..15ea4ae55939 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -25,5 +25,10 @@ post-install:
 	${CP} ${FILESDIR}/freebsd.core.markers ${PREFIX}/lib/X11/xearth
 	${CP} ${FILESDIR}/freebsd.committers.markers ${PREFIX}/lib/X11/xearth
 	${CP} ${FILESDIR}/freebsd.ftp.markers ${PREFIX}/lib/X11/xearth
+	${ECHO} "# All of FreeBSD's committers, including core :)" > \
+	    ${PREFIX}/lib/X11/xearth/freebsd.core_and_committers.markers
+	${GREP} -hv '^[[:space:]]*#' ${FILESDIR}/freebsd.core.markers \
+	    ${FILESDIR}/freebsd.committers.markers >> \
+	    ${PREFIX}/lib/X11/xearth/freebsd.core_and_committers.markers
 
 .include <bsd.port.mk>
diff --git a/astro/xearth/files/freebsd.committers.markers b/astro/xearth/files/freebsd.committers.markers
index 2b3a502be7fb..7c4b1516477c 100644
--- a/astro/xearth/files/freebsd.committers.markers
+++ b/astro/xearth/files/freebsd.committers.markers
@@ -72,3 +72,4 @@
 
   44.95    34.1 "phantom"                       # Simferopol, Ukraine
   50.4     30.5 "sobomax"                       # Kiev, Ukraine
+  47.5   -122.4 "jdp"                           # Seattle, WA
diff --git a/astro/xearth/files/freebsd.core.markers b/astro/xearth/files/freebsd.core.markers
index fbab36505c3e..86bc3f87d988 100644
--- a/astro/xearth/files/freebsd.core.markers
+++ b/astro/xearth/files/freebsd.core.markers
@@ -2,10 +2,9 @@
 # FreeBSD core team members
 #
 40.0, -123.5,  "jkh"                            # Miranda, CA
-37.4, -122.0,  "asami"                          # Santa Clara, 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
-47.5, -122.4,  "jdp"                            # Seattle, WA
 42.34, -71.19, "gwollman"                       # Brighton, MA
 39.2,  -77.0,  "jmb"                            # Silver Spring, MD
 51.5,    0.0,  "dfr"                            # London, UK
diff --git a/astro/xearth/pkg-descr b/astro/xearth/pkg-descr
index 5672b726746b..7930e0a1293f 100644
--- a/astro/xearth/pkg-descr
+++ b/astro/xearth/pkg-descr
@@ -6,8 +6,13 @@ time between updates can be changed with the -wait option.
 Xearth  can  also  render  directly into PPM and GIF files
 instead of drawing in the root window.
 
-There are additional files called freebsd.{core,ftp}.markers
-which give the location of FreeBSD core team members and FTP
-sites.  These are installed in /usr/X11R6/lib/X11/xearth.
+There are four addition marker file installed in
+/usr/X11R6/lib/X11/xearth which specify the locations of
+various FreeBSD people and places:
+
+freebsd.core.markers - members of the FreeBSD core team
+freebsd.committers.markers - FreeBSD committers (non-core)
+freebsd.core_and_committers.markers - core plus committers
+freebsd.ftp.markers - FreeBSD FTP mirrors
 
 WWW: http://www.cs.colorado.edu/~tuna/xearth/index.html
diff --git a/astro/xearth/pkg-plist b/astro/xearth/pkg-plist
index 9cf79af94645..9be09b24d3dd 100644
--- a/astro/xearth/pkg-plist
+++ b/astro/xearth/pkg-plist
@@ -1,5 +1,6 @@
 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