pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gpsd: Depend on ncurses



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Apr 30 20:20:44 2019 -0400
Changeset:	f066d4b1f33b0253323691339c36d2ef3087186d

Modified Files:
	gpsd/Makefile
	gpsd/PLIST
Added Files:
	gpsd/TODO

Log Message:
gpsd: Depend on ncurses

gpsd uses pkg-config to find ncurses, so it doesn't find our builtin
curses, by any name.

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

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

diffstat:
 gpsd/Makefile | 12 ++++++++----
 gpsd/PLIST    |  4 ++--
 gpsd/TODO     |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diffs:
diff --git a/gpsd/Makefile b/gpsd/Makefile
index 5e01a1e0f2..902c057679 100644
--- a/gpsd/Makefile
+++ b/gpsd/Makefile
@@ -19,10 +19,11 @@ USE_LANGUAGES=	c99 c++
 # \todo Separate upstream's build into configure and build.
 NO_CONFIGURE=	yes
 
-# \todo Check if this is necessary.
-# gpsd looks for ncurses but not curses. (Not yet filed upstream.)
+# \todo Consider teaching gpsd to use base system curses.  Note that
+# gpsd is documented to use ncurses, not curses, and expects a
+# pkgconfig file.
 FAKE_NCURSES=	yes
-# gpsd uses syncok
+# gpsd uses syncok.  Insist on an implementation that provides it.
 USE_CURSES=	syncok
 
 # Documentation depends
@@ -71,8 +72,11 @@ do-test:
 .include "../../devel/scons/buildlink3.mk"
 
 .include "../../devel/libusb1/buildlink3.mk"
+# builtin curses does not provide a pkgconfig file and is thus deficient.
+USE_BUILTIN.ncurses=	no
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../mk/curses.buildlink3.mk"
+#.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gpsd/PLIST b/gpsd/PLIST
index f9fcf8d215..4b4ee70262 100644
--- a/gpsd/PLIST
+++ b/gpsd/PLIST
@@ -1,12 +1,12 @@
 @comment $NetBSD: PLIST,v 1.10 2011/03/23 16:08:34 gdt Exp $
-@comment bin/cgps
+bin/cgps
 bin/gegps
 bin/gps2udp
 bin/gpscat
 bin/gpsctl
 bin/gpsdecode
 bin/gpsfake
-@comment bin/gpsmon
+bin/gpsmon
 bin/gpspipe
 bin/gpsprof
 bin/gpxlogger
diff --git a/gpsd/TODO b/gpsd/TODO
new file mode 100644
index 0000000000..a16b677225
--- /dev/null
+++ b/gpsd/TODO
@@ -0,0 +1 @@
+Check if libgpsd withdrawal is a bug or not.


Home | Main Index | Thread Index | Old Index