Ticket #42862: mp-base.patch

File mp-base.patch, 2.5 KB (added by Ionic (Mihai Moldovan), 7 years ago)

Splitting up os.version into os.minor as well.

  • src/macports1.0/macports.tcl

     
    5959        rsync_server rsync_options rsync_dir startupitem_type startupitem_install place_worksymlink macportsuser \
    6060        configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \
    6161        applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \
    62         os_arch os_endian os_version os_major os_platform macosx_version macosx_sdk_version macosx_deployment_target \
     62        os_arch os_endian os_version os_major os_minor os_platform macosx_version macosx_sdk_version macosx_deployment_target \
    6363        packagemaker_path default_compilers sandbox_enable delete_la_files cxx_stdlib \
    6464        pkg_post_unarchive_deletions $user_options"
    6565
     
    573573        macports::os_endian \
    574574        macports::os_version \
    575575        macports::os_major \
     576        macports::os_minor \
    576577        macports::os_platform \
    577578        macports::macosx_version \
    578579        macports::macosx_sdk_version \
     
    593594    if {$os_arch eq {i586} || $os_arch eq {i686} || $os_arch eq {x86_64}} {set os_arch "i386"}
    594595    set os_version $tcl_platform(osVersion)
    595596    set os_major [lindex [split $os_version .] 0]
     597    set os_minor [lindex [split $os_version .] 1]
    596598    set os_platform [string tolower $tcl_platform(os)]
    597599    # Remove trailing "Endian"
    598600    set os_endian [string range $tcl_platform(byteOrder) 0 end-6]
  • src/port1.0/portmain.tcl

     
    5151        long_description description homepage notes license \
    5252        provides conflicts replaced_by \
    5353        worksrcdir filesdir distname portdbpath libpath distpath sources_conf \
    54         os.platform os.subplatform os.version os.major os.arch os.endian \
     54        os.platform os.subplatform os.version os.major os.minor os.arch os.endian \
    5555        platforms default_variants install.user install.group \
    5656        macosx_deployment_target universal_variant os.universal_supported \
    5757        supported_archs depends_skip_archcheck installs_libs \
     
    116116default os.platform {$os_platform}
    117117default os.version {$os_version}
    118118default os.major {$os_major}
     119default os.minor {$os_minor}
    119120default os.arch {$os_arch}
    120121default os.endian {$os_endian}
    121122