svn commit: r554142 - head/Mk/Scripts
Mathieu Arnold
mat at FreeBSD.org
Thu Nov 5 16:51:35 UTC 2020
Author: mat
Date: Thu Nov 5 16:51:30 2020
New Revision: 554142
URL: https://svnweb.freebsd.org/changeset/ports/554142
Log:
Backout r554139.
Modified:
head/Mk/Scripts/check-desktop-entries.sh
head/Mk/Scripts/check-stagedir.sh
head/Mk/Scripts/check-vulnerable.sh
head/Mk/Scripts/check_leftovers.sh
head/Mk/Scripts/checksum.sh
head/Mk/Scripts/create-manifest.sh
head/Mk/Scripts/depends-list.sh
head/Mk/Scripts/desktop-categories.sh
head/Mk/Scripts/dialog4ports.sh
head/Mk/Scripts/do-depends.sh
head/Mk/Scripts/do-fetch.sh
head/Mk/Scripts/do-patch.sh
head/Mk/Scripts/do-users-groups.sh
head/Mk/Scripts/find-lib.sh
head/Mk/Scripts/generate-symbols.sh
head/Mk/Scripts/install-desktop-entries.sh
head/Mk/Scripts/makesum.sh
head/Mk/Scripts/plist_sub_sed_sort.sh
head/Mk/Scripts/ports_env.sh
head/Mk/Scripts/qa.sh
head/Mk/Scripts/rust-compat11-canary.sh
head/Mk/Scripts/smart_makepatch.sh
Modified: head/Mk/Scripts/check-desktop-entries.sh
==============================================================================
--- head/Mk/Scripts/check-desktop-entries.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/check-desktop-entries.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/check-stagedir.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -12,7 +12,6 @@
# c. Files in plist which are owned by dependencies/MTREEs
set -e
-set pipefail
. ${SCRIPTSDIR}/functions.sh
Modified: head/Mk/Scripts/check-vulnerable.sh
==============================================================================
--- head/Mk/Scripts/check-vulnerable.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/check-vulnerable.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/check_leftovers.sh
==============================================================================
--- head/Mk/Scripts/check_leftovers.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/check_leftovers.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -23,8 +23,6 @@
# 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"
Modified: head/Mk/Scripts/checksum.sh
==============================================================================
--- head/Mk/Scripts/checksum.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/checksum.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/create-manifest.sh
==============================================================================
--- head/Mk/Scripts/create-manifest.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/create-manifest.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/depends-list.sh
==============================================================================
--- head/Mk/Scripts/depends-list.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/depends-list.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -3,7 +3,6 @@
# $FreeBSD$
set -e
-set pipefail
. ${dp_SCRIPTSDIR}/functions.sh
Modified: head/Mk/Scripts/desktop-categories.sh
==============================================================================
--- head/Mk/Scripts/desktop-categories.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/desktop-categories.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/dialog4ports.sh
==============================================================================
--- head/Mk/Scripts/dialog4ports.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/dialog4ports.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -2,7 +2,6 @@
# $FreeBSD$
# Maintainer: portmgr at FreeBSD.org
set -e
-set pipefail
[ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DIALOG4PORTS}" ] && set -x
Modified: head/Mk/Scripts/do-depends.sh
==============================================================================
--- head/Mk/Scripts/do-depends.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/do-depends.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. ${dp_SCRIPTSDIR}/functions.sh
Modified: head/Mk/Scripts/do-fetch.sh
==============================================================================
--- head/Mk/Scripts/do-fetch.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/do-fetch.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/do-patch.sh
==============================================================================
--- head/Mk/Scripts/do-patch.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/do-patch.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/do-users-groups.sh
==============================================================================
--- head/Mk/Scripts/do-users-groups.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/do-users-groups.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/find-lib.sh
==============================================================================
--- head/Mk/Scripts/find-lib.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/find-lib.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -2,8 +2,6 @@
# MAINTAINER: portmgr at 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
Modified: head/Mk/Scripts/generate-symbols.sh
==============================================================================
--- head/Mk/Scripts/generate-symbols.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/generate-symbols.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -9,8 +9,6 @@
# /usr/local/bin/ssh -> /usr/local/lib/debug/usr/local/bin/ssh.debug
LIB_DIR_PREFIX="${LOCALBASE}/lib/debug"
-set pipefail
-
msg() {
echo "====> $*"
}
Modified: head/Mk/Scripts/install-desktop-entries.sh
==============================================================================
--- head/Mk/Scripts/install-desktop-entries.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/install-desktop-entries.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/makesum.sh
==============================================================================
--- head/Mk/Scripts/makesum.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/makesum.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -4,7 +4,6 @@
# MAINTAINER: portmgr at FreeBSD.org
set -e
-set pipefail
. "${dp_SCRIPTSDIR}/functions.sh"
Modified: head/Mk/Scripts/plist_sub_sed_sort.sh
==============================================================================
--- head/Mk/Scripts/plist_sub_sed_sort.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/plist_sub_sed_sort.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -5,8 +5,6 @@
#
# PLIST_SUB_SED helper to sort by longest value first.
-set pipefail
-
awk '{
while (match($0, /s![^!]*![^!]*!g;/)) {
sedp=substr($0, RSTART, RLENGTH)
Modified: head/Mk/Scripts/ports_env.sh
==============================================================================
--- head/Mk/Scripts/ports_env.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/ports_env.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -3,8 +3,6 @@
# MAINTAINER: portmgr at FreeBSD.org
# $FreeBSD$
-set pipefail
-
if [ -z "${SCRIPTSDIR}" ]; then
echo "Must set SCRIPTSDIR" >&2
exit 1
Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/qa.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -2,8 +2,6 @@
# MAINTAINER: portmgr at 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
Modified: head/Mk/Scripts/rust-compat11-canary.sh
==============================================================================
--- head/Mk/Scripts/rust-compat11-canary.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/rust-compat11-canary.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -2,7 +2,6 @@
# MAINTAINER: rust at FreeBSD.org
# $FreeBSD$
set -eu
-set pipefail
if [ "${OPSYS}" != FreeBSD ] || [ "${OSVERSION}" -lt 1200000 ]; then
exit 0
Modified: head/Mk/Scripts/smart_makepatch.sh
==============================================================================
--- head/Mk/Scripts/smart_makepatch.sh Thu Nov 5 16:50:46 2020 (r554141)
+++ head/Mk/Scripts/smart_makepatch.sh Thu Nov 5 16:51:30 2020 (r554142)
@@ -25,8 +25,6 @@
# 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
More information about the svn-ports-head
mailing list