Return to patch-SConstruct CVS log

Up to [local] / ports / misc / gpsd3 / patches

Annotation of ports/misc/gpsd3/patches/patch-SConstruct, Revision 1.3

1.2       kirby       1: Index: SConstruct
                      2: --- SConstruct.orig
                      3: +++ SConstruct
1.3     ! kirby       4: @@ -513,7 +513,7 @@ def CheckPKG(context, name):
        !             5:
1.1       kirby       6:
                      7:  # Stylesheet URLs for making HTML and man pages from DocBook XML.
                      8: -docbook_url_stem = 'http://docbook.sourceforge.net/release/xsl/current/'
1.3     ! kirby       9: +docbook_url_stem = '${LOCALBASE}/share/xsl/docbook/'
1.1       kirby      10:  docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
                     11:  docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
                     12:
1.3     ! kirby      13: @@ -941,7 +941,10 @@ else:
        !            14:      # Determine if Qt network libraries are present, and
        !            15:      # if not, force qt to off
        !            16:      if env["qt"]:
        !            17: -        qt_net_name = 'Qt%sNetwork' % env["qt_versioned"]
        !            18: +      if env["qt_versioned"] == "5":
        !            19: +              qt_net_name = 'Qt5Network'
        !            20: +      elif env["qt_versioned"] == "4":
        !            21: +              qt_net_name = 'QtNetwork'
        !            22:          qt_network = config.CheckPKG(qt_net_name)
        !            23:          if not qt_network:
        !            24:              env["qt"] = False
        !            25: @@ -1092,8 +1095,7 @@ if env['coveraging'] and env['python_coverage'] and no
1.2       kirby      26:  # Two shared libraries provide most of the code for the C programs
1.1       kirby      27:
                     28:  libgps_version_soname = libgps_version_current - libgps_version_age
1.2       kirby      29: -libgps_version = "%d.%d.%d" % (libgps_version_soname, libgps_version_age,
                     30: -                               libgps_version_revision)
1.1       kirby      31: +libgps_version = "%d.%d" %(libgps_version_soname, libgps_version_revision)
                     32:
                     33:  libgps_sources = [
                     34:      "ais_json.c",
1.3     ! kirby      35: @@ -1463,9 +1465,7 @@ else:
1.1       kirby      36:              python_objects[ext].append(
                     37:                  python_env.NoCache(
                     38:                      python_env.SharedObject(
1.3     ! kirby      39: -                        src.split(".")[0] + '-py_' +
        !            40: -                        '_'.join(['%s' % (x) for x in sys.version_info]) +
        !            41: -                        python_config['SO'], src
1.2       kirby      42: +                        src.split(".")[0] + python_config['SO'], src
1.1       kirby      43:                      )
                     44:                  )
                     45:              )
1.3     ! kirby      46: @@ -1697,7 +1697,6 @@ if tiocmiwait:
        !            47:      })
        !            48:
        !            49:  python_manpages = {
        !            50: -    "gegps.1": "gps.xml",
        !            51:      "gpscat.1": "gpscat.xml",
        !            52:      "gpsfake.1": "gpsfake.xml",
1.2       kirby      53:      "gpsprof.1": "gpsprof.xml",