4 files changed, 27 insertions, 40 deletions

diff --git a/astro/gaia/Makefile b/astro/gaia/Makefile
index f347978240c8..69130d651fe6 100644
--- a/astro/gaia/Makefile
+++ b/astro/gaia/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gaia
-PORTVERSION=	0.1.0
+PORTVERSION=	0.1.2
 CATEGORIES=	astro
-MASTER_SITES=	http://gaia.serezhkin.com/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gaia-clean
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Display geographic maps with optional GPS tracking support
@@ -20,32 +21,33 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
 
 USE_BZIP2=	yes
 USE_SCONS=	yes
+SCONS_BUILDENV=	${SCONS_ENV}
+SCONS_ARGS+=	prefix=${PREFIX} use_env=1
 
-OPTIONS=	GPS "Build with GPS support" OFF
-
-IGNORE=		distribution stopped due to complaints by Google (software changes required)
+OPTIONS=	GPS "Build with GPS support" off
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GPS)
 LIB_DEPENDS+=	gps.15:${PORTSDIR}/astro/gpsd
-.else
-SCONS_ARGS+=	gpsd=0
+SCONS_ARGS+=	gpsd=1
 .endif
 
-PLIST_FILES=	bin/gaia share/gaia/README share/gaia/font.png
+PLIST_FILES=	bin/gaia share/gaia/font.png
 PLIST_DIRS=	share/gaia
 
+PORTDOCS=	README
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; s|%%CXX%%|${CXX}|g ; \
-		s|%%DATADIR%%|${PREFIX}/share/gaia| ; \
-		s|%%CFLAGS%%|${CFLAGS}| ; \
-		s|%%CXXFLAGS%%|${CXXFLAGS}|g' ${WRKSRC}/SConstruct
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gaia ${TARGETDIR}/bin/
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/data/font.png ${DATADIR}/
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		-e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/SConstruct
+
+.if !defined(NOPORTDOCS)
+post-install:
+	${MKDIR} ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/astro/gaia/distinfo b/astro/gaia/distinfo
index fb81a170108a..dd5ce3496fa6 100644
--- a/astro/gaia/distinfo
+++ b/astro/gaia/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaia-0.1.0.tar.bz2) = 9a9f5a3e5095dae5dbf2e6dd998d1f5d
-SHA256 (gaia-0.1.0.tar.bz2) = 83931c8e5316d3b156a4b71c1e92ec693133daa24f803c35ef983580fe42e48b
-SIZE (gaia-0.1.0.tar.bz2) = 64892
+MD5 (gaia-0.1.2.tar.bz2) = b9bd7fd9b035e843788c6a6f25baf07f
+SHA256 (gaia-0.1.2.tar.bz2) = 9174671fa3e88f6f10d6e5acfe1d18e8e4d6177fa0e288632b4b70f978864c95
+SIZE (gaia-0.1.2.tar.bz2) = 60241
diff --git a/astro/gaia/files/patch-SConstruct b/astro/gaia/files/patch-SConstruct
deleted file mode 100644
index 888fa6a7e88a..000000000000
--- a/astro/gaia/files/patch-SConstruct
+++ /dev/null
@@ -1,15 +0,0 @@
---- SConstruct~	Wed Nov  8 01:42:33 2006
-+++ SConstruct	Thu Nov 23 19:46:29 2006
-@@ -10,8 +10,10 @@
- #######################################
- # ENVIRONMENT
- #######################################
--env = Environment( CCFLAGS = [ '-Wall', '-g' ],
--		   CXXFLAGS = [ '-Wall', '-g' ],
-+env = Environment( CCFLAGS = Split("%%CFLAGS%% -DDATADIR='"'"%%DATADIR%%"'"'"),
-+		   CXXFLAGS = Split("%%CXXFLAGS%% -DDATADIR='"'"%%DATADIR%%"'"'"),
-+		   CC = Split ('%%CC%%'),
-+		   CXX = Split('%%CXX%%'),
- 		   CPPPATH = [ '/usr/local/include', '/usr/X11R6/include' ],
- 		   LIBPATH = [ '/usr/X11R6/lib', '/usr/local/lib' ],
- 		   options = opts )
diff --git a/astro/gaia/pkg-descr b/astro/gaia/pkg-descr
index fcec5bad3d74..2853ac638d98 100644
--- a/astro/gaia/pkg-descr
+++ b/astro/gaia/pkg-descr
@@ -1,7 +1,7 @@
-Gaia is an open, portable, customizable and extendable Google Earth client,
+Gaia is an open, portable, customizable and extendable Earth viewer,
 currently in an early stage of development.
 
-Optionally, the current position as reported by any GPS device supported 
-by "gpsd" can be tracked and displayed.
+Optionally, the current position as reported by any GPS device
+supported by "gpsd" can be tracked and displayed.
 
-WWW: http://gaia.serezhkin.com/
+WWW: http://www.sourceforge.net/projects/gaia-clean