CVS commit: pkgsrc/geography/gpsd

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Mar 19 16:31:43 UTC 2017

Modified Files:
        pkgsrc/geography/gpsd: Makefile

Log Message:
Use better method to avoid NetBSD curses

The basic issue is that gpsd does not build with NetBSD curses because
it uses syncok.  Previously, I set CURSES_DEFAULT, which is incorrect
because it is a user-settable variable.

Include syncok in USE_CURSES (which doesn't has any effect because it
isn't yet supported in curses.builtin.mk).  Also include getsyx, which
gpsd doesn't use, but which will prevent NetBSD curses from being
selected.  The getsyx line can be removed when there is syncok
support.

Also restore FAKE_NCURSES, because gpsd doesn't look for curses, only
ncurses (not yet filed upstream).

Thanks to Joerg for pointing out my error and to Roy for the specific
fix suggestion.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 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.35 pkgsrc/geography/gpsd/Makefile:1.36
--- pkgsrc/geography/gpsd/Makefile:1.35 Sun Mar 19 00:23:00 2017
+++ pkgsrc/geography/gpsd/Makefile      Sun Mar 19 16:31:43 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2017/03/19 00:23:00 gdt Exp $
+# $NetBSD: Makefile,v 1.36 2017/03/19 16:31:43 gdt Exp $
 
 # gpsd 3.11 has been released.  It has only not been updated because
 # newer versions use scons.
 DISTNAME=      gpsd-2.96
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    geography
 MASTER_SITES=  http://download-mirror.savannah.gnu.org/releases/gpsd/
 
@@ -24,8 +24,15 @@ PYTHON_VERSIONS_INCOMPATIBLE=        34 35 36 #
 USE_TOOLS+=    gmake
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c99 c++
-# gpsd uses syncok, which is in pkgsrc ncurses but not NetBSD system curses
-CURSES_DEFAULT=        ncurses
+
+# gpsd looks for ncurses but not curses. (Not yet filed upstream.)
+FAKE_NCURSES=  yes
+
+# gpsd uses syncok (which at least NetBSD curses lacks).
+USE_CURSES+=   syncok
+# However, syncok isn't tested in mk/curses.builtin.mk.  For now, test
+# another feature that NetBSD curses lacks.
+USE_CURSES+=   getsyx
 
 CFLAGS.SunOS=  -DLOG_PERROR=0