- update astro/gpsd to 3.9

- fix build on head
- remove stale options and patch
- chase the update in dependent ports

PR:		178279
Submitted by:	glebius (maintainer)

9 files changed, 43 insertions, 66 deletions

diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile
index 8d3882a0bc50..c922b6fa291c 100644
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	foxtrotgps
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro geography
 MASTER_SITES=	http://www.foxtrotgps.org/releases/
 
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index 3d968d3726a2..1a20db8e29c1 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gpsd
-PORTVERSION=	3.6
-PORTREVISION=	1
+PORTVERSION=	3.9
 CATEGORIES=	astro geography
 MASTER_SITES=	SAVANNAH
 
@@ -21,7 +20,7 @@ INSTALLS_EGGINFO=	yes
 PYDISTUTILS_EGGINFO=	gps-${PORTVERSION}.egg-info
 MAKE_JOBS_SAFE=	yes
 
-SCONS_BUILDENV=	${SCONS_ENV}
+SCONS_BUILDENV=	CC=${CC}
 SCONS_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
 		chrpath=no
 
@@ -30,12 +29,12 @@ MAN1=	cgps.1 gegps.1 gps.1 gpscat.1 gpsctl.1 gpsdecode.1 \
 	gpsmon.1 lcdgps.1
 MAN3=	libgps.3 libgpsd.3 libgpsmm.3 libQgpsmm.3
 MAN5=	srec.5 gpsd_json.5
-MAN8=	gpsd.8 gpsdctl.8
+MAN8=	gpsd.8 gpsdctl.8 gpsinit.8
 MANCOMPRESSED=	no
 
 OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FV18 GARMIN GARMINTXT \
-		GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NCURSES NMEA NTPSHM NTRIP \
-		OCEANSERVER OLDPROTO ONCORE PASSTHROUGH PPS PPSONCTS PROFILING RECONFIGURE \
+		GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NMEA NTPSHM NTRIP \
+		OCEANSERVER OLDPROTO ONCORE PASSTHROUGH PPS PROFILING RECONFIGURE \
 		RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
 		TSIP QTBIND UBX USB
 OPTIONS_DEFAULT=	AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FV18 GARMIN GARMINTXT GEOSTAR \
@@ -57,7 +56,6 @@ GTK2_DESC=		Install py-gtk2 (required for xgps & xgpsspeed)
 ITRAX_DESC=		iTrax support
 MTK_DESC=		MTK-3301 support
 NAVCOM_DESC=		Navcom support
-NCURSES_DESC=		Build with ncurses(3)
 NETFEED_DESC=		Build support for handling TCP/IP data sources
 NMEA_DESC=		NMEA support
 NTPSHM_DESC=		NTP time hinting support
@@ -67,7 +65,6 @@ OLDPROTO_DESC=		Old (pre-JSON) protocol support in client lib
 ONCORE_DESC=		Motorola OnCore chipset support
 PASSTHROUGH_DESC=	Build support for passing through JSON
 PPS_DESC=		PPS time syncing support
-PPSONCTS_DESC=		PPS pulse on CTS rather than DCD
 PROFILING_DESC=		Profiling support
 RECONFIGURE_DESC=	Allow gpsd to change device settings
 RTCM104V2_DESC=		rtcm104v2 support
@@ -197,10 +194,6 @@ IGNORE=		PPS requires NTPSHM
 .	endif
 .endif
 
-.if ${PORT_OPTIONS:MPPSONCTS}
-SCONS_ARGS+=	pps_on_cts=yes
-.endif
-
 # Export methods
 .if ! ${PORT_OPTIONS:MSOCKEXPORT}
 SCONS_ARGS+=	socket_export=no
@@ -260,14 +253,6 @@ SCONS_ARGS+=	reconfigure=no
 SCONS_ARGS+=	libgpsmm=no
 .endif
 
-.if ! ${PORT_OPTIONS:MNCURSES}
-SCONS_ARGS+=	ncurses=no
-PLIST_SUB+=	CURSES="@comment "
-.else
-PLIST_SUB+=	CURSES=""
-USE_NCURSES=	yes
-.endif
-
 # Build control
 .if ${PORT_OPTIONS:MPROFILING}
 SCONS_ARGS+=	profiling=yes
diff --git a/astro/gpsd/distinfo b/astro/gpsd/distinfo
index c46e1639237b..7c720e069728 100644
--- a/astro/gpsd/distinfo
+++ b/astro/gpsd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpsd-3.6.tar.gz) = 53a078dd547a17c4eeb0529a6d6eb338dac217811caf9644a0194184219494cc
-SIZE (gpsd-3.6.tar.gz) = 1449822
+SHA256 (gpsd-3.9.tar.gz) = d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a
+SIZE (gpsd-3.9.tar.gz) = 1518775
diff --git a/astro/gpsd/files/patch-SConstruct b/astro/gpsd/files/patch-SConstruct
index 0df663e19370..12f4ff30aa50 100644
--- a/astro/gpsd/files/patch-SConstruct
+++ b/astro/gpsd/files/patch-SConstruct
@@ -1,27 +1,27 @@
---- SConstruct.orig	2012-01-12 20:41:41.000000000 +0400
-+++ SConstruct	2012-01-14 03:42:13.000000000 +0400
-@@ -423,14 +423,7 @@
- # are like FreeBSD.
- ncurseslibs= []
- if env['ncurses']:
--    if config.CheckPKG('ncurses'):
--        ncurseslibs = pkg_config('ncurses')
--    elif config.CheckExecutable('ncurses5-config --version', 'ncurses5-config'):
--        ncurseslibs = ['!ncurses5-config --libs --cflags']
--    elif sys.platform.startswith('freebsd'):
--        ncurseslibs= [ '-lncurses' ]
--    elif sys.platform.startswith('openbsd'):
--        ncurseslibs= [ '-lcurses' ]
-+    ncurseslibs= [ '-lncurses' ]
- 
- if env['usb']:
-     # In FreeBSD except version 7, USB libraries are in the base system
-@@ -1150,7 +1143,7 @@
+--- SConstruct.orig	2013-05-01 09:44:21.000000000 +0400
++++ SConstruct	2013-05-01 16:30:55.000000000 +0400
+@@ -590,7 +590,14 @@
+ #ifdef __LITTLE_ENDIAN__
+ #undef WORDS_BIGENDIAN
+ #else
+-#include <endian.h>
++''')
++
++if config.CheckHeader("endian.h"):
++	confdefs.append("#include <endian.h>")
++elif config.CheckHeader("sys/endian.h"):
++	confdefs.append("#include <sys/endian.h>")
++
++confdefs.append('''
+ #if __BYTE_ORDER == __BIG_ENDIAN
+ #define WORDS_BIGENDIAN 1
+ #elif __BYTE_ORDER == __LITTLE_ENDIAN
+@@ -1242,7 +1249,7 @@
  if not env['python']:
      python_install = []
  else:
 -    python_lib_dir = sysconfig.get_python_lib(plat_specific=1)
-+    python_lib_dir = sysconfig.get_python_lib(plat_specific=1, prefix = env['prefix'])
++    python_lib_dir = sysconfig.get_python_lib(plat_specific=1,prefix=env['prefix'])
      python_module_dir = python_lib_dir + os.sep + 'gps'
      python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
                                                      python_built_extensions)
diff --git a/astro/gpsd/files/patch-libgps.h b/astro/gpsd/files/patch-libgps.h
deleted file mode 100644
index e4cf6b7ec4f0..000000000000
--- a/astro/gpsd/files/patch-libgps.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgps.h.orig	2011-11-22 12:49:33.000000000 +0400
-+++ libgps.h	2012-01-15 16:48:21.469612990 +0400
-@@ -21,6 +21,7 @@
- #ifdef DBUS_EXPORT_ENABLE
-     dbus,
- #endif /* DBUS_EXPORT_ENABLE */
-+	dummy, /* so it compiles when all exports are disabled */
- };
- 
- /* values to poke in the gps_fd member if we get it via something special */ 
diff --git a/astro/gpsd/pkg-descr b/astro/gpsd/pkg-descr
index efa9a782cb2c..9b5b8e321440 100644
--- a/astro/gpsd/pkg-descr
+++ b/astro/gpsd/pkg-descr
@@ -1,11 +1,11 @@
-gpsd is a service daemon that monitors one or more GPSes 
-attached to a host computer through serial or USB ports, 
-making all data on the location/course/velocity of the 
-sensors available to be queried on TCP port 2947 of the 
-host computer. With gpsd, multiple GPS client applications 
-(such as navigational and wardriving software) can share 
-access to GPSes without contention or loss of data. Also, 
-gpsd responds to queries with a format that is substantially 
+gpsd is a service daemon that monitors one or more GPSes
+attached to a host computer through serial or USB ports,
+making all data on the location/course/velocity of the
+sensors available to be queried on TCP port 2947 of the
+host computer. With gpsd, multiple GPS client applications
+(such as navigational and wardriving software) can share
+access to GPSes without contention or loss of data. Also,
+gpsd responds to queries with a format that is substantially
 easier to parse than the NMEA 0183 emitted by most GPSes.
 
 WWW: http://catb.org/gpsd/
diff --git a/astro/gpsd/pkg-plist b/astro/gpsd/pkg-plist
index db695039f22f..f07f60c768c5 100644
--- a/astro/gpsd/pkg-plist
+++ b/astro/gpsd/pkg-plist
@@ -1,16 +1,16 @@
+bin/cgps
 bin/gegps
 bin/gpscat
 bin/gpsctl
 bin/gpsdecode
 bin/gpsfake
+bin/gpsmon
 bin/gpspipe
 bin/gpsprof
 bin/gpxlogger
 bin/lcdgps
 bin/xgps
 bin/xgpsspeed
-%%CURSES%%bin/cgps
-%%CURSES%%bin/gpsmon
 include/gps.h
 include/libgpsmm.h
 %%QTBIND%%lib/libQgpsmm.prl
@@ -23,9 +23,9 @@ lib/libgps.so.20
 lib/libgps.so.20.0
 lib/libgps.so.20.0.0
 lib/libgpsd.so
-lib/libgpsd.so.20
-lib/libgpsd.so.20.0
-lib/libgpsd.so.20.0.0
+lib/libgpsd.so.21
+lib/libgpsd.so.21.0
+lib/libgpsd.so.21.0.0
 %%PYTHON_SITELIBDIR%%/gps/__init__.py
 %%PYTHON_SITELIBDIR%%/gps/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gps/__init__.pyo
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 190262de5c06..a4047a0dbf12 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	marble
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index af289bbb5448..8575cee5a07f 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qlandkartegt
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION}