diff -uNr /usr/ports/Mk/Scripts/cargo-crates.awk /x/usr/ports/Mk/Scripts/cargo-crates.awk --- /usr/ports/Mk/Scripts/cargo-crates.awk 2019-08-07 19:37:10.000000000 +0900 +++ /x/usr/ports/Mk/Scripts/cargo-crates.awk 2019-12-05 15:42:22.000000000 +0900 @@ -1,11 +1,14 @@ # MAINTAINER: rust@FreeBSD.org -# $FreeBSD: head/Mk/Scripts/cargo-crates.awk 508310 2019-08-07 10:37:10Z tobik $ +# $FreeBSD: head/Mk/Scripts/cargo-crates.awk 519063 2019-12-05 06:42:22Z tobik $ BEGIN { gh_tuple_len = 0 gl_tuple_len = 0 crates_len = 0 package_name = "" + crate_name = "" + crate_version = "" + crate_source = "" gitlab_sites["https://gitlab.com"] = 1 gitlab_sites["https://gitlab.freedesktop.org"] = 1 @@ -13,19 +16,37 @@ gitlab_sites["https://gitlab.redox-os.org"] = 1 } -/^"checksum .* .* \(registry\+.*\)" = ".*"/ { - # $2: crate - # $3: version - # $4: url - # $6: checksum - crates[crates_len++] = sprintf("%s-%s", $2, $3) -} - /^name = ".*"/ { + crate_name = $3 + gsub(/"/, "", crate_name) + package_name = $3 gsub("[^a-zA-Z_]", "", package_name) } +/^version = ".*"/ { + crate_version = $3 + gsub(/"/, "", crate_version) +} + +/^source = ".*"/ { + crate_source = $3 + gsub(/"/, "", crate_source) +} + +/^\[\[package\]\]$/ { + add_crate() +} + +function add_crate() { + if (crate_source == "registry+https://github.com/rust-lang/crates.io-index") { + crates[crates_len++] = sprintf("%s-%s", crate_name, crate_version) + } + crate_name = "" + crate_version = "" + crate_source = "" +} + function split_url(s) { # scheme:[//[user[:password]@]host[:port]][/path][?query][#fragment] split(s, url_scheme, "://") @@ -112,6 +133,8 @@ } END { + add_crate() + if (gh_tuple_len > 0 && ENVIRON["USE_GITHUB"] == "") { printf "USE_GITHUB=\tnodefault\n" } diff -uNr /usr/ports/Mk/Uses/go.mk /x/usr/ports/Mk/Uses/go.mk --- /usr/ports/Mk/Uses/go.mk 2019-11-18 01:19:36.000000000 +0900 +++ /x/usr/ports/Mk/Uses/go.mk 2019-12-03 20:16:19.000000000 +0900 @@ -1,4 +1,4 @@ -# $FreeBSD: head/Mk/Uses/go.mk 517831 2019-11-17 16:19:36Z dmgk $ +# $FreeBSD: head/Mk/Uses/go.mk 518928 2019-12-03 11:16:19Z antoine $ # # This file contains logic to ease porting of Go binaries using the # `go` command. @@ -12,8 +12,8 @@ # in modules-aware mode. # no_targets Indicates that Go is needed at build time as a part of # make/CMake build. This will setup build environment like -# GO_ENV, GO_BUILDFLAGS but will not create post-extract and -# do-{build,install,test} targets. +# GO_ENV, GO_BUILDFLAGS but will not create post-extract, do-build +# and do-install targets. # run Indicates that Go is needed at run time and adds it to # RUN_DEPENDS. # @@ -21,20 +21,20 @@ # # GO_PKGNAME # The name of the package when building in GOPATH mode. This -# is the directory that will be created in ${GOPATH}/src. If not set -# explicitly and GH_SUBDIR or GL_SUBDIR is present, GO_PKGNAME will -# be inferred from it. +# is the directory that will be created in GOPATH/src and seen +# by the `go` command. If not set explicitly and GH_SUBDIR or +# GL_SUBDIR is present, GO_PKGNAME will be inferred from it. # It is not needed when building in modules-aware mode. # # GO_TARGET -# The packages to build. The default value is ${GO_PKGNAME}. -# GO_TARGET can also be a tuple in the form package:path where path can be -# either a simple filename or a full path starting with ${PREFIX}. +# The packages to build. If not set explicitly, defaults to +# GO_PKGNAME. GO_TARGET can also be a tuple in the form +# package:path where path can be either a simple filename or a +# full path starting with ${PREFIX}. Specifying a full path +# like ${PREFIX}/sbin/binary will install the resulting binary +# as ${PREFIX}/sbin/binary. Using just simple filename is a +# shortcut to installing it as ${PREFIX}/bin/filename. # -# GO_TEST_TARGET -# The packages to test. The default value is `./...` (the current package -# and all subpackages). -# # CGO_CFLAGS # Additional CFLAGS variables to be passed to the C compiler by the `go` # command @@ -72,9 +72,7 @@ GO_PKGNAME= ${PORTNAME} . endif .endif - GO_TARGET?= ${GO_PKGNAME} -GO_TEST_TARGET?= ./... GO_BUILDFLAGS+= -v -buildmode=exe .if !defined(WITH_DEBUG) && empty(GO_BUILDFLAGS:M-ldflags*) @@ -104,7 +102,8 @@ GO_ENV+= GOPATH="" \ GOBIN="${GO_WRKDIR_BIN}" .else -GO_WRKSRC= ${WRKDIR}/src/${GO_PKGNAME} +GO_WRKDIR_SRC= ${WRKDIR}/src +GO_WRKSRC= ${GO_WRKDIR_SRC}/${GO_PKGNAME} GO_ENV+= GOPATH="${WRKDIR}" \ GOBIN="" .endif @@ -159,15 +158,6 @@ ${ECHO_MSG} "===> Installing $${src} as $${dst}"; \ ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/$${src} $${dst}; \ done -.endif - -.if !target(do-test) && empty(go_ARGS:Mno_targets) -do-test: - (cd ${GO_WRKSRC}; \ - for t in ${GO_TEST_TARGET}; do \ - ${ECHO_MSG} "===> Testing $${t}"; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS} $${t}; \ - done) .endif # Helper targets for port maintainers diff -uNr /usr/ports/Mk/Uses/kde.mk /x/usr/ports/Mk/Uses/kde.mk --- /usr/ports/Mk/Uses/kde.mk 2019-11-17 20:06:13.000000000 +0900 +++ /x/usr/ports/Mk/Uses/kde.mk 2019-12-05 02:29:42.000000000 +0900 @@ -1,4 +1,4 @@ -# $FreeBSD: head/Mk/Uses/kde.mk 517817 2019-11-17 11:06:13Z tcberner $ +# $FreeBSD: head/Mk/Uses/kde.mk 519033 2019-12-04 17:29:42Z tcberner $ # # Provides support for KDE and KF5-based ports. # @@ -54,7 +54,7 @@ # === VERSIONS OF THE DIFFERENT COMPONENTS ===================================== # Current KDE desktop. -KDE_PLASMA_VERSION?= 5.17.3 +KDE_PLASMA_VERSION?= 5.17.4 KDE_PLASMA_BRANCH?= stable # Current KDE frameworks.