Index: svnadmin/hooks/post-commit
===================================================================
--- svnadmin/hooks/post-commit	(revision 558431)
+++ svnadmin/hooks/post-commit	(revision 558432)
@@ -1,68 +1,64 @@
 #!/bin/sh
 
 # $FreeBSD$
 
 # POST-COMMIT HOOK
 #
 # The post-commit hook is invoked after a commit.  Subversion runs
 # this hook by invoking a program (script, executable, binary, etc.)
 # named 'post-commit' (for which this file is a template) with the 
 # following ordered arguments:
 #
 #   [1] REPO         (the path to this repository)
 #   [2] REV          (the number of the revision just committed)
 #
 # The default working directory for the invocation is undefined, so
 # the program should set one explicitly if it cares.
 #
 # Because the commit has already completed and cannot be undone,
 # the exit code of the hook program is ignored.  The hook program
 # can use the 'svnlook' utility to help it examine the
 # newly-committed tree.
 #
 # On a Unix system, the normal procedure is to have 'post-commit'
 # invoke other programs to do the real work, though it may do the
 # work itself too.
 #
 # Note that 'post-commit' must be executable by the user(s) who will
 # invoke it (typically the user httpd runs as), and that user must
 # have filesystem-level permission to access the repository.
 #
 # On a Windows system, you should name the hook program
 # 'post-commit.bat' or 'post-commit.exe',
 # but the basic idea is the same.
 # 
 # The hook program typically does not inherit the environment of
 # its parent process.  For example, a common problem is for the
 # PATH environment variable to not be set to its usual value, so
 # that subprograms fail to launch unless invoked via absolute path.
 # If you're having unexpected problems with a hook program, the
 # culprit may be unusual (or missing) environment variables.
 # 
 # Here is an example hook script, for a Unix /bin/sh interpreter.
 # For more examples and pre-written hooks, see those in
 # the Subversion repository at
 # http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
 # http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
 
 
 REPO="$1"
 REV="$2"
 
 . /s/svn/ports/hooks/scripts/env.sh
 
 # update conf/ and hooks/.
 update-root.sh "$REPO" "$REV"
 
 # commit mail
 mailer.py commit "$REPO" "$REV" /s/svn/ports/conf/mailer.conf
 
-# mfh
-
-mfh.sh "${REPO}" "${REV}"
-
 # Ping bugzilla if there's a reference
 notify_bz.sh "$REPO" "$REV"
 
 #commit-email.pl "$REPO" "$REV" commit-watchers@example.org
 #log-commit.py --repository "$REPO" --revision "$REV"
Index: svnadmin/hooks/scripts/mfh.sh
===================================================================
--- svnadmin/hooks/scripts/mfh.sh	(revision 558431)
+++ svnadmin/hooks/scripts/mfh.sh	(nonexistent)
@@ -1,43 +0,0 @@
-#!/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/sbin/sendmail -oi -f $AUTHOR@FreeBSD.org $AUTHOR@FreeBSD.org portmgr@FreeBSD.org ports-secteam@FreeBSD.org
-
-

Property changes on: svnadmin/hooks/scripts/mfh.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property