Framework: partially sync with upstream

Taken from: HardenedBSD

MOVED

@@ -12789,3 +12789,4 @@ www/pivotx||2019-05-31|Has expired: inactive upstream and does not work with PHP
 dns/bind912|dns/bind914|2019-05-31|Has expired: Support ends, please move to dns/bind914.
 multimedia/vdr-plugin-softhddevice||2019-05-31|Has expired: unmaintained and depends on vulnerable multimedia/ffmpeg0
 devel/pecl-pthreads||2019-06-02|Has expired: Does not work with recent versions of php
+net-mgmt/ccnet-client||2019-06-10|Removed, no longer has dependencies and has been abandoned upstream

Mk/Uses/cargo.mk

@@ -86,6 +86,7 @@ CARGO_CARGO_RUN= \
 # User arguments for cargo targets.
 CARGO_BUILD_ARGS?=
 CARGO_INSTALL_ARGS?=
+CARGO_INSTALL_PATH?=	.
 CARGO_TEST_ARGS?=
 CARGO_UPDATE_ARGS?=
 
@@ -257,12 +258,14 @@ do-build:
 
 .if !target(do-install) && ${CARGO_INSTALL:tl} == "yes"
 do-install:
+.  for path in ${CARGO_INSTALL_PATH}
 	@${CARGO_CARGO_RUN} install \
-		--path . \
+		--path "${path}" \
 		--root "${STAGEDIR}${PREFIX}" \
 		--verbose \
 		${CARGO_INSTALL_ARGS}
 	@${RM} -- "${STAGEDIR}${PREFIX}/.crates.toml"
+.  endfor
 .endif
 
 .if !target(do-test) && ${CARGO_TEST:tl} == "yes"

Tools/scripts/addport

@@ -331,7 +331,9 @@ foreach my $thisdir (@dirs) {
 	# let's get our hands dirty.
 	if (! -d "ports") {
 		system("$svn co --depth empty $repo ports") && errx(1, "can't get ports root, aborting.");
-		chdir "ports" or err(1,"ports");
+	}
+	chdir "ports" or err(1,"ports");
+	if (! -d "$category") {
 		system("$svn up --depth files $category") && errx(1, "can't get temporary category directory, aborting.");
 	}
 	chdir $category or err(1,"$category");