CVS commit: pkgsrc/geography/gpsd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun  8 05:33:47 UTC 2023

Modified Files:
        pkgsrc/geography/gpsd: Makefile

Log Message:
gpsd: switch to scons4

Add missing dependency for gpsplot.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/geography/gpsd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gpsd/Makefile
diff -u pkgsrc/geography/gpsd/Makefile:1.70 pkgsrc/geography/gpsd/Makefile:1.71
--- pkgsrc/geography/gpsd/Makefile:1.70 Tue Jun  6 12:41:30 2023
+++ pkgsrc/geography/gpsd/Makefile      Thu Jun  8 05:33:46 2023
@@ -1,81 +1,57 @@
-# $NetBSD: Makefile,v 1.70 2023/06/06 12:41:30 riastradh Exp $
+# $NetBSD: Makefile,v 1.71 2023/06/08 05:33:46 wiz Exp $
 
 DISTNAME=      gpsd-3.25
+PKGREVISION=   1
 CATEGORIES=    geography
 MASTER_SITES=  http://download-mirror.savannah.gnu.org/releases/gpsd/
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      https://gpsd.io/
 COMMENT=       GPS information daemon
-
 LICENSE=       modified-bsd
 
-PY_PATCHPLIST= yes
+TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+=      ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=      ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial
 
 USE_TOOLS+=    pkg-config gmake
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c99 c++
 
-# \todo Separate upstream's build into configure and build.
-NO_CONFIGURE=  yes
+PY_PATCHPLIST=                 yes
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 # Note that gpsd is documented to use ncurses, not curses.
 FAKE_NCURSES=  yes
 # gpsd uses syncok.  Insist on an implementation that provides it.
 USE_CURSES=    syncok
 
-DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-DEPENDS+=      ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial
-
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 CFLAGS.SunOS=  -DLOG_PERROR=0
 
 ## scons arguments
-SCONS_ARGS+=   prefix=${PREFIX}
-SCONS_ARGS+=   mandir=${PKGMANDIR}
-SCONS_ARGS+=   docdir=share/doc/gpsd
+SCONS_BUILD_ARGS+=     prefix=${PREFIX}
+SCONS_BUILD_ARGS+=     mandir=${PKGMANDIR}
+SCONS_BUILD_ARGS+=     docdir=share/doc/gpsd
 # Use the python chosen by pkgsrc, not "/usr/bin/env python"
-SCONS_ARGS+=   python_shebang=${PYTHONBIN}
-SCONS_ARGS+=   target_python=${PYTHONBIN}
+SCONS_BUILD_ARGS+=     python_shebang=${PYTHONBIN}
+SCONS_BUILD_ARGS+=     target_python=${PYTHONBIN}
 # Require man pages (the build suceeeds and skips them w/o asciidoctor).
-SCONS_ARGS+=   manbuild=yes
+SCONS_BUILD_ARGS+=     manbuild=yes
 # Do not use the net at build time.
-SCONS_ARGS+=   leapfetch=no
+SCONS_BUILD_ARGS+=     leapfetch=no
 # scons is hard to understand, so enable debugging always
-SCONS_ARGS+=   --debug=explain,prepare
+#SCONS_BUILD_ARGS+=    --debug=explain,prepare
 
 RCD_SCRIPTS=   gpsd
 
-SUBST_CLASSES+=                pyenv
-SUBST_MESSAGE.pyenv=   Fixing Python path in test script
-# We would choose post-configure, but gpsd's build system blurs
-# configure and build.
-SUBST_STAGE.pyenv=     pre-build
-SUBST_FILES.pyenv+=    tests/test_misc.py
-SUBST_SED.pyenv=       -e 's,/usr/bin/env python.*$$,${PYTHONBIN},'
-
-# \todo: Determine if CC/CXX are needed (e.g, when using other than gcc).
-#      CC=${CC:Q} CXX=${CXX:Q}
-do-build:
-       cd ${WRKSRC} && \
-       ${SETENV} ${MAKE_ENV} ${SCONSBIN} \
-       ${SCONS_ARGS} \
-       -j${MAKE_JOBS:U1}
-
-do-install:
-       cd ${WRKSRC} && \
-       ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SCONSBIN} \
-       ${SCONS_ARGS} \
-       install
-
-do-test:
-       cd ${WRKSRC} && \
-       ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SCONSBIN} \
-       ${SCONS_ARGS} \
-       check
+REPLACE_PYTHON+=       tests/test_misc.py
+
+# \todo Separate upstream's build into configure and build.
+do-configure:
 
 .include "../../mk/bsd.prefs.mk"
+
 .if ${OPSYS} == "Darwin"
 PLIST_SUBST+=  PLIST_SO=
 PLIST_SUBST+=  PLIST_DYLIB=.dylib
@@ -85,14 +61,12 @@ PLIST_SUBST+=       PLIST_DYLIB=
 .endif
 
 .include "../../lang/ruby/rubyversion.mk"
-TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor
-
-# \todo Change to TOOLS or TOOL_DEPENDS after scons support is improved.
-.include "../../devel/scons/buildlink3.mk"
-
+.include "../../devel/scons4/build.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../graphics/py-cairo/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 # \todo Resolve mk/curses not invoking ncurses builtin processing.
 # For now, include the ncurses package directly.