svn commit: r439960 - in head/astro/gpsd: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Tue May 2 16:26:17 UTC 2017
Author: amdmi3
Date: Tue May 2 16:26:15 2017
New Revision: 439960
URL: https://svnweb.freebsd.org/changeset/ports/439960
Log:
- Update to 3.16
PR: 207273
Submitted by: z7dr6ut7gs at snkmail.com (maintainer)
Deleted:
head/astro/gpsd/files/patch-compiler.h
head/astro/gpsd/files/patch-libgps.pc.in
head/astro/gpsd/files/patch-libgpsd.pc.in
Modified:
head/astro/gpsd/Makefile
head/astro/gpsd/distinfo
head/astro/gpsd/files/patch-SConstruct
head/astro/gpsd/pkg-plist
Modified: head/astro/gpsd/Makefile
==============================================================================
--- head/astro/gpsd/Makefile Tue May 2 15:53:21 2017 (r439959)
+++ head/astro/gpsd/Makefile Tue May 2 16:26:15 2017 (r439960)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gpsd
-PORTVERSION= 3.14
-PORTREVISION= 4
+PORTVERSION= 3.16
CATEGORIES= astro geography
MASTER_SITES= SAVANNAH
@@ -16,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \
xsltproc:textproc/libxslt
-USES= cpe pathfix pkgconfig python scons shebangfix
+USES= cpe pathfix pkgconfig python:2 scons shebangfix
CPE_VENDOR= gpsd_project
USE_RC_SUBR= gpsd
SHEBANG_FILES= *.py gps/*.py gegps xgps gpscat xgpsspeed gpsprof \
@@ -24,6 +23,7 @@ SHEBANG_FILES= *.py gps/*.py gegps xgps
MAKE_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig"
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 \
@@ -36,6 +36,7 @@ OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND E
NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE PASSTHROUGH \
RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT \
SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB
+OPTIONS_SUB= yes
AIVDM_DESC= Aivdm support
ASHTECH_DESC= Ashtech support
@@ -110,12 +111,13 @@ RTCM104V3_MAKE_ARGS_OFF= rtcm104v3=no
NTP_MAKE_ARGS_OFF= ntp=no
NTPSHM_MAKE_ARGS_OFF= ntpshm=no
PPS_MAKE_ARGS_OFF= pps=no
-PPS_IMPLIES= NTPSHM
+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= dbus_export=yes
+DBUS_MAKE_ARGS_OFF= dbus_export=no
SHMEXPORT_MAKE_ARGS_OFF= shm_export=no
# Communication
@@ -130,7 +132,7 @@ TIMING_MAKE_ARGS_OFF= timing=no
# Client-side options
NCURSES_MAKE_ARGS_OFF= ncurses=no
NCURSES_USES= ncurses
-QTBIND_USE= QT4=network
+QTBIND_USE= QT4=network,corelib
QTBIND_MAKE_ARGS= qt=yes
QTBIND_MAKE_ARGS_OFF= qt=no
QTBIND_PLIST_SUB= QTBIND=""
Modified: head/astro/gpsd/distinfo
==============================================================================
--- head/astro/gpsd/distinfo Tue May 2 15:53:21 2017 (r439959)
+++ head/astro/gpsd/distinfo Tue May 2 16:26:15 2017 (r439960)
@@ -1,2 +1,3 @@
-SHA256 (gpsd-3.14.tar.gz) = 504fc812f3c1525a1a48e04bf4d77f9a8066c201448d98089df89d58ef53a8cb
-SIZE (gpsd-3.14.tar.gz) = 1398425
+TIMESTAMP = 1493742351
+SHA256 (gpsd-3.16.tar.gz) = 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029
+SIZE (gpsd-3.16.tar.gz) = 8587490
Modified: head/astro/gpsd/files/patch-SConstruct
==============================================================================
--- head/astro/gpsd/files/patch-SConstruct Tue May 2 15:53:21 2017 (r439959)
+++ head/astro/gpsd/files/patch-SConstruct Tue May 2 16:26:15 2017 (r439960)
@@ -1,19 +1,101 @@
---- SConstruct.orig 2015-03-14 11:24:41 UTC
+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
-@@ -305,16 +305,6 @@ def installdir(dir, add_destdir=True):
- wrapped.replace("/usr/lib/systemd", "/lib/systemd")
- return wrapped
+@@ -985,37 +985,37 @@ gpsmon_sources = [
+ ## Production programs
--# Honor the specified installation prefix in link paths.
--if env["sysroot"]:
-- env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)])
--
--# Don't hack RPATH unless libdir points somewhere that is not on the
--# minimum default load path.
--if env["shared"]:
-- if env["libdir"] not in ["/usr/lib", "/lib"]:
-- env.Prepend(RPATH=[installdir('libdir')])
--
- # Give deheader a way to set compiler flags
- if 'MORECFLAGS' in os.environ:
- env.Append(CFLAGS=Split(os.environ['MORECFLAGS']))
+ 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)
Modified: head/astro/gpsd/pkg-plist
==============================================================================
--- head/astro/gpsd/pkg-plist Tue May 2 15:53:21 2017 (r439959)
+++ head/astro/gpsd/pkg-plist Tue May 2 16:26:15 2017 (r439960)
@@ -1,11 +1,11 @@
-bin/cgps
+%%NCURSES%%bin/cgps
bin/gegps
bin/gps2udp
bin/gpscat
bin/gpsctl
bin/gpsdecode
bin/gpsfake
-bin/gpsmon
+%%NCURSES%%bin/gpsmon
bin/gpspipe
bin/gpsprof
bin/gpxlogger
@@ -18,16 +18,10 @@ include/libgpsmm.h
%%QTBIND%%lib/libQgpsmm.prl
%%QTBIND%%lib/libQgpsmm.so
%%QTBIND%%lib/libQgpsmm.so.22
-%%QTBIND%%lib/libQgpsmm.so.22.0
%%QTBIND%%lib/libQgpsmm.so.22.0.0
lib/libgps.so
lib/libgps.so.22
-lib/libgps.so.22.0
lib/libgps.so.22.0.0
-lib/libgpsd.so
-lib/libgpsd.so.22
-lib/libgpsd.so.22.0
-lib/libgpsd.so.22.0.0
man/man1/cgps.1.gz
man/man1/gegps.1.gz
man/man1/gps.1.gz
@@ -45,14 +39,13 @@ man/man1/xgps.1.gz
man/man1/xgpsspeed.1.gz
man/man3/libQgpsmm.3.gz
man/man3/libgps.3.gz
-man/man3/libgpsd.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%%/gps-3.14.egg-info
+%%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%%
%%PYTHON_SITELIBDIR%%/gps/__init__.py
%%PYTHON_SITELIBDIR%%/gps/__init__.pyc
%%PYTHON_SITELIBDIR%%/gps/__init__.pyo
More information about the svn-ports-all
mailing list