diff options
Diffstat (limited to 'ports-mgmt/porttools/files/patch-cmd_commit.in')
-rw-r--r-- | ports-mgmt/porttools/files/patch-cmd_commit.in | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/ports-mgmt/porttools/files/patch-cmd_commit.in b/ports-mgmt/porttools/files/patch-cmd_commit.in deleted file mode 100644 index d3bdbc8a9d58..000000000000 --- a/ports-mgmt/porttools/files/patch-cmd_commit.in +++ /dev/null @@ -1,89 +0,0 @@ ---- cmd_commit.in.orig 2009-09-10 04:59:59.000000000 +0900 -+++ cmd_commit.in 2013-04-27 07:26:46.000000000 +0900 -@@ -1,6 +1,6 @@ - # cmd_commit - # Module for port(1) --# SUMMARY: commit a port into the FreeBSD Ports CVS Repository -+# SUMMARY: commit a port into the FreeBSD Ports SVN Repository - # - # $Id: cmd_commit.in,v 1.2 2009/09/09 19:58:30 skolobov Exp $ - # -@@ -59,13 +59,17 @@ - - # Determine if this is a new port - MODE="update" --[ "`grep '\$FreeBSD: ' Makefile`" ] || MODE="new" -+svn status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:' -+if [ $? -eq 0 ] -+then -+ MODE="new" -+fi - - # Run portlint(1) to validate port's sanity - echo "===> Pre-commit portlint check" - FLAGS="-C" - [ "${MODE}" = "new" ] && FLAGS="${FLAGS} -N" --PL_CVS_IGNORE='^\d+$|^pr-patch$|^cvs-msg$' \ -+PL_SVN_IGNORE='^\d+$|^pr-patch$|^svn-msg$' \ - portlint ${FLAGS} - if [ $? -ne 0 ] - then -@@ -74,21 +78,25 @@ - fi - - --PORTSDIR="`make -V PORTSDIR`" -+# See if SVN message already exists, and use that for commit log -+MSG="svn-msg" -+FLAGS="" -+ - if [ "${MODE}" = "new" ] - then -- ${PORTSDIR}/Tools/scripts/addport -d `pwd` -u ${FREEFALL_USERNAME} --else -- # Initialize CVS environment -- PCVS="cvs -d ${FREEFALL_USERNAME}@pcvs.FreeBSD.org:/home/pcvs" -+ PORTSDIR="`make -V PORTSDIR`" - -+ if [ -e ${MSG} ] -+ then -+ FLAGS="-c ${MSG}" -+ fi -+ -+ ${PORTSDIR}/Tools/scripts/addport -d `pwd` -u ${FREEFALL_USERNAME} ${FLAGS} -+else - # Make sure we are working with up-to-date version -- echo "===> Pre-commit CVS update" -- ${PCVS} update -+ echo "===> Pre-commit SVN update" -+ svn update - -- # See if CVS message already exists, and use that for commit log -- MSG="cvs-msg" -- FLAGS="" - if [ -e ${MSG} ] - then - FLAGS="-F ${MSG}" -@@ -99,18 +107,18 @@ - echo '=============================================' - cat ${MSG} - echo '=============================================' -- read -p "Is the CVS message above correct? (y/n)" ANSWER -+ read -p "Is the SVN message above correct? (y/n)" ANSWER - [ "${ANSWER}" = "y" ] && break - ${VISUAL:-vi} ${MSG} - done - fi - # Commit the port update - echo "===> Committing port update" -- ${PCVS} commit ${FLAGS} -+ svn commit ${FLAGS} - -- # Remove CVS message file only if commit was successful -- [ $? -eq 0 -a -e ${MSG} ] && rm ${MSG} - fi -+# Remove SVN message file only if commit was successful -+[ $? -eq 0 -a -e ${MSG} ] && rm ${MSG} - - echo "===> Done" - exit 0 |