- Update to 1.3

PR:		180510
Submitted by:	Ports Fury

5 files changed, 51 insertions, 72 deletions

diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index e5fd42a6f7fa..2269ae366f13 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -2,43 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	gpredict
-PORTVERSION=	1.2
-PORTREVISION=	2
+PORTVERSION=	1.3
 CATEGORIES=	comms hamradio
-MASTER_SITES=	SF/gpredict/Gpredict/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/Gpredict/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Amateur Radio satellite tracking and prediction
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # (or later)
 
 LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib \
+		curl:${PORTSDIR}/ftp/curl \
 		goocanvas:${PORTSDIR}/graphics/goocanvas
-BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
+USES=		gettext pathfix
 USE_GNOME=	gtk20
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --localedir=${PREFIX}/share/locale
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		gpredict.1
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
-DESKTOP_ENTRIES="GPREDICT" \
-		"Predict satellite passage times" \
-		"${PREFIX}/share/pixmaps/gpredict/icons/gpredict-icon.png" \
-		"gpredict" \
-		"" \
-		true
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^Icon/s|=.*|=${PREFIX}/share/pixmaps/gpredict-icon.png|' \
+		${WRKSRC}/data/desktop/gpredict.desktop.in
 
 .include <bsd.port.mk>
diff --git a/comms/gpredict/distinfo b/comms/gpredict/distinfo
index 1d88d99b4572..673617d44964 100644
--- a/comms/gpredict/distinfo
+++ b/comms/gpredict/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpredict-1.2.tar.gz) = ff4e4e912ac723eab63ce78876d5a521c29a4abe6d20e98904d483d63d25388a
-SIZE (gpredict-1.2.tar.gz) = 4682391
+SHA256 (gpredict-1.3.tar.gz) = b0f6beed8da1b2c513ba1f22593195c6097fc7ccfc66cba4bdbc16277238d5a3
+SIZE (gpredict-1.3.tar.gz) = 4750388
diff --git a/comms/gpredict/files/patch-po-Makefile.in.in b/comms/gpredict/files/patch-po-Makefile.in.in
deleted file mode 100644
index bb6d1eb71064..000000000000
--- a/comms/gpredict/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	2010-10-29 16:19:07.000000000 +0100
-+++ po/Makefile.in.in	2010-10-29 16:19:25.000000000 +0100
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = $(datadir)/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
diff --git a/comms/gpredict/pkg-descr b/comms/gpredict/pkg-descr
index 68a686df2705..90bd946a4d06 100644
--- a/comms/gpredict/pkg-descr
+++ b/comms/gpredict/pkg-descr
@@ -1,7 +1,7 @@
-Gpredict is a satellite tracking and prediction application.
+Gpredict is a real time satellite tracking and orbit prediction program
+written using the Gtk+ widgets. Gpredict is targetted mainly towards ham
+radio operators but others interested in satellite tracking may find it
+useful as well. Gpredict uses the SGP4/SDP4 algorithms, which are
+compatible with the NORAD Keplerian elements.
 
-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.
-
-WWW: http://gpredict.sourceforge.net/
+WWW: http://gpredict.oz9aec.net/
diff --git a/comms/gpredict/pkg-plist b/comms/gpredict/pkg-plist
index d9cf0c52b05a..74fa1bae3840 100644
--- a/comms/gpredict/pkg-plist
+++ b/comms/gpredict/pkg-plist
@@ -1,14 +1,14 @@
 bin/gpredict
+share/applications/gpredict.desktop
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
 %%DATADIR%%/ChangeLog
 %%DATADIR%%/NEWS
 %%DATADIR%%/README
 %%DATADIR%%/TODO
-%%DATADIR%%/data/sample.qth
-%%DATADIR%%/data/locations.dat
 %%DATADIR%%/data/Amateur.mod
-%%DATADIR%%/data/satdata/satellites.dat
+%%DATADIR%%/data/locations.dat
+%%DATADIR%%/data/sample.qth
 %%DATADIR%%/data/satdata/amateur.cat
 %%DATADIR%%/data/satdata/cubesat.cat
 %%DATADIR%%/data/satdata/dmc.cat
@@ -36,6 +36,7 @@ bin/gpredict
 %%DATADIR%%/data/satdata/raduga.cat
 %%DATADIR%%/data/satdata/resource.cat
 %%DATADIR%%/data/satdata/sarsat.cat
+%%DATADIR%%/data/satdata/satellites.dat
 %%DATADIR%%/data/satdata/sbas.cat
 %%DATADIR%%/data/satdata/science.cat
 %%DATADIR%%/data/satdata/tdrss.cat
@@ -82,6 +83,20 @@ bin/gpredict
 %%DATADIR%%/data/trsp/35935.trsp
 %%DATADIR%%/data/trsp/36122.trsp
 %%DATADIR%%/data/trsp/7530.trsp
+share/locale/cs/LC_MESSAGES/gpredict.mo
+share/locale/da/LC_MESSAGES/gpredict.mo
+share/locale/de/LC_MESSAGES/gpredict.mo
+share/locale/en_GB/LC_MESSAGES/gpredict.mo
+share/locale/en_US/LC_MESSAGES/gpredict.mo
+share/locale/es/LC_MESSAGES/gpredict.mo
+share/locale/fi/LC_MESSAGES/gpredict.mo
+share/locale/fr/LC_MESSAGES/gpredict.mo
+share/locale/it/LC_MESSAGES/gpredict.mo
+share/locale/lt/LC_MESSAGES/gpredict.mo
+share/locale/ru/LC_MESSAGES/gpredict.mo
+share/locale/th/LC_MESSAGES/gpredict.mo
+share/pixmaps/gpredict-icon.png
+share/pixmaps/gpredict/icons/gpredict-antenna-small.png
 share/pixmaps/gpredict/icons/gpredict-antenna.png
 share/pixmaps/gpredict/icons/gpredict-azel-small.png
 share/pixmaps/gpredict/icons/gpredict-calendar.png
@@ -106,48 +121,37 @@ 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-small.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/icons/gpredict-shuttle-small.png
+share/pixmaps/gpredict/icons/gpredict-shuttle.png
 share/pixmaps/gpredict/maps/earth_800.png
-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_1024.jpg
 share/pixmaps/gpredict/maps/nasa-bmng-03_2048.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-05_1024.jpg
 share/pixmaps/gpredict/maps/nasa-bmng-05_2048.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-07_1024.jpg
 share/pixmaps/gpredict/maps/nasa-bmng-07_2048.jpg
+share/pixmaps/gpredict/maps/nasa-bmng-08_1024.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
-%%NLS%%share/locale/cs/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/en_US/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gpredict.mo
-%%NLS%%share/locale/th/LC_MESSAGES/gpredict.mo
-%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_US
+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
 @dirrm share/pixmaps/gpredict/maps
 @dirrm share/pixmaps/gpredict/icons
 @dirrm share/pixmaps/gpredict
-@dirrm %%DATADIR%%/data/satdata
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
 @dirrm %%DATADIR%%/data/trsp
+@dirrm %%DATADIR%%/data/satdata
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
+@dirrmtry share/applications