- Update to 3.2

Submitted by:	glebius (maintainer)

4 files changed, 42 insertions, 19 deletions

diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index 8c00a77d9f60..661eb4367e41 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gpsd
-PORTVERSION=	3.1
+PORTVERSION=	3.2
 CATEGORIES=	astro geography
 MASTER_SITES=	SAVANNAH
 
@@ -14,7 +14,8 @@ MAINTAINER=	glebius@FreeBSD.org
 COMMENT=	Daemon that monitors one or more GPSes attached to a host computer
 
 BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+		xsltproc:${PORTSDIR}/textproc/libxslt \
+		chrpath:${PORTSDIR}/devel/chrpath
 
 USE_GNOME=	pkgconfig
 USE_SCONS=	yes
@@ -25,7 +26,7 @@ PYDISTUTILS_EGGINFO=	gps-${PORTVERSION}.egg-info
 MAKE_JOBS_SAFE=	yes
 
 SCONS_BUILDENV=	${SCONS_ENV}
-SCONS_ARGS=	prefix="${PREFIX}" mandir="/man" pkgconfigdir="/libdata/pkgconfig"
+SCONS_ARGS=	prefix="${PREFIX}" mandir="/man" pkgconfig="/libdata/pkgconfig"
 
 MAN1=	cgps.1 gegps.1 gps.1 gpscat.1 gpsctl.1 gpsdecode.1 \
 	gpsfake.1  gpspipe.1 gpsprof.1 xgps.1 xgpsspeed.1 \
@@ -272,10 +273,12 @@ SCONS_ARGS+=	profiling=yes
 # if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted
 # with these files when module is imported from root user
 post-install:
-	@${FIND} ${PYTHON_SITELIBDIR}/gps -name "*.py" -exec \
+	@${FIND} ${PYTHON_SITELIBDIR:C/^${LOCALBASE}/${PREFIX}/}/gps \
+		-name "*.py" -exec \
 		${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py {} \;
 	@${SETENV} PYTHONOPTIMIZE=yes \
-		${FIND} ${PYTHON_SITELIBDIR}/gps -name "*.py" -exec \
+		${FIND} ${PYTHON_SITELIBDIR:C/^${LOCALBASE}/${PREFIX}/}/gps \
+		-name "*.py" -exec \
 		${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py {} \;
 
 .include <bsd.port.mk>
diff --git a/astro/gpsd/distinfo b/astro/gpsd/distinfo
index 02484d92a12a..cf1ec2179701 100644
--- a/astro/gpsd/distinfo
+++ b/astro/gpsd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpsd-3.1.tar.gz) = 36c92cbd61256cdbe3b982057395cc95b065166e094df285b9cf91e79f328b7b
-SIZE (gpsd-3.1.tar.gz) = 2136072
+SHA256 (gpsd-3.2.tar.gz) = b614d970ea90f3e21d603397ebd42d31ba15f9f5f758c86fbd845bcab084d13f
+SIZE (gpsd-3.2.tar.gz) = 1399694
diff --git a/astro/gpsd/files/patch-SConstruct b/astro/gpsd/files/patch-SConstruct
index 22bbf01c453f..6fa45500121a 100644
--- a/astro/gpsd/files/patch-SConstruct
+++ b/astro/gpsd/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct.orig	2011-08-28 15:14:24.000000000 +0400
-+++ SConstruct	2011-09-03 02:00:14.000000000 +0400
-@@ -346,12 +346,7 @@
+--- SConstruct.orig	2011-10-26 07:05:02.000000000 +0400
++++ SConstruct	2011-10-26 16:22:43.000000000 +0400
+@@ -385,12 +385,7 @@
  # are like FreeBSD.
  ncurseslibs= []
  if env['ncurses']:
@@ -14,12 +14,12 @@
  
  if env['usb']:
      # In FreeBSD except version 7, USB libraries are in the base system
-@@ -771,7 +766,7 @@
- env.Depends(gpspipe, compiled_gpslib)
- 
- gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'], parse_flags=gpslibs+dbus_recv_libs)
--env.Depends(gpspipe, compiled_gpslib)
-+env.Depends(gpxlogger, compiled_gpslib)
- 
- lcdgps = env.Program('lcdgps', ['lcdgps.c'], parse_flags=gpslibs)
- env.Depends(lcdgps, compiled_gpslib)
+@@ -1111,7 +1106,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_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-nosirf b/astro/gpsd/files/patch-nosirf
new file mode 100644
index 000000000000..e1ef3874309b
--- /dev/null
+++ b/astro/gpsd/files/patch-nosirf
@@ -0,0 +1,20 @@
+diff --git a/driver_ubx.c b/driver_ubx.c
+index 757f126..51c4a09 100644
+--- driver_ubx.c
++++ driver_ubx.c
+@@ -227,14 +227,7 @@ ubx_msg_nav_svinfo(struct gps_device_t *session, unsigned char *buf,
+ 	/*@ +predboolothers */
+ 	j++;
+     }
+-    /* mark SBAS sats in use if SBAS was in use as of the last MID 27 */
+-    for (i = 0; i < j; i++) {
+-	int prn = session->gpsdata.PRN[i];
+-	if (DGPS_PRN(prn) \
+-		&& session->gpsdata.status == STATUS_DGPS_FIX \
+-		&& session->driver.sirf.dgps_source == SIRF_DGPS_SOURCE_SBAS)
+-	    session->gpsdata.used[session->gpsdata.satellites_used++] = prn;
+-    }
++
+     session->gpsdata.skyview_time = NAN;
+     session->gpsdata.satellites_visible = (int)st;
+     session->gpsdata.satellites_used = (int)nsv;