4 files changed, 106 insertions, 33 deletions

diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index 863a3190f625..63a44a4a8211 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -5,19 +5,19 @@
 # $FreeBSD$
 
 PORTNAME=	gpredict
-PORTVERSION=	0.9.0
-PORTREVISION=	4
+PORTVERSION=	1.1
 CATEGORIES=	comms hamradio
-MASTER_SITES=	SF/groundstation/Gpredict/${PORTVERSION}
+MASTER_SITES=	SF/gpredict/Gpredict/${PORTVERSION}
 
 MAINTAINER=	matt@chronos.org.uk
 COMMENT=	Amateur Radio satellite tracking and prediction
 
-LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib:install
-BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl:install
-RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl:install
+LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib \
+		goocanvas:${PORTSDIR}/graphics/goocanvas
+BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-network
 USE_GMAKE=	yes
diff --git a/comms/gpredict/distinfo b/comms/gpredict/distinfo
index 99e69c39077c..affb4dafba52 100644
--- a/comms/gpredict/distinfo
+++ b/comms/gpredict/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpredict-0.9.0.tar.gz) = bde60ddfb7075fbd554a16c5b6dd19c1
-SHA256 (gpredict-0.9.0.tar.gz) = 8686c357c188223792a1267255565a60a2e3fe30ddeb45a816ebfe42b099ec42
-SIZE (gpredict-0.9.0.tar.gz) = 2414711
+MD5 (gpredict-1.1.tar.gz) = 6d88bd51000e3f65962e60d0ab042229
+SHA256 (gpredict-1.1.tar.gz) = eb38ce0b961fbf52ce294cd3d648fa97e8db298f96f0fb4dd8ceb960827f6cf9
+SIZE (gpredict-1.1.tar.gz) = 4101711
diff --git a/comms/gpredict/pkg-descr b/comms/gpredict/pkg-descr
index f40ca67be778..68a686df2705 100644
--- a/comms/gpredict/pkg-descr
+++ b/comms/gpredict/pkg-descr
@@ -1,12 +1,7 @@
-Gpredict is a satellite tracking and prediction application
-written using Gtk+ and Gnome widgets by Alexandru Csete.
+Gpredict is a satellite tracking and prediction application.
 
-Part of the groundstation suite, its purpose is to track
-the various amateur, weather and military satellites that
-are of interest to radio amateurs.
+Originally part of the groundstation suite, its purpose is 
+to track the various amateur, weather and military satellites 
+that are of interest to radio amateurs.
 
-The groundstation suite comprises Gnome-rig and Gnome-predict
-and is intended to provide a low-cost amateur radio station
-with the facilities of a high-end satellite station.
-
-WWW: http://groundstation.sourceforge.net/
+WWW: http://gpredict.sourceforge.net/
diff --git a/comms/gpredict/pkg-plist b/comms/gpredict/pkg-plist
index 5f293170cd1f..ca18651f9dea 100644
--- a/comms/gpredict/pkg-plist
+++ b/comms/gpredict/pkg-plist
@@ -5,19 +5,77 @@ bin/gpredict
 %%DATADIR%%/NEWS
 %%DATADIR%%/README
 %%DATADIR%%/TODO
-%%DATADIR%%/data/Amateur.mod
-%%DATADIR%%/data/amateur.tle
-%%DATADIR%%/data/cubesat.tle
-%%DATADIR%%/data/galileo.tle
-%%DATADIR%%/data/geo.tle
-%%DATADIR%%/data/gps-ops.tle
-%%DATADIR%%/data/iridium.tle
-%%DATADIR%%/data/locations.dat
-%%DATADIR%%/data/military.tle
-%%DATADIR%%/data/radar.tle
 %%DATADIR%%/data/sample.qth
-%%DATADIR%%/data/science.tle
-%%DATADIR%%/data/weather.tle
+%%DATADIR%%/data/locations.dat
+%%DATADIR%%/data/Amateur.mod
+%%DATADIR%%/data/satdata/satellites.dat 
+%%DATADIR%%/data/satdata/amateur.cat    
+%%DATADIR%%/data/satdata/cubesat.cat    
+%%DATADIR%%/data/satdata/dmc.cat        
+%%DATADIR%%/data/satdata/education.cat  
+%%DATADIR%%/data/satdata/engineering.cat
+%%DATADIR%%/data/satdata/galileo.cat    
+%%DATADIR%%/data/satdata/geo.cat        
+%%DATADIR%%/data/satdata/geodetic.cat   
+%%DATADIR%%/data/satdata/glo-ops.cat    
+%%DATADIR%%/data/satdata/globalstar.cat 
+%%DATADIR%%/data/satdata/goes.cat       
+%%DATADIR%%/data/satdata/gorizont.cat   
+%%DATADIR%%/data/satdata/gps-ops.cat    
+%%DATADIR%%/data/satdata/intelsat.cat   
+%%DATADIR%%/data/satdata/iridium.cat    
+%%DATADIR%%/data/satdata/military.cat   
+%%DATADIR%%/data/satdata/molniya.cat    
+%%DATADIR%%/data/satdata/musson.cat     
+%%DATADIR%%/data/satdata/nnss.cat       
+%%DATADIR%%/data/satdata/noaa.cat       
+%%DATADIR%%/data/satdata/orbcomm.cat    
+%%DATADIR%%/data/satdata/other-comm.cat 
+%%DATADIR%%/data/satdata/other.cat      
+%%DATADIR%%/data/satdata/radar.cat      
+%%DATADIR%%/data/satdata/raduga.cat     
+%%DATADIR%%/data/satdata/resource.cat   
+%%DATADIR%%/data/satdata/sarsat.cat     
+%%DATADIR%%/data/satdata/sbas.cat       
+%%DATADIR%%/data/satdata/science.cat    
+%%DATADIR%%/data/satdata/tdrss.cat      
+%%DATADIR%%/data/satdata/tle-new.cat    
+%%DATADIR%%/data/satdata/visual.cat     
+%%DATADIR%%/data/satdata/weather.cat    
+%%DATADIR%%/data/satdata/x-comm.cat     
+%%DATADIR%%/data/trsp/20439.trsp        
+%%DATADIR%%/data/trsp/20442.trsp        
+%%DATADIR%%/data/trsp/22825.trsp        
+%%DATADIR%%/data/trsp/22826.trsp        
+%%DATADIR%%/data/trsp/23439.trsp        
+%%DATADIR%%/data/trsp/24278.trsp        
+%%DATADIR%%/data/trsp/24786.trsp        
+%%DATADIR%%/data/trsp/25338.trsp        
+%%DATADIR%%/data/trsp/25397.trsp        
+%%DATADIR%%/data/trsp/25544.trsp        
+%%DATADIR%%/data/trsp/26352.trsp        
+%%DATADIR%%/data/trsp/26536.trsp        
+%%DATADIR%%/data/trsp/26871.trsp        
+%%DATADIR%%/data/trsp/26931.trsp        
+%%DATADIR%%/data/trsp/27453.trsp        
+%%DATADIR%%/data/trsp/27607.trsp        
+%%DATADIR%%/data/trsp/27844.trsp        
+%%DATADIR%%/data/trsp/27848.trsp        
+%%DATADIR%%/data/trsp/27939.trsp        
+%%DATADIR%%/data/trsp/28375.trsp
+%%DATADIR%%/data/trsp/28650.trsp
+%%DATADIR%%/data/trsp/28654.trsp
+%%DATADIR%%/data/trsp/28895.trsp
+%%DATADIR%%/data/trsp/32785.trsp
+%%DATADIR%%/data/trsp/32787.trsp
+%%DATADIR%%/data/trsp/32789.trsp
+%%DATADIR%%/data/trsp/32791.trsp
+%%DATADIR%%/data/trsp/33493.trsp
+%%DATADIR%%/data/trsp/33498.trsp
+%%DATADIR%%/data/trsp/33499.trsp
+%%DATADIR%%/data/trsp/33591.trsp
+%%DATADIR%%/data/trsp/35865.trsp
+%%DATADIR%%/data/trsp/7530.trsp
 share/pixmaps/gpredict/icons/gpredict-antenna.png
 share/pixmaps/gpredict/icons/gpredict-azel-small.png
 share/pixmaps/gpredict/icons/gpredict-calendar.png
@@ -46,9 +104,29 @@ share/pixmaps/gpredict/maps/nasa-topo_1024.jpg
 share/pixmaps/gpredict/maps/nasa-topo_1600.jpg
 share/pixmaps/gpredict/maps/nasa-topo_2048.jpg
 share/pixmaps/gpredict/maps/nasa-topo_800.png
+share/pixmaps/gpredict/maps/nasa-bmng-01_1024.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-03_1024.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-05_1024.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-07_1024.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-08_1024.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-01_2048.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-03_2048.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-05_2048.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-07_2048.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-08_2048.jpg
+share/pixmaps/gpredict/icons/gpredict-antenna-small.png
+share/pixmaps/gpredict/icons/gpredict-oscilloscope-small.png
+share/pixmaps/gpredict/icons/gpredict-shuttle.png
+share/pixmaps/gpredict/icons/gpredict-shuttle-small.png
+share/locale/fr/LC_MESSAGES/gpredict.mo
+share/locale/en_GB/LC_MESSAGES/gpredict.mo
+share/locale/en_US/LC_MESSAGES/gpredict.mo                        
 @dirrm share/pixmaps/gpredict/maps
 @dirrm share/pixmaps/gpredict/icons
 @dirrm share/pixmaps/gpredict
+@dirrm %%DATADIR%%/data/satdata
+@dirrm %%DATADIR%%/data/trsp
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrmtry lib/locale
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US