gpsd: Depend on the right gobject

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Apr 30 19:52:49 2019 -0400
Changeset:	e17ede2a626d94b988e1a47d007301cd09820e49

Modified Files:
	gpsd/Makefile
	gpsd/PLIST

Log Message:
gpsd: Depend on the right gobject

(Apparently there is gobject and gobject3, and others say gi for our
gobject3.)

Adjust doc depends.

Add xgps back to PLIST now that it is built.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e17ede2a626d94b988e1a47d007301cd09820e49

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

diffstat:
 gpsd/Makefile | 28 ++++++++++++++++------------
 gpsd/PLIST    |  8 ++++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diffs:
diff --git a/gpsd/Makefile b/gpsd/Makefile
index 16663eb37f..5e01a1e0f2 100644
--- a/gpsd/Makefile
+++ b/gpsd/Makefile
@@ -25,6 +25,18 @@ FAKE_NCURSES=	yes
 # gpsd uses syncok
 USE_CURSES=	syncok
 
+# Documentation depends
+BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
+
+# \todo Decide if buildlink3 is more appropriate.
+DEPENDS+=		${PYPKGPREFIX}-gobject3:../../devel/py-gobject3
+
+CFLAGS.SunOS=	-DLOG_PERROR=0
+
+# Configure phase arguments:
+SCONS_ARGS+=	leapfetch=no		# Do not use the net at build time.
+SCONS_ARGS+=	target_python=${PYTHONBIN}	# Use our python, not "python".
+
 SUBST_CLASSES+=		pyenv
 SUBST_MESSAGE.pyenv=	Fixing path in Python scripts
 SUBST_STAGE.pyenv=	pre-build	# We don't configure :-(
@@ -33,19 +45,12 @@ SUBST_FILES.pyenv+=	gpscat
 SUBST_FILES.pyenv+=	gpsfake
 SUBST_FILES.pyenv+=	gpsprof
 SUBST_FILES.pyenv+=	ubxtool
+SUBST_FILES.pyenv+=	xgps
+SUBST_FILES.pyenv+=	xgpsspeed
 SUBST_FILES.pyenv+=	zerk
 SUBST_SED.pyenv=	-e 's,/usr/bin/env python.*$$,${PYTHONBIN},'
 
-# \todo Check if this is necessary.
-BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
-
-CFLAGS.SunOS=	-DLOG_PERROR=0
-
-# Configure phase arguments:
-SCONS_ARGS+=	leapfetch=no		# Do not use the net at build time.
-SCONS_ARGS+=	target_python=${PYTHONBIN}
-
-# \todo: Determine if CC/CXX are needed here.
+# \todo: Determine if CC/CXX are needed (e.g, when using other than gcc).
 #	CC=${CC:Q} CXX=${CXX:Q}
 do-build:
 	cd ${WRKSRC} && \
@@ -62,11 +67,10 @@ do-test:
 	cd ${WRKSRC} && \
 	${SETENV} ${INSTALL_ENV} ${SCONSBIN} check
 
-# \todo Change to TOOLS or BUILD_DEPENDS after scons is improved.
+# \todo Change to TOOLS or BUILD_DEPENDS after scons support is improved.
 .include "../../devel/scons/buildlink3.mk"
 
 .include "../../devel/libusb1/buildlink3.mk"
-.include "../../devel/py-gobject/buildlink3.mk"
 .include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/gpsd/PLIST b/gpsd/PLIST
index 184d71902f..f9fcf8d215 100644
--- a/gpsd/PLIST
+++ b/gpsd/PLIST
@@ -12,8 +12,8 @@ bin/gpsprof
 bin/gpxlogger
 bin/lcdgps
 bin/ntpshmmon
-@comment bin/xgps
-@comment bin/xgpsspeed
+bin/xgps
+bin/xgpsspeed
 bin/ubxtool
 bin/zerk
 include/gps.h
@@ -49,8 +49,8 @@ man/man1/gpxlogger.1
 man/man1/lcdgps.1
 man/man1/ntpshmmon.1
 man/man1/ubxtool.1
-@comment man/man1/xgps.1
-@comment man/man1/xgpsspeed.1
+man/man1/xgps.1
+man/man1/xgpsspeed.1
 man/man1/zerk.1
 man/man3/libQgpsmm.3
 man/man3/libgps.3