Index: svnadmin/hooks/scripts/mfh.sh =================================================================== --- svnadmin/hooks/scripts/mfh.sh (revision 392291) +++ svnadmin/hooks/scripts/mfh.sh (revision 392292) @@ -1,43 +1,43 @@ #!/bin/sh # $FreeBSD$ REPOS="$1" REV="$2" AUTHOR=$(svnlook author -r "$REV" "$REPOS") LOG=$(svnlook log -r "$REV" "$REPOS") DIFF=$(svnlook diff -r "$REV" "$REPOS") MFH_LINE=$(echo "$LOG" | grep '^MFH:[[:space:]]*[[:digit:]]\+Q[[:digit:]]') if [ "$MFH_LINE" = "" ]; then exit 0 fi BRANCH_LINE=$(echo "$MFH_LINE" | sed -e "s|MFH:[[:blank:]]*\(.*\)|\1|") BRANCH=$(echo "${BRANCH_LINE}" | sed -Ee "s|([[:digit:]]+Q[[:digit:]]+)(.*)|\1|") BRANCH_DESC=${BRANCH_LINE##${BRANCH}} echo "From: ${AUTHOR}@FreeBSD.org To: portmgr@FreeBSD.org, ports-secteam@FreeBSD.org Subject: MFH request r$REV to $BRANCH${BRANCH_DESC} Hello, Request from $AUTHOR to merge r$REV to branch $BRANCH using \${PORTSDIR}/Tools/scripts/mfh $BRANCH $REV https://svnweb.freebsd.org/changeset/ports/$REV Commit message follows: ---------- $LOG ---------- diff: ---------- $DIFF ---------- -" | /usr/bin/sendmail -oi -f $AUTHOR@freebsd.org portmgr@FreeBSD.org ports-secteam@FreeBSD.org +" | /usr/sbin/sendmail -oi -f $AUTHOR@freebsd.org portmgr@FreeBSD.org ports-secteam@FreeBSD.org