diff -ruN ./gpredict/Makefile ./gpredict-devel/Makefile --- ./gpredict/Makefile 2010-04-26 15:21:49.000000000 +0100 +++ ./gpredict-devel/Makefile 2010-10-29 16:38:30.000000000 +0100 @@ -5,8 +5,7 @@ # $FreeBSD: ports/comms/gpredict/Makefile,v 1.21 2010/03/28 06:31:58 dinoex Exp $ PORTNAME= gpredict -PORTVERSION= 1.1 -PORTREVISION= 2 +PORTVERSION= 1.2 CATEGORIES= comms hamradio MASTER_SITES= SF/gpredict/Gpredict/${PORTVERSION} @@ -18,13 +17,22 @@ 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 +PLIST_SUB+= NLS="" +.endif + DESKTOP_ENTRIES="GPREDICT" \ "Predict satellite passage times" \ "${PREFIX}/share/pixmaps/gpredict/icons/gpredict-icon.png" \ diff -ruN ./gpredict/distinfo ./gpredict-devel/distinfo --- ./gpredict/distinfo 2010-01-03 17:52:02.000000000 +0000 +++ ./gpredict-devel/distinfo 2010-10-23 21:22:55.000000000 +0100 @@ -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 -ruN ./gpredict/files/patch-aclocal.m4 ./gpredict-devel/files/patch-aclocal.m4 --- ./gpredict/files/patch-aclocal.m4 1970-01-01 01:00:00.000000000 +0100 +++ ./gpredict-devel/files/patch-aclocal.m4 2010-10-29 16:16:29.000000000 +0100 @@ -0,0 +1,15 @@ +--- aclocal.m4.orig 2010-10-12 10:50:43.000000000 +0100 ++++ aclocal.m4 2010-10-29 16:11:26.000000000 +0100 +@@ -415,11 +415,7 @@ + test "x$prefix" = xNONE && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix=$prefix + datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` +-else +- localedir=`eval echo "${datadir}/locale"` +-fi ++localedir=`eval echo "${datadir}/locale"` + prefix="$glib_save_prefix" + exec_prefix="$glib_save_exec_prefix" + datarootdir="$glib_save_datarootdir" diff -ruN ./gpredict/files/patch-po-Makefile.in.in ./gpredict-devel/files/patch-po-Makefile.in.in --- ./gpredict/files/patch-po-Makefile.in.in 1970-01-01 01:00:00.000000000 +0100 +++ ./gpredict-devel/files/patch-po-Makefile.in.in 2010-10-29 16:20:17.000000000 +0100 @@ -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 -ruN ./gpredict/files/patch-src-Makefile.am ./gpredict-devel/files/patch-src-Makefile.am --- ./gpredict/files/patch-src-Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ ./gpredict-devel/files/patch-src-Makefile.am 2010-10-29 16:18:04.000000000 +0100 @@ -0,0 +1,11 @@ +--- src/Makefile.am.orig 2010-10-29 16:16:59.000000000 +0100 ++++ src/Makefile.am 2010-10-29 16:17:12.000000000 +0100 +@@ -7,7 +7,7 @@ + -DDATADIR=\""$(datadir)"\" \ + -DPACKAGE_DATA_DIR=\""$(datadir)/gpredict"\" \ + -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/gpredict"\" \ +- -DPACKAGE_LOCALE_DIR=\""$(prefix)/locale"\" ++ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" + + ## We have to disable these for now because GtkTooltips have been + ## deprecated in Gtk+ 2.12 diff -ruN ./gpredict/pkg-plist ./gpredict-devel/pkg-plist --- ./gpredict/pkg-plist 2010-01-03 17:52:02.000000000 +0000 +++ ./gpredict-devel/pkg-plist 2010-10-29 16:34:07.000000000 +0100 @@ -75,6 +75,12 @@ %%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.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,17 @@ 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 @dirrm share/pixmaps/gpredict/maps @dirrm share/pixmaps/gpredict/icons @dirrm share/pixmaps/gpredict @@ -128,5 +149,27 @@ @dirrm %%DATADIR%%/data/trsp @dirrm %%DATADIR%%/data @dirrm %%DATADIR%% -@dirrmtry share/locale/en_US/LC_MESSAGES -@dirrmtry share/locale/en_US +%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/th/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/cs +%%NLS%%@dirrmtry share/locale/de +%%NLS%%@dirrmtry share/locale/es +%%NLS%%@dirrmtry share/locale/fi +%%NLS%%@dirrmtry share/locale/fr +%%NLS%%@dirrmtry share/locale/it +%%NLS%%@dirrmtry share/locale/lt +%%NLS%%@dirrmtry share/locale/ru +%%NLS%%@dirrmtry share/locale/th +%%NLS%%@dirrmtry share/locale/fr +%%NLS%%@dirrmtry share/locale/en_GB +%%NLS%%@dirrmtry share/locale/en_US +%%NLS%%@dirrmtry share/locale