Index: head/deskutils/basket/Makefile =================================================================== --- head/deskutils/basket/Makefile (revision 532067) +++ head/deskutils/basket/Makefile (revision 532068) @@ -1,40 +1,37 @@ # Created by: Markus Brueffer # $FreeBSD$ PORTNAME= basket DISTVERSIONPREFIX= v DISTVERSION= 2.49a-46 DISTVERSIONSUFFIX= -g60e38c6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils kde - -PATCH_SITES= https://github.com/basket-notepads/basket/commit/ -PATCHFILES= 094580f207b5ba9f44e9af00834f9c93f06fb440.patch:-p1 MAINTAINER= ports@FreeBSD.org COMMENT= Desktop organization tool LICENSE= GPLv2 LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ libgit2.so:devel/libgit2 USES= cmake compiler:c++11-lang desktop-file-utils gettext-tools \ kde:5 pkgconfig qt:5 shared-mime-info tar:bzip2 xorg USE_KDE= ecm archive auth codecs completion config configwidgets \ coreaddons crash dbusaddons doctools filemetadata globalaccel \ guiaddons i18n iconthemes jobwidgets kcmutils kio \ notifications parts service sonnet textwidgets widgetsaddons \ windowsystem xmlgui USE_QT= concurrent core dbus gui network phonon4 testlib widgets xml \ buildtools_build qmake_build USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= basket-notepads PLIST_SUB= QT5_VERSION=${QT5_VERSION} .include Index: head/deskutils/basket/distinfo =================================================================== --- head/deskutils/basket/distinfo (revision 532067) +++ head/deskutils/basket/distinfo (revision 532068) @@ -1,5 +1,3 @@ TIMESTAMP = 1584082836 SHA256 (basket-notepads-basket-v2.49a-46-g60e38c6_GH0.tar.gz) = 24415255f9c2446cd7b3b972fa001ecd9dcaa20fe6c64b326828c5b5a1961464 SIZE (basket-notepads-basket-v2.49a-46-g60e38c6_GH0.tar.gz) = 4688562 -SHA256 (094580f207b5ba9f44e9af00834f9c93f06fb440.patch) = 2c1ce9ed5b800c1b1c1055a69169f2b2a90290136e9cc0bafe92e33acd179fe9 -SIZE (094580f207b5ba9f44e9af00834f9c93f06fb440.patch) = 1016 Index: head/deskutils/basket/files/patch-src_application.cpp =================================================================== --- head/deskutils/basket/files/patch-src_application.cpp (nonexistent) +++ head/deskutils/basket/files/patch-src_application.cpp (revision 532068) @@ -0,0 +1,20 @@ +--- src/application.cpp.orig 2018-12-05 17:27:24 UTC ++++ src/application.cpp +@@ -56,7 +56,7 @@ Application::Application(int &argc, char **argv) + + + #ifdef WITH_LIBGIT2 +- #if LIBGIT2_SOVERSION >= 22 ++ #if LIBGIT2_VER_MAJOR >= 1 + git_libgit2_init(); + #else + git_threads_init(); +@@ -67,7 +67,7 @@ Application::Application(int &argc, char **argv) + Application::~Application() + { + #ifdef WITH_LIBGIT2 +- #if LIBGIT2_SOVERSION >= 22 ++ #if LIBGIT2_VER_MAJOR >= 1 + git_libgit2_shutdown(); + #else + git_threads_shutdown(); Property changes on: head/deskutils/basket/files/patch-src_application.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/cargo-c/Makefile =================================================================== --- head/devel/cargo-c/Makefile (revision 532067) +++ head/devel/cargo-c/Makefile (revision 532068) @@ -1,161 +1,162 @@ # $FreeBSD$ PORTNAME= cargo-c DISTVERSION= 0.6.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO # XXX Teach USES=cargo to have proper default DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jbeich@FreeBSD.org COMMENT= Cargo C-ABI helpers LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgit2.so:devel/libgit2 \ libcurl.so:ftp/curl \ libssh2.so:security/libssh2 USES= cargo ssl PLIST_FILES= bin/cargo-cbuild \ bin/cargo-cinstall CARGO_CRATES= adler32-1.0.4 \ aho-corasick-0.7.10 \ ansi_term-0.11.0 \ anyhow-1.0.28 \ atty-0.2.14 \ autocfg-1.0.0 \ bitflags-1.2.1 \ bitmaps-2.1.0 \ bstr-0.2.12 \ bytesize-1.0.0 \ cargo-0.43.1 \ cargo-platform-0.1.1 \ cbindgen-0.14.1 \ cc-1.0.50 \ cfg-if-0.1.10 \ clap-2.33.0 \ commoncrypto-0.2.0 \ commoncrypto-sys-0.2.0 \ core-foundation-0.7.0 \ core-foundation-sys-0.7.0 \ crates-io-0.31.0 \ crc32fast-1.2.0 \ crossbeam-channel-0.4.2 \ crossbeam-utils-0.7.2 \ crypto-hash-0.3.4 \ curl-0.4.28 \ curl-sys-0.4.30+curl-7.69.1 \ env_logger-0.7.1 \ filetime-0.2.9 \ flate2-1.0.14 \ fnv-1.0.6 \ foreign-types-0.3.2 \ foreign-types-shared-0.1.1 \ fs2-0.4.3 \ fwdansi-1.1.0 \ getrandom-0.1.14 \ git2-0.11.0 \ git2-curl-0.12.0 \ glob-0.3.0 \ globset-0.4.5 \ heck-0.3.1 \ hermit-abi-0.1.11 \ hex-0.3.2 \ hex-0.4.2 \ home-0.5.3 \ humantime-1.3.0 \ humantime-2.0.0 \ idna-0.2.0 \ ignore-0.4.14 \ im-rc-14.3.0 \ itoa-0.4.5 \ jobserver-0.1.21 \ lazy_static-1.4.0 \ lazycell-1.2.1 \ libc-0.2.69 \ libgit2-sys-0.10.0 \ libnghttp2-sys-0.1.3 \ libssh2-sys-0.2.16 \ libz-sys-1.0.25 \ log-0.4.8 \ matches-0.1.8 \ maybe-uninit-2.0.0 \ memchr-2.3.3 \ miniz_oxide-0.3.6 \ miow-0.3.3 \ num_cpus-1.13.0 \ opener-0.4.1 \ openssl-0.10.29 \ openssl-probe-0.1.2 \ openssl-sys-0.9.55 \ percent-encoding-2.1.0 \ pkg-config-0.3.17 \ ppv-lite86-0.2.6 \ proc-macro-error-1.0.2 \ proc-macro-error-attr-1.0.2 \ proc-macro2-1.0.10 \ quick-error-1.2.3 \ quote-1.0.3 \ rand-0.7.3 \ rand_chacha-0.2.2 \ rand_core-0.5.1 \ rand_hc-0.2.0 \ rand_xoshiro-0.4.0 \ redox_syscall-0.1.56 \ regex-1.3.6 \ regex-syntax-0.6.17 \ remove_dir_all-0.5.2 \ rustc-workspace-hack-1.0.0 \ rustfix-0.5.1 \ ryu-1.0.3 \ same-file-1.0.6 \ schannel-0.1.18 \ semver-0.9.0 \ semver-parser-0.7.0 \ serde-1.0.106 \ serde_derive-1.0.106 \ serde_ignored-0.1.1 \ serde_json-1.0.51 \ shell-escape-0.1.4 \ sized-chunks-0.5.3 \ smallvec-1.3.0 \ socket2-0.3.12 \ strip-ansi-escapes-0.1.0 \ strsim-0.8.0 \ structopt-0.3.13 \ structopt-derive-0.4.6 \ syn-1.0.17 \ syn-mid-0.5.0 \ tar-0.4.26 \ tempfile-3.1.0 \ termcolor-1.1.0 \ textwrap-0.11.0 \ thread_local-1.0.1 \ toml-0.5.6 \ typenum-1.12.0 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.12 \ unicode-segmentation-1.6.0 \ unicode-width-0.1.7 \ unicode-xid-0.2.0 \ url-2.1.1 \ utf8parse-0.1.1 \ vcpkg-0.2.8 \ vec_map-0.8.1 \ version_check-0.9.1 \ vte-0.3.3 \ walkdir-2.3.1 \ wasi-0.9.0+wasi-snapshot-preview1 \ winapi-0.3.8 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.4 \ winapi-x86_64-pc-windows-gnu-0.4.0 post-patch: @${REINPLACE_CMD} -e 's,libdir.join("pkgconfig,prefix.join("libdata/pkgconfig,' \ ${WRKSRC}/src/install_paths.rs .include Index: head/devel/cargo-tree/Makefile =================================================================== --- head/devel/cargo-tree/Makefile (revision 532067) +++ head/devel/cargo-tree/Makefile (revision 532068) @@ -1,68 +1,68 @@ # $FreeBSD$ PORTNAME= cargo-tree DISTVERSION= 0.29.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= yuri@FreeBSD.org COMMENT= Rust's cargo subcommand to visualize dependency graph as a tree #' LICENSE= APACHE20 MIT LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 USES= cargo ssl CARGO_CRATES= ansi_term-0.11.0 \ anyhow-1.0.26 \ atty-0.2.14 \ bitflags-1.2.1 \ cargo_metadata-0.9.1 \ clap-2.33.0 \ fixedbitset-0.1.9 \ heck-0.3.1 \ hermit-abi-0.1.6 \ itoa-0.4.5 \ lazy_static-1.4.0 \ libc-0.2.66 \ ordermap-0.3.5 \ petgraph-0.4.13 \ proc-macro-error-0.4.5 \ proc-macro-error-attr-0.4.5 \ proc-macro2-1.0.8 \ quote-1.0.2 \ rustversion-1.0.2 \ ryu-1.0.2 \ semver-0.9.0 \ semver-parser-0.7.0 \ serde-1.0.104 \ serde_derive-1.0.104 \ serde_json-1.0.45 \ strsim-0.8.0 \ structopt-0.3.8 \ structopt-derive-0.4.1 \ syn-1.0.14 \ syn-mid-0.4.0 \ textwrap-0.11.0 \ unicode-segmentation-1.6.0 \ unicode-width-0.1.7 \ unicode-xid-0.2.0 \ vec_map-0.8.1 \ winapi-0.3.8 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 PLIST_FILES= bin/${PORTNAME} post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cargo-tree .include Index: head/devel/geany-plugin-git-changebar/Makefile =================================================================== --- head/devel/geany-plugin-git-changebar/Makefile (revision 532067) +++ head/devel/geany-plugin-git-changebar/Makefile (revision 532068) @@ -1,19 +1,19 @@ # $FreeBSD$ PORTNAME= geany-plugin-git-changebar PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PATCH_SITES= https://github.com/geany/geany-plugins/commit/ PATCHFILES= 9497d829e1b207eb83575dc6f617feecfb89bc16.patch:-p1 MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} LIB_DEPENDS= libgit2.so:devel/libgit2 OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Index: head/devel/geany-plugin-workbench/Makefile =================================================================== --- head/devel/geany-plugin-workbench/Makefile (revision 532067) +++ head/devel/geany-plugin-workbench/Makefile (revision 532068) @@ -1,17 +1,17 @@ # $FreeBSD$ PORTNAME= geany-plugin-workbench PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PATCH_SITES= https://github.com/geany/geany-plugins/commit/ PATCHFILES= 9497d829e1b207eb83575dc6f617feecfb89bc16.patch:-p1 MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} LIB_DEPENDS= libgit2.so:devel/libgit2 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Index: head/devel/git-absorb/Makefile =================================================================== --- head/devel/git-absorb/Makefile (revision 532067) +++ head/devel/git-absorb/Makefile (revision 532068) @@ -1,88 +1,88 @@ # $FreeBSD$ PORTNAME= git-absorb DISTVERSION= 0.5.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel MAINTAINER= greg@unrelenting.technology COMMENT= Git command for automating fixup/autosquash commits LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libgit2.so:devel/libgit2 USES= cargo USE_GITHUB= yes GH_ACCOUNT= tummychow CARGO_CRATES= ansi_term-0.10.2 \ atty-0.2.12 \ autocfg-0.1.4 \ backtrace-0.3.32 \ backtrace-sys-0.1.30 \ bitflags-1.1.0 \ cc-1.0.37 \ cfg-if-0.1.9 \ chrono-0.4.7 \ clap-2.30.0 \ failure-0.1.5 \ failure_derive-0.1.5 \ fuchsia-cprng-0.1.1 \ git2-0.9.1 \ idna-0.1.5 \ isatty-0.1.9 \ kernel32-sys-0.2.2 \ lazy_static-1.3.0 \ libc-0.2.59 \ libgit2-sys-0.8.1 \ libz-sys-1.0.25 \ log-0.4.7 \ matches-0.1.8 \ memchr-2.0.2 \ num-integer-0.1.41 \ num-traits-0.2.8 \ percent-encoding-1.0.1 \ pkg-config-0.3.14 \ proc-macro2-0.4.30 \ quote-0.6.13 \ rand-0.4.6 \ rand_core-0.3.1 \ rand_core-0.4.0 \ rdrand-0.4.0 \ redox_syscall-0.1.56 \ remove_dir_all-0.5.2 \ rustc-demangle-0.1.15 \ slog-2.1.1 \ slog-async-2.2.0 \ slog-term-2.3.0 \ smallvec-0.6.10 \ strsim-0.7.0 \ syn-0.15.39 \ synstructure-0.10.2 \ take_mut-0.2.2 \ tempdir-0.3.7 \ term-0.4.6 \ textwrap-0.9.0 \ thread_local-0.3.6 \ time-0.1.42 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.8 \ unicode-width-0.1.5 \ unicode-xid-0.1.0 \ url-1.7.2 \ vcpkg-0.2.7 \ vec_map-0.8.1 \ winapi-0.2.8 \ winapi-0.3.7 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 PLIST_FILES= bin/git-absorb post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/git-absorb .include Index: head/devel/gitaly/Makefile =================================================================== --- head/devel/gitaly/Makefile (revision 532067) +++ head/devel/gitaly/Makefile (revision 532068) @@ -1,118 +1,118 @@ # $FreeBSD$ PORTNAME= gitaly DISTVERSION= 12.9.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.22:devel/git \ rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \ - rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \ + rubygem-rugged>=0.28:devel/rubygem-rugged \ rubygem-github-linguist>=7.5<8.0:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \ rubygem-activesupport60>=6.0.2.2<6.0.2.3:devel/rubygem-activesupport60 \ rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.8<4.2.8.0:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ rubygem-grpc124>=1.24.0<1.25.0:net/rubygem-grpc124 \ rubygem-sentry-raven29>=2.9.0<2.10.0:devel/rubygem-sentry-raven29 \ rubygem-faraday>=0.12<1.0:www/rubygem-faraday \ rubygem-rbtrace>0:devel/rubygem-rbtrace \ rubygem-gitlab-labkit>=0.11.0<0.11.1:devel/rubygem-gitlab-labkit \ rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \ rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38 BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=9.3.0:devel/gitlab-shell USES= gmake go:modules,no_targets USE_RUBY= yes MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags GL_COMMIT= d6c8a3d730ebb1f00572914e502285fd7729ead3 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor # 52dd GH_TUPLE= \ BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \ cloudflare:tableflip:8392f1641731:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \ codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/vendor/github.com/codahale/hdrhistogram \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ getsentry:sentry-go:v0.3.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \ go-gorp:gorp:v1.7.2:go_gorp_gorp/vendor/gopkg.in/gorp.v1 \ go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \ golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \ golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \ golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \ golang:sys:86b910548bc1:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \ google:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \ google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \ googleapis:gax-go:v2.0.5:googleapis_gax_go/vendor/github.com/googleapis/gax-go/v2 \ googleapis:google-api-go-client:v0.15.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ googleapis:google-cloud-go:v0.50.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \ grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \ grpc:grpc-go:v1.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \ kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \ konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \ libgit2:git2go:ecaeb7a21d47:libgit2_git2go/vendor/github.com/libgit2/git2go \ lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \ matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ prometheus:client_golang:v1.0.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ prometheus:client_model:14fe0d1b01d4:prometheus_client_model/vendor/github.com/prometheus/client_model \ prometheus:common:v0.4.1:prometheus_common/vendor/github.com/prometheus/common \ prometheus:procfs:v0.0.3:prometheus_procfs/vendor/github.com/prometheus/procfs \ rubenv:sql-migrate:06338513c237:rubenv_sql_migrate/vendor/github.com/rubenv/sql-migrate \ sebest:xff:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \ sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \ tinylib:msgp:v1.1.0:tinylib_msgp/vendor/github.com/tinylib/msgp \ uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \ uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib GL_TUPLE= gitlab-org:labkit:9cb7801f7feafecc53f5a061ffeae5c11567da9b:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/ruby/gitlab-shell/config.yml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample ${MV} ${WRKSRC}/ruby/gitlab-shell/config.yml.example ${WRKSRC}/ruby/gitlab-shell/config.yml.sample do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete (cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/bin && \ cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample ${STAGEDIR}${DATADIR}) && \ cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby .include Index: head/devel/gitaly/files/patch-ruby_Gemfile =================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile (revision 532067) +++ head/devel/gitaly/files/patch-ruby_Gemfile (revision 532068) @@ -1,38 +1,42 @@ --- ruby/Gemfile.orig 2020-03-26 12:14:05 UTC +++ ruby/Gemfile -@@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3' - gem 'rugged', '~> 0.28' +@@ -3,10 +3,10 @@ + # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 + gem 'bundler', '>= 1.17.3' + +-gem 'rugged', '~> 0.28' ++gem 'rugged', '~> 1.0' gem 'github-linguist', '~> 7.5', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' -gem 'activesupport', '6.0.2' +gem 'activesupport', '6.0.2.2' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false @@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.9.1' +gem 'gitlab-labkit', '~> 0.11.0' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE @@ -24,17 +24,3 @@ gem 'licensee', '~> 8.9.0' gem 'google-protobuf', '~> 3.8.0' -group :development, :test do - gem 'rubocop', '~> 0.69', require: false - gem 'rspec', require: false - gem 'rspec-parameterized', require: false - gem 'timecop', require: false - gem 'factory_bot', require: false - gem 'pry', '~> 0.12.2', require: false - - # gitlab-shell spec gems - gem 'listen', '~> 0.5.0' - gem 'simplecov', '~> 0.17.1', require: false - gem 'vcr', '~> 4.0.0' - gem 'webmock', '~> 3.4.0' -end Index: head/devel/gitg/Makefile =================================================================== --- head/devel/gitg/Makefile (revision 532067) +++ head/devel/gitg/Makefile (revision 532068) @@ -1,58 +1,58 @@ # Created by: kipz # $FreeBSD$ PORTNAME= gitg PORTVERSION= 3.32.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= kwm@FreeBSD.org COMMENT= GTK-based git repository viewer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ valac:lang/vala LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libenchant.so:textproc/enchant \ libgee-0.8.so:devel/libgee \ libgit2.so:devel/libgit2 \ libgit2-glib-1.0.so:devel/libgit2-glib \ libpeas-1.0.so:devel/libpeas \ libgtkspell3-3.so:textproc/gtkspell3 \ libdazzle-1.0.so:x11-toolkits/libdazzle \ libsecret-1.so:security/libsecret RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas CONFLICTS= gitg0-[0-9]* PORTSCOUT= limitw:1,even USES= compiler:c11 desktop-file-utils gettext gnome localbase \ meson pathfix pkgconfig python:3.4+,build tar:xz USE_GNOME= cairo gtk30 gtksourceview3 intltool introspection INSTALLS_ICONS= yes USE_LDCONFIG= yes GLIB_SCHEMAS= org.gnome.gitg.gschema.xml BINARY_ALIAS= python3=${PYTHON_VERSION} OPTIONS_DEFINE= PYTHON OPTIONS_SUB= yes PYTHON_USES= python:3.2+ PYTHON_MESON_TRUE= python PYTHON_USE= GNOME=pygobject3 post-patch: @${REINPLACE_CMD} -e 's|0.27.0|0.28.0|g' \ ${WRKSRC}/meson.build post-install-PYTHON-on: (cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) .include Index: head/devel/gnome-builder/Makefile =================================================================== --- head/devel/gnome-builder/Makefile (revision 532067) +++ head/devel/gnome-builder/Makefile (revision 532068) @@ -1,86 +1,86 @@ # $FreeBSD$ PORTNAME= gnome-builder PORTVERSION= 3.28.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= IDE for writing software for GNOME LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libjson-glib-1.0.so:devel/json-glib \ libpeas-1.0.so:devel/libpeas \ libjsonrpc-glib-1.0.so:devel/jsonrpc-glib \ libtemplate_glib-1.0.so:devel/template-glib \ libdazzle-1.0.so:x11-toolkits/libdazzle \ libenchant-2.so:textproc/enchant2 \ libgspell-1.so:textproc/gspell \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libdevhelp-3.so:devel/devhelp \ libgit2-glib-1.0.so:devel/libgit2-glib \ libpcre.so:devel/pcre \ libvala-0.40.so:lang/vala PORTSCOUT= limitw:1,even PORTDOCS= * CONFLICTS_BUILD= gnome-builder-3.16.* USES= compiler:c++11-lang cpe desktop-file-utils gettext gnome meson pkgconfig python:3.6+,build tar:xz USE_GNOME= cairo gtksourceview3 introspection libxml2 vte3 USE_LDCONFIG= yes INSTALLS_ICONS= yes CPE_VENDOR= gnome BINARY_ALIAS= python3=${PYTHON_VERSION} MESON_ARGS= -Dwith_flatpak=false \ -Dwith_sysprof=false \ -Dwith_qemu=false \ -Dwith_jhbuild=false PLIST_SUB+= PORTVER=${PORTVERSION} GLIB_SCHEMAS= org.gnome.builder.build.gschema.xml \ org.gnome.builder.code-insight.gschema.xml \ org.gnome.builder.editor.gschema.xml \ org.gnome.builder.editor.language.gschema.xml \ org.gnome.builder.extension-type.gschema.xml \ org.gnome.builder.gnome-code-assistance.gschema.xml \ org.gnome.builder.gschema.xml \ org.gnome.builder.plugin.gschema.xml \ org.gnome.builder.plugins.color_picker_plugin.gschema.xml \ org.gnome.builder.plugins.eslint.gschema.xml \ org.gnome.builder.project-tree.gschema.xml \ org.gnome.builder.project.gschema.xml \ org.gnome.builder.terminal.gschema.xml \ org.gnome.builder.workbench.gschema.xml OPTIONS_SUB= YES OPTIONS_DEFINE= CLANG DOCS OPTIONS_DEFAULT= CLANG # track the latest llvm/clang version, the config script picks the newest available LLVM_VER= 60 CLANG_DESC= Build the clang plugin CLANG_MESON_TRUE= with_clang CLANG_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} CLANG_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} # jedi plugin with dependancies doesn't work MESON_ARGS+= -Dwith_jedi=false #RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ # ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ # ${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} # 11.1 and older has issues with vala generated code. post-patch: ${REINPLACE_CMD} -e '/-Werror=return-type/d' \ ${WRKSRC}/meson.build .include Index: head/devel/grv/Makefile =================================================================== --- head/devel/grv/Makefile (revision 532067) +++ head/devel/grv/Makefile (revision 532068) @@ -1,54 +1,54 @@ # $FreeBSD$ PORTNAME= grv DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= dmgk@FreeBSD.org COMMENT= Terminal interface for viewing git repositories LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgit2.so:devel/libgit2 USES= go ncurses pkgconfig readline:port USE_GITHUB= yes GH_ACCOUNT= rgburke GH_SUBDIR= src/github.com/rgburke/grv GH_TUPLE= bradfitz:slice:2b758aa:slice/vendor/github.com/bradfitz/slice \ camlistore:go4:94abd69:reflectutil/vendor/go4.org \ davecgh:go-spew:d8f796a:spew/vendor/github.com/davecgh/go-spew \ gobwas:glob:e7a84e9:glob/vendor/github.com/gobwas/glob \ golang:crypto:a1f597e:crypto/vendor/golang.org/x/crypto \ golang:sys:fead790:sys/vendor/golang.org/x/sys \ mattn:go-runewidth:703b5e6:runewidth/vendor/github.com/mattn/go-runewidth \ pmezard:go-difflib:5d4384e:difflib/vendor/github.com/pmezard/go-difflib \ rgburke:goncurses:74f667a:goncurses/vendor/github.com/rgburke/goncurses \ rjeczalik:notify:629144b:notify/vendor/github.com/rjeczalik/notify \ Sirupsen:logrus:v1.4.0:logrus/vendor/github.com/Sirupsen/logrus \ stretchr:objx:c61a9df:objx/vendor/github.com/stretchr/objx \ stretchr:testify:34c6fa2:testify/vendor/github.com/stretchr/testify \ tchap:go-patricia:v2.3.0:patricia/vendor/github.com/tchap/go-patricia \ libgit2:git2go:ecaeb7a:git2go/vendor/gopkg.in/libgit2/git2go.v27 # Keep this in sync with devel/libgit2 version GO_TARGET= ./cmd/grv GO_BUILDFLAGS= -ldflags "-X main.version=${PORTVERSION}" PLIST_FILES= bin/grv OPTIONS_DEFINE= DOCS PORTDOCS= * do-test: cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDLAGS} ${GO_TARGET} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include Index: head/devel/interactive_rebase_tool/Makefile =================================================================== --- head/devel/interactive_rebase_tool/Makefile (revision 532067) +++ head/devel/interactive_rebase_tool/Makefile (revision 532068) @@ -1,69 +1,69 @@ # $FreeBSD$ PORTNAME= interactive_rebase_tool DISTVERSION= 1.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= petteri.valkonen@iki.fi COMMENT= Improved sequence editor for Git LICENSE= GPLv3+ LIB_DEPENDS= libgit2.so:devel/libgit2 USES= cargo ncurses USE_GITHUB= yes GH_ACCOUNT= MitMaro GH_PROJECT= git-interactive-rebase-tool CARGO_CRATES= ansi_term-0.11.0 \ atty-0.2.11 \ bitflags-1.0.4 \ cc-1.0.29 \ cfg-if-0.1.6 \ chrono-0.4.6 \ clap-2.32.0 \ git2-0.7.5 \ idna-0.1.5 \ libc-0.2.49 \ libgit2-sys-0.7.11 \ libz-sys-1.0.25 \ log-0.4.6 \ matches-0.1.8 \ ncurses-5.98.0 \ num-integer-0.1.39 \ num-traits-0.2.6 \ pancurses-0.16.1 \ pdcurses-sys-0.7.0 \ percent-encoding-1.0.1 \ pkg-config-0.3.14 \ redox_syscall-0.1.51 \ redox_termios-0.1.1 \ smallvec-0.6.8 \ strsim-0.7.0 \ termion-1.5.1 \ textwrap-0.10.0 \ time-0.1.42 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.8 \ unicode-segmentation-1.2.1 \ unicode-width-0.1.5 \ unreachable-1.0.0 \ url-1.7.2 \ vcpkg-0.2.6 \ vec_map-0.8.1 \ void-1.0.2 \ winapi-0.3.6 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ winreg-0.5.1 PLIST_FILES= bin/interactive-rebase-tool \ man/man1/interactive-rebase-tool.1.gz post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/interactive-rebase-tool ${INSTALL_MAN} ${WRKSRC}/src/interactive-rebase-tool.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include Index: head/devel/kf5-ktexteditor/Makefile =================================================================== --- head/devel/kf5-ktexteditor/Makefile (revision 532067) +++ head/devel/kf5-ktexteditor/Makefile (revision 532068) @@ -1,22 +1,22 @@ # $FreeBSD$ PORTNAME= ktexteditor DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 advanced embeddable text editor LIB_DEPENDS= libgit2.so:devel/libgit2 \ libeditorconfig.so:editors/editorconfig-core-c USES= cmake compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz USE_KDE= archive auth codecs completion config configwidgets \ coreaddons ecm guiaddons i18n iconthemes itemviews \ jobwidgets kio parts service sonnet syntaxhighlighting \ textwidgets widgetsaddons xmlgui USE_QT= buildtools_build concurrent core dbus declarative gui \ network printsupport qmake_build script widgets xml xmlpatterns .include Index: head/devel/libgit2/Makefile =================================================================== --- head/devel/libgit2/Makefile (revision 532067) +++ head/devel/libgit2/Makefile (revision 532068) @@ -1,54 +1,50 @@ # $FreeBSD$ # Also update devel/libgit2-glib, devel/rubygem-rugged, devel/py-pygit2 # Make sure you bump revision of depending ports, if SONAME changes # objdump -p libgit2.so |grep SONAME # Tools/scripts/search_lib_depends_and_bump.sh devel/libgit2 PORTNAME= libgit2 -PORTVERSION= 0.99.0 +PORTVERSION= 1.0.0 CATEGORIES= devel MASTER_SITES= https://github.com/libgit2/libgit2/releases/download/v${PORTVERSION}/ - -PATCH_SITES= https://github.com/libgit2/libgit2/commit/ -PATCHFILES= 3828ea67b97fc56dead976f319792ead3aa7e623.patch:-p1 \ - 6d25dbdc5c3924336f61bc6091df64821acb95f2.patch:-p1 MAINTAINER= mfechner@FreeBSD.org COMMENT= Portable, pure C implementation of the Git core LICENSE= GPLv2 LIB_DEPENDS= libpcre.so:devel/pcre USES= cmake pkgconfig ssl USE_LDCONFIG= yes CMAKE_OFF= BUILD_CLAR PLIST_SUB= PORTVERSION=${PORTVERSION} \ SHLIB_VER=${PORTVERSION:R} OPTIONS_DEFINE= SSH THREADS OPTIONS_DEFAULT=SSH THREADS SSH_DESC= Enable SSH support through libssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSH_CMAKE_BOOL= USE_SSH THREADS_CMAKE_BOOL= THREADSAFE .include .if ${SSL_DEFAULT} == base post-patch: @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \ ${WRKSRC}/cmake/Modules/SelectHTTPSBackend.cmake .endif do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DBUILD_CLAR=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include Index: head/devel/libgit2/distinfo =================================================================== --- head/devel/libgit2/distinfo (revision 532067) +++ head/devel/libgit2/distinfo (revision 532068) @@ -1,7 +1,3 @@ -TIMESTAMP = 1584488391 -SHA256 (libgit2-0.99.0.tar.gz) = 174024310c1563097a6613a0d3f7539d11a9a86517cd67ce533849065de08a11 -SIZE (libgit2-0.99.0.tar.gz) = 5307975 -SHA256 (3828ea67b97fc56dead976f319792ead3aa7e623.patch) = 24228aa70d3846140450aab253b41c82d8aab75ccc1e50eb848f84e42de79b5b -SIZE (3828ea67b97fc56dead976f319792ead3aa7e623.patch) = 1491 -SHA256 (6d25dbdc5c3924336f61bc6091df64821acb95f2.patch) = 3bd76965dfc1b4976c2f00ef788e39f1eef6896ea50f2fa6541a92d309619fb7 -SIZE (6d25dbdc5c3924336f61bc6091df64821acb95f2.patch) = 1226 +TIMESTAMP = 1586841403 +SHA256 (libgit2-1.0.0.tar.gz) = 6a1fa16a7f6335ce8b2630fbdbb5e57c4027929ebc56fcd1ac55edb141b409b4 +SIZE (libgit2-1.0.0.tar.gz) = 5312324 Index: head/devel/libgit2-glib/Makefile =================================================================== --- head/devel/libgit2-glib/Makefile (revision 532067) +++ head/devel/libgit2-glib/Makefile (revision 532068) @@ -1,40 +1,41 @@ # Created by: Gustau Perez # $FreeBSD$ # Also update devel/libgit2, devel/rubygem-rugged, devel/py-pygit2 PORTNAME= libgit2-glib PORTVERSION= 0.99.0.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Glib wrapper library around the libgit2 git access library LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= vapigen:lang/vala LIB_DEPENDS= libgit2.so:devel/libgit2 USES= compiler:c11 gnome localbase \ meson pkgconfig python:3.4+,build tar:xz USE_GNOME= glib20 introspection USE_LDCONFIG= yes MESON_ARGS= -Dpython=false BINARY_ALIAS= python3=${PYTHON_VERSION} # XXX: meson_vapi_link.py does not respect STAGEDIR for some reason and silently # fails when building as user and touches the external fs when building as root. # Neutralize it. We replicate what it does in post-install. post-patch: @${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/meson_vapi_link.py post-install: ${RLN} ${STAGEDIR}${PREFIX}/share/vala/vapi/libgit2-glib-1.0.deps \ ${STAGEDIR}${PREFIX}/share/vala/vapi/ggit-1.0.deps ${RLN} ${STAGEDIR}${PREFIX}/share/vala/vapi/libgit2-glib-1.0.vapi \ ${STAGEDIR}${PREFIX}/share/vala/vapi/ggit-1.0.vapi .include Index: head/devel/py-gitless/Makefile =================================================================== --- head/devel/py-gitless/Makefile (revision 532067) +++ head/devel/py-gitless/Makefile (revision 532068) @@ -1,36 +1,36 @@ # Created by: Carlos J. Puga Medina # $FreeBSD$ PORTNAME= gitless PORTVERSION= 0.8.6 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= cpm@FreeBSD.org COMMENT= Version control system built on top of Git LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.5.1:devel/py-clint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygit2>=0.26.0:devel/py-pygit2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sh>=1.12.14:devel/py-sh@${PY_FLAVOR} \ git:devel/git TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils USE_LOCALE= en_US.UTF-8 USE_GITHUB= yes GH_ACCOUNT= sdg-mit NO_ARCH= yes do-test: @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} nosetests-${PYTHON_VER} -v .include Index: head/devel/py-pygit2/Makefile =================================================================== --- head/devel/py-pygit2/Makefile (revision 532067) +++ head/devel/py-pygit2/Makefile (revision 532068) @@ -1,35 +1,35 @@ # Created by: William Grzybowski # $FreeBSD$ # Also update devel/libgit2, devel/libgit2-glib, devel/rubygem-rugged PORTNAME= pygit2 -PORTVERSION= 1.1.1 +PORTVERSION= 1.2.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= mfechner@FreeBSD.org COMMENT= Python bindings for libgit2 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>1.0:devel/py-cffi@${PY_FLAVOR} BUILD_DEPENDS= ${MY_DEPENDS} LIB_DEPENDS= libgit2.so:devel/libgit2 RUN_DEPENDS= ${MY_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils MAKE_ENV= LIBGIT2=${LOCALBASE} PYDISTUTILS_TEST_TARGET?= test do-test: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_TEST_TARGET} ${PYDISTUTILS_TESTARGS}) post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pygit2/_*git2*.so \ .include Index: head/devel/py-pygit2/distinfo =================================================================== --- head/devel/py-pygit2/distinfo (revision 532067) +++ head/devel/py-pygit2/distinfo (revision 532068) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584067930 -SHA256 (pygit2-1.1.1.tar.gz) = 9255d507d5d87bf22dfd57997a78908010331fc21f9a83eca121a53f657beb3c -SIZE (pygit2-1.1.1.tar.gz) = 217896 +TIMESTAMP = 1586841595 +SHA256 (pygit2-1.2.0.tar.gz) = f991347f5b11589ac8dc5a3c8257a514cf802545b75c11133a43ae9f76388278 +SIZE (pygit2-1.2.0.tar.gz) = 232458 Index: head/devel/rubygem-bugspots/Makefile =================================================================== --- head/devel/rubygem-bugspots/Makefile (revision 532067) +++ head/devel/rubygem-bugspots/Makefile (revision 532068) @@ -1,24 +1,24 @@ # Created by: TAKATSU Tomonari # $FreeBSD$ PORTNAME= bugspots PORTVERSION= 0.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= Bugspots - Bug Prediction Heuristic LICENSE= MIT RUN_DEPENDS= rubygem-rainbow>=0:devel/rubygem-rainbow \ rubygem-rugged>=0.21.0:devel/rubygem-rugged NO_ARCH= yes USE_RUBY= yes USES= gem PLIST_FILES= bin/bugspots bin/git-bugspots .include Index: head/devel/rubygem-gitlab_git/Makefile =================================================================== --- head/devel/rubygem-gitlab_git/Makefile (revision 532067) +++ head/devel/rubygem-gitlab_git/Makefile (revision 532068) @@ -1,24 +1,24 @@ # $FreeBSD$ PORTNAME= gitlab_git PORTVERSION= 10.7.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= GitLab wrapper around git objects LICENSE= MIT RUN_DEPENDS= rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \ rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \ rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \ rubygem-rugged>=0.24.0:devel/rubygem-rugged NO_ARCH= yes USE_RUBY= yes USES= gem .include Index: head/devel/rubygem-licensee/Makefile =================================================================== --- head/devel/rubygem-licensee/Makefile (revision 532067) +++ head/devel/rubygem-licensee/Makefile (revision 532068) @@ -1,25 +1,25 @@ # Created by: Brendan Molloy # $FreeBSD$ PORTNAME= licensee PORTVERSION= 9.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= mfechner@FreeBSD.org COMMENT= Detects under what license a project is distributed LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-rugged>=0.24:devel/rubygem-rugged \ +RUN_DEPENDS= rubygem-rugged>=1.0:devel/rubygem-rugged \ rubygem-octokit>=4.8.0:net/rubygem-octokit NO_ARCH= yes USE_RUBY= yes USES= gem PLIST_FILES= bin/licensee .include Index: head/devel/rubygem-licensee/files/patch-gemspec =================================================================== --- head/devel/rubygem-licensee/files/patch-gemspec (revision 532067) +++ head/devel/rubygem-licensee/files/patch-gemspec (revision 532068) @@ -1,11 +1,13 @@ ---- licensee.gemspec.orig 2018-05-09 19:33:48 UTC +--- licensee.gemspec.orig 2020-04-14 10:35:08 UTC +++ licensee.gemspec -@@ -23,7 +23,7 @@ Gem::Specification.new do |s| +@@ -23,8 +23,8 @@ Gem::Specification.new do |s| s.specification_version = 4 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q.freeze, ["~> 4.8.0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 0.24"]) + s.add_runtime_dependency(%q.freeze, ["~> 4.8"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.24"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) s.add_development_dependency(%q.freeze, ["~> 0.8"]) s.add_development_dependency(%q.freeze, [">= 0.9", "< 2.0"]) + s.add_development_dependency(%q.freeze, ["~> 0.9"]) Index: head/devel/rubygem-licensee8/Makefile =================================================================== --- head/devel/rubygem-licensee8/Makefile (revision 532067) +++ head/devel/rubygem-licensee8/Makefile (revision 532068) @@ -1,27 +1,27 @@ # Created by: Brendan Molloy # $FreeBSD$ PORTNAME= licensee PORTVERSION= 8.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 8 MAINTAINER= mfechner@FreeBSD.org COMMENT= Detects under what license a project is distributed LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-rugged>=0.24:devel/rubygem-rugged +RUN_DEPENDS= rubygem-rugged>=1.0:devel/rubygem-rugged PORTSCOUT= limit:^8\. NO_ARCH= yes USE_RUBY= yes USES= gem PLIST_FILES= bin/licensee .include Index: head/devel/rubygem-licensee8/files/patch-licensee.gemspec =================================================================== --- head/devel/rubygem-licensee8/files/patch-licensee.gemspec (nonexistent) +++ head/devel/rubygem-licensee8/files/patch-licensee.gemspec (revision 532068) @@ -0,0 +1,11 @@ +--- licensee.gemspec.orig 2020-04-14 06:08:22 UTC ++++ licensee.gemspec +@@ -23,7 +23,7 @@ Gem::Specification.new do |s| + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q.freeze, ["~> 0.24"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) + s.add_development_dependency(%q.freeze, ["~> 0.9"]) + s.add_development_dependency(%q.freeze, ["~> 3.5"]) + s.add_development_dependency(%q.freeze, ["~> 10.3"]) Property changes on: head/devel/rubygem-licensee8/files/patch-licensee.gemspec ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/rubygem-rugged/Makefile =================================================================== --- head/devel/rubygem-rugged/Makefile (revision 532067) +++ head/devel/rubygem-rugged/Makefile (revision 532068) @@ -1,25 +1,25 @@ # Created by: Steve Wills # $FreeBSD$ # Also update devel/libgit2, devel/libgit2-glib, devel/py-pygit2 PORTNAME= rugged -PORTVERSION= 0.99.0 +PORTVERSION= 1.0.0 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= mfechner@FreeBSD.org COMMENT= Rugged is a Ruby binding to the libgit2 linkable library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= libgit2>=${PORTVERSION:R}:devel/libgit2 LIB_DEPENDS= libgit2.so:devel/libgit2 \ libgmp.so:math/gmp CONFIGURE_ARGS= --use-system-libraries USES= gem pkgconfig USE_RUBY= yes .include Index: head/devel/rubygem-rugged/distinfo =================================================================== --- head/devel/rubygem-rugged/distinfo (revision 532067) +++ head/devel/rubygem-rugged/distinfo (revision 532068) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584068021 -SHA256 (rubygem/rugged-0.99.0.gem) = df23853a4073b6f094b12ecf70a0e7fd3e20ce03a7da3a543b0919a53eef3313 -SIZE (rubygem/rugged-0.99.0.gem) = 1485824 +TIMESTAMP = 1586841640 +SHA256 (rubygem/rugged-1.0.0.gem) = 70f8d44376664649804913175f06f2eb2fefe4fa18130e5f46fc7670d5b9ada7 +SIZE (rubygem/rugged-1.0.0.gem) = 1487360 Index: head/devel/sentry-cli/Makefile =================================================================== --- head/devel/sentry-cli/Makefile (revision 532067) +++ head/devel/sentry-cli/Makefile (revision 532068) @@ -1,291 +1,292 @@ # $FreeBSD$ PORTNAME= sentry-cli DISTVERSION= 1.52.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= vulcan@wired.sh COMMENT= Command line utility to work with Sentry LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= getsentry CARGO_CRATES= adler32-1.0.4 \ advapi32-sys-0.2.0 \ ahash-0.3.2 \ aho-corasick-0.7.10 \ anylog-0.5.0 \ app_dirs-1.2.1 \ arc-swap-0.4.5 \ arrayref-0.3.6 \ arrayvec-0.5.1 \ atty-0.2.14 \ autocfg-0.1.7 \ autocfg-1.0.0 \ backoff-0.1.6 \ backtrace-0.3.46 \ backtrace-sys-0.1.35 \ base64-0.10.1 \ base64-0.11.0 \ bitflags-1.2.1 \ bitmaps-2.0.0 \ blake2b_simd-0.5.10 \ block-buffer-0.7.3 \ block-padding-0.1.5 \ brotli-sys-0.3.2 \ brotli2-0.3.2 \ bstr-0.2.12 \ byte-tools-0.3.1 \ byteorder-1.3.4 \ bzip2-0.3.3 \ bzip2-sys-0.1.8+1.0.8 \ cc-1.0.50 \ cfg-if-0.1.10 \ chardet-0.2.4 \ chrono-0.4.11 \ clap-2.33.0 \ clicolors-control-1.0.1 \ cloudabi-0.0.3 \ console-0.10.0 \ const-random-0.1.8 \ const-random-macro-0.1.8 \ constant_time_eq-0.1.5 \ crc32fast-1.2.0 \ crossbeam-channel-0.4.2 \ crossbeam-deque-0.7.3 \ crossbeam-epoch-0.8.2 \ crossbeam-queue-0.2.1 \ crossbeam-utils-0.7.2 \ csv-1.1.3 \ csv-core-0.1.10 \ curl-0.4.28 \ curl-sys-0.4.30+curl-7.69.1 \ debugid-0.7.1 \ digest-0.8.1 \ dirs-1.0.5 \ dirs-2.0.2 \ dirs-sys-0.3.4 \ dlv-list-0.2.2 \ dmsort-1.0.0 \ dotenv-0.15.0 \ either-1.5.3 \ elementtree-0.5.0 \ encode_unicode-0.3.6 \ encoding-0.2.33 \ encoding-index-japanese-1.20141219.5 \ encoding-index-korean-1.20141219.5 \ encoding-index-simpchinese-1.20141219.5 \ encoding-index-singlebyte-1.20141219.5 \ encoding-index-tradchinese-1.20141219.5 \ encoding_index_tests-0.1.4 \ failure-0.1.7 \ failure_derive-0.1.7 \ fake-simd-0.1.2 \ fallible-iterator-0.2.0 \ flate2-1.0.14 \ fnv-1.0.6 \ fuchsia-cprng-0.1.1 \ generic-array-0.12.3 \ getrandom-0.1.14 \ gimli-0.20.0 \ git2-0.13.0 \ glob-0.3.0 \ globset-0.4.5 \ goblin-0.2.1 \ hashbrown-0.7.1 \ hermit-abi-0.1.8 \ hostname-0.3.1 \ httpdate-0.3.2 \ humantime-2.0.0 \ idna-0.1.5 \ idna-0.2.0 \ if_chain-0.1.3 \ if_chain-1.0.0 \ ignore-0.4.13 \ im-14.3.0 \ indexmap-1.3.2 \ indicatif-0.14.0 \ instant-0.1.2 \ itertools-0.9.0 \ itoa-0.4.5 \ java-properties-1.2.0 \ jobserver-0.1.21 \ kernel32-sys-0.2.2 \ lazy_static-1.4.0 \ lazycell-1.2.1 \ libc-0.2.68 \ libgit2-sys-0.12.0+0.99.0 \ libz-sys-1.0.25 \ line-wrap-0.1.1 \ lock_api-0.3.3 \ log-0.4.8 \ mac-process-info-0.2.0 \ maplit-1.0.2 \ match_cfg-0.1.0 \ matches-0.1.8 \ maybe-uninit-2.0.0 \ memchr-2.3.3 \ memmap-0.7.0 \ memoffset-0.5.4 \ might-be-minified-0.3.0 \ miniz_oxide-0.3.6 \ new_debug_unreachable-1.0.4 \ num-integer-0.1.42 \ num-traits-0.2.11 \ num_cpus-1.12.0 \ number_prefix-0.3.0 \ ole32-sys-0.2.0 \ opaque-debug-0.2.3 \ open-1.4.0 \ openssl-probe-0.1.2 \ openssl-sys-0.9.54 \ ordered-multimap-0.2.4 \ osascript-0.3.0 \ parking_lot-0.10.0 \ parking_lot_core-0.7.0 \ pdb-0.6.0 \ percent-encoding-1.0.1 \ percent-encoding-2.1.0 \ pest-2.1.3 \ pest_derive-2.1.0 \ pest_generator-2.1.3 \ pest_meta-2.1.3 \ phf_shared-0.8.0 \ pkg-config-0.3.17 \ plain-0.2.3 \ plist-0.5.3 \ podio-0.1.6 \ ppv-lite86-0.2.6 \ precomputed-hash-0.1.1 \ prettytable-rs-0.8.0 \ proc-macro-hack-0.5.14 \ proc-macro2-0.4.30 \ proc-macro2-1.0.9 \ proguard-3.0.0 \ quote-0.6.13 \ quote-1.0.3 \ r2d2-0.8.8 \ rand-0.6.5 \ rand-0.7.3 \ rand_chacha-0.1.1 \ rand_chacha-0.2.2 \ rand_core-0.3.1 \ rand_core-0.4.2 \ rand_core-0.5.1 \ rand_hc-0.1.0 \ rand_hc-0.2.0 \ rand_isaac-0.1.1 \ rand_jitter-0.1.4 \ rand_os-0.1.3 \ rand_pcg-0.1.2 \ rand_xorshift-0.1.1 \ rand_xoshiro-0.4.0 \ rayon-1.3.0 \ rayon-core-1.7.0 \ rdrand-0.4.0 \ redox_syscall-0.1.56 \ redox_users-0.3.4 \ regex-1.3.5 \ regex-automata-0.1.9 \ regex-syntax-0.6.17 \ runas-0.2.1 \ rust-argon2-0.7.0 \ rust-ini-0.15.2 \ rustc-demangle-0.1.16 \ rustc_version-0.2.3 \ ryu-1.0.3 \ safemem-0.3.3 \ same-file-1.0.6 \ schannel-0.1.18 \ scheduled-thread-pool-0.2.4 \ scopeguard-1.1.0 \ scroll-0.9.2 \ scroll-0.10.1 \ scroll_derive-0.9.5 \ scroll_derive-0.10.1 \ semver-0.9.0 \ semver-parser-0.7.0 \ sentry-0.18.0 \ sentry-types-0.14.1 \ serde-1.0.105 \ serde_derive-1.0.105 \ serde_json-1.0.48 \ sha-1-0.8.2 \ sha1-0.6.0 \ shell32-sys-0.1.2 \ signal-hook-0.1.13 \ signal-hook-registry-1.2.0 \ siphasher-0.3.2 \ sized-chunks-0.5.3 \ smallvec-1.2.0 \ socket2-0.3.11 \ sourcemap-5.0.0 \ stable_deref_trait-1.1.1 \ string_cache-0.8.0 \ strsim-0.8.0 \ symbolic-7.2.0 \ symbolic-common-7.2.0 \ symbolic-debuginfo-7.2.0 \ symbolic-proguard-7.2.0 \ syn-0.15.44 \ syn-1.0.17 \ synstructure-0.12.3 \ term-0.5.2 \ term_size-0.3.1 \ termios-0.3.1 \ textwrap-0.11.0 \ thread_local-1.0.1 \ time-0.1.42 \ typenum-1.11.2 \ ucd-trie-0.1.3 \ uname-0.1.1 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.12 \ unicode-width-0.1.7 \ unicode-xid-0.1.0 \ unicode-xid-0.2.0 \ unix-daemonize-0.1.2 \ url-1.7.2 \ url-2.1.1 \ username-0.2.0 \ uuid-0.8.1 \ vcpkg-0.2.8 \ version_check-0.9.1 \ walkdir-2.3.1 \ wasi-0.9.0+wasi-snapshot-preview1 \ which-3.1.1 \ winapi-0.2.8 \ winapi-0.3.8 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.3 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ xdg-2.2.0 \ xml-rs-0.8.0 \ zip-0.5.5 CARGO_FEATURES= --no-default-features PLIST_FILES= bin/${PORTNAME} PORTDOCS= CHANGELOG.md README.md OPTIONS_DEFINE= DOCS REPORTING OPTIONS_DEFAULT= REPORTING REPORTING_DESC= Enable crash reporting REPORTING_VARS= CARGO_FEATURES+=with_crash_reporting post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/editors/gedit-plugins/Makefile =================================================================== --- head/editors/gedit-plugins/Makefile (revision 532067) +++ head/editors/gedit-plugins/Makefile (revision 532068) @@ -1,52 +1,52 @@ # Created by: Adam Weinberger # $FreeBSD$ PORTNAME= gedit-plugins PORTVERSION= 3.28.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Plugins for GEdit 3 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gedit>=0:editors/gedit \ valac:lang/vala \ itstool:textproc/itstool LIB_DEPENDS= libpeas-1.0.so:devel/libpeas \ libzeitgeist-2.0.so:sysutils/zeitgeist \ libgit2-glib-1.0.so:devel/libgit2-glib RUN_DEPENDS= gedit>=0:editors/gedit PORTSCOUT= limitw:1,even USES= compiler:c11 gettext gmake gnome libtool localbase pathfix pkgconfig \ python:3.4+ tar:xz USE_GNOME= cairo gdkpixbuf2 gtk30 gtksourceview3 intlhack introspection USE_CSTD= c11 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.gedit.plugins.drawspaces.gschema.xml \ org.gnome.gedit.plugins.wordcompletion.gschema.xml USES+= python BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} LIB_DEPENDS+= libgucharmap_2_90.so:deskutils/gucharmap RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} USE_GNOME+= vte3 CONFIGURE_ARGS+=--enable-python GLIB_SCHEMAS+= org.gnome.gedit.plugins.terminal.gschema.xml \ org.gnome.gedit.plugins.translate.gschema.xml post-patch: @${REINPLACE_CMD} -e 's| \\t\\r\\n\\f|[:space:]|g' \ ${WRKSRC}/configure .include Index: head/editors/jucipp/Makefile =================================================================== --- head/editors/jucipp/Makefile (revision 532067) +++ head/editors/jucipp/Makefile (revision 532068) @@ -1,38 +1,38 @@ # Created by: Mohammad S. Babaei # $FreeBSD$ PORTNAME= jucipp DISTVERSIONPREFIX= v DISTVERSION= 1.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= info@babaei.net COMMENT= Lightweight C++-IDE with support for C++11, C++14 and C++17 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} LIB_DEPENDS= libaspell.so:textproc/aspell \ libboost_filesystem.so:devel/boost-libs \ libgit2.so:devel/libgit2 RUN_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} USES= cmake compiler:c++14-lang desktop-file-utils gnome pkgconfig USE_GITLAB= yes GL_ACCOUNT= cppit GL_COMMIT= 22b7c68c9f740f5db1c93c699068568fc87b3a07 GL_TUPLE= cppit:libclangmm:a0316826f7f0c91949c6e11376fd4e92e39a008c:libclangmm/lib/libclangmm \ eidheim:tiny-process-library:a6773276efdbc322f1abb0159301f5502647eb52:tinyprocesslibrary/lib/tiny-process-library USE_GNOME= gdkpixbuf2 gtkmm30 gtksourceviewmm3 INSTALLS_ICONS= yes CMAKE_ARGS= -DCMAKE_INCLUDE_PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/include \ -DCMAKE_LIBRARY_PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib PLIST_FILES= bin/juci \ share/applications/juci.desktop \ share/icons/hicolor/scalable/apps/juci.svg .include Index: head/editors/kate/Makefile =================================================================== --- head/editors/kate/Makefile (revision 532067) +++ head/editors/kate/Makefile (revision 532068) @@ -1,28 +1,28 @@ # $FreeBSD$ PORTNAME= kate DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Basic editor framework for the KDE system BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ docbook-xml>0:textproc/docbook-xml LIB_DEPENDS= libgit2.so:devel/libgit2 USES= cmake compiler:c++11-lang desktop-file-utils gettext \ pkgconfig kde:5 qt:5 tar:xz USE_KDE= activities attica auth bookmarks codecs completion config \ configwidgets coreaddons crash dbusaddons doctools ecm \ guiaddons i18n iconthemes init itemmodels itemviews \ jobwidgets kio newstuff package parts plasma-framework \ service solid sonnet texteditor textwidgets threadweaver \ wallet widgetsaddons windowsystem xmlgui USE_QT= concurrent core dbus gui network script sql widgets xml \ buildtools_build qmake_build OPTIONS_DEFINE= DOCS .include Index: head/lang/julia06/Makefile =================================================================== --- head/lang/julia06/Makefile (revision 532067) +++ head/lang/julia06/Makefile (revision 532068) @@ -1,201 +1,201 @@ # Created by: Iblis Lin # $FreeBSD$ PORTNAME= julia PORTVERSION= 0.6.4 DISTVERSIONSUFFIX= -full -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= 06 MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= Julia Language: A fresh approach to technical computing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-09-15 ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libgmp.so:math/gmp \ libmbedtls.so:security/mbedtls \ libmpfr.so:math/mpfr \ libpcre2-8.so:devel/pcre2 \ libssh2.so:security/libssh2 \ libutf8proc.so:textproc/utf8proc EXTRACT_DEPENDS=gmake:devel/gmake BUILD_DEPENDS= patchelf:sysutils/patchelf \ pcre2-config:devel/pcre2 \ cmake:devel/cmake USES= gmake compiler:c++11-lib fortran python:2.7,build perl5 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} INSTALLDIR= julia/${PORTNAME}${PKGNAMESUFFIX} MANDIRS+= ${PREFIX}/${INSTALLDIR}/man ALL_TARGET= default INSTALL_TARGET= install TEST_TARGET= test PLIST_SUB= VERSION="${PORTVERSION:R}" \ SOVERSION="${PORTVERSION}" \ JULIA="${INSTALLDIR}" CXXFLAGS+= -stdlib=libc++ -std=c++11 MAKE_ARGS+= prefix=${PREFIX}/${INSTALLDIR} \ JCXXFLAGS="${CXXFLAGS}" \ FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \ USE_GPL_LIBS=${USE_GPL_LIBS} \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LIBUV=0 \ USE_SYSTEM_MBEDTLS=1 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_UTF8PROC=1 \ NO_GIT=1 OPTIONS_DEFINE= EXAMPLES DEBUG DOCS GPL_LIBS DESKTOP NATIVE OPTIONS_DEFAULT= OPENLIBM OPTIONS_GROUP= PRIVATE OPTIONS_GROUP_PRIVATE= ARPACK OPENBLAS OPTIONS_SINGLE= LIBM OPTIONS_SINGLE_LIBM= SYSLIBM OPENLIBM OPTIONS_SUB= yes PRIVATE_DESC= Build self-shipped private depends LIBM_DESC= Math library implementation DEBUG_VARS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all DEBUG_MAKE_ARGS= BUNDLE_DEBUG_LIBS=1 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= html DOCS_VARS= INSTALL_TARGET+=install-docs EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX} PORTEXAMPLES= * EXAMPLES_VARS= INSTALL_TARGET+=install-examples GPL_LIBS_DESC= Build with GPL libs: FFTW and SUITESPARSE GPL_LIBS_LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float GPL_LIBS_MAKE_ARGS= USE_SYSTEM_SUITESPARSE=0 USE_SYSTEM_FFTW=1 GPL_LIBS_VARS= USE_GPL_LIBS=1 DESKTOP_DESC= Install icon, .desktop and appdata files DESKTOP_USES= gnome DESKTOP_VARS= INSTALL_TARGET+=install-desktop \ INSTALLS_ICONS=yes ARPACK_DESC= Build self-shipped private arpack-ng ARPACK_MAKE_ARGS= USE_SYSTEM_ARPACK=0 ARPACK_MAKE_ARGS_OFF= USE_SYSTEM_ARPACK=1 ARPACK_LIB_DEPENDS_OFF= libarpack.so:math/arpack-ng SYSLIBM_DESC= Build with system libm SYSLIBM_MAKE_ARGS= USE_SYSTEM_LIBM=1 OPENLIBM_DESC= Build with OpenLibm (math/openlibm) OPENLIBM_MAKE_ARGS= USE_SYSTEM_OPENLIBM=1 OPENLIBM_LIB_DEPENDS= libopenlibm.so:math/openlibm OPENBLAS_DESC= Private OpenBLAS v0.3.0\ (ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!}) OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1 OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1 OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas .include NATIVE_DESC= Build with native CPU JIT tuning .if ${PORT_OPTIONS:MNATIVE} MAKE_ARGS+= JULIA_CPU_TARGET=native .else .if ${ARCH} == "amd64" MAKE_ARGS+= JULIA_CPU_TARGET=x86-64 .elif ${ARCH} == "i386" MAKE_ARGS+= JULIA_CPU_TARGET=pentium4 .else MAKE_ARGS+= JULIA_CPU_TARGET=generic .endif .endif # .if ${PORT_OPTIONS:MNATIVE} # OPENBLAS plist .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "amd64" PLIST_SUB+= OPENBLAS64="64_" .else PLIST_SUB+= OPENBLAS64="" .endif .endif # .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "i386" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile .endif post-extract: ${GMAKE} -C ${WRKSRC}/deps extract post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME}${PKGNAMESUFFIX} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection # Julia build script uses the name x86_86/x86, which are different from ports framework echo "ARCH=" >> ${WRKSRC}/Make.user post-patch-OPENBLAS-on: ${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch post-patch-OPENBLAS-off: echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user post-configure-OPENBLAS-off: ${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \ ${FILESDIR}/check_openblas.c ${WRKSRC}/check_openblas && ( \ echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \ ) || ( \ echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \ ) post-install: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/man/man1/julia.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1 # clean up for Pkg3.jl .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/${file} ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/ext/TOML/${file} .endfor post-install-DEBUG-on: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia-debug ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-debug post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc/julia ${STAGEDIR}${DOCSDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-DOCS-off: # remove empty dir ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-EXAMPLES-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/examples/julia ${STAGEDIR}${EXAMPLESDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/examples .include Index: head/lang/julia07/Makefile =================================================================== --- head/lang/julia07/Makefile (revision 532067) +++ head/lang/julia07/Makefile (revision 532068) @@ -1,186 +1,186 @@ # Created by: Iblis Lin # $FreeBSD$ PORTNAME= julia PORTVERSION= 0.7.0 DISTVERSIONSUFFIX= -full -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= 07 MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= Julia Language: A fresh approach to technical computing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-09-15 ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libgmp.so:math/gmp \ libmbedtls.so:security/mbedtls \ libmpfr.so:math/mpfr \ libpcre2-8.so:devel/pcre2 \ libssh2.so:security/libssh2 \ libutf8proc.so:textproc/utf8proc EXTRACT_DEPENDS=gmake:devel/gmake BUILD_DEPENDS= patchelf:sysutils/patchelf \ pcre2-config:devel/pcre2 \ cmake:devel/cmake USES= gmake compiler:c++11-lib fortran python:2.7,build perl5 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} INSTALLDIR= julia/${PORTNAME}${PKGNAMESUFFIX} MANDIRS+= ${PREFIX}/${INSTALLDIR}/man ALL_TARGET= default INSTALL_TARGET= install TEST_TARGET= test PLIST_SUB= VERSION="${PORTVERSION:R}" \ SOVERSION="${PORTVERSION}" \ JULIA="${INSTALLDIR}" CXXFLAGS+= -stdlib=libc++ -std=c++11 MAKE_ARGS+= prefix=${PREFIX}/${INSTALLDIR} \ JCXXFLAGS="${CXXFLAGS}" \ FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \ USE_GPL_LIBS=${USE_GPL_LIBS} \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LIBUV=0 \ USE_SYSTEM_MBEDTLS=1 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_UTF8PROC=1 \ NO_GIT=1 OPTIONS_DEFINE= DEBUG DOCS GPL_LIBS DESKTOP NATIVE OPTIONS_DEFAULT= OPENLIBM OPTIONS_GROUP= PRIVATE OPTIONS_GROUP_PRIVATE= OPENBLAS OPTIONS_SINGLE= LIBM OPTIONS_SINGLE_LIBM= SYSLIBM OPENLIBM OPTIONS_SUB= yes PRIVATE_DESC= Build self-shipped private depends LIBM_DESC= Math library implementation DEBUG_VARS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all DEBUG_MAKE_ARGS= BUNDLE_DEBUG_LIBS=1 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= html DOCS_VARS= INSTALL_TARGET+=install-docs GPL_LIBS_DESC= Build with GPL lib: SUITESPARSE GPL_LIBS_MAKE_ARGS= USE_SYSTEM_SUITESPARSE=0 GPL_LIBS_VARS= USE_GPL_LIBS=1 DESKTOP_DESC= Install icon, .desktop and appdata files DESKTOP_USES= gnome DESKTOP_VARS= INSTALL_TARGET+=install-desktop \ INSTALLS_ICONS=yes SYSLIBM_DESC= Build with system libm SYSLIBM_MAKE_ARGS= USE_SYSTEM_LIBM=1 OPENLIBM_DESC= Build with OpenLibm (math/openlibm) OPENLIBM_MAKE_ARGS= USE_SYSTEM_OPENLIBM=1 OPENLIBM_LIB_DEPENDS= libopenlibm.so:math/openlibm OPENBLAS_DESC= Private OpenBLAS v0.3.2\ (ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!}) OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1 OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1 OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas .include NATIVE_DESC= Build with native CPU JIT tuning .if ${PORT_OPTIONS:MNATIVE} MAKE_ARGS+= JULIA_CPU_TARGET=native .else .if ${ARCH} == "amd64" MAKE_ARGS+= JULIA_CPU_TARGET=x86-64 .elif ${ARCH} == "i386" MAKE_ARGS+= JULIA_CPU_TARGET=pentium4 .else MAKE_ARGS+= JULIA_CPU_TARGET=generic .endif .endif # .if ${PORT_OPTIONS:MNATIVE} # OPENBLAS plist .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "amd64" PLIST_SUB+= OPENBLAS64="64_" .else PLIST_SUB+= OPENBLAS64="" .endif .endif # .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "i386" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile .endif post-extract: ${GMAKE} -C ${WRKSRC}/deps extract post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME}${PKGNAMESUFFIX} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection # Julia build script uses the name x86_86/x86, which are different from ports framework echo "ARCH=" >> ${WRKSRC}/Make.user post-patch-OPENBLAS-on: ${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch post-patch-OPENBLAS-off: echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user post-configure-OPENBLAS-off: ${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \ ${FILESDIR}/check_openblas.c ${WRKSRC}/check_openblas && ( \ echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \ ) || ( \ echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \ ) post-install: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/man/man1/julia.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1 # clean up for Pkg3.jl .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/${file} ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/ext/TOML/${file} .endfor post-install-DEBUG-on: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia-debug ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-debug post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc/julia ${STAGEDIR}${DOCSDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-DOCS-off: # remove empty dir ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc .include Index: head/lang/julia10/Makefile =================================================================== --- head/lang/julia10/Makefile (revision 532067) +++ head/lang/julia10/Makefile (revision 532068) @@ -1,188 +1,188 @@ # Created by: Iblis Lin # $FreeBSD$ PORTNAME= julia PORTVERSION= 1.0.4 DISTVERSIONSUFFIX= -full -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= 10 MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= Julia Language: A fresh approach to technical computing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libgmp.so:math/gmp \ libmbedtls.so:security/mbedtls \ libmpfr.so:math/mpfr \ libpcre2-8.so:devel/pcre2 \ libssh2.so:security/libssh2 \ libutf8proc.so:textproc/utf8proc EXTRACT_DEPENDS=gmake:devel/gmake BUILD_DEPENDS= patchelf:sysutils/patchelf \ pcre2-config:devel/pcre2 \ cmake:devel/cmake USES= gmake compiler:c++11-lib fortran python:2.7,build perl5 \ shebangfix USE_LDCONFIG= yes DESCR= ${.CURDIR}/../julia/pkg-descr SHEBANG_GLOB= *.sh WRKSRC= ${WRKDIR}/julia-${PORTVERSION} INSTALLDIR= julia/${PORTNAME}${PKGNAMESUFFIX} MANDIRS+= ${PREFIX}/${INSTALLDIR}/man ALL_TARGET= default INSTALL_TARGET= install TEST_TARGET= test PLIST_SUB= VERSION="${PORTVERSION:R}" \ JULIA="${INSTALLDIR}" CXXFLAGS+= -stdlib=libc++ -std=c++11 MAKE_ARGS+= prefix=${PREFIX}/${INSTALLDIR} \ JCXXFLAGS="${CXXFLAGS}" \ FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \ USE_GPL_LIBS=${USE_GPL_LIBS} \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LIBUV=0 \ USE_SYSTEM_MBEDTLS=1 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_UTF8PROC=1 \ NO_GIT=1 OPTIONS_DEFINE= DEBUG DOCS GPL_LIBS DESKTOP NATIVE OPTIONS_DEFAULT= OPENLIBM OPTIONS_GROUP= PRIVATE OPTIONS_GROUP_PRIVATE= OPENBLAS OPTIONS_SINGLE= LIBM OPTIONS_SINGLE_LIBM= SYSLIBM OPENLIBM OPTIONS_SUB= yes PRIVATE_DESC= Build self-shipped private depends LIBM_DESC= Math library implementation DEBUG_VARS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all DEBUG_MAKE_ARGS= BUNDLE_DEBUG_LIBS=1 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= html DOCS_VARS= INSTALL_TARGET+=install-docs GPL_LIBS_DESC= Build with GPL lib: SUITESPARSE GPL_LIBS_MAKE_ARGS= USE_SYSTEM_SUITESPARSE=0 GPL_LIBS_VARS= USE_GPL_LIBS=1 DESKTOP_DESC= Install icon, .desktop and appdata files DESKTOP_USES= gnome DESKTOP_VARS= INSTALL_TARGET+=install-desktop \ INSTALLS_ICONS=yes SYSLIBM_DESC= Build with system libm SYSLIBM_MAKE_ARGS= USE_SYSTEM_LIBM=1 OPENLIBM_DESC= Build with OpenLibm (math/openlibm) OPENLIBM_MAKE_ARGS= USE_SYSTEM_OPENLIBM=1 OPENLIBM_LIB_DEPENDS= libopenlibm.so:math/openlibm OPENBLAS_DESC= Private OpenBLAS v0.3.2\ (ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!}) OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1 OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1 OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas .include NATIVE_DESC= Build with native CPU JIT tuning .if ${PORT_OPTIONS:MNATIVE} MAKE_ARGS+= JULIA_CPU_TARGET=native .else .if ${ARCH} == "amd64" MAKE_ARGS+= JULIA_CPU_TARGET=x86-64 .elif ${ARCH} == "i386" MAKE_ARGS+= JULIA_CPU_TARGET=pentium4 .else MAKE_ARGS+= JULIA_CPU_TARGET=generic .endif .endif # .if ${PORT_OPTIONS:MNATIVE} # OPENBLAS plist .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "amd64" PLIST_SUB+= OPENBLAS64="64_" .else PLIST_SUB+= OPENBLAS64="" .endif .endif # .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "i386" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile .endif post-extract: ${MAKE_CMD} -C ${WRKSRC}/deps extract ${MAKE_CMD} -C ${WRKSRC}/stdlib install post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME}${PKGNAMESUFFIX} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection # Julia build script uses the name x86_86/x86, which are different from ports framework echo "ARCH=" >> ${WRKSRC}/Make.user post-patch-OPENBLAS-on: ${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch post-patch-OPENBLAS-off: echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user post-configure-OPENBLAS-off: ${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \ ${FILESDIR}/check_openblas.c ${WRKSRC}/check_openblas && ( \ echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \ ) || ( \ echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \ ) post-install: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/man/man1/julia.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1 # clean up for Pkg3.jl .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/${file} ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/ext/TOML/${file} .endfor post-install-DEBUG-on: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia-debug ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-debug post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc/julia ${STAGEDIR}${DOCSDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-DOCS-off: # remove empty dir ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc .include Index: head/lang/julia11/Makefile =================================================================== --- head/lang/julia11/Makefile (revision 532067) +++ head/lang/julia11/Makefile (revision 532068) @@ -1,191 +1,191 @@ # Created by: Iblis Lin # $FreeBSD$ PORTNAME= julia PORTVERSION= 1.1.1 DISTVERSIONSUFFIX= -full -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= 11 MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= Julia Language: A fresh approach to technical computing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-09-15 ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libgmp.so:math/gmp \ libmbedtls.so:security/mbedtls \ libmpfr.so:math/mpfr \ libpcre2-8.so:devel/pcre2 \ libssh2.so:security/libssh2 \ libutf8proc.so:textproc/utf8proc EXTRACT_DEPENDS=gmake:devel/gmake BUILD_DEPENDS= patchelf:sysutils/patchelf \ pcre2-config:devel/pcre2 \ cmake:devel/cmake USES= gmake compiler:c++11-lib fortran python:2.7,build perl5 \ shebangfix USE_LDCONFIG= yes DESCR= ${.CURDIR}/../julia/pkg-descr SHEBANG_GLOB= *.sh WRKSRC= ${WRKDIR}/julia-${PORTVERSION} INSTALLDIR= julia/${PORTNAME}${PKGNAMESUFFIX} MANDIRS+= ${PREFIX}/${INSTALLDIR}/man ALL_TARGET= default INSTALL_TARGET= install TEST_TARGET= test PLIST_SUB= VERSION="${PORTVERSION:R}" \ JULIA="${INSTALLDIR}" CXXFLAGS+= -stdlib=libc++ -std=c++11 MAKE_ARGS+= prefix=${PREFIX}/${INSTALLDIR} \ JCXXFLAGS="${CXXFLAGS}" \ FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \ USE_GPL_LIBS=${USE_GPL_LIBS} \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LIBUV=0 \ USE_SYSTEM_MBEDTLS=1 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_UTF8PROC=1 \ NO_GIT=1 OPTIONS_DEFINE= DEBUG DOCS GPL_LIBS DESKTOP NATIVE OPTIONS_DEFAULT= OPENLIBM OPTIONS_GROUP= PRIVATE OPTIONS_GROUP_PRIVATE= OPENBLAS OPTIONS_SINGLE= LIBM OPTIONS_SINGLE_LIBM= SYSLIBM OPENLIBM OPTIONS_SUB= yes PRIVATE_DESC= Build self-shipped private depends LIBM_DESC= Math library implementation DEBUG_VARS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all DEBUG_MAKE_ARGS= BUNDLE_DEBUG_LIBS=1 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= html DOCS_VARS= INSTALL_TARGET+=install-docs GPL_LIBS_DESC= Build with GPL lib: SUITESPARSE GPL_LIBS_MAKE_ARGS= USE_SYSTEM_SUITESPARSE=0 GPL_LIBS_VARS= USE_GPL_LIBS=1 DESKTOP_DESC= Install icon, .desktop and appdata files DESKTOP_USES= gnome DESKTOP_VARS= INSTALL_TARGET+=install-desktop \ INSTALLS_ICONS=yes SYSLIBM_DESC= Build with system libm SYSLIBM_MAKE_ARGS= USE_SYSTEM_LIBM=1 OPENLIBM_DESC= Build with OpenLibm (math/openlibm) OPENLIBM_MAKE_ARGS= USE_SYSTEM_OPENLIBM=1 OPENLIBM_LIB_DEPENDS= libopenlibm.so:math/openlibm OPENBLAS_DESC= Private OpenBLAS v0.3.3\ (ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!}) OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1 OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1 OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas .include NATIVE_DESC= Build with native CPU JIT tuning .if ${PORT_OPTIONS:MNATIVE} MAKE_ARGS+= JULIA_CPU_TARGET=native .else .if ${ARCH} == "amd64" MAKE_ARGS+= JULIA_CPU_TARGET=x86-64 .elif ${ARCH} == "i386" MAKE_ARGS+= JULIA_CPU_TARGET=pentium4 .else MAKE_ARGS+= JULIA_CPU_TARGET=generic .endif .endif # .if ${PORT_OPTIONS:MNATIVE} # OPENBLAS plist .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "amd64" PLIST_SUB+= OPENBLAS64="64_" .else PLIST_SUB+= OPENBLAS64="" .endif .endif # .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "i386" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile .endif post-extract: ${MAKE_CMD} -C ${WRKSRC}/deps extract ${MAKE_CMD} -C ${WRKSRC}/stdlib install post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME}${PKGNAMESUFFIX} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection # Julia build script uses the name x86_86/x86, which are different from ports framework echo "ARCH=" >> ${WRKSRC}/Make.user post-patch-OPENBLAS-on: ${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch post-patch-OPENBLAS-off: echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user post-configure-OPENBLAS-off: ${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \ ${FILESDIR}/check_openblas.c ${WRKSRC}/check_openblas && ( \ echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \ ) || ( \ echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \ ) post-install: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/man/man1/julia.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1 # clean up for Pkg3.jl .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/${file} ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/ext/TOML/${file} .endfor post-install-DEBUG-on: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia-debug ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-debug post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc/julia ${STAGEDIR}${DOCSDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-DOCS-off: # remove empty dir ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc .include Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 532067) +++ head/lang/rust/Makefile (revision 532068) @@ -1,234 +1,234 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust PORTVERSION?= 1.42.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ LOCAL/tobik/rust:bootstrap \ https://static.rust-lang.org/dist/:bootstrap DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src DISTFILES?= ${NIGHTLY_DATE:D${NIGHTLY_DATE}/}${DISTNAME}${EXTRACT_SUFX}:src \ ${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \ ${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \ ${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap DIST_SUBDIR?= rust EXTRACT_ONLY?= ${DISTFILES:N*\:bootstrap:C/:.*//} MAINTAINER= rust@FreeBSD.org COMMENT= Language with a focus on memory safety and concurrency LICENSE= APACHE20 MIT LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT IGNORE_FreeBSD_11_powerpc64= is missing a bootstrap for FreeBSD 11.x powerpc64 ONLY_FOR_ARCHS?= aarch64 amd64 armv6 armv7 i386 powerpc64 ONLY_FOR_ARCHS_REASON?= requires prebuilt bootstrap compiler BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 USES= pkgconfig python:3.3+,build ssl tar:xz MAKE_ENV= LIBGIT2_SYS_USE_PKG_CONFIG=1 \ LIBSSH2_SYS_USE_PKG_CONFIG=1 \ OPENSSL_DIR="${OPENSSLBASE}" \ RUST_BACKTRACE=1 TEST_ENV= ${MAKE_ENV} \ ALLOW_NONZERO_RLIMIT_CORE=1 CONFLICTS_INSTALL?= rust-nightly OPTIONS_DEFINE= DOCS GDB SOURCES WASM OPTIONS_DEFAULT= SOURCES WASM GDB_DESC= Install ports gdb (necessary for debugging rust programs) SOURCES_DESC= Install source files WASM_DESC= Build the WebAssembly target (wasm32-unknown-unknown) DOCS_VARS_OFF= _RUST_BUILD_DOCS=false DOCS_VARS= _RUST_BUILD_DOCS=true GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb WASM_VARS_OFF= _RUST_BUILD_WASM=false WASM_VARS= _RUST_BUILD_WASM=true # See WRKSRC/src/stage0.txt for the date and version values. BOOTSTRAPS_DATE?= 2020-02-29 RUST_BOOTSTRAP_VERSION?= 1.41.1 CARGO_BOOTSTRAP_VERSION?= 0.42.0 BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl} CARGO_VENDOR_DIR?= ${WRKSRC}/vendor # Rust's target arch string might be different from *BSD arch strings _RUST_ARCH_amd64= x86_64 _RUST_ARCH_i386= i686 _RUST_TARGET= ${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl} _RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} _RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} _CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${_RUST_TARGET} .include .if exists(${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX}) EXTRA_PATCHES+= ${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX} .endif .if ${ARCH} == powerpc64 # The bootstrap is hardcoded to use gcc9 # but we can build with a newer or older compiler as provided by USE_GCC=yes BUILD_DEPENDS+= gcc9:lang/gcc9 USE_GCC= yes .endif .if ${ARCH} == aarch64 && ${OSVERSION} < 1200502 IGNORE= fails to run due to a bug in rtld, update to 12-STABLE r342847 or 13-CURRENT r342113 .endif .ifdef QEMU_EMULATING IGNORE= fails to build with qemu-user-static .endif post-extract: @${MKDIR} ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX} \ ${WRKSRC}/build/cache/${_RUSTC_BOOTSTRAP}${EXTRACT_SUFX} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX} \ ${WRKSRC}/build/cache/${_RUST_STD_BOOTSTRAP}${EXTRACT_SUFX} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX} \ ${WRKSRC}/build/cache/${_CARGO_BOOTSTRAP}${EXTRACT_SUFX} post-patch: @${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb @${ECHO_MSG} "Canonical bootstrap date and version before patching:" @${GREP} -E '^(date|rustc|cargo)' ${WRKSRC}/src/stage0.txt # If we override the versions and date of the bootstraps (for instance # on aarch64 where we provide our own bootstraps), we need to update # places where they are recorded. @${REINPLACE_CMD} -e 's,^date:.*,date: ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}},' \ -e 's,^rustc:.*,rustc: ${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}},' \ -e '/^rustfmt:/d' \ -e 's,^cargo:.*,cargo: ${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}},' \ ${WRKSRC}/src/stage0.txt @${ECHO_MSG} "Bootstrap date and version after patching:" @${GREP} -E '^(date|rustc|cargo)' ${WRKSRC}/src/stage0.txt .if ${ARCH} == powerpc64 # Starting with 13.0 powerpc64 is ELFv2 while 12.0 is ELFv1. Pass the correct LLVM target triple. @${REINPLACE_CMD} 's,powerpc64-unknown-freebsd,powerpc64-unknown-freebsd${OSREL},' \ ${WRKSRC}/src/librustc_target/spec/powerpc64_unknown_freebsd.rs .endif # Disable vendor checksums @${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \ ${CARGO_VENDOR_DIR}/*/.cargo-checksum.json post-patch-SOURCES-off: # Mimic tools in config.toml with just src excluded @${REINPLACE_CMD} 's,config.tools.*"src".*,false;,' \ ${WRKSRC}/src/bootstrap/install.rs do-configure: # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64 @${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \ ${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh @${ECHO_CMD} '[build]' > ${WRKSRC}/config.toml @${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'extended=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'python="${PYTHON_CMD}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'docs=${_RUST_BUILD_DOCS}' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'verbose=2' >> ${WRKSRC}/config.toml .if ${PORT_OPTIONS:MWASM} @${ECHO_CMD} 'target=["${_RUST_TARGET}","wasm32-unknown-unknown"]' >> ${WRKSRC}/config.toml .endif @${ECHO_CMD} '[install]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'prefix="${PREFIX}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'verbose-tests=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'lld=${_RUST_BUILD_WASM}' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) @${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml .else @${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml .endif @${ECHO_CMD} '[target.${_RUST_TARGET}]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml .if ${ARCH} == armv6 # fails to link with base ld.bfd: rustc_codegen_llvm.e2557spx-cgu.11:(.text._ZN89_$LT$rustc_target..abi..call..CastTarget$u20$as$u20$rustc_codegen_llvm..abi..LlvmType$GT$9llvm_type17h1296210ab461fc57E+0x54): relocation truncated to fit: R_ARM_CALL against symbol `__aeabi_uldivmod' defined in .text.__aeabi_uldivmod section in /tmp/rustcdnGbao/libcompiler_builtins-ee65b414e4115a8f.rlib(compiler_builtins-ee65b414e4115a8f.compiler_builtins.ay8p39ey-cgu.13.rcgu.o) @${PRINTF} '#!/bin/sh\nexec ${CC} -fuse-ld=lld "$$@"' > ${WRKDIR}/cc-wrapper @${CHMOD} +x ${WRKDIR}/cc-wrapper @${ECHO_CMD} 'linker="${WRKDIR}/cc-wrapper"' >> ${WRKSRC}/config.toml .else @${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml .endif @${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml @${REINPLACE_CMD} 's,%CC%,${CC},g' \ ${WRKSRC}/src/librustc_llvm/build.rs \ ${WRKSRC}/src/bootstrap/native.rs do-build: @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py build --jobs=${MAKE_JOBS_NUMBER} do-install: # DESTDIR not in MAKE_ENV as it would cause the bundled LLVM to be # staged into it during do-build. @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${PYTHON_CMD} \ x.py install --jobs=${MAKE_JOBS_NUMBER} # We autogenerate the plist file. We do that, instead of the # regular pkg-plist, because several libraries have a computed # filename based on the absolute path of the source files. As it # is user-specific, we cannot know their filename in advance. @${RM} -r ${STAGEDIR}${DOCSDIR}/*.old \ ${STAGEDIR}${DOCSDIR}/html/.lock \ ${STAGEDIR}${DOCSDIR}/html/.stamp \ ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-* \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh @${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -exec ${FILE} -i {} + | \ ${AWK} -F: '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD} @${FIND} ${STAGEDIR}${PREFIX} -not -type d | \ ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,,' \ -e 's,(share/man/man[1-9]/.*\.[0-9]),\1.gz,' >> ${TMPPLIST} post-install-SOURCES-on: # Silence stage-qa warnings by sanitizing permissions on sources @${FIND} ${STAGEDIR}${PREFIX}/lib/rustlib/src -type f -exec ${CHMOD} \ ${SHAREMODE} {} + # Note that make test does not work when rust is already installed. do-test: @cd ${WRKSRC} && \ ${SETENV} ${TEST_ENV} ${PYTHON_CMD} x.py test --jobs=${MAKE_JOBS_NUMBER} .if !defined(_RUST_MAKESUM_GUARD) makesum: ${MAKE} -D_RUST_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]} ${MAKE} -D_RUST_MAKESUM_GUARD makesum PPC_ABI=ELFv1 ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch} ${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp ${RM} ${DISTINFO_FILE}.${arch} .endfor .if ${ONLY_FOR_ARCHS:Mpowerpc64} ${MAKE} -D_RUST_MAKESUM_GUARD makesum PPC_ABI=ELFv2 ARCH=powerpc64 DISTINFO_FILE=${DISTINFO_FILE}.powerpc64-elfv2 ${SED} 1d ${DISTINFO_FILE}.powerpc64-elfv2 >> ${DISTINFO_FILE}.tmp ${RM} ${DISTINFO_FILE}.powerpc64-elfv2 .endif ${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE} ${RM} ${DISTINFO_FILE}.tmp .endif .include Index: head/lang/rust-nightly/Makefile =================================================================== --- head/lang/rust-nightly/Makefile (revision 532067) +++ head/lang/rust-nightly/Makefile (revision 532068) @@ -1,33 +1,33 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ PORTVERSION= 1.44.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= upstream does not provide bootstraps for other architectures CONFLICTS_INSTALL= rust MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo # Get latest from top level 'date' key in # https://static.rust-lang.org/dist/channel-rust-nightly.toml NIGHTLY_DATE= 2020-04-17 # See WRKSRC/src/stage0.txt for this date BOOTSTRAPS_DATE= 2020-03-12 RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta post-configure: # Don't abort if optional tools fail to build # https://github.com/rust-lang/rust/commit/53254a888b42 @${ECHO_CMD} 'missing-tools = true' >>${WRKSRC}/config.toml .include "${MASTERDIR}/Makefile" Index: head/lang/rust-nightly/files/patch-vendor_libgit2-sys_build.rs =================================================================== --- head/lang/rust-nightly/files/patch-vendor_libgit2-sys_build.rs (revision 532067) +++ head/lang/rust-nightly/files/patch-vendor_libgit2-sys_build.rs (nonexistent) @@ -1,11 +0,0 @@ ---- vendor/libgit2-sys/build.rs.orig 2020-04-17 09:21:48 UTC -+++ vendor/libgit2-sys/build.rs -@@ -8,7 +8,7 @@ fn main() { - let ssh = env::var("CARGO_FEATURE_SSH").is_ok(); - - let mut cfg = pkg_config::Config::new(); -- if let Ok(lib) = cfg.atleast_version("1.0.0").probe("libgit2") { -+ if let Ok(lib) = cfg.atleast_version("0.99.0").probe("libgit2") { - for include in &lib.include_paths { - println!("cargo:root={}", include.display()); - } Property changes on: head/lang/rust-nightly/files/patch-vendor_libgit2-sys_build.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/misc/broot/Makefile =================================================================== --- head/misc/broot/Makefile (revision 532067) +++ head/misc/broot/Makefile (revision 532068) @@ -1,192 +1,193 @@ # $FreeBSD$ PORTNAME= broot DISTVERSIONPREFIX= v DISTVERSION= 0.13.6 +PORTREVISION= 1 CATEGORIES= misc MAINTAINER= vulcan@wired.sh COMMENT= Quick and easy new way to see and navigate directory trees LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgit2.so:devel/libgit2 RUN_DEPENDS= git:devel/git USES= cargo USE_GITHUB= yes GH_ACCOUNT= canop CARGO_CRATES= aho-corasick-0.7.6 \ ansi_term-0.11.0 \ arc-swap-0.4.4 \ arrayref-0.3.5 \ arrayvec-0.4.12 \ atty-0.2.13 \ autocfg-0.1.7 \ backtrace-0.3.40 \ backtrace-sys-0.1.32 \ base64-0.10.1 \ bitflags-1.2.1 \ blake2b_simd-0.5.8 \ bstr-0.2.8 \ bumpalo-3.2.1 \ byteorder-1.3.2 \ cast-0.2.3 \ cc-1.0.46 \ cfg-if-0.1.10 \ chrono-0.4.9 \ clap-2.33.0 \ cloudabi-0.0.3 \ constant_time_eq-0.1.4 \ criterion-0.3.1 \ criterion-plot-0.4.1 \ crossbeam-0.7.2 \ crossbeam-channel-0.3.9 \ crossbeam-deque-0.7.2 \ crossbeam-epoch-0.7.2 \ crossbeam-epoch-0.8.0 \ crossbeam-queue-0.1.2 \ crossbeam-queue-0.2.0 \ crossbeam-utils-0.6.6 \ crossbeam-utils-0.7.0 \ crossterm-0.16.0 \ crossterm_winapi-0.6.1 \ csv-1.1.1 \ csv-core-0.1.6 \ custom_error-1.7.1 \ directories-2.0.2 \ dirs-2.0.2 \ dirs-sys-0.3.4 \ either-1.5.3 \ failure-0.1.6 \ failure_derive-0.1.6 \ fuchsia-cprng-0.1.1 \ fuchsia-zircon-0.3.3 \ fuchsia-zircon-sys-0.3.3 \ git2-0.11.0 \ glob-0.3.0 \ hermit-abi-0.1.3 \ id-arena-2.2.1 \ idna-0.2.0 \ iovec-0.1.4 \ is_executable-0.1.2 \ itertools-0.8.2 \ itoa-0.4.4 \ jobserver-0.1.19 \ js-sys-0.3.37 \ kernel32-sys-0.2.2 \ lazy-regex-0.1.2 \ lazy_static-1.4.0 \ libc-0.2.65 \ libgit2-sys-0.10.0 \ libz-sys-1.0.25 \ lock_api-0.3.2 \ log-0.4.8 \ matches-0.1.8 \ memchr-2.2.1 \ memoffset-0.5.2 \ minimad-0.6.4 \ mio-0.6.21 \ miow-0.2.1 \ net2-0.2.33 \ nodrop-0.1.14 \ num-integer-0.1.41 \ num-traits-0.2.8 \ num_cpus-1.11.1 \ oorandom-11.1.0 \ open-1.4.0 \ parking_lot-0.10.0 \ parking_lot_core-0.7.0 \ pathdiff-0.1.0 \ percent-encoding-2.1.0 \ pkg-config-0.3.17 \ plotters-0.2.12 \ proc-macro2-1.0.6 \ quote-1.0.2 \ rand_core-0.3.1 \ rand_core-0.4.2 \ rand_os-0.1.3 \ rayon-1.3.0 \ rayon-core-1.7.0 \ rdrand-0.4.0 \ redox_syscall-0.1.56 \ redox_users-0.3.1 \ regex-1.3.1 \ regex-automata-0.1.8 \ regex-syntax-0.6.12 \ rust-argon2-0.5.1 \ rustc-demangle-0.1.16 \ rustc_version-0.2.3 \ ryu-1.0.2 \ same-file-1.0.5 \ scopeguard-1.0.0 \ secular-0.2.0 \ semver-0.9.0 \ semver-parser-0.7.0 \ serde-1.0.102 \ serde_derive-1.0.103 \ serde_json-1.0.42 \ signal-hook-0.1.13 \ signal-hook-registry-1.2.0 \ simplelog-0.7.4 \ slab-0.4.2 \ smallvec-1.0.0 \ strsim-0.8.0 \ syn-1.0.7 \ synstructure-0.12.1 \ term-0.6.1 \ termimad-0.8.16 \ textwrap-0.11.0 \ thiserror-1.0.4 \ thiserror-impl-1.0.4 \ thread_local-0.3.6 \ time-0.1.42 \ tinytemplate-1.0.2 \ toml-0.5.5 \ umask-0.1.7 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.11 \ unicode-width-0.1.6 \ unicode-xid-0.2.0 \ url-2.1.1 \ users-0.9.1 \ vcpkg-0.2.8 \ vec_map-0.8.1 \ walkdir-2.3.1 \ wasm-bindgen-0.2.60 \ wasm-bindgen-backend-0.2.60 \ wasm-bindgen-macro-0.2.60 \ wasm-bindgen-macro-support-0.2.60 \ wasm-bindgen-shared-0.2.60 \ web-sys-0.3.37 \ winapi-0.2.8 \ winapi-0.3.8 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.2 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ ws2_32-sys-0.2.1 SUB_FILES= pkg-message PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz PORTDOCS= CHANGELOG.md README.md OPTIONS_DEFINE= DOCS pre-build: @${MV} ${WRKSRC}/man/page ${WRKSRC}/man/${PORTNAME}.1 @${REINPLACE_CMD} -e 's|#version|${DISTVERSION}|g' \ -e "s|#date|$$(date +'%Y\/%m\/%d')|g" ${WRKSRC}/man/${PORTNAME}.1 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/net-mgmt/rubygem-oxidized/Makefile =================================================================== --- head/net-mgmt/rubygem-oxidized/Makefile (revision 532067) +++ head/net-mgmt/rubygem-oxidized/Makefile (revision 532068) @@ -1,36 +1,36 @@ # Created by: Nick Hilliard # $FreeBSD$ PORTNAME= oxidized PORTVERSION= 0.26.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt rubygems MASTER_SITES= RG MAINTAINER= nick@foobar.org COMMENT= Network device configuration backup tool LICENSE= APACHE20 RUN_DEPENDS= rubygem-asetus>=0.1:devel/rubygem-asetus \ rubygem-net-ssh>=5:security/rubygem-net-ssh \ rubygem-net-telnet>=0.1.1:security/rubygem-net-telnet \ - rubygem-rugged>=0.21.4:devel/rubygem-rugged \ + rubygem-rugged>=1.0:devel/rubygem-rugged \ rubygem-slop3>=3.5:devel/rubygem-slop3 USES= gem shebangfix USE_RUBY= yes NO_ARCH= yes USE_RC_SUBR= oxidized PLIST_FILES= bin/oxidized SHEBANG_FILES= extra/*.runit USERS= oxidized GROUPS= oxidized SUB_LIST= RUBY=${RUBY} .include Index: head/net-mgmt/rubygem-oxidized/files/patch-gemspec =================================================================== --- head/net-mgmt/rubygem-oxidized/files/patch-gemspec (revision 532067) +++ head/net-mgmt/rubygem-oxidized/files/patch-gemspec (revision 532068) @@ -1,11 +1,13 @@ ---- oxidized.gemspec.orig 2019-04-06 14:12:09 UTC +--- oxidized.gemspec.orig 2020-04-17 05:54:47 UTC +++ oxidized.gemspec -@@ -25,7 +25,7 @@ Gem::Specification.new do |s| +@@ -25,8 +25,8 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q.freeze, ["~> 0.1"]) s.add_runtime_dependency(%q.freeze, ["~> 5"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.1.1"]) +- s.add_runtime_dependency(%q.freeze, ["~> 0.21", ">= 0.21.4"]) + s.add_runtime_dependency(%q.freeze, ["~> 0.1", ">= 0.1.1"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.21", ">= 0.21.4"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 1.0", ">= 0.21.4"]) s.add_runtime_dependency(%q.freeze, ["~> 3.5"]) s.add_development_dependency(%q.freeze, ["~> 2.0"]) + s.add_development_dependency(%q.freeze, ["~> 1"]) Index: head/security/cargo-audit/Makefile =================================================================== --- head/security/cargo-audit/Makefile (revision 532067) +++ head/security/cargo-audit/Makefile (revision 532068) @@ -1,253 +1,253 @@ # $FreeBSD$ PORTNAME= cargo-audit DISTVERSIONPREFIX= v DISTVERSION= 0.11.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org COMMENT= Audit Cargo.lock for crates with security vulnerabilities LICENSE= APACHE20 MIT LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT LIB_DEPENDS= libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= RustSec CARGO_CRATES= abscissa_core-0.5.2 \ abscissa_derive-0.5.0 \ aho-corasick-0.7.6 \ ansi_term-0.11.0 \ anyhow-1.0.26 \ arc-swap-0.4.4 \ arrayref-0.3.5 \ arrayvec-0.5.1 \ ascii-0.9.3 \ atty-0.2.14 \ autocfg-0.1.7 \ autocfg-1.0.0 \ backtrace-0.3.42 \ backtrace-sys-0.1.32 \ base64-0.11.0 \ bitflags-1.2.1 \ blake2b_simd-0.5.10 \ bumpalo-3.1.2 \ byteorder-1.3.2 \ bytes-0.5.3 \ c2-chacha-0.2.3 \ canonical-path-2.0.2 \ cargo-edit-0.5.0 \ cargo-lock-4.0.1 \ cargo_metadata-0.9.1 \ cc-1.0.50 \ cfg-if-0.1.10 \ chrono-0.4.10 \ clap-2.33.0 \ color-backtrace-0.3.0 \ combine-3.8.1 \ constant_time_eq-0.1.5 \ core-foundation-0.6.4 \ core-foundation-sys-0.6.2 \ crates-index-0.13.4 \ crossbeam-utils-0.7.0 \ cvss-1.0.0 \ darling-0.10.2 \ darling_core-0.10.2 \ darling_macro-0.10.2 \ dirs-2.0.2 \ dirs-sys-0.3.4 \ dtoa-0.4.4 \ either-1.5.3 \ encoding_rs-0.8.22 \ env_proxy-0.4.0 \ error-chain-0.12.1 \ failure-0.1.6 \ failure_derive-0.1.6 \ fixedbitset-0.2.0 \ fnv-1.0.6 \ foreign-types-0.3.2 \ foreign-types-shared-0.1.1 \ fuchsia-zircon-0.3.3 \ fuchsia-zircon-sys-0.3.3 \ futures-channel-0.3.1 \ futures-core-0.3.1 \ futures-io-0.3.1 \ futures-sink-0.3.1 \ futures-task-0.3.1 \ futures-util-0.3.1 \ generational-arena-0.2.7 \ getrandom-0.1.14 \ git2-0.11.0 \ glob-0.3.0 \ gumdrop-0.7.0 \ gumdrop_derive-0.7.0 \ h2-0.2.1 \ heck-0.3.1 \ hermit-abi-0.1.6 \ hex-0.4.0 \ home-0.5.3 \ http-0.2.0 \ http-body-0.3.1 \ httparse-1.3.4 \ hyper-0.13.1 \ hyper-tls-0.4.1 \ ident_case-1.0.1 \ idna-0.2.0 \ indexmap-1.3.1 \ iovec-0.1.4 \ itoa-0.4.4 \ jobserver-0.1.19 \ js-sys-0.3.35 \ kernel32-sys-0.2.2 \ lazy_static-1.4.0 \ libc-0.2.66 \ libgit2-sys-0.10.0 \ libssh2-sys-0.2.14 \ libz-sys-1.0.25 \ linked-hash-map-0.5.2 \ log-0.4.8 \ matchers-0.0.1 \ matches-0.1.8 \ maybe-uninit-2.0.0 \ memchr-2.3.0 \ mime-0.3.16 \ mime_guess-2.0.1 \ mio-0.6.21 \ miow-0.2.1 \ native-tls-0.2.3 \ net2-0.2.33 \ nom-4.2.3 \ num-integer-0.1.42 \ num-traits-0.2.11 \ num_cpus-1.12.0 \ once_cell-1.3.1 \ openssl-0.10.26 \ openssl-probe-0.1.2 \ openssl-src-111.6.1+1.1.1d \ openssl-sys-0.9.53 \ owning_ref-0.4.0 \ percent-encoding-2.1.0 \ petgraph-0.5.0 \ pin-project-0.4.7 \ pin-project-internal-0.4.7 \ pin-project-lite-0.1.4 \ pin-utils-0.1.0-alpha.4 \ pkg-config-0.3.17 \ platforms-0.2.1 \ ppv-lite86-0.2.6 \ proc-macro-error-0.4.5 \ proc-macro-error-attr-0.4.5 \ proc-macro2-1.0.8 \ quote-1.0.2 \ rand-0.7.3 \ rand_chacha-0.2.1 \ rand_core-0.5.1 \ rand_hc-0.2.0 \ redox_syscall-0.1.56 \ redox_users-0.3.4 \ regex-1.3.3 \ regex-automata-0.1.8 \ regex-syntax-0.6.13 \ remove_dir_all-0.5.2 \ reqwest-0.10.1 \ rust-argon2-0.7.0 \ rustc-demangle-0.1.16 \ rustsec-0.18.0 \ rustversion-1.0.1 \ ryu-1.0.2 \ schannel-0.1.16 \ secrecy-0.6.0 \ security-framework-0.3.4 \ security-framework-sys-0.3.3 \ semver-0.9.0 \ semver-parser-0.7.0 \ semver-parser-0.9.0 \ serde-1.0.104 \ serde_derive-1.0.104 \ serde_json-1.0.46 \ serde_urlencoded-0.6.1 \ signal-hook-0.1.12 \ signal-hook-registry-1.2.0 \ slab-0.4.2 \ smallvec-0.6.13 \ smallvec-1.1.0 \ sourcefile-0.1.4 \ stable_deref_trait-1.1.1 \ strsim-0.8.0 \ strsim-0.9.3 \ structopt-0.3.8 \ structopt-derive-0.4.1 \ subprocess-0.1.20 \ syn-1.0.14 \ syn-mid-0.4.0 \ synstructure-0.12.3 \ tempfile-3.1.0 \ termcolor-1.1.0 \ textwrap-0.11.0 \ thiserror-1.0.10 \ thiserror-impl-1.0.10 \ thread_local-1.0.1 \ time-0.1.42 \ tokio-0.2.10 \ tokio-tls-0.3.0 \ tokio-util-0.2.0 \ toml-0.5.6 \ toml_edit-0.1.5 \ tower-service-0.3.0 \ tracing-0.1.12 \ tracing-attributes-0.1.6 \ tracing-core-0.1.9 \ tracing-log-0.1.1 \ tracing-subscriber-0.1.6 \ try-lock-0.2.2 \ unicase-2.6.0 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.12 \ unicode-segmentation-1.6.0 \ unicode-width-0.1.7 \ unicode-xid-0.2.0 \ unreachable-1.0.0 \ url-2.1.1 \ utf8-ranges-1.0.4 \ vcpkg-0.2.8 \ vec_map-0.8.1 \ version_check-0.1.5 \ version_check-0.9.1 \ void-1.0.2 \ wait-timeout-0.2.0 \ want-0.3.0 \ wasi-0.9.0+wasi-snapshot-preview1 \ wasm-bindgen-0.2.58 \ wasm-bindgen-backend-0.2.58 \ wasm-bindgen-futures-0.4.8 \ wasm-bindgen-macro-0.2.58 \ wasm-bindgen-macro-support-0.2.58 \ wasm-bindgen-shared-0.2.58 \ wasm-bindgen-webidl-0.2.58 \ web-sys-0.3.35 \ weedle-0.10.0 \ winapi-0.2.8 \ winapi-0.3.8 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.3 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ winreg-0.6.2 \ ws2_32-sys-0.2.1 \ zeroize-1.1.0 NO_TEST= yes PLIST_FILES= bin/cargo-audit post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cargo-audit .include Index: head/shells/starship/Makefile =================================================================== --- head/shells/starship/Makefile (revision 532067) +++ head/shells/starship/Makefile (revision 532068) @@ -1,150 +1,150 @@ # $FreeBSD$ PORTNAME= starship DISTVERSION= 0.13.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= shells MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= yuri@FreeBSD.org COMMENT= Cross-shell prompt for astronauts LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 RUN_DEPENDS= powerline-fonts>0:x11-fonts/powerline-fonts USES= cargo ssl CARGO_CRATES= \ aho-corasick-0.7.3 \ ansi_term-0.11.0 \ ansi_term-0.12.0 \ arrayref-0.3.5 \ arrayvec-0.4.10 \ atty-0.2.11 \ autocfg-0.1.2 \ backtrace-0.3.34 \ backtrace-sys-0.1.28 \ base64-0.10.1 \ battery-0.7.4 \ bitflags-1.1.0 \ blake2b_simd-0.5.6 \ byteorder-1.3.2 \ c2-chacha-0.2.2 \ cc-1.0.36 \ cfg-if-0.1.7 \ chrono-0.4.6 \ clap-2.33.0 \ cloudabi-0.0.3 \ constant_time_eq-0.1.3 \ core-foundation-0.6.4 \ core-foundation-sys-0.6.2 \ crossbeam-deque-0.6.3 \ crossbeam-epoch-0.7.1 \ crossbeam-queue-0.1.2 \ crossbeam-utils-0.6.5 \ dirs-2.0.2 \ dirs-sys-0.3.4 \ either-1.5.2 \ env_logger-0.6.2 \ failure-0.1.5 \ failure_derive-0.1.5 \ fuchsia-zircon-0.3.3 \ fuchsia-zircon-sys-0.3.3 \ getrandom-0.1.10 \ git2-0.10.0 \ humantime-1.2.0 \ idna-0.2.0 \ itoa-0.4.4 \ lazycell-1.2.1 \ lazy_static-1.4.0 \ libc-0.2.58 \ libc-0.2.60 \ libgit2-sys-0.9.0 \ libssh2-sys-0.2.11 \ libz-sys-1.0.25 \ log-0.4.8 \ mach-0.2.3 \ matches-0.1.8 \ memchr-2.2.0 \ memoffset-0.2.1 \ nix-0.14.0 \ nodrop-0.1.13 \ num-integer-0.1.39 \ num-traits-0.2.6 \ num_cpus-1.10.0 \ numtoa-0.1.0 \ openssl-probe-0.1.2 \ openssl-sys-0.9.46 \ path-slash-0.1.1 \ percent-encoding-2.0.0 \ pkg-config-0.3.14 \ pretty_env_logger-0.3.1 \ ppv-lite86-0.2.5 \ quick-error-1.2.2 \ quote-0.6.3 \ rand-0.7.0 \ rand_core-0.3.1 \ rand_core-0.5.0 \ rand_chacha-0.2.1 \ rand_core-0.4.0 \ rand_hc-0.2.0 \ rand_os-0.1.1 \ rayon-1.1.0 \ rayon-core-1.5.0 \ rdrand-0.4.0 \ redox_syscall-0.1.56 \ redox_termios-0.1.1 \ redox_users-0.3.1 \ regex-1.1.6 \ regex-syntax-0.6.6 \ remove_dir_all-0.5.2 \ rust-argon2-0.5.1 \ rustc-demangle-0.1.16 \ proc-macro2-0.4.8 \ ryu-1.0.0 \ scopeguard-0.3.3 \ serde-1.0.98 \ serde_json-1.0.40 \ smallvec-0.6.10 \ spin-0.5.0 \ strsim-0.8.0 \ syn-0.15.0 \ synstructure-0.10.0 \ tempfile-3.1.0 \ termcolor-1.0.4 \ termion-1.5.3 \ textwrap-0.11.0 \ thread_local-0.3.6 \ time-0.1.42 \ toml-0.5.3 \ typenum-1.10.0 \ ucd-util-0.1.3 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.8 \ unicode-width-0.1.5 \ unicode-xid-0.1.0 \ uom-0.23.0 \ url-2.0.0 \ utf8-ranges-1.0.2 \ vcpkg-0.2.7 \ vec_map-0.8.1 \ void-1.0.2 \ wasi-0.5.0 \ winapi-0.3.7 \ winapi-build-0.1.1 \ winapi-util-0.1.2 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ wincolor-1.0.2 PLIST_FILES= bin/${PORTNAME} post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/sysutils/exa/Makefile =================================================================== --- head/sysutils/exa/Makefile (revision 532067) +++ head/sysutils/exa/Makefile (revision 532068) @@ -1,101 +1,101 @@ # $FreeBSD$ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org COMMENT= Modern replacement for ls LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE LIB_DEPENDS= libgit2.so:devel/libgit2 USES= cargo USE_GITHUB= yes GH_ACCOUNT= ogham CARGO_CRATES= aho-corasick-0.7.3 \ ansi_term-0.12.0 \ atty-0.2.11 \ autocfg-0.1.4 \ bitflags-1.0.4 \ byteorder-1.3.2 \ cc-1.0.35 \ cfg-if-0.1.7 \ datetime-0.4.7 \ env_logger-0.6.1 \ git2-0.9.1 \ glob-0.3.0 \ humantime-1.2.0 \ idna-0.1.5 \ iso8601-0.1.1 \ kernel32-sys-0.2.2 \ lazy_static-1.3.0 \ libc-0.2.51 \ libgit2-sys-0.8.1 \ libz-sys-1.0.25 \ locale-0.2.2 \ log-0.4.6 \ matches-0.1.8 \ memchr-2.2.0 \ natord-1.0.9 \ nom-1.2.4 \ num-traits-0.1.43 \ num-traits-0.2.6 \ num_cpus-1.10.0 \ number_prefix-0.3.0 \ openssl-src-111.3.0+1.1.1c \ openssl-sys-0.9.47 \ pad-0.1.5 \ percent-encoding-1.0.1 \ pkg-config-0.3.14 \ quick-error-1.2.2 \ redox_syscall-0.1.54 \ redox_termios-0.1.1 \ regex-1.1.6 \ regex-syntax-0.6.6 \ scoped_threadpool-0.1.9 \ smallvec-0.6.9 \ term_grid-0.1.7 \ term_size-0.3.1 \ termcolor-1.0.4 \ termion-1.5.1 \ thread_local-0.3.6 \ ucd-util-0.1.3 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.8 \ unicode-width-0.1.5 \ url-1.7.2 \ users-0.9.1 \ utf8-ranges-1.0.2 \ vcpkg-0.2.6 \ winapi-0.2.8 \ winapi-0.3.7 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.2 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ wincolor-1.0.1 \ zoneinfo_compiled-0.4.8 PLIST_FILES= bin/exa \ man/man1/exa.1.gz \ etc/bash_completion.d/exa.bash \ share/fish/completions/exa.fish \ share/zsh/site-functions/_exa post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/contrib/completions.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/exa.bash @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions ${INSTALL_DATA} ${WRKSRC}/contrib/completions.fish ${STAGEDIR}${PREFIX}/share/fish/completions/exa.fish @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/contrib/completions.zsh ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_exa ${INSTALL_MAN} ${WRKSRC}/contrib/man/exa.1 ${STAGEDIR}${PREFIX}/man/man1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/exa .include Index: head/sysutils/fusefs-gitfs/Makefile =================================================================== --- head/sysutils/fusefs-gitfs/Makefile (revision 532067) +++ head/sysutils/fusefs-gitfs/Makefile (revision 532068) @@ -1,49 +1,49 @@ # $FreeBSD$ PORTNAME= gitfs DISTVERSION= 0.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils devel PKGNAMEPREFIX= fusefs- MAINTAINER= jbeich@FreeBSD.org COMMENT= Version controlled file system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>=0.1.1:devel/py-atomiclong@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cffi>=1.12.3:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fusepy>=3.0.1:devel/py-fusepy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycparser>=2.19:devel/py-pycparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygit2>=0.28.2:devel/py-pygit2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}raven>=6.10.0:devel/py-raven@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.6.5:devel/py-pytest@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= PressLabs NO_ARCH= yes USES= python:3.5+ USE_PYTHON= autoplist distutils concurrent optsuffix post-patch: @${REINPLACE_CMD} -e 's/==/>=/' ${WRKSRC}/*requirements.txt # XXX Integrations tests want MOUNT_PATH, REPO_* passed via TEST_ENV do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest) .include .if ${PYTHON_REL} < 3300 TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} .else post-patch: patch-py3k-mock patch-py3k-mock: @${GREP} -Flr 'mock import' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -i .bak.mock -e 's/mock import/unittest.&/' .endif .include Index: head/textproc/bat/Makefile =================================================================== --- head/textproc/bat/Makefile (revision 532067) +++ head/textproc/bat/Makefile (revision 532068) @@ -1,207 +1,207 @@ # $FreeBSD$ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.13.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org COMMENT= Clone of cat with syntax highlighting LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libclang.so:devel/llvm${LLVM_DEFAULT} LIB_DEPENDS= libgit2.so:devel/libgit2 \ libonig.so:devel/oniguruma USES= cargo USE_GITHUB= yes GH_ACCOUNT= sharkdp PLIST_FILES= bin/bat \ man/man1/bat.1.gz CARGO_CRATES= adler32-1.0.4 \ aho-corasick-0.7.10 \ ansi_colours-1.0.1 \ ansi_term-0.11.0 \ ansi_term-0.12.1 \ anymap-0.12.1 \ arrayref-0.3.6 \ arrayvec-0.5.1 \ assert_cmd-0.12.0 \ atty-0.2.14 \ autocfg-1.0.0 \ backtrace-0.3.45 \ backtrace-sys-0.1.34 \ base64-0.10.1 \ base64-0.11.0 \ bincode-1.2.1 \ bindgen-0.50.1 \ bitflags-1.2.1 \ blake2b_simd-0.5.10 \ block-buffer-0.7.3 \ block-padding-0.1.5 \ bstr-0.2.12 \ byte-tools-0.3.1 \ byteorder-1.3.4 \ cc-1.0.50 \ cexpr-0.3.6 \ cfg-if-0.1.10 \ chrono-0.4.11 \ clang-sys-0.28.1 \ clap-2.33.0 \ clicolors-control-1.0.1 \ console-0.10.0 \ constant_time_eq-0.1.5 \ content_inspector-0.2.4 \ crc32fast-1.2.0 \ crossbeam-utils-0.7.2 \ deunicode-1.1.0 \ difference-2.0.0 \ digest-0.8.1 \ dirs-2.0.2 \ dirs-sys-0.3.4 \ doc-comment-0.3.3 \ either-1.5.3 \ encode_unicode-0.3.6 \ encoding-0.2.33 \ encoding-index-japanese-1.20141219.5 \ encoding-index-korean-1.20141219.5 \ encoding-index-simpchinese-1.20141219.5 \ encoding-index-singlebyte-1.20141219.5 \ encoding-index-tradchinese-1.20141219.5 \ encoding_index_tests-0.1.4 \ env_logger-0.6.2 \ error-chain-0.12.2 \ escargot-0.5.0 \ failure-0.1.7 \ fake-simd-0.1.2 \ flate2-1.0.14 \ fnv-1.0.6 \ fuchsia-cprng-0.1.1 \ fxhash-0.2.1 \ generic-array-0.12.3 \ getrandom-0.1.14 \ git2-0.13.0 \ glob-0.3.0 \ globset-0.4.5 \ hermit-abi-0.1.8 \ humantime-1.3.0 \ idna-0.1.5 \ idna-0.2.0 \ itertools-0.8.2 \ itoa-0.4.5 \ jobserver-0.1.21 \ kernel32-sys-0.2.2 \ lazy_static-1.4.0 \ lazycell-1.2.1 \ libc-0.2.68 \ libgit2-sys-0.12.0+0.99.0 \ libloading-0.5.2 \ libz-sys-1.0.25 \ line-wrap-0.1.1 \ linked-hash-map-0.5.2 \ liquid-0.19.0 \ liquid-compiler-0.19.0 \ liquid-derive-0.19.0 \ liquid-error-0.19.0 \ liquid-interpreter-0.19.0 \ liquid-value-0.19.1 \ log-0.4.8 \ maplit-1.0.2 \ matches-0.1.8 \ memchr-2.3.3 \ miniz_oxide-0.3.6 \ nom-4.2.3 \ num-integer-0.1.42 \ num-traits-0.2.11 \ onig-5.0.0 \ onig_sys-69.2.0 \ opaque-debug-0.2.3 \ peeking_take_while-0.1.2 \ percent-encoding-1.0.1 \ percent-encoding-2.1.0 \ pest-2.1.3 \ pest_derive-2.1.0 \ pest_generator-2.1.3 \ pest_meta-2.1.3 \ pkg-config-0.3.17 \ plist-0.4.2 \ predicates-1.0.4 \ predicates-core-1.0.0 \ predicates-tree-1.0.0 \ proc-macro-hack-0.5.14 \ proc-macro2-0.4.30 \ proc-macro2-1.0.9 \ proc-quote-0.2.2 \ proc-quote-impl-0.2.2 \ quick-error-1.2.3 \ quote-0.6.13 \ quote-1.0.3 \ rand-0.4.6 \ rand_core-0.3.1 \ rand_core-0.4.2 \ rdrand-0.4.0 \ redox_syscall-0.1.56 \ redox_users-0.3.4 \ regex-1.3.5 \ regex-syntax-0.6.17 \ remove_dir_all-0.5.2 \ rust-argon2-0.7.0 \ rustc-demangle-0.1.16 \ ryu-1.0.3 \ safemem-0.3.3 \ same-file-1.0.6 \ serde-1.0.105 \ serde_derive-1.0.105 \ serde_json-1.0.48 \ sha-1-0.8.2 \ shell-words-0.1.0 \ shlex-0.1.1 \ smallvec-1.2.0 \ strsim-0.8.0 \ syn-0.15.44 \ syn-1.0.17 \ syntect-3.3.0 \ tempdir-0.3.7 \ term_size-0.3.1 \ termcolor-1.1.0 \ termios-0.3.1 \ textwrap-0.11.0 \ thread_local-1.0.1 \ time-0.1.42 \ treeline-0.1.0 \ typenum-1.11.2 \ ucd-trie-0.1.3 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.12 \ unicode-segmentation-1.6.0 \ unicode-width-0.1.7 \ unicode-xid-0.1.0 \ unicode-xid-0.2.0 \ url-1.7.2 \ url-2.1.1 \ vcpkg-0.2.8 \ vec_map-0.8.1 \ version_check-0.1.5 \ version_check-0.9.1 \ walkdir-2.3.1 \ wasi-0.9.0+wasi-snapshot-preview1 \ which-2.0.1 \ wild-2.0.2 \ winapi-0.2.8 \ winapi-0.3.8 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.3 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ xml-rs-0.8.0 \ yaml-rust-0.4.3 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bat find ${WRKDIR}/target -name "bat.1" -exec cp {} ${WRKSRC}/doc/bat.1 \; ${INSTALL_MAN} ${WRKSRC}/doc/bat.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include Index: head/textproc/rubygem-github-linguist/Makefile =================================================================== --- head/textproc/rubygem-github-linguist/Makefile (revision 532067) +++ head/textproc/rubygem-github-linguist/Makefile (revision 532068) @@ -1,28 +1,28 @@ # $FreeBSD$ PORTNAME= github-linguist PORTVERSION= 7.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= GitHub Language detection LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-charlock_holmes>=0.7.6<0.8:textproc/rubygem-charlock_holmes \ rubygem-escape_utils>=1.2.0<1.3:textproc/rubygem-escape_utils \ rubygem-mini_mime>=1.0<2.0:mail/rubygem-mini_mime \ rubygem-rugged>=0.25.1:devel/rubygem-rugged # bin/linguist #CONFLICTS_INSTALL= qtchooser rubygem-github-linguist47 rubygem-gitlab-linguist USES= gem USE_RUBY= yes PLIST_FILES= bin/git-linguist bin/github-linguist .include Index: head/www/gitlab-ce/Makefile =================================================================== --- head/www/gitlab-ce/Makefile (revision 532067) +++ head/www/gitlab-ce/Makefile (revision 532068) @@ -1,287 +1,287 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gitlab-ce PORTVERSION= 12.9.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Web GUI for managing git repositories LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! MY_DEPENDS= git>=2.22.2:devel/git \ gitlab-shell>=12.0.0:devel/gitlab-shell \ gitlab-workhorse>=8.25.2:www/gitlab-workhorse \ gitaly>=${PORTVERSION}:devel/gitaly \ gitlab-pages>=1.17.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ yarn>=1.10.0:www/yarn \ rubygem-rails60>=6.0.2.2<6.0.2.3:www/rubygem-rails60 \ rubygem-bootsnap>=1.4.6<2.0:devel/rubygem-bootsnap \ rubygem-nakayoshi_fork>=0.0.4<0.1.0:devel/rubygem-nakayoshi_fork \ rubygem-responders-rails60>=3.0<4.0:www/rubygem-responders-rails60 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ rubygem-default_value_for>=3.3.0<3.4.0:devel/rubygem-default_value_for \ rubygem-pg>=1.1<2:databases/rubygem-pg \ - rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \ + rubygem-rugged>=0.28:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.2<2.0:devel/rubygem-grape-path-helpers \ rubygem-faraday>=0.12<1.0:www/rubygem-faraday \ rubygem-marginalia>=1.8.0<1.9:databases/rubygem-marginalia \ rubygem-devise-rails60>=4.6<5.0:devel/rubygem-devise-rails60 \ rubygem-doorkeeper>=5.0.2<5.1:security/rubygem-doorkeeper \ rubygem-doorkeeper-openid_connect>=1.6.3<1.7:security/rubygem-doorkeeper-openid_connect \ rubygem-omniauth>=1.8<2.0:security/rubygem-omniauth \ rubygem-omniauth-auth0>=2.0.0<2.1.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-oauth2>=0.0.9<0.1.0:net/rubygem-omniauth-azure-oauth2 \ rubygem-omniauth-cas3>=1.1.4<1.2.0:security/rubygem-omniauth-cas3 \ rubygem-omniauth-facebook4>=4.0.0<4.1.0:net/rubygem-omniauth-facebook4 \ rubygem-omniauth-github>=1.4.0<2.0:net/rubygem-omniauth-github \ rubygem-omniauth-gitlab>=1.0.2<1.1.0:security/rubygem-omniauth-gitlab \ rubygem-omniauth-google-oauth2>=0.6.0<0.7.0:net/rubygem-omniauth-google-oauth2 \ rubygem-omniauth-kerberos>=0.3.0<0.4.0:net/rubygem-omniauth-kerberos \ rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \ rubygem-omniauth-saml>=1.10<2.0:security/rubygem-omniauth-saml \ rubygem-omniauth-shibboleth>=1.3.0<1.4.0:security/rubygem-omniauth-shibboleth \ rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \ rubygem-omniauth_crowd22>=2.2.0<2.3.0:devel/rubygem-omniauth_crowd22 \ rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \ rubygem-omniauth_openid_connect>=0.3.3<0.4.0:net/rubygem-omniauth_openid_connect \ rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \ rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \ rubygem-rack-oauth2>=1.9.3<1.10.0:security/rubygem-rack-oauth2 \ rubygem-jwt21>=2.1.0<2.2.0:www/rubygem-jwt21 \ rubygem-gssapi>0:security/rubygem-gssapi \ rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=0.12.1<0.13.0:graphics/rubygem-invisible_captcha \ rubygem-devise-two-factor-rails60>=3.1.0<3.2.0:security/rubygem-devise-two-factor-rails60 \ rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \ rubygem-attr_encrypted>=3.1.0<3.2.0:security/rubygem-attr_encrypted \ rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \ rubygem-validates_hostname>=1.0.6<1.1.0:dns/rubygem-validates_hostname \ rubygem-rubyzip20>=2.0.0<2.1.0:archivers/rubygem-rubyzip20 \ rubygem-acme-client>=2.0.5<2.1.0:security/rubygem-acme-client \ rubygem-browser>=2.5<3.0:www/rubygem-browser \ rubygem-gpgme>=2.0.20<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap>=2.1.1<2.2.0:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap>0:net/rubygem-net-ldap \ rubygem-grape11>=1.1.0<1.2.0:devel/rubygem-grape11 \ rubygem-grape-entity>=0.7.1<0.8.0,1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \ rubygem-graphql>=1.9.19<1.10.0:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.0.0.b.3<2.1.0:net/rubygem-apollo_upload_server \ rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \ rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \ rubygem-kaminari-rails60>=1.0<2.0:www/rubygem-kaminari-rails60 \ rubygem-hamlit>=2.11.0<2.12.0:www/rubygem-hamlit \ rubygem-carrierwave>=1.3<2.0:www/rubygem-carrierwave \ rubygem-mini_magick>0:graphics/rubygem-mini_magick \ rubygem-fog-aws>=3.5<4.0:net/rubygem-fog-aws \ rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \ rubygem-fog-google>=1.9<1.10:net/rubygem-fog-google \ rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \ rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \ rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \ rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \ rubygem-google-api-client>=0.23<1.0:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \ rubygem-elasticsearch-model6>=6.1<7:textproc/rubygem-elasticsearch-model6 \ rubygem-elasticsearch-rails6>=6.1<7:textproc/rubygem-elasticsearch-rails6 \ rubygem-elasticsearch-api6>=6.1<7:textproc/rubygem-elasticsearch-api6 \ rubygem-aws-sdk>0:devel/rubygem-aws-sdk \ rubygem-faraday_middleware-aws-signers-v4>0:devel/rubygem-faraday_middleware-aws-signers-v4 \ rubygem-html-pipeline>=2.12<3.0:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list=2.3.1:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \ rubygem-commonmarker>=0.20<1.0:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ rubygem-rdoc>=6.1.2<6.2:devel/rubygem-rdoc \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ rubygem-asciidoctor>=2.0.10<2.1.0:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-include-ext>=0.3.1<0.4.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml0010=0.0.10:textproc/rubygem-asciidoctor-plantuml0010 \ rubygem-rouge>=3.17.0<3.18:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.10.8<1.11.0:textproc/rubygem-nokogiri \ rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.3<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ rubygem-rack20>=2.0.9<2.1.0,3:www/rubygem-rack20 \ rubygem-unicorn>=5.4.1<5.5.0:www/rubygem-unicorn \ rubygem-unicorn-worker-killer>=0.4.4<0.5.0:www/rubygem-unicorn-worker-killer \ rubygem-gitlab-puma>=4.3.3.g.2:www/rubygem-gitlab-puma \ rubygem-gitlab-puma_worker_killer>=0.1.1.g.1:www/rubygem-gitlab-puma_worker_killer \ rubygem-rack-timeout>=0:www/rubygem-rack-timeout \ rubygem-state_machines-activerecord>=0.6.0<0.7.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=6.0<7.0:www/rubygem-acts-as-taggable-on \ rubygem-sidekiq5>=5.2.7<5.3.0:devel/rubygem-sidekiq5 \ rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace>=1.6.0<1.7.0:databases/rubygem-redis-namespace \ rubygem-gitlab-sidekiq-fetcher=0.5.2_1:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \ rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \ rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \ rubygem-re2>=1.1.1<1.2.0:devel/rubygem-re2 \ rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.1<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ rubygem-redis>=4.0<5.0:databases/rubygem-redis \ rubygem-connection_pool>=2.0<3.0:net/rubygem-connection_pool \ rubygem-redis-rails-rails60>=5.0.2<5.1:www/rubygem-redis-rails-rails60 \ rubygem-discordrb-webhooks-blackst0ne>=3.3<4.0:net-im/rubygem-discordrb-webhooks-blackst0ne \ rubygem-hipchat>=1.6.0<1.7.0:net-im/rubygem-hipchat \ rubygem-jira-ruby1>=1.7<2.0:devel/rubygem-jira-ruby1 \ rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \ rubygem-flowdock>=0.7<1.0:www/rubygem-flowdock \ rubygem-slack-messenger>=2.3.3<2.4.0:devel/rubygem-slack-messenger \ rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \ rubygem-asana>=0.9<1.0:www/rubygem-asana \ rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \ rubygem-kubeclient>=4.6.0<4.7.0:www/rubygem-kubeclient \ rubygem-sanitize>=4.6<5.0:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2<1.1.0:textproc/rubygem-babosa \ rubygem-loofah>=2.2<3.0:textproc/rubygem-loofah \ rubygem-licensee8>=8.9<9.0:devel/rubygem-licensee8 \ rubygem-ace-rails-ap>=4.1.0<4.2.0:www/rubygem-ace-rails-ap \ rubygem-charlock_holmes>=0.7.5<0.8.0:textproc/rubygem-charlock_holmes \ rubygem-mimemagic>=0.3.2<0.4.0:misc/rubygem-mimemagic \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \ rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \ rubygem-webpack-rails-rails60>=0.9.10<0.10.0:www/rubygem-webpack-rails-rails60 \ rubygem-rack-proxy>=0.6.0<0.7.0:www/rubygem-rack-proxy \ rubygem-sassc-rails-rails60>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails60 \ rubygem-uglifier27>=2.7.2<2.8.0:www/rubygem-uglifier27 \ rubygem-addressable>=2.7<3:www/rubygem-addressable \ rubygem-font-awesome-rails-rails60>=4.7<5.0:devel/rubygem-font-awesome-rails-rails60 \ rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \ rubygem-gon-rails60>=6.2<7.0:www/rubygem-gon-rails60 \ rubygem-request_store>=1.3<2.0:devel/rubygem-request_store \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=1.0<2.0:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.2.0<6.3.0:www/rubygem-rack-attack \ rubygem-sentry-raven>=2.9<3.0:devel/rubygem-sentry-raven \ rubygem-premailer-rails-rails60>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails60 \ rubygem-gitlab-labkit>=0.11.0<0.11.1:devel/rubygem-gitlab-labkit \ rubygem-ruby_parser>=3.8<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails60>=6.0<7.0:devel/rubygem-rails-i18n-rails60 \ rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \ rubygem-gettext_i18n_rails_js-rails60>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails60 \ rubygem-gettext32>=3.2.2<3.3.0:devel/rubygem-gettext32 \ rubygem-batch-loader>=1.4.0<1.5.0:devel/rubygem-batch-loader \ rubygem-peek-rails60>=1.1.0<2.0:devel/rubygem-peek-rails60 \ rubygem-snowplow-tracker>=0.6.1<0.7.0:devel/rubygem-snowplow-tracker \ rubygem-gitlab-derailed_benchmarks>0:benchmarks/rubygem-gitlab-derailed_benchmarks \ rubygem-method_source0>=0.8<1.0:devel/rubygem-method_source0 \ rubygem-influxdb>=0.2<1.0:databases/rubygem-influxdb \ rubygem-prometheus-client-mmap>=0.10.0<0.11.0:devel/rubygem-prometheus-client-mmap \ rubygem-raindrops>=0.18<1.0:www/rubygem-raindrops \ rubygem-octokit>=4.15<5.0:net/rubygem-octokit \ rubygem-gitlab-mail_room>=0.0.3<0.1.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-ruby-prof>=1.0.0<1.1.0:devel/rubygem-ruby-prof \ rubygem-stackprof>=0.2.15<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.4<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=0.9<1.0:devel/rubygem-memory_profiler \ rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \ rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \ rubygem-oauth2>=1.4<2.0:net/rubygem-oauth2 \ rubygem-health_check26-rails60>=2.6.0<2.7.0:devel/rubygem-health_check26-rails60 \ rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.1.6<1.2.0:sysutils/rubygem-sys-filesystem \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-net-ssh>=5.2<6.0,2:security/rubygem-net-ssh \ rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \ rubygem-gitaly>=12.9.0.p.r4<12.10.0:net/rubygem-gitaly \ rubygem-grpc124>=1.24.0<1.25.0:net/rubygem-grpc124 \ rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38 \ rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \ rubygem-flipper>=0.17.1<0.18.0:devel/rubygem-flipper \ rubygem-flipper-active_record>=0.17.1<0.18.0:databases/rubygem-flipper-active_record \ rubygem-flipper-active_support_cache_store>=0.17.1<0.18.0:devel/rubygem-flipper-active_support_cache_store \ rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \ rubygem-lograge-rails60>=0.5<1.0:www/rubygem-lograge-rails60 \ rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \ rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \ rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries \ rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \ rubygem-liquid>=4.0<5:textproc/rubygem-liquid \ rubygem-lru_redux>0:devel/rubygem-lru_redux \ rubygem-erubi>=1.9.0<1.10:www/rubygem-erubi \ rubygem-mail>=2.7.1<2.7.2,2:mail/rubygem-mail BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} CONFLICTS_INSTALL= gitolite-* \ gitolite2-* \ gogs-* \ gitea-* \ ${PYTHON_PKGNAMEPREFIX}-gitosis-* USE_RUBY= yes USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags GL_COMMIT= 571e31b8362a6903c97c5d42f2211151941a7cd3 USERS= git GROUPS= git NO_BUILD= yes post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ ${WRKSRC}/config/unicorn.rb.example \ ${WRKSRC}/lib/support/nginx/gitlab \ ${WRKSRC}/lib/support/nginx/gitlab-ssl do-install: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample (cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local) ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete ${FIND} ${WRKSRC} -name '*.gitignore' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample ${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) .include Index: head/www/gitlab-ce/files/patch-Gemfile =================================================================== --- head/www/gitlab-ce/files/patch-Gemfile (revision 532067) +++ head/www/gitlab-ce/files/patch-Gemfile (revision 532068) @@ -1,120 +1,129 @@ ---- Gemfile.orig 2020-03-26 12:19:15 UTC +--- Gemfile.orig 2020-04-14 21:01:52 UTC +++ Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '6.0.2' +gem 'rails', '6.0.2.2' gem 'bootsnap', '~> 1.4.6' +@@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.3.0' + # Supported DBs + gem 'pg', '~> 1.1' + +-gem 'rugged', '~> 0.28' ++gem 'rugged', '~> 1.0' + gem 'grape-path-helpers', '~> 1.2' + + gem 'faraday', '~> 0.12' @@ -93,7 +93,6 @@ gem 'graphql', '~> 1.9.19' # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' @@ -227,7 +226,7 @@ gem 'redis-rails', '~> 5.0.2' gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration -gem 'hipchat', '~> 1.5.0' +gem 'hipchat', '~> 1.6.0' # Jira integration gem 'jira-ruby', '~> 1.7' @@ -329,92 +328,6 @@ group :metrics do # Prometheus gem 'prometheus-client-mmap', '~> 0.10.0' gem 'raindrops', '~> 0.18' -end - -group :development do - gem 'brakeman', '~> 4.2', require: false - gem 'danger', '~> 6.0', require: false - - gem 'letter_opener_web', '~> 1.3.4' - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false - - # Better errors handler - gem 'better_errors', '~> 2.5.0' - gem 'binding_of_caller', '~> 0.8.0' - - # thin instead webrick - gem 'thin', '~> 1.7.0' -end - -group :development, :test do - gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.5.1', platform: :mri - gem 'pry-rails', '~> 0.3.9' - - gem 'awesome_print', require: false - - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 5.1.0' - gem 'rspec-rails', '~> 4.0.0.beta4' - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' - - # Generate Fake data - gem 'ffaker', '~> 2.10' - - gem 'spring', '~> 2.0.0' - gem 'spring-commands-rspec', '~> 1.0.4' - - gem 'gitlab-styles', '~> 3.1.0', require: false - # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.74.0' - gem 'rubocop-performance', '~> 1.4.1' - gem 'rubocop-rspec', '~> 1.37.0' - - gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.34.0', require: false - gem 'simplecov', '~> 0.18.5', require: false - gem 'bundler-audit', '~> 0.6.1', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - - gem 'knapsack', '~> 1.17' - - gem 'simple_po_parser', '~> 1.1.2', require: false - - gem 'timecop', '~> 0.9.1' - - gem 'png_quantizator', '~> 0.2.1', require: false - - gem 'parallel', '~> 1.19', require: false -end - -# Gems required in omnibus-gitlab pipeline -group :development, :test, :omnibus do - gem 'license_finder', '~> 5.4', require: false -end - -group :test do - gem 'fuubar', '~> 2.2.0' - gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.5' - gem 'rspec-set', '~> 0.1.3' - gem 'rspec-parameterized', require: false - - gem 'capybara', '~> 3.22.0' - gem 'capybara-screenshot', '~> 1.0.22' - gem 'selenium-webdriver', '~> 3.142' - - gem 'shoulda-matchers', '~> 4.0.1', require: false - gem 'email_spec', '~> 2.2.0' - gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 3.5.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 0.10.0' - gem 'rspec_junit_formatter' - gem 'guard-rspec' end gem 'octokit', '~> 4.15' Index: head/www/rubygem-gitlab-gollum-rugged_adapter/Makefile =================================================================== --- head/www/rubygem-gitlab-gollum-rugged_adapter/Makefile (revision 532067) +++ head/www/rubygem-gitlab-gollum-rugged_adapter/Makefile (revision 532068) @@ -1,23 +1,23 @@ # $FreeBSD$ PORTNAME= gitlab-gollum-rugged_adapter PORTVERSION= 0.4.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www rubygems MASTER_SITES= RG MAINTAINER= mfechner@FreeBSD.org COMMENT= Adapter for Gollum to use Rugged (libgit2) at the backend LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-mime-types>=1.15:misc/rubygem-mime-types \ - rubygem-rugged>=0.25:devel/rubygem-rugged + rubygem-rugged>=1.0:devel/rubygem-rugged USES= gem USE_RUBY= yes NO_ARCH= yes .include Index: head/www/rubygem-gitlab-gollum-rugged_adapter/files/patch-gitlab-gollum-rugged__adapter.gemspec =================================================================== --- head/www/rubygem-gitlab-gollum-rugged_adapter/files/patch-gitlab-gollum-rugged__adapter.gemspec (nonexistent) +++ head/www/rubygem-gitlab-gollum-rugged_adapter/files/patch-gitlab-gollum-rugged__adapter.gemspec (revision 532068) @@ -0,0 +1,11 @@ +--- gitlab-gollum-rugged_adapter.gemspec.orig 2020-04-14 05:55:27 UTC ++++ gitlab-gollum-rugged_adapter.gemspec +@@ -21,7 +21,7 @@ Gem::Specification.new do |s| + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q.freeze, ["~> 0.25"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) + s.add_runtime_dependency(%q.freeze, [">= 1.15"]) + s.add_development_dependency(%q.freeze, ["= 3.4.0"]) + else Property changes on: head/www/rubygem-gitlab-gollum-rugged_adapter/files/patch-gitlab-gollum-rugged__adapter.gemspec ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/rubygem-gollum-rugged_adapter/Makefile =================================================================== --- head/www/rubygem-gollum-rugged_adapter/Makefile (revision 532067) +++ head/www/rubygem-gollum-rugged_adapter/Makefile (revision 532068) @@ -1,23 +1,23 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gollum-rugged_adapter PORTVERSION= 0.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= Adapter for Gollum to use Rugged (libgit2) at the backend LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-mime-types>=1.15:misc/rubygem-mime-types \ - rubygem-rugged>=0.25:devel/rubygem-rugged + rubygem-rugged>=1.0:devel/rubygem-rugged NO_ARCH= yes USE_RUBY= yes USES= gem .include Index: head/www/rubygem-gollum-rugged_adapter/files/patch-gollum-rugged__adapter.gemspec =================================================================== --- head/www/rubygem-gollum-rugged_adapter/files/patch-gollum-rugged__adapter.gemspec (nonexistent) +++ head/www/rubygem-gollum-rugged_adapter/files/patch-gollum-rugged__adapter.gemspec (revision 532068) @@ -0,0 +1,11 @@ +--- gollum-rugged_adapter.gemspec.orig 2020-04-14 08:45:40 UTC ++++ gollum-rugged_adapter.gemspec +@@ -21,7 +21,7 @@ Gem::Specification.new do |s| + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q.freeze, ["~> 0.25"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) + s.add_runtime_dependency(%q.freeze, [">= 1.15"]) + s.add_development_dependency(%q.freeze, ["= 3.4.0"]) + else Property changes on: head/www/rubygem-gollum-rugged_adapter/files/patch-gollum-rugged__adapter.gemspec ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/stagit/Makefile =================================================================== --- head/www/stagit/Makefile (revision 532067) +++ head/www/stagit/Makefile (revision 532068) @@ -1,41 +1,41 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= stagit PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://codemadness.org/releases/stagit/ MAINTAINER= tobik@FreeBSD.org COMMENT= Static Git page generator LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgit2.so:devel/libgit2 USE_CSTD= c99 MAKE_ARGS= COMPATOBJ="" \ LIBGIT_INC="-I${LOCALBASE}/include" \ LIBGIT_LIB="-L${LOCALBASE}/lib -lgit2" OPTIONS_DEFINE= DOCS EXAMPLES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/stagit ${WRKSRC}/stagit-index \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/stagit.1 ${WRKSRC}/stagit-index.1 \ ${STAGEDIR}${PREFIX}/share/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC} && \ ${INSTALL_DATA} example_create.sh example_post-receive.sh \ favicon.png logo.png style.css ${STAGEDIR}${EXAMPLESDIR} .include