diff --git a/REQUIRE b/REQUIRE index 38bdc9a..2a0ff7b 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,4 +1,4 @@ julia 0.6 URIParser SHA -Compat 0.44.0 +Compat 0.46.0 diff --git a/src/BinDeps.jl b/src/BinDeps.jl index 0116d97..ffbfb48 100644 --- a/src/BinDeps.jl +++ b/src/BinDeps.jl @@ -425,7 +425,7 @@ lower(s) = (c=SynchronousStepCollection();lower(s,c);c) function lower(s::AutotoolsDependency,collection) prefix = s.prefix if Compat.Sys.iswindows() - prefix = replace(replace(s.prefix,"\\","/"),"C:/","/c/") + prefix = replace(replace(s.prefix, "\\" => "/"), "C:/" => "/c/") end cmdstring = "pwd && ./configure --prefix=$(prefix) "*join(s.configure_options," ") @@ -581,7 +581,7 @@ function glibc_version() ptr = Libdl.dlsym_e(libc, :gnu_get_libc_version) ptr == C_NULL && return # non-glibc v = unsafe_string(ccall(ptr, Ptr{UInt8}, ())) - ismatch(Base.VERSION_REGEX, v) ? VersionNumber(v) : nothing + contains(v, Base.VERSION_REGEX) ? VersionNumber(v) : nothing end include("dependencies.jl") diff --git a/src/dependencies.jl b/src/dependencies.jl index aa0e1c7..a6c14d3 100644 --- a/src/dependencies.jl +++ b/src/dependencies.jl @@ -240,7 +240,7 @@ function package_available(p::BSDPkg) can_use(BSDPkg) || return false rgx = Regex(string("^(", p.package, ")(\\s+.+)?\$")) for line in eachline(`pkg search -L name $(p.package)`) - ismatch(rgx, line) && return true + contains(line, rgx) && return true end return false end @@ -258,9 +258,9 @@ function available_version(p::BSDPkg) rawversion = chomp(line[findfirst(c->c==':', line)+2:end]) # Chop off the port revision and epoch by removing everything after and # including the first underscore - libversion = replace(rawversion, r"_.+$", "") + libversion = replace(rawversion, r"_.+$" => "") # This should be a valid version, but it's still possible that it isn't - if ismatch(Base.VERSION_REGEX, libversion) + if contains(libversion, Base.VERSION_REGEX) return VersionNumber(libversion) else error("\"$rawversion\" is not recognized as a version. Please report this to BinDeps.jl.")