Index: head/astro/gpsd/Makefile =================================================================== --- head/astro/gpsd/Makefile (revision 459613) +++ head/astro/gpsd/Makefile (revision 459614) @@ -1,154 +1,159 @@ # Created by: Anton Karpov # $FreeBSD$ PORTNAME= gpsd -PORTVERSION= 3.16 +PORTVERSION= 3.17 CATEGORIES= astro geography MASTER_SITES= SAVANNAH MAINTAINER= z7dr6ut7gs@snkmail.com COMMENT= Daemon that monitors one or more GPSes attached to a host computer LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe pathfix pkgconfig python:2 scons shebangfix +USES= cpe pathfix pkgconfig python:2.7 scons shebangfix CPE_VENDOR= gpsd_project +USE_PYTHON= flavors USE_RC_SUBR= gpsd SHEBANG_FILES= *.py gps/*.py gegps xgps gpscat xgpsspeed gpsprof \ gpsfake MAKE_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \ - manbuild=no + manbuild=no target_python="${PYTHON_CMD}" MAKE_ENV= DESTDIR="${STAGEDIR}" PLIST_SUB= PYTHON_EGGINFO=gps-${PORTVERSION}.egg-info OPTIONS_DEFINE= AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 GARMIN \ GARMINTXT GEOSTAR GPSCLOCK IPV6 ITRAX MTK NAVCOM NCURSES \ NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE \ PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 RTCM104V3 \ SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \ - TSIP QTBIND UBLOX USB + TSIP QTBIND UBLOX USB X11 OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 GARMIN \ GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES NETFEED \ NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE PASSTHROUGH \ RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT \ - SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB + SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB X11 OPTIONS_SUB= yes AIVDM_DESC= Aivdm support ASHTECH_DESC= Ashtech support CPPBIND_DESC= Build C++ bindings EARTHMATE_DESC= DeLorme EarthMate Zodiac support EVERMORE_DESC= Evermore binary support FURY_DESC= Jackson Labs Fury and Firefly support FV18_DESC= San Jose Navigation FV-18 support GARMIN_DESC= Garmin kernel driver support GARMINTXT_DESC= Garmin Simple Text support GEOSTAR_DESC= Geostar Protocol support GPSCLOCK_DESC= GPSclock support ITRAX_DESC= iTrax support MTK_DESC= MTK-3301 support NAVCOM_DESC= Navcom support NCURSES_DESC= Build with ncurses NETFEED_DESC= Build support for handling TCP/IP data sources NMEA0183_DESC= NMEA0183 support NTP_DESC= NTP time hinting support NTPSHM_DESC= NTP time hinting support via shared memory NTRIP_DESC= NTRIP support OCEANSERVER_DESC= Oceanserver support ONCORE_DESC= Motorola OnCore chipset support PASSTHROUGH_DESC= Build support for passing through JSON PPS_DESC= PPS time syncing support PROFILING_DESC= Profiling support RECONFIGURE_DESC= Allow gpsd to change device settings RTCM104V2_DESC= rtcm104v2 support RTCM104V3_DESC= rtcm104v3 support SHMEXPORT_DESC= Enable export via shared memory SIRF_DESC= SiRF chipset support SOCKEXPORT_DESC= Enable export over sockets SUPERSTARII_DESC= SuperStarII support TIMING_DESC= Build latency timing support TNT_DESC= True North Technologies support TRIPMATE_DESC= DeLorme TripMate support TSIP_DESC= Trimble TSIP support QTBIND_DESC= build QT bindings UBLOX_DESC= u-blox protocol support USB_DESC= libusb support for USB devices # Options related to GPS protocols NMEA0183_MAKE_ARGS_OFF= nmea0183=no ASHTECH_MAKE_ARGS_OFF= ashtech=no EARTHMATE_MAKE_ARGS_OFF= earthmate=no EVERMORE_MAKE_ARGS_OFF= evermore=no FURY_MAKE_ARGS_OFF= fury=no FV18_MAKE_ARGS_OFF= fv18=no GARMIN_MAKE_ARGS_OFF= garmin=no GARMINTXT_MAKE_ARGS_OFF= garmintxt=no GEOSTAR_MAKE_ARGS_OFF= geostar=no ITRAX_MAKE_ARGS_OFF= itrax=no MTK_MAKE_ARGS_OFF= mtk3301=no NAVCOM_MAKE_ARGS_OFF= navcom=no ONCORE_MAKE_ARGS_OFF= oncore=no SIRF_MAKE_ARGS_OFF= sirf=no SUPERSTARII_MAKE_ARGS_OFF= superstar2=no TNT_MAKE_ARGS_OFF= tnt=no TRIPMATE_MAKE_ARGS_OFF= tripmate=no TSIP_MAKE_ARGS_OFF= tsip=no UBLOX_MAKE_ARGS_OFF= ublox=no # Options related to Non-GPS protocols AIVDM_MAKE_ARGS_OFF= aivdm=no GPSCLOCK_MAKE_ARGS_OFF= gpsclock=no NTRIP_MAKE_ARGS_OFF= ntrip=no OCEANSERVER_MAKE_ARGS_OFF= oceanserver=no RTCM104V2_MAKE_ARGS_OFF= rtcm104v2=no RTCM104V3_MAKE_ARGS_OFF= rtcm104v3=no # Time service NTP_MAKE_ARGS_OFF= ntp=no NTPSHM_MAKE_ARGS_OFF= ntpshm=no PPS_MAKE_ARGS_OFF= pps=no PPS_IMPLIES= NTPSHM # Export methods SOCKEXPORT_MAKE_ARGS_OFF= socket_export=no DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_MAKE_ARGS= dbus_export=yes DBUS_MAKE_ARGS_OFF= dbus_export=no SHMEXPORT_MAKE_ARGS_OFF= shm_export=no # Communication USB_MAKE_ARGS_OFF= usb=no IPV6_MAKE_ARGS_OFF= ipv6=no NETFEED_MAKE_ARGS_OFF= netfeed=no PASSTHROUGH_MAKE_ARGS_OFF= passthrough=no # Other daemon options TIMING_MAKE_ARGS_OFF= timing=no # Client-side options NCURSES_MAKE_ARGS_OFF= ncurses=no NCURSES_USES= ncurses QTBIND_USE= QT4=network,corelib QTBIND_MAKE_ARGS= qt=yes QTBIND_MAKE_ARGS_OFF= qt=no QTBIND_PLIST_SUB= QTBIND="" QTBIND_PLIST_SUB_OFF= QTBIND="@comment " RECONFIGURE_MAKE_ARGS_OFF= reconfigure=no CPPBIND_MAKE_ARGS_OFF= libgpsmm=no +X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR} +#X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR} +X11_USE= GNOME=gtk30 # Build control PROFILING_MAKE_ARGS= profiling=yes # generates .py[co] files for installed modules # if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted # with these files when module is imported from root user post-install: (cd ${STAGEDIR}${PREFIX} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) .include Index: head/astro/gpsd/distinfo =================================================================== --- head/astro/gpsd/distinfo (revision 459613) +++ head/astro/gpsd/distinfo (revision 459614) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493742351 -SHA256 (gpsd-3.16.tar.gz) = 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 -SIZE (gpsd-3.16.tar.gz) = 8587490 +TIMESTAMP = 1516146278 +SHA256 (gpsd-3.17.tar.gz) = 68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a +SIZE (gpsd-3.17.tar.gz) = 8755304 Index: head/astro/gpsd/files/patch-SConstruct =================================================================== --- head/astro/gpsd/files/patch-SConstruct (revision 459613) +++ head/astro/gpsd/files/patch-SConstruct (nonexistent) @@ -1,101 +0,0 @@ -Remove LIBPATH='.' - see http://lists.nongnu.org/archive/html/gpsd-dev/2016-02/msg00042.html - ---- SConstruct.orig 2016-01-08 19:25:48 UTC -+++ SConstruct -@@ -985,37 +985,37 @@ gpsmon_sources = [ - ## Production programs - - gpsd = env.Program('gpsd', gpsd_sources, -- LIBS=['gpsd', 'gps_static'], LIBPATH='.', -+ LIBS=['gpsd', 'gps_static'], - parse_flags=gpsdflags+gpsflags) - gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'], -- LIBS=['gpsd', 'gps_static'], LIBPATH='.', -+ LIBS=['gpsd', 'gps_static'], - parse_flags=gpsdflags+gpsflags) - gpsctl = env.Program('gpsctl', ['gpsctl.c'], -- LIBS=['gpsd', 'gps_static'], LIBPATH='.', -+ LIBS=['gpsd', 'gps_static'], - parse_flags=gpsdflags+gpsflags) - gpsmon = env.Program('gpsmon', gpsmon_sources, -- LIBS=['gpsd', 'gps_static'], LIBPATH='.', -+ LIBS=['gpsd', 'gps_static'], - parse_flags=gpsdflags + gpsflags + ncurseslibs) - gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], -- LIBS=['gps_static'], LIBPATH='.', -+ LIBS=['gps_static'], - parse_flags=gpsflags) - gpspipe = env.Program('gpspipe', ['gpspipe.c'], -- LIBS=['gps_static'], LIBPATH='.', -+ LIBS=['gps_static'], - parse_flags=gpsflags) - gps2udp = env.Program('gps2udp', ['gps2udp.c'], -- LIBS=['gps_static'], LIBPATH='.', -+ LIBS=['gps_static'], - parse_flags=gpsflags) - gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'], -- LIBS=['gps_static'], LIBPATH='.', -+ LIBS=['gps_static'], - parse_flags=gpsflags) - lcdgps = env.Program('lcdgps', ['lcdgps.c'], -- LIBS=['gps_static'], LIBPATH='.', -+ LIBS=['gps_static'], - parse_flags=gpsflags) - cgps = env.Program('cgps', ['cgps.c'], -- LIBS=['gps_static'], LIBPATH='.', -+ LIBS=['gps_static'], - parse_flags=gpsflags + ncurseslibs) - ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'], -- LIBS=['gps_static'], LIBPATH='.', -+ LIBS=['gps_static'], - parse_flags=gpsflags) - - binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, lcdgps, ntpshmmon] -@@ -1024,26 +1024,26 @@ if env["ncurses"]: - - # Test programs - always link locally and statically - test_bits = env.Program('test_bits', ['test_bits.c'], -- LIBS=['gps_static'], LIBPATH='.') -+ LIBS=['gps_static']) - test_float = env.Program('test_float', ['test_float.c']) - test_geoid = env.Program('test_geoid', ['test_geoid.c'], - LIBS=['gpsd', 'gps_static'], -- LIBPATH='.', parse_flags=gpsdflags) -+ parse_flags=gpsdflags) - test_matrix = env.Program('test_matrix', ['test_matrix.c'], - LIBS=['gpsd', 'gps_static'], -- LIBPATH='.', parse_flags=gpsdflags) -+ parse_flags=gpsdflags) - test_mktime = env.Program('test_mktime', ['test_mktime.c'], -- LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"]) -+ LIBS=['gps_static'], parse_flags=["-lm"]) - test_packet = env.Program('test_packet', ['test_packet.c'], - LIBS=['gpsd', 'gps_static'], -- LIBPATH='.', parse_flags=gpsdflags) -+ parse_flags=gpsdflags) - test_timespec = env.Program('test_timespec', ['test_timespec.c'], - LIBS=['gpsd', 'gps_static'], -- LIBPATH='.', parse_flags=gpsdflags) -+ parse_flags=gpsdflags) - test_trig = env.Program('test_trig', ['test_trig.c'], parse_flags=["-lm"]) - # test_libgps for glibc older than 2.17 - test_libgps = env.Program('test_libgps', ['test_libgps.c'], -- LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"] + rtlibs + dbusflags) -+ LIBS=['gps_static'], parse_flags=["-lm"] + rtlibs + dbusflags) - - if not env['socket_export']: - announce("test_json not building because socket_export is disabled") -@@ -1051,11 +1051,11 @@ if not env['socket_export']: - else: - test_json = env.Program( - 'test_json', ['test_json.c'], -- LIBS=['gps_static'], LIBPATH='.', -+ LIBS=['gps_static'], - parse_flags=["-lm"] + rtlibs + usbflags + dbusflags) - - test_gpsmm = env.Program('test_gpsmm', ['test_gpsmm.cpp'], -- LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"]) -+ LIBS=['gps_static'], parse_flags=["-lm"]) - testprogs = [test_bits, test_float, test_geoid, test_libgps, test_matrix, test_mktime, test_packet, test_timespec, test_trig] - if env['socket_export']: - testprogs.append(test_json) Property changes on: head/astro/gpsd/files/patch-SConstruct ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/astro/gpsd/pkg-plist =================================================================== --- head/astro/gpsd/pkg-plist (revision 459613) +++ head/astro/gpsd/pkg-plist (revision 459614) @@ -1,70 +1,70 @@ %%NCURSES%%bin/cgps bin/gegps bin/gps2udp bin/gpscat bin/gpsctl bin/gpsdecode bin/gpsfake %%NCURSES%%bin/gpsmon bin/gpspipe bin/gpsprof bin/gpxlogger bin/lcdgps -bin/ntpshmmon -bin/xgps -bin/xgpsspeed +%%PPS%%bin/ntpshmmon +%%X11%%bin/xgps +%%X11%%bin/xgpsspeed include/gps.h include/libgpsmm.h %%QTBIND%%lib/libQgpsmm.prl %%QTBIND%%lib/libQgpsmm.so -%%QTBIND%%lib/libQgpsmm.so.22 -%%QTBIND%%lib/libQgpsmm.so.22.0.0 +%%QTBIND%%lib/libQgpsmm.so.23 +%%QTBIND%%lib/libQgpsmm.so.23.0.0 lib/libgps.so -lib/libgps.so.22 -lib/libgps.so.22.0.0 +lib/libgps.so.23 +lib/libgps.so.23.0.0 man/man1/cgps.1.gz man/man1/gegps.1.gz man/man1/gps.1.gz man/man1/gps2udp.1.gz man/man1/gpscat.1.gz man/man1/gpsctl.1.gz man/man1/gpsdecode.1.gz man/man1/gpsfake.1.gz man/man1/gpsmon.1.gz man/man1/gpspipe.1.gz man/man1/gpsprof.1.gz +man/man1/gpxlogger.1.gz man/man1/lcdgps.1.gz man/man1/ntpshmmon.1.gz -man/man1/xgps.1.gz -man/man1/xgpsspeed.1.gz +%%X11%%man/man1/xgps.1.gz +%%X11%%man/man1/xgpsspeed.1.gz man/man3/libQgpsmm.3.gz man/man3/libgps.3.gz man/man3/libgpsmm.3.gz man/man5/gpsd_json.5.gz man/man5/srec.5.gz man/man8/gpsd.8.gz man/man8/gpsdctl.8.gz man/man8/gpsinit.8.gz %%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%% %%PYTHON_SITELIBDIR%%/gps/__init__.py %%PYTHON_SITELIBDIR%%/gps/__init__.pyc %%PYTHON_SITELIBDIR%%/gps/__init__.pyo %%PYTHON_SITELIBDIR%%/gps/client.py %%PYTHON_SITELIBDIR%%/gps/client.pyc %%PYTHON_SITELIBDIR%%/gps/client.pyo %%PYTHON_SITELIBDIR%%/gps/clienthelpers.so %%PYTHON_SITELIBDIR%%/gps/fake.py %%PYTHON_SITELIBDIR%%/gps/fake.pyc %%PYTHON_SITELIBDIR%%/gps/fake.pyo %%PYTHON_SITELIBDIR%%/gps/gps.py %%PYTHON_SITELIBDIR%%/gps/gps.pyc %%PYTHON_SITELIBDIR%%/gps/gps.pyo %%PYTHON_SITELIBDIR%%/gps/misc.py %%PYTHON_SITELIBDIR%%/gps/misc.pyc %%PYTHON_SITELIBDIR%%/gps/misc.pyo %%PYTHON_SITELIBDIR%%/gps/packet.so %%QTBIND%%libdata/pkgconfig/Qgpsmm.pc libdata/pkgconfig/libgps.pc -libdata/pkgconfig/libgpsd.pc sbin/gpsd sbin/gpsdctl