Re: UPDATE misc/gpsd
On Sat, June 26, 2021 12:33, Landry Breuil wrote: > Le Thu, Jun 24, 2021 at 11:02:04AM +0300, Kirill Bychkov a ?crit : >> On Sun, June 6, 2021 21:24, Kirill Bychkov wrote: >> > On Sun, May 23, 2021 20:48, Kirill Bychkov wrote: >> >> On Fri, May 14, 2021 13:15, Kirill Bychkov wrote: >> >>> Hi ports@, >> >>> Attached is an update to gpsd. All consumers seems to be happy with it. >> >>> OK? Comments? >> >> >> >> Ping. >> >> >> >> >> > Ping >> >> Anyone? > > Reads good, but shouldnt patches/patch-SConstruct be also removed if the > file was moved upstream to SConscript ? > > Landry Yep. Missed cvs rm. Also reported by solene@ Fixed diff attached. > gpsd-3.22.diff Description: Binary data
Re: UPDATE misc/gpsd
Le Thu, Jun 24, 2021 at 11:02:04AM +0300, Kirill Bychkov a écrit : > On Sun, June 6, 2021 21:24, Kirill Bychkov wrote: > > On Sun, May 23, 2021 20:48, Kirill Bychkov wrote: > >> On Fri, May 14, 2021 13:15, Kirill Bychkov wrote: > >>> Hi ports@, > >>> Attached is an update to gpsd. All consumers seems to be happy with it. > >>> OK? Comments? > >> > >> Ping. > >> > >> > > Ping > > Anyone? Reads good, but shouldnt patches/patch-SConstruct be also removed if the file was moved upstream to SConscript ? Landry
Re: UPDATE misc/gpsd
On Sun, June 6, 2021 21:24, Kirill Bychkov wrote: > On Sun, May 23, 2021 20:48, Kirill Bychkov wrote: >> On Fri, May 14, 2021 13:15, Kirill Bychkov wrote: >>> Hi ports@, >>> Attached is an update to gpsd. All consumers seems to be happy with it. >>> OK? Comments? >> >> Ping. >> >> > Ping Anyone? gpsd-3.22.diff Description: Binary data
Re: UPDATE misc/gpsd
On Sun, May 23, 2021 20:48, Kirill Bychkov wrote: > On Fri, May 14, 2021 13:15, Kirill Bychkov wrote: >> Hi ports@, >> Attached is an update to gpsd. All consumers seems to be happy with it. >> OK? Comments? > > Ping. > > Ping gpsd-3.22.diff Description: Binary data
Re: UPDATE misc/gpsd
On Fri, May 14, 2021 13:15, Kirill Bychkov wrote: > Hi ports@, > Attached is an update to gpsd. All consumers seems to be happy with it. > OK? Comments? Ping.
Re: [UPDATE] misc/gpsd
On Fri, May 15, 2020 09:41, Kirill Bychkov wrote:
> Hi!
> Here is an update to gpsd-3.20.
> gpsd has some API changes so it's consumers need fixes. See my
> previous mail.
> Comments? OKs?
>
Hi,
All consumers were fixed already and gpsd 3.21
is out. It's not the latest version but 3.22 requires
some more work which I want to do separately.
All dependent ports are building fine, regression tests
are passing.
OK?
Index: Makefile
===
RCS file: /cvs/ports/misc/gpsd/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile4 Jan 2021 14:06:35 - 1.79
+++ Makefile12 Feb 2021 14:41:30 -
@@ -4,14 +4,14 @@ COMMENT-main= service daemon that monit
COMMENT-x11= GUI test apps using gpsd
COMMENT-php= web-based gpsd monitor in php
-VERSION= 3.19
+VERSION= 3.21
DISTNAME= gpsd-${VERSION}
PKGNAME-main= gpsd-${VERSION}
PKGNAME-x11= gpsd-x11-${VERSION}
PKGNAME-php= gpsd-php-${VERSION}
-REVISION= 2
-SHARED_LIBS += gps 20.0 # 25.0
+SHARED_LIBS += gps 21.0# 27.0
+SHARED_LIBS += gpsdpacket 0.0 # 21.0
CATEGORIES=misc geo
HOMEPAGE = https://gpsd.gitlab.io/gpsd/index.html
@@ -41,6 +41,7 @@ MODSCONS_FLAGS += gpsd_user=_gpsd \
MULTI_PACKAGES = -main -php -x11
BUILD_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \
+ devel/py-serial${MODPY_FLAVOR} \
textproc/xmlto \
textproc/libxslt \
textproc/docbook \
Index: distinfo
===
RCS file: /cvs/ports/misc/gpsd/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo31 Jul 2019 15:44:30 - 1.10
+++ distinfo12 Feb 2021 14:41:30 -
@@ -1,2 +1,2 @@
-SHA256 (gpsd-3.19.tar.gz) = J90k1Fsqxpuqt5M9or9q5fsL6QEw9n51PBEKNHcVXzk=
-SIZE (gpsd-3.19.tar.gz) = 10581777
+SHA256 (gpsd-3.21.tar.gz) = ZVBMOvjTsMzjwHQFuIFddzDS0r4tp9KNJ18anFfG/pE=
+SIZE (gpsd-3.21.tar.gz) = 3984157
Index: patches/patch-SConstruct
===
RCS file: /cvs/ports/misc/gpsd/patches/patch-SConstruct,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-SConstruct
--- patches/patch-SConstruct22 Sep 2020 15:16:20 - 1.2
+++ patches/patch-SConstruct12 Feb 2021 14:41:30 -
@@ -2,8 +2,8 @@ $OpenBSD: patch-SConstruct,v 1.2 2020/09
Index: SConstruct
--- SConstruct.orig
+++ SConstruct
-@@ -72,8 +72,7 @@ gpsd_version = "3.19"
- libgps_version_current = 25
+@@ -264,8 +264,7 @@ api_version_minor = 14
+ libgps_version_current = 27
libgps_version_revision = 0
libgps_version_age = 0
-libgps_version = "%d.%d.%d" % (libgps_version_current, libgps_version_age,
@@ -12,7 +12,7 @@ Index: SConstruct
#
# Release identification ends here
-@@ -546,7 +545,7 @@ def CheckPKG(context, name):
+@@ -754,7 +753,7 @@ def CheckPKG(context, name):
# Stylesheet URLs for making HTML and man pages from DocBook XML.
@@ -21,7 +21,7 @@ Index: SConstruct
docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
-@@ -1090,6 +1089,10 @@ else:
+@@ -1374,6 +1373,10 @@ else:
# if not, force qt to off
if config.env["qt"]:
qt_net_name = 'Qt%sNetwork' % config.env["qt_versioned"]
@@ -32,40 +32,33 @@ Index: SConstruct
qt_network = config.CheckPKG(qt_net_name)
if not qt_network:
config.env["qt"] = False
-@@ -1584,25 +1587,6 @@ else:
- }
+@@ -1500,20 +1503,6 @@ elif config.env['python']:
+
+ config.env['xgps_deps'] = True
- if env['xgps']:
-# check for pycairo
--try:
--imp.find_module('cairo')
--except ImportError:
--# no pycairo, don't build xgps, xgpsspeed
--announce("WARNING: Python module pycairo not found.\n"
-- "xgps and xgpsspeed will not be installed")
--env['xgps'] = False
+-if not config.GetPythonValue('module cairo (pycairo)',
+- 'import cairo', '"found"'):
+-# no pycairo, used by xgps, xgpsspeed
+-config.env['xgps_deps'] = False
+-announce("WARNING: Python module cairo (pycairo) not found.")
-
--# check for pygobject
--try:
--imp.find_module('gi')
--except ImportError:
--# no pycairo, don't build xgps, xgpsspeed
--announce("WARNING: Python module pygobject not found.\n"
-- "xgps and xgpsspeed will not be installed")
--env['xgps'] = False
+-# check for pycairo
+-if not config.GetPythonValue('module gi (pygobject)',
+-
Re: update misc/gpsd 2.29 - 2.33
On Wed, Jun 14, 2006 at 07:40:42PM -0600, Chris Kuethe wrote: lots of fun changes since 2.29. New data logging tools, unit conversions should all be done correctly now, port speed can be fixed at compile time if you're into that sort of thing... I get an error when linking xgps: /usr/local/bin/libtool --tag=CC --mode=link cc -O2 -pipe -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type -D_GNU_SOURCE -I/usr/X11R6/include -L/usr/local/lib -L/usr/X11R6/lib -o xgps display.o xgps.o -lm -lc -lXm -lXt -L/usr/X11R6/lib -lSM -lICE libgps.la -lm -lpthread cc -O2 -pipe -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type -D_GNU_SOURCE -I/usr/X11R6/include -o .libs/xgps display.o xgps.o -L/usr/local/lib -L/usr/X11R6/lib -lXm -lXt -lSM -lICE -L./.libs -lgps -lm -lpthread -Wl,-rpath,/usr/local/lib xgps.o(.text+0xc84): In function `update_panel': : warning: strcpy() is almost always misused, please use strlcpy() /usr/local/lib/libXm.so.3.0: warning: sprintf() is often misused, please use snprintf() /usr/local/lib/libXm.so.3.0: warning: strcat() is almost always misused, please use strlcat() xgps.o(.text+0xec4): In function `update_panel': : undefined reference to `deg_to_str' xgps.o(.text+0xf35): In function `update_panel': : undefined reference to `deg_to_str' collect2: ld returned 1 exit status *** Error code 1 Stop in /usr/obj/gpsd-2.33/gpsd-2.33 (line 717 of Makefile).
Re: update misc/gpsd 2.29 - 2.32
Chris Kuethe [2006-03-13, 09:08:09]:
patches/patch-serial_c integrated upstream and should be deleted
the sample client apps (gpxlogger, cgpxlogger, xgps, cgps,...) are all
now documented in the xgps manpage in case anyone is wondering.
the makefile tries to rebuild the manpages with xmlto, which we don't
have. i faked that out with true since appropriately formatted
manpages are already provided.
There are some problems with this port.
First, it's clear the dependencies are broken (try make package without
openmotif installed on your system). I suggest the following change
(switch to BUILD/RUN depends since lib-depends-check gives libXm as extra).
Index: Makefile
===
RCS file: /cvs/ports/misc/gpsd/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile2006/01/14 20:05:49 1.6
+++ Makefile2006/03/23 17:43:35
@@ -3,10 +3,10 @@
COMMENT= service daemon that monitors one or more GPSes
COMMENT-motif= motif-based test apps using gpsd
-VERSION= 2.29
+VERSION= 2.32
DISTNAME= gpsd-${VERSION}
-PKGNAME= gpsd-${VERSION}p2
-PKGNAME-motif= gpsd-motif-${VERSION}p0
+PKGNAME= gpsd-${VERSION}
+PKGNAME-motif= gpsd-motif-${VERSION}
SHARED_LIBS= gps 16.0
CATEGORIES=misc
@@ -36,6 +36,8 @@
MULTI_PACKAGES=-motif
CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
+RUN_DEPENDS= ::x11/openmotif
+BUILD_DEPENDS= ${RUN_DEPENDS}
.endif
SUBPACKAGE?=
@@ -43,8 +45,7 @@
.if defined(PACKAGING)
. if ${SUBPACKAGE} == -motif
WANTLIB= ICE Xaw X11 SM Xt c m pthread
-LIB_DEPENDS= Xm::x11/openmotif \
- gps::misc/gpsd
+LIB_DEPENDS+= gps::misc/gpsd
. endif
.endif
Second, I get a compilation error when doing make regress:
if c++ -DHAVE_CONFIG_H -I. -I. -I.-I/usr/local/include
-I/usr/X11R6/include -O2 -pipe -Wformat -Wbounded -MT gpsmm_test.o
-MD -MP -MF .deps/gpsmm_test.Tpo -c -o gpsmm_test.o gpsmm_test.cpp;
then mv -f .deps/gpsmm_test.Tpo .deps/gpsmm_test.Po;
else rm -f .deps/gpsmm_test.Tpo; exit 1; fi
gpsmm_test.cpp: In function `int main()':
gpsmm_test.cpp:41: error: invalid conversion from `void (*)(gps_data_t*, char*)
' to `void (*)(gps_data_t*, char*, long unsigned int, int)'
gpsmm_test.cpp:41: error: initializing argument 1 of `int
gpsmm::set_callback(void (*)(gps_data_t*, char*, long unsigned int, int))'
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: update misc/gpsd 2.29 - 2.32
steven mestdagh [2006-03-23, 18:49:20]:
Chris Kuethe [2006-03-13, 09:08:09]:
patches/patch-serial_c integrated upstream and should be deleted
the sample client apps (gpxlogger, cgpxlogger, xgps, cgps,...) are all
now documented in the xgps manpage in case anyone is wondering.
the makefile tries to rebuild the manpages with xmlto, which we don't
have. i faked that out with true since appropriately formatted
manpages are already provided.
There are some problems with this port.
First, it's clear the dependencies are broken (try make package without
openmotif installed on your system). I suggest the following change
(switch to BUILD/RUN depends since lib-depends-check gives libXm as extra).
oops, this should be better
Index: Makefile
===
RCS file: /cvs/ports/misc/gpsd/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile2006/01/14 20:05:49 1.6
+++ Makefile2006/03/23 18:02:28
@@ -3,10 +3,10 @@
COMMENT= service daemon that monitors one or more GPSes
COMMENT-motif= motif-based test apps using gpsd
-VERSION= 2.29
+VERSION= 2.32
DISTNAME= gpsd-${VERSION}
-PKGNAME= gpsd-${VERSION}p2
-PKGNAME-motif= gpsd-motif-${VERSION}p0
+PKGNAME= gpsd-${VERSION}
+PKGNAME-motif= gpsd-motif-${VERSION}
SHARED_LIBS= gps 16.0
CATEGORIES=misc
@@ -36,6 +36,7 @@
MULTI_PACKAGES=-motif
CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
+BUILD_DEPENDS= ::x11/openmotif
.endif
SUBPACKAGE?=
@@ -43,8 +44,8 @@
.if defined(PACKAGING)
. if ${SUBPACKAGE} == -motif
WANTLIB= ICE Xaw X11 SM Xt c m pthread
-LIB_DEPENDS= Xm::x11/openmotif \
- gps::misc/gpsd
+LIB_DEPENDS= gps::misc/gpsd
+RUN_DEPENDS= ::x11/openmotif
. endif
.endif
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: update misc/gpsd 2.29 - 2.32
On Mon, Mar 13, 2006 at 01:57:46PM -0700, Chris Kuethe wrote: one more patch - conversion error in gpsd.c that would cause the wrong units to be output. here's the diff with that included. Works on zaurus (tested gpsd + cgps and gpsd + kismet). Ciao, Kili
Re: update misc/gpsd 2.29 - 2.32
we think the units conversion really is fixed now. some frustration was expressed over why SVN didn't seem to take the patch. On 3/13/06, Chris Kuethe [EMAIL PROTECTED] wrote: patches/patch-serial_c integrated upstream and should be deleted the sample client apps (gpxlogger, cgpxlogger, xgps, cgps,...) are all now documented in the xgps manpage in case anyone is wondering. the makefile tries to rebuild the manpages with xmlto, which we don't have. i faked that out with true since appropriately formatted manpages are already provided. -- GDB has a 'break' feature; why doesn't it have 'fix' too? gpsd.diff Description: Binary data
Re: update misc/gpsd 2.29 - 2.32
On 3/13/06, Chris Kuethe [EMAIL PROTECTED] wrote: patches/patch-serial_c integrated upstream and should be deleted the sample client apps (gpxlogger, cgpxlogger, xgps, cgps,...) are all now documented in the xgps manpage in case anyone is wondering. the makefile tries to rebuild the manpages with xmlto, which we don't have. i faked that out with true since appropriately formatted manpages are already provided. one more patch - conversion error in gpsd.c that would cause the wrong units to be output. here's the diff with that included. -- GDB has a 'break' feature; why doesn't it have 'fix' too? gpsd.diff Description: Binary data
