4 files changed, 110 insertions, 69 deletions

diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index c36a8656a262..876d7b0f3cd0 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	gpredict
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/gpredict/Gpredict/${PORTVERSION}
 
@@ -18,13 +17,23 @@ LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib \
 BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-USE_GNOME=	gtk20 gnomehack
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-network
+CONFIGURE_ARGS=	--prefix=${PREFIX} --localedir=${PREFIX}/share/locale
 USE_GMAKE=	yes
 
 MAN1=		gpredict.1
 
+LICENSE=	GPLv2
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.endif
+
 DESKTOP_ENTRIES="GPREDICT" \
 		"Predict satellite passage times" \
 		"${PREFIX}/share/pixmaps/gpredict/icons/gpredict-icon.png" \
diff --git a/comms/gpredict/distinfo b/comms/gpredict/distinfo
index affb4dafba52..623cb3ad5f13 100644
--- a/comms/gpredict/distinfo
+++ b/comms/gpredict/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpredict-1.1.tar.gz) = 6d88bd51000e3f65962e60d0ab042229
-SHA256 (gpredict-1.1.tar.gz) = eb38ce0b961fbf52ce294cd3d648fa97e8db298f96f0fb4dd8ceb960827f6cf9
-SIZE (gpredict-1.1.tar.gz) = 4101711
+MD5 (gpredict-1.2.tar.gz) = 9b46a3e0fe2de276b15ae10f72be0fca
+SHA256 (gpredict-1.2.tar.gz) = ff4e4e912ac723eab63ce78876d5a521c29a4abe6d20e98904d483d63d25388a
+SIZE (gpredict-1.2.tar.gz) = 4682391
diff --git a/comms/gpredict/files/patch-po-Makefile.in.in b/comms/gpredict/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..bb6d1eb71064
--- /dev/null
+++ b/comms/gpredict/files/patch-po-Makefile.in.in
@@ -0,0 +1,11 @@
+--- 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-plist b/comms/gpredict/pkg-plist
index ca18651f9dea..d9cf0c52b05a 100644
--- a/comms/gpredict/pkg-plist
+++ b/comms/gpredict/pkg-plist
@@ -8,60 +8,60 @@ bin/gpredict
 %%DATADIR%%/data/sample.qth
 %%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/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/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
@@ -75,6 +75,12 @@ bin/gpredict
 %%DATADIR%%/data/trsp/33499.trsp
 %%DATADIR%%/data/trsp/33591.trsp
 %%DATADIR%%/data/trsp/35865.trsp
+%%DATADIR%%/data/trsp/35870.trsp
+%%DATADIR%%/data/trsp/35932.trsp
+%%DATADIR%%/data/trsp/35933.trsp
+%%DATADIR%%/data/trsp/35934.trsp
+%%DATADIR%%/data/trsp/35935.trsp
+%%DATADIR%%/data/trsp/36122.trsp
 %%DATADIR%%/data/trsp/7530.trsp
 share/pixmaps/gpredict/icons/gpredict-antenna.png
 share/pixmaps/gpredict/icons/gpredict-azel-small.png
@@ -83,10 +89,17 @@ share/pixmaps/gpredict/icons/gpredict-clock-small.png
 share/pixmaps/gpredict/icons/gpredict-clock.png
 share/pixmaps/gpredict/icons/gpredict-crash.png
 share/pixmaps/gpredict/icons/gpredict-icon.png
-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-layout-00.png
+share/pixmaps/gpredict/icons/gpredict-layout-01.png
+share/pixmaps/gpredict/icons/gpredict-layout-02.png
+share/pixmaps/gpredict/icons/gpredict-layout-03.png
+share/pixmaps/gpredict/icons/gpredict-layout-04.png
+share/pixmaps/gpredict/icons/gpredict-layout-05.png
+share/pixmaps/gpredict/icons/gpredict-layout-06.png
+share/pixmaps/gpredict/icons/gpredict-layout-07.png
+share/pixmaps/gpredict/icons/gpredict-layout-08.png
+share/pixmaps/gpredict/icons/gpredict-layout-99.png
+share/pixmaps/gpredict/icons/gpredict-leds.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
@@ -118,9 +131,19 @@ 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                        
+%%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
 @dirrm share/pixmaps/gpredict/maps
 @dirrm share/pixmaps/gpredict/icons
 @dirrm share/pixmaps/gpredict
@@ -128,5 +151,3 @@ share/locale/en_US/LC_MESSAGES/gpredict.mo
 @dirrm %%DATADIR%%/data/trsp
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US