Date: Wed, 6 Dec 2006 00:20:53 +0300 (MSK) From: Dmitry Marakasov <amdmi3@mail.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/106392: [PATCH] update astro/gaia to 0.1.2 Message-ID: <20061205212053.7FD884051@hades.panopticon> Resent-Message-ID: <200612052120.kB5LKEkq000651@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106392 >Category: ports >Synopsis: [PATCH] update astro/gaia to 0.1.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Dec 05 21:20:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD hades.panopticon 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #3: Wed Nov 1 14:20:50 MSK 2006 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: Update to 0.1.2: * Fixed failure to run on displays with 16bit color depth * Fixed compile under OpenBSD (+improvements in SCons stuff) * Fixed bug with navigation going mad and not working on some systems * Fixed crashes on SMP (thanks for contribution) * Google Earth imagery support removed * NASA World Wind imagery support added * Build system improved * On-disk image cache tweaked (but no fast indexed storage for now) I would also like to be maintainer of this port, as I'm gaia's author. If se@ don't mind, of course :) >How-To-Repeat: >Fix: --- gaia-0.1.2.patch begins here --- diff -ruN gaia.orig/Makefile gaia/Makefile --- gaia.orig/Makefile Wed Dec 6 00:01:38 2006 +++ gaia/Makefile Wed Dec 6 00:13:09 2006 @@ -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 @@ 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 -ruN gaia.orig/distinfo gaia/distinfo --- gaia.orig/distinfo Wed Dec 6 00:01:38 2006 +++ gaia/distinfo Wed Dec 6 00:02:19 2006 @@ -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 -ruN gaia.orig/files/patch-SConstruct gaia/files/patch-SConstruct --- gaia.orig/files/patch-SConstruct Wed Dec 6 00:01:38 2006 +++ gaia/files/patch-SConstruct Thu Jan 1 03:00:00 1970 @@ -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 -ruN gaia.orig/pkg-descr gaia/pkg-descr --- gaia.orig/pkg-descr Wed Dec 6 00:01:38 2006 +++ gaia/pkg-descr Wed Dec 6 00:08:44 2006 @@ -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 --- gaia-0.1.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061205212053.7FD884051>