Index: Mk/Scripts/check-desktop-entries.sh
===================================================================
--- Mk/Scripts/check-desktop-entries.sh
+++ Mk/Scripts/check-desktop-entries.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/check-stagedir.sh
===================================================================
--- Mk/Scripts/check-stagedir.sh
+++ Mk/Scripts/check-stagedir.sh
@@ -12,6 +12,7 @@
 #  c. Files in plist which are owned by dependencies/MTREEs
 
 set -e
+set pipefail
 
 . ${SCRIPTSDIR}/functions.sh
 
Index: Mk/Scripts/check-vulnerable.sh
===================================================================
--- Mk/Scripts/check-vulnerable.sh
+++ Mk/Scripts/check-vulnerable.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/check_leftovers.sh
===================================================================
--- Mk/Scripts/check_leftovers.sh
+++ Mk/Scripts/check_leftovers.sh
@@ -23,6 +23,8 @@
 # The PLIST_SUB feature can be disabled by setting PLIST_SUB_SED=
 # in environment.
 
+set pipefail
+
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_CHECK_LEFTOVERS}" ] && set -x
 
 origin="$1"
Index: Mk/Scripts/checksum.sh
===================================================================
--- Mk/Scripts/checksum.sh
+++ Mk/Scripts/checksum.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/create-manifest.sh
===================================================================
--- Mk/Scripts/create-manifest.sh
+++ Mk/Scripts/create-manifest.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/depends-list.sh
===================================================================
--- Mk/Scripts/depends-list.sh
+++ Mk/Scripts/depends-list.sh
@@ -3,6 +3,7 @@
 # $FreeBSD$
 
 set -e
+set pipefail
 
 . ${dp_SCRIPTSDIR}/functions.sh
 
Index: Mk/Scripts/desktop-categories.sh
===================================================================
--- Mk/Scripts/desktop-categories.sh
+++ Mk/Scripts/desktop-categories.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/dialog4ports.sh
===================================================================
--- Mk/Scripts/dialog4ports.sh
+++ Mk/Scripts/dialog4ports.sh
@@ -2,6 +2,7 @@
 # $FreeBSD$
 # Maintainer: portmgr@FreeBSD.org
 set -e
+set pipefail
 
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DIALOG4PORTS}" ] && set -x
 
Index: Mk/Scripts/do-depends.sh
===================================================================
--- Mk/Scripts/do-depends.sh
+++ Mk/Scripts/do-depends.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . ${dp_SCRIPTSDIR}/functions.sh
 
Index: Mk/Scripts/do-fetch.sh
===================================================================
--- Mk/Scripts/do-fetch.sh
+++ Mk/Scripts/do-fetch.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/do-patch.sh
===================================================================
--- Mk/Scripts/do-patch.sh
+++ Mk/Scripts/do-patch.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/do-users-groups.sh
===================================================================
--- Mk/Scripts/do-users-groups.sh
+++ Mk/Scripts/do-users-groups.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/find-lib.sh
===================================================================
--- Mk/Scripts/find-lib.sh
+++ Mk/Scripts/find-lib.sh
@@ -2,6 +2,8 @@
 # MAINTAINER: portmgr@FreeBSD.org
 # $FreeBSD$
 
+set pipefail
+
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_FIND_LIB}" ] && set -x
 
 if [ -z "${LIB_DIRS}" -o -z "${LOCALBASE}" ]; then
Index: Mk/Scripts/generate-symbols.sh
===================================================================
--- Mk/Scripts/generate-symbols.sh
+++ Mk/Scripts/generate-symbols.sh
@@ -9,6 +9,8 @@
 # /usr/local/bin/ssh    -> /usr/local/lib/debug/usr/local/bin/ssh.debug
 LIB_DIR_PREFIX="${LOCALBASE}/lib/debug"
 
+set pipefail
+
 msg() {
         echo "====> $*"
 }
Index: Mk/Scripts/install-desktop-entries.sh
===================================================================
--- Mk/Scripts/install-desktop-entries.sh
+++ Mk/Scripts/install-desktop-entries.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/makesum.sh
===================================================================
--- Mk/Scripts/makesum.sh
+++ Mk/Scripts/makesum.sh
@@ -4,6 +4,7 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
+set pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
Index: Mk/Scripts/plist_sub_sed_sort.sh
===================================================================
--- Mk/Scripts/plist_sub_sed_sort.sh
+++ Mk/Scripts/plist_sub_sed_sort.sh
@@ -5,6 +5,8 @@
 #
 # PLIST_SUB_SED helper to sort by longest value first.
 
+set pipefail
+
 awk '{
 	while (match($0, /s![^!]*![^!]*!g;/)) {
 		sedp=substr($0, RSTART, RLENGTH)
Index: Mk/Scripts/ports_env.sh
===================================================================
--- Mk/Scripts/ports_env.sh
+++ Mk/Scripts/ports_env.sh
@@ -3,6 +3,8 @@
 # MAINTAINER: portmgr@FreeBSD.org
 # $FreeBSD$
 
+set pipefail
+
 if [ -z "${SCRIPTSDIR}" ]; then
 	echo "Must set SCRIPTSDIR" >&2
 	exit 1
Index: Mk/Scripts/qa.sh
===================================================================
--- Mk/Scripts/qa.sh
+++ Mk/Scripts/qa.sh
@@ -2,6 +2,8 @@
 # MAINTAINER: portmgr@FreeBSD.org
 # $FreeBSD$
 
+set pipefail
+
 if [ -z "${STAGEDIR}" -o -z "${PREFIX}" -o -z "${LOCALBASE}" ]; then
 	echo "STAGEDIR, PREFIX, LOCALBASE required in environment." >&2
 	exit 1
Index: Mk/Scripts/rust-compat11-canary.sh
===================================================================
--- Mk/Scripts/rust-compat11-canary.sh
+++ Mk/Scripts/rust-compat11-canary.sh
@@ -2,6 +2,7 @@
 # MAINTAINER: rust@FreeBSD.org
 # $FreeBSD$
 set -eu
+set pipefail
 
 if [ "${OPSYS}" != FreeBSD ] || [ "${OSVERSION}" -lt 1200000 ]; then
 	exit 0
Index: Mk/Scripts/smart_makepatch.sh
===================================================================
--- Mk/Scripts/smart_makepatch.sh
+++ Mk/Scripts/smart_makepatch.sh
@@ -25,6 +25,8 @@
 # if those targets modify source files (e.g. with sed).  You may also
 # want to disable EXTRA_PATCHES as well if that is being used.
 
+set pipefail
+
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_SMART_MAKEPATCH}" ] && set -x
 
 if [ -z "${PATCHDIR}" -o -z "${PATCH_WRKSRC}" -o -z "${WRKDIR}" ]; then