=================================================================== RCS file: /cvs/ports/misc/gpsd3/patches/Attic/patch-SConstruct,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ports/misc/gpsd3/patches/Attic/patch-SConstruct 2017/12/05 14:54:35 1.2 +++ ports/misc/gpsd3/patches/Attic/patch-SConstruct 2019/06/11 15:34:46 1.3 @@ -1,25 +1,28 @@ Index: SConstruct --- SConstruct.orig +++ SConstruct -@@ -483,7 +483,7 @@ def CheckPKG(context, name): - return ret +@@ -513,7 +513,7 @@ def CheckPKG(context, name): + # Stylesheet URLs for making HTML and man pages from DocBook XML. -docbook_url_stem = 'http://docbook.sourceforge.net/release/xsl/current/' -+docbook_url_stem = '/usr/local/share/xsl/docbook/' ++docbook_url_stem = '${LOCALBASE}/share/xsl/docbook/' docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl' docbook_html_uri = docbook_url_stem + 'html/docbook.xsl' -@@ -679,7 +679,7 @@ else: - elif sys.platform.startswith('freebsd'): - ncurseslibs = ['-lncurses'] - elif sys.platform.startswith('openbsd'): -- ncurseslibs = ['-lcurses'] -+ ncurseslibs = ['-lncurses'] - elif sys.platform.startswith('darwin'): - ncurseslibs = ['-lcurses'] - else: -@@ -1044,8 +1044,7 @@ if env['coveraging'] and env['python_coverage'] and no +@@ -941,7 +941,10 @@ else: + # Determine if Qt network libraries are present, and + # if not, force qt to off + if env["qt"]: +- qt_net_name = 'Qt%sNetwork' % env["qt_versioned"] ++ if env["qt_versioned"] == "5": ++ qt_net_name = 'Qt5Network' ++ elif env["qt_versioned"] == "4": ++ qt_net_name = 'QtNetwork' + qt_network = config.CheckPKG(qt_net_name) + if not qt_network: + env["qt"] = False +@@ -1092,8 +1095,7 @@ if env['coveraging'] and env['python_coverage'] and no # Two shared libraries provide most of the code for the C programs libgps_version_soname = libgps_version_current - libgps_version_age @@ -29,22 +32,22 @@ libgps_sources = [ "ais_json.c", -@@ -1377,9 +1376,7 @@ else: +@@ -1463,9 +1465,7 @@ else: python_objects[ext].append( python_env.NoCache( python_env.SharedObject( -- src.split(".")[0] + '-py_' -- + '_'.join(['%s' % (x) for x in sys.version_info]) -- + python_config['SO'], src +- src.split(".")[0] + '-py_' + +- '_'.join(['%s' % (x) for x in sys.version_info]) + +- python_config['SO'], src + src.split(".")[0] + python_config['SO'], src ) ) ) -@@ -1597,7 +1594,6 @@ python_manpages = { - "gpsprof.1": "gpsprof.xml", - "gpsfake.1": "gpsfake.xml", - "gpscat.1": "gpscat.xml", +@@ -1697,7 +1697,6 @@ if tiocmiwait: + }) + + python_manpages = { - "gegps.1": "gps.xml", - } - if env['xgps']: - python_manpages.update({ + "gpscat.1": "gpscat.xml", + "gpsfake.1": "gpsfake.xml", + "gpsprof.1": "gpsprof.xml",