Update to gpsd-3.22
ok solene@ landry@
This commit is contained in:
kirby
parent
3531778c46
commit
c40fc9f6b6
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.82 2021/02/24 16:49:00 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.83 2021/06/30 12:23:50 kirby Exp $
|
||||
|
||||
COMMENT-main= service daemon that monitors one or more GPSes
|
||||
COMMENT-x11= GUI test apps using gpsd
|
||||
COMMENT-php= web-based gpsd monitor in php
|
||||
|
||||
VERSION= 3.21
|
||||
REVISION-php= 0
|
||||
VERSION= 3.22
|
||||
DISTNAME= gpsd-${VERSION}
|
||||
PKGNAME-main= gpsd-${VERSION}
|
||||
PKGNAME-x11= gpsd-x11-${VERSION}
|
||||
@ -69,20 +68,17 @@ PREFIX-php= ${VARBASE}/www
|
||||
|
||||
SUBST_VARS += VERSION
|
||||
|
||||
MODPY_ADJ_FILES = gegps gpsprof gps/gps.py gpsfake gpscat xgps xgpsspeed \
|
||||
gps/aiogps.py gps/clienthelpers.py ubxtool zerk
|
||||
|
||||
pre-configure:
|
||||
@perl -pi -e "s,/usr/share/gpsd/,," ${WRKSRC}/packaging/X11/*.desktop
|
||||
@perl -pi -e "s,http://docbook.sourceforge.net/release/xsl/current/,\
|
||||
${LOCALBASE}/share/xsl/docbook/," \
|
||||
${WRKSRC}/SConstruct
|
||||
${SUBST_CMD} ${WRKSRC}/SConstruct
|
||||
${SUBST_CMD} ${WRKSRC}/SConscript
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${WRKINST}/var/www/gpsd
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/gpsd.php ${WRKINST}/var/www/gpsd
|
||||
${INSTALL_DATA} ${WRKSRC}/gpsd_config.h ${PREFIX}/include
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAME}/clients/gpsd.php ${WRKINST}/var/www/gpsd
|
||||
${INSTALL_DATA} ${WRKSRC}/${PKGNAME}/include/gpsd_config.h ${PREFIX}/include
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
|
||||
${INSTALL_DATA} ${WRKSRC}/packaging/X11/*.desktop \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (gpsd-3.21.tar.gz) = ZVBMOvjTsMzjwHQFuIFddzDS0r4tp9KNJ18anFfG/pE=
|
||||
SIZE (gpsd-3.21.tar.gz) = 3984157
|
||||
SHA256 (gpsd-3.22.tar.gz) = eD/fKl94pZMjDHv6i0CZVlRXZVYyJMbFatacxsKmN6M=
|
||||
SIZE (gpsd-3.22.tar.gz) = 4758761
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
$OpenBSD: patch-SConstruct,v 1.3 2021/02/14 08:30:56 kirby Exp $
|
||||
Index: SConstruct
|
||||
--- SConstruct.orig
|
||||
+++ SConstruct
|
||||
@@ -264,8 +264,7 @@ api_version_minor = 14
|
||||
libgps_version_current = 27
|
||||
$OpenBSD: patch-SConscript,v 1.1 2021/06/30 12:23:50 kirby Exp $
|
||||
|
||||
Index: SConscript
|
||||
--- SConscript.orig
|
||||
+++ SConscript
|
||||
@@ -272,8 +272,7 @@ api_version_minor = 14
|
||||
libgps_version_current = 28
|
||||
libgps_version_revision = 0
|
||||
libgps_version_age = 0
|
||||
-libgps_version = "%d.%d.%d" % (libgps_version_current, libgps_version_age,
|
||||
@ -12,7 +13,7 @@ Index: SConstruct
|
||||
#
|
||||
# Release identification ends here
|
||||
|
||||
@@ -754,7 +753,7 @@ def CheckPKG(context, name):
|
||||
@@ -805,7 +804,7 @@ def CheckPKG(context, name):
|
||||
|
||||
|
||||
# Stylesheet URLs for making HTML and man pages from DocBook XML.
|
||||
@ -21,7 +22,7 @@ Index: SConstruct
|
||||
docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
|
||||
docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
|
||||
|
||||
@@ -1374,6 +1373,10 @@ else:
|
||||
@@ -1440,6 +1439,10 @@ if not cleaning and not helping:
|
||||
# if not, force qt to off
|
||||
if config.env["qt"]:
|
||||
qt_net_name = 'Qt%sNetwork' % config.env["qt_versioned"]
|
||||
@ -32,7 +33,7 @@ Index: SConstruct
|
||||
qt_network = config.CheckPKG(qt_net_name)
|
||||
if not qt_network:
|
||||
config.env["qt"] = False
|
||||
@@ -1500,20 +1503,6 @@ elif config.env['python']:
|
||||
@@ -1609,20 +1612,6 @@ if not cleaning and not helping and config.env['python
|
||||
|
||||
config.env['xgps_deps'] = True
|
||||
|
||||
@ -43,17 +44,17 @@ Index: SConstruct
|
||||
- config.env['xgps_deps'] = False
|
||||
- announce("WARNING: Python module cairo (pycairo) not found.")
|
||||
-
|
||||
- # check for pycairo
|
||||
- # check for pygobject
|
||||
- if not config.GetPythonValue('module gi (pygobject)',
|
||||
- 'import gi', '"found"'):
|
||||
- # no pycairo, used by xgps, xgpsspeed
|
||||
- # no pygobject, used by xgps, xgpsspeed
|
||||
- config.env['xgps_deps'] = False
|
||||
- announce("WARNING: Python module gi (pygobject) not found.")
|
||||
-
|
||||
# gtk+ needed by pygobject
|
||||
if not config.CheckPKG('gtk+-3.0'):
|
||||
config.env['xgps_deps'] = False
|
||||
@@ -1730,7 +1719,7 @@ static_gpsdlib = env.StaticLibrary(
|
||||
@@ -1847,7 +1836,7 @@ libgpsd_static = env.StaticLibrary(
|
||||
packet_ffi_objects = [env.SharedObject(s) for s in packet_ffi_extension]
|
||||
packet_ffi_shared = env.SharedLibrary(target="gpsdpacket",
|
||||
source=packet_ffi_objects,
|
||||
@ -61,4 +62,4 @@ Index: SConstruct
|
||||
+ SHLIBVERSION="%s" % ('${LIBgpsdpacket_VERSION}'),
|
||||
parse_flags=rtlibs + libgps_flags)
|
||||
|
||||
env.Clean(libgps_shared, "gps_maskdump.c")
|
||||
libraries = [libgps_shared, packet_ffi_shared]
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.13 2021/02/14 08:30:56 kirby Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.14 2021/06/30 12:23:50 kirby Exp $
|
||||
@conflict gpsd-python-<=2.38p3
|
||||
@pkgpath misc/gpsd,-python
|
||||
@newuser _gpsd:551:dialer:daemon:GPS server:/nonexistent:/sbin/nologin
|
||||
@ -6,13 +6,16 @@
|
||||
bin/gegps
|
||||
@bin bin/gps2udp
|
||||
bin/gpscat
|
||||
bin/gpscsv
|
||||
@bin bin/gpsctl
|
||||
@bin bin/gpsdecode
|
||||
bin/gpsfake
|
||||
@bin bin/gpsmon
|
||||
@bin bin/gpspipe
|
||||
bin/gpsplot
|
||||
bin/gpsprof
|
||||
@bin bin/gpsrinex
|
||||
bin/gpssubframe
|
||||
@bin bin/gpxlogger
|
||||
@bin bin/lcdgps
|
||||
@bin bin/ntpshmmon
|
||||
@ -44,6 +47,8 @@ lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MA
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}ubx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}ubx.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/aiogps.py
|
||||
@ -53,19 +58,23 @@ lib/python${MODPY_VERSION}/site-packages/gps/fake.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/gps.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/misc.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/packet.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/ubx.py
|
||||
lib/python${MODPY_VERSION}/site-packages/gps/watch_options.py
|
||||
@man man/man1/cgps.1
|
||||
@man man/man1/gegps.1
|
||||
@man man/man1/gps.1
|
||||
@man man/man1/gps2udp.1
|
||||
@man man/man1/gpscat.1
|
||||
@man man/man1/gpscsv.1
|
||||
@man man/man1/gpsctl.1
|
||||
@man man/man1/gpsdecode.1
|
||||
@man man/man1/gpsfake.1
|
||||
@man man/man1/gpsmon.1
|
||||
@man man/man1/gpspipe.1
|
||||
@man man/man1/gpsplot.1
|
||||
@man man/man1/gpsprof.1
|
||||
@man man/man1/gpsrinex.1
|
||||
@man man/man1/gpssubframe.1
|
||||
@man man/man1/gpxlogger.1
|
||||
@man man/man1/lcdgps.1
|
||||
@man man/man1/ntpshmmon.1
|
||||
@ -75,7 +84,6 @@ lib/python${MODPY_VERSION}/site-packages/gps/watch_options.py
|
||||
@man man/man3/libgps.3
|
||||
@man man/man3/libgpsmm.3
|
||||
@man man/man5/gpsd_json.5
|
||||
@man man/man5/srec.5
|
||||
@man man/man8/gpsd.8
|
||||
@man man/man8/gpsdctl.8
|
||||
@man man/man8/gpsinit.8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user