svn commit: r342763 - head/sys/conf

[Ed Maste]

Author: emaste
Date: Fri Jan  4 16:47:35 2019
New Revision: 342763
URL: https://svnweb.freebsd.org/changeset/base/342763

Log:
  newvers: retire p4 version support
  
  Perforce no longer offers a FreeBSD client and it not a viable VCS for
  FreeBSD development.  Remove p4 version logic to simplify newvers.sh in
  advance of other changes.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh	Fri Jan  4 15:03:35 2019	(r342762)
+++ head/sys/conf/newvers.sh	Fri Jan  4 16:47:35 2019	(r342763)
@@ -202,12 +202,6 @@ if [ -z "${svnversion}" ] && [ -x /usr/bin/svnlitevers
 	fi
 fi
 
-for dir in /usr/bin /usr/local/bin; do
-	if [ -x "${dir}/p4" ] && [ -z ${p4_cmd} ] ; then
-		p4_cmd=${dir}/p4
-	fi
-done
-
 if findvcs .git; then
 	for dir in /usr/bin /usr/local/bin; do
 		if [ -x "${dir}/git" ] ; then
@@ -274,25 +268,6 @@ if [ -n "$git_cmd" ] ; then
 	fi
 fi
 
-if [ -n "$p4_cmd" ] ; then
-	p4version=`cd ${SYSDIR} && $p4_cmd changes -m1 "./...#have" 2>&1 | \
-		awk '{ print $2 }'`
-	case "$p4version" in
-	[0-9]*)
-		p4version=" ${p4version}"
-		p4opened=`cd ${SYSDIR} && $p4_cmd opened ./... 2>&1`
-		case "$p4opened" in
-		File*) ;;
-		//*)
-			p4version="${p4version}+edit"
-			modified=true
-			;;
-		esac
-		;;
-	*)	unset p4version ;;
-	esac
-fi
-
 if [ -n "$hg_cmd" ] ; then
 	hg=`$hg_cmd id 2>/dev/null`
 	hgsvn=`$hg_cmd svn info 2>/dev/null | \
@@ -320,10 +295,10 @@ done
 shift $((OPTIND - 1))
 
 if [ -z "${include_metadata}" ]; then
-	VERINFO="${VERSION}${svn}${git}${hg}${p4version} ${i}"
+	VERINFO="${VERSION}${svn}${git}${hg} ${i}"
 	VERSTR="${VERINFO}\\n"
 else
-	VERINFO="${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}"
+	VERINFO="${VERSION} #${v}${svn}${git}${hg}: ${t}"
 	VERSTR="${VERINFO}\\n    ${u}@${h}:${d}\\n"
 fi