3 files changed, 52 insertions, 60 deletions

diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index a2b22420b5a2..b073aa8b1f98 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -5,21 +5,21 @@
 # $FreeBSD$
 
 PORTNAME=	gpredict
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	groundstation
 
-MAINTAINER=	matt@mattsnetwork.co.uk
+MAINTAINER=	matt@chronos.org.uk
 COMMENT=	Amateur Radio satellite tracking and prediction
 
 LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib:install
 
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomecanvas gal
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--disable-nls	# nls isn't supported yet
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
+
+MAN1=		gpredict.1
 
 .include <bsd.port.mk>
diff --git a/comms/gpredict/distinfo b/comms/gpredict/distinfo
index 72abcda24390..e747c54e2244 100644
--- a/comms/gpredict/distinfo
+++ b/comms/gpredict/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpredict-0.5.1.tar.gz) = 11779a7567b1f4997934df2eaee28fd2
-SHA256 (gpredict-0.5.1.tar.gz) = 02a1f141b81b813e0e23a8450f9c64c22f460f6a3858a2f123f8bcc8f7dae916
-SIZE (gpredict-0.5.1.tar.gz) = 844358
+MD5 (gpredict-0.6.1.tar.gz) = 8486d63fa7d50b7f27e71af5da9b3a18
+SHA256 (gpredict-0.6.1.tar.gz) = 91ada1053fa3f7d87c08aa40a76839acf3e9febca9aa13574066d220d654889f
+SIZE (gpredict-0.6.1.tar.gz) = 1802643
diff --git a/comms/gpredict/pkg-plist b/comms/gpredict/pkg-plist
index ebcb1aa46490..8310a8e0531f 100644
--- a/comms/gpredict/pkg-plist
+++ b/comms/gpredict/pkg-plist
@@ -1,57 +1,49 @@
 bin/gpredict
-%%DATADIR%%/amateur.tle
-%%DATADIR%%/iridium.tle
-%%DATADIR%%/locations.dat
-%%DATADIR%%/military.tle
-%%DATADIR%%/radar.tle
-%%DATADIR%%/science.tle
-%%DATADIR%%/weather.tle
-share/pixmaps/gpredict/icons/antenna.png
-share/pixmaps/gpredict/icons/calendar.png
-share/pixmaps/gpredict/icons/cancel.png
-share/pixmaps/gpredict/icons/crash.png
-share/pixmaps/gpredict/icons/gnome-globe.png
-share/pixmaps/gpredict/icons/gnome-oscilloscope.png
-share/pixmaps/gpredict/icons/gpredict-dir-closed.xpm
-share/pixmaps/gpredict/icons/gpredict-dir-open.xpm
-share/pixmaps/gpredict/icons/gpredict-disk-16.xpm
-share/pixmaps/gpredict/icons/gpredict-file-list.xpm
-share/pixmaps/gpredict/icons/gpredict-globe-16.xpm
-share/pixmaps/gpredict/icons/gpredict-home.png
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/COPYING
+%%DATADIR%%/ChangeLog
+%%DATADIR%%/NEWS
+%%DATADIR%%/README
+%%DATADIR%%/TODO
+%%DATADIR%%/data/Amateur.mod
+%%DATADIR%%/data/amateur.tle
+%%DATADIR%%/data/cubesat.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
+share/pixmaps/gpredict/icons/gpredict-antenna.png
+share/pixmaps/gpredict/icons/gpredict-azel-small.png
+share/pixmaps/gpredict/icons/gpredict-calendar.png
+share/pixmaps/gpredict/icons/gpredict-crash.png
 share/pixmaps/gpredict/icons/gpredict-icon.png
-share/pixmaps/gpredict/icons/gpredict-icon.xpm
-share/pixmaps/gpredict/icons/gpredict-tle-web.png
-share/pixmaps/gpredict/icons/ic910-wide.png
-share/pixmaps/gpredict/icons/ic910.png
-share/pixmaps/gpredict/icons/info.png
-share/pixmaps/gpredict/icons/map-druid.png
-share/pixmaps/gpredict/icons/map.png
-share/pixmaps/gpredict/icons/map.xpm
-share/pixmaps/gpredict/icons/mir-original.png
-share/pixmaps/gpredict/icons/module-attach.png
-share/pixmaps/gpredict/icons/module-close.png
-share/pixmaps/gpredict/icons/module-detach.png
-share/pixmaps/gpredict/icons/prefs.png
-share/pixmaps/gpredict/icons/prefs_20.png
-share/pixmaps/gpredict/icons/print.png
-share/pixmaps/gpredict/icons/print_20.png
-share/pixmaps/gpredict/icons/radio.png
-share/pixmaps/gpredict/icons/radio.xpm
-share/pixmaps/gpredict/icons/satlist-druid.png
-share/pixmaps/gpredict/icons/satlist.png
-share/pixmaps/gpredict/icons/save.png
-share/pixmaps/gpredict/icons/save_as.png
-share/pixmaps/gpredict/icons/save_as_20.png
-share/pixmaps/gpredict/icons/skyview.png
-share/pixmaps/gpredict/icons/stock_timer.png
-share/pixmaps/gpredict/icons/windows.png
-share/pixmaps/gpredict/icons/windows_small.png
-share/pixmaps/gpredict/maps/CPEarth_800.jpg
-share/pixmaps/gpredict/maps/N1MXK_YEL_800.jpg
-share/pixmaps/gpredict/maps/NASA_800.jpg
-share/pixmaps/gpredict/maps/earth_800.jpg
-share/pixmaps/gpredict/maps/night_800.jpg
+share/pixmaps/gpredict/icons/gpredict-layout-1.png
+share/pixmaps/gpredict/icons/gpredict-layout-2.png
+share/pixmaps/gpredict/icons/gpredict-layout-3.png
+share/pixmaps/gpredict/icons/gpredict-layout-4.png
+share/pixmaps/gpredict/icons/gpredict-mod-attach.png
+share/pixmaps/gpredict/icons/gpredict-mod-close.png
+share/pixmaps/gpredict/icons/gpredict-mod-config.png
+share/pixmaps/gpredict/icons/gpredict-mod-detach.png
+share/pixmaps/gpredict/icons/gpredict-mod-popup.png
+share/pixmaps/gpredict/icons/gpredict-notebook.png
+share/pixmaps/gpredict/icons/gpredict-oscilloscope.png
+share/pixmaps/gpredict/icons/gpredict-planner-small.png
+share/pixmaps/gpredict/icons/gpredict-planner.png
+share/pixmaps/gpredict/icons/gpredict-polar-small.png
+share/pixmaps/gpredict/icons/gpredict-sat-list.png
+share/pixmaps/gpredict/icons/gpredict-sat-pref.png
+share/pixmaps/gpredict/maps/earth_800.png
+share/pixmaps/gpredict/maps/nasa-topo_800.png
 @dirrm share/pixmaps/gpredict/maps
 @dirrm share/pixmaps/gpredict/icons
 @dirrm share/pixmaps/gpredict
+@dirrmtry share/pixmaps
+@dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
+@dirrmtry locale