Index: head/comms/geoid/Makefile
===================================================================
--- head/comms/geoid/Makefile	(revision 478989)
+++ head/comms/geoid/Makefile	(revision 478990)
@@ -1,33 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	geoid
 PORTVERSION=	1.0
 DISTVERSIONSUFFIX=	.src
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/LinuxApps/
 DISTNAME=	fl_geoid
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Geodetic computer for amateur radio use
 
 LICENSE=	GPLv2+ NONE  # only one src file contains license
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libpng16.so:graphics/png
 
-USES=		gmake
+USES=		gmake jpeg
+USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 MAKEFILE=	makefile
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/geoid.cxx
+		's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/geoid.cxx
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/geoid ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/geoid.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/country.pos ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/comms/geoid/files/patch-geoid.cxx
===================================================================
--- head/comms/geoid/files/patch-geoid.cxx	(revision 478989)
+++ head/comms/geoid/files/patch-geoid.cxx	(revision 478990)
@@ -1,15 +1,24 @@
 --- geoid.cxx.orig	Mon Dec 18 13:53:07 2006
 +++ geoid.cxx	Tue Mar 20 22:02:44 2007
 @@ -28,10 +28,8 @@
  	strFname.append("/.geoid/country.pos");
    
   	if (ReadGeoFile((char *)strFname.c_str()) == -1) {
 - 		strFname = szHomedir;
 - 		strFname.append("/country.pos");
 - 		if (ReadGeoFile((char *)strFname.c_str()) == -1) {
 -	  		fl_message("Cannot open %s", (char *)strFname.c_str());
 + 		if (ReadGeoFile("%%LOCALBASE%%/share/geoid/country.pos") == -1) {
 +	  		fl_message("Cannot open country.pos");
    			exit(0);
   		}
  	}
+@@ -46,7 +44,7 @@ int main(int argc, char **argv) {
+ 
+ void About()
+ {
+-	fl_message("Geodetic computer\nVersion: "VERSION"\nDave Freese\nw1hkj@@w1hkj.com");
++	fl_message("Geodetic computer\nVersion: " VERSION "\nDave Freese\nw1hkj@@w1hkj.com");
+ }
+ 
+ void cbSaveQTH()