0c93135004
This makes the process of make patch, fix fallout, make makepatch much easier as only one iteration is required. While there, refactor things around, and streamline messages passed between functions. PR: 244626 Reported by: cem
148 lines
3.1 KiB
Bash
148 lines
3.1 KiB
Bash
#!/bin/sh
|
|
# $FreeBSD$
|
|
#
|
|
# MAINTAINER: portmgr@FreeBSD.org
|
|
|
|
set -e
|
|
|
|
. "${dp_SCRIPTSDIR}/functions.sh"
|
|
|
|
validate_env dp_BZCAT dp_CAT dp_DISTDIR dp_ECHO_MSG dp_EXTRA_PATCHES \
|
|
dp_EXTRA_PATCH_TREE dp_GZCAT dp_OPSYS dp_PATCH dp_PATCHDIR \
|
|
dp_PATCHFILES dp_PATCH_ARGS dp_PATCH_DEBUG_TMP dp_PATCH_DIST_ARGS \
|
|
dp_PATCH_SILENT dp_PATCH_WRKSRC dp_PKGNAME dp_PKGORIGIN \
|
|
dp_UNZIP_NATIVE_CMD dp_XZCAT
|
|
|
|
[ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DO_PATCH}" ] && set -x
|
|
|
|
set -u
|
|
|
|
has_failed=""
|
|
|
|
cat_file() {
|
|
case "$1" in
|
|
*.Z|*.gz)
|
|
${dp_GZCAT} "$1"
|
|
;;
|
|
*.bz2)
|
|
${dp_BZCAT} "$1"
|
|
;;
|
|
*.xz)
|
|
${dp_XZCAT} "$1"
|
|
;;
|
|
*.zip)
|
|
${dp_UNZIP_NATIVE_CMD} -p "$1"
|
|
;;
|
|
*)
|
|
${dp_CAT} "$1"
|
|
;;
|
|
esac
|
|
}
|
|
|
|
apply_one_patch() {
|
|
local file="$1"
|
|
local msg="$2"
|
|
shift 2
|
|
local patch_strip=""
|
|
|
|
case ${file} in
|
|
*:-p[0-9])
|
|
patch_strip=${file##*:}
|
|
file=${file%:-p[0-9]}
|
|
;;
|
|
esac
|
|
|
|
if [ -n "${msg}" ]; then
|
|
${dp_ECHO_MSG} "===> Applying ${msg} ${file}${patch_strip:+ with ${patch_strip}}"
|
|
fi
|
|
|
|
if ! cat_file "$file" | do_patch "$@" ${patch_strip}; then
|
|
${dp_ECHO_MSG} "===> FAILED Applying ${msg} ${file}${patch_strip:+ with ${patch_strip}}"
|
|
has_failed=1
|
|
fi
|
|
}
|
|
|
|
do_patch() {
|
|
"${dp_PATCH}" -d "${dp_PATCH_WRKSRC}" "$@"
|
|
}
|
|
|
|
patch_from_directory() {
|
|
local dir="$1"
|
|
local msg="$2"
|
|
local patches_applied=""
|
|
local patches_failed=""
|
|
|
|
if [ -d "${dir}" ]; then
|
|
cd "${dir}"
|
|
|
|
if [ "$(echo patch-*)" != "patch-*" ]; then
|
|
|
|
${dp_ECHO_MSG} "===> Applying ${msg} patches for ${dp_PKGNAME}"
|
|
|
|
|
|
for i in patch-*; do
|
|
case ${i} in
|
|
*.orig|*.rej|*~|*,v)
|
|
${dp_ECHO_MSG} "====> IGNORING patchfile ${i}"
|
|
;;
|
|
*)
|
|
if [ -n "${dp_PATCH_DEBUG_TMP}" ]; then
|
|
${dp_ECHO_MSG} "====> Applying ${msg} patch ${i}"
|
|
fi
|
|
if cat_file "$i" | do_patch ${dp_PATCH_ARGS}; then
|
|
patches_applied="${patches_applied} ${i}"
|
|
else
|
|
${dp_ECHO_MSG} "====> FAILED Applying ${msg} patch ${i}"
|
|
patches_failed="${patches_failed} ${i}"
|
|
fi
|
|
;;
|
|
esac
|
|
done
|
|
|
|
if [ -n "${patches_applied}" -a "${dp_PATCH_SILENT}" != "yes" ]; then
|
|
${dp_ECHO_MSG} "===> Cleanly applied ${msg} patch(es) ${patches_applied}"
|
|
fi
|
|
if [ -n "${patches_failed}" -a "${dp_PATCH_SILENT}" != "yes" ]; then
|
|
${dp_ECHO_MSG} "===> FAILED to apply cleanly ${msg} patch(es) ${patches_failed}"
|
|
has_failed=1
|
|
fi
|
|
fi
|
|
fi
|
|
}
|
|
|
|
if [ -n "${dp_PATCHFILES}" ]; then
|
|
${dp_ECHO_MSG} "===> Applying distribution patches for ${dp_PKGNAME}"
|
|
cd "${dp_DISTDIR}"
|
|
for i in ${dp_PATCHFILES}; do
|
|
apply_one_patch "${i}" \
|
|
"${dp_PATCH_DEBUG_TMP:+ distribution patch}" \
|
|
${dp_PATCH_DIST_ARGS}
|
|
done
|
|
fi
|
|
|
|
if [ -n "${dp_EXTRA_PATCHES}" ]; then
|
|
for i in ${dp_EXTRA_PATCHES}; do
|
|
if [ -d "${i}" ]; then
|
|
patch_from_directory "${i}" \
|
|
"extra patch"
|
|
else
|
|
apply_one_patch "${i}" \
|
|
"extra patch" \
|
|
${dp_PATCH_ARGS}
|
|
fi
|
|
done
|
|
fi
|
|
|
|
patch_from_directory "${dp_PATCHDIR}" "${dp_OPSYS}"
|
|
|
|
if [ -n "${dp_EXTRA_PATCH_TREE}" ]; then
|
|
patch_from_directory "${dp_EXTRA_PATCH_TREE}/${dp_PKGORIGIN}" "local"
|
|
fi
|
|
|
|
if [ -n "$has_failed" ]; then
|
|
${dp_ECHO_MSG} "==> SOME PATCHES FAILED TO APPLY CLEANLY."
|
|
${dp_ECHO_MSG} "==> Look for FAILED messages above."
|
|
false
|
|
fi
|
|
|