[BACK]Return to patch-SConstruct CVS log [TXT][DIR] Up to [local] / ports / misc / gpsd3 / patches

Diff for /ports/misc/gpsd3/patches/Attic/patch-SConstruct between version 1.2 and 1.3

version 1.2, 2017/12/05 14:54:35 version 1.3, 2019/06/11 15:34:46
Line 1 
Line 1 
 Index: SConstruct  Index: SConstruct
 --- SConstruct.orig  --- SConstruct.orig
 +++ SConstruct  +++ SConstruct
 @@ -483,7 +483,7 @@ def CheckPKG(context, name):  @@ -513,7 +513,7 @@ def CheckPKG(context, name):
      return ret  
   
   
  # Stylesheet URLs for making HTML and man pages from DocBook XML.   # Stylesheet URLs for making HTML and man pages from DocBook XML.
 -docbook_url_stem = 'http://docbook.sourceforge.net/release/xsl/current/'  -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_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
  docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'   docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
   
 @@ -679,7 +679,7 @@ else:  @@ -941,7 +941,10 @@ else:
          elif sys.platform.startswith('freebsd'):       # Determine if Qt network libraries are present, and
              ncurseslibs = ['-lncurses']       # if not, force qt to off
          elif sys.platform.startswith('openbsd'):       if env["qt"]:
 -            ncurseslibs = ['-lcurses']  -        qt_net_name = 'Qt%sNetwork' % env["qt_versioned"]
 +            ncurseslibs = ['-lncurses']  +       if env["qt_versioned"] == "5":
          elif sys.platform.startswith('darwin'):  +               qt_net_name = 'Qt5Network'
              ncurseslibs = ['-lcurses']  +       elif env["qt_versioned"] == "4":
          else:  +               qt_net_name = 'QtNetwork'
 @@ -1044,8 +1044,7 @@ if env['coveraging'] and env['python_coverage'] and no           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   # Two shared libraries provide most of the code for the C programs
   
  libgps_version_soname = libgps_version_current - libgps_version_age   libgps_version_soname = libgps_version_current - libgps_version_age
Line 29 
Line 32 
   
  libgps_sources = [   libgps_sources = [
      "ais_json.c",       "ais_json.c",
 @@ -1377,9 +1376,7 @@ else:  @@ -1463,9 +1465,7 @@ else:
              python_objects[ext].append(               python_objects[ext].append(
                  python_env.NoCache(                   python_env.NoCache(
                      python_env.SharedObject(                       python_env.SharedObject(
 -                        src.split(".")[0] + '-py_'  -                        src.split(".")[0] + '-py_' +
 -                        + '_'.join(['%s' % (x) for x in sys.version_info])  -                        '_'.join(['%s' % (x) for x in sys.version_info]) +
 -                        + python_config['SO'], src  -                        python_config['SO'], src
 +                        src.split(".")[0] + python_config['SO'], src  +                        src.split(".")[0] + python_config['SO'], src
                      )                       )
                  )                   )
              )               )
 @@ -1597,7 +1594,6 @@ python_manpages = {  @@ -1697,7 +1697,6 @@ if tiocmiwait:
      "gpsprof.1": "gpsprof.xml",       })
      "gpsfake.1": "gpsfake.xml",  
      "gpscat.1": "gpscat.xml",   python_manpages = {
 -    "gegps.1": "gps.xml",  -    "gegps.1": "gps.xml",
  }       "gpscat.1": "gpscat.xml",
  if env['xgps']:       "gpsfake.1": "gpsfake.xml",
      python_manpages.update({       "gpsprof.1": "gpsprof.xml",
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
CVSweb