From owner-svn-src-stable@FreeBSD.ORG  Tue Mar 19 19:49:07 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0B371D10;
 Tue, 19 Mar 2013 19:49:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F1E8DDB;
 Tue, 19 Mar 2013 19:49:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2JJn6h9017035;
 Tue, 19 Mar 2013 19:49:06 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2JJn65e017034;
 Tue, 19 Mar 2013 19:49:06 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201303191949.r2JJn65e017034@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 19 Mar 2013 19:49:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r248530 - stable/8/release
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Mar 2013 19:49:07 -0000

Author: gjb (doc,ports committer)
Date: Tue Mar 19 19:49:06 2013
New Revision: 248530
URL: http://svnweb.freebsd.org/changeset/base/248530

Log:
  - Revert r248483, keeping devel/subversion as a port dependency
    for the doc/ build.
  - Remove logic in release/Makefile that modifies local src/ tree.[1]
  
  Submitted by:	delphij [1]
  Approved by:	re (jpaetzel)

Modified:
  stable/8/release/Makefile

Modified: stable/8/release/Makefile
==============================================================================
--- stable/8/release/Makefile	Tue Mar 19 19:32:28 2013	(r248529)
+++ stable/8/release/Makefile	Tue Mar 19 19:49:06 2013	(r248530)
@@ -499,13 +499,6 @@ release rerelease:
 .endif
 .endif
 .endif
-	# Add version information to those things that need it.
-	if [ ! -f ${CHROOTDIR}/tmp/.world_done ]; then \
-		cd ${CHROOTDIR}/usr/src/sys/conf && \
-		mv newvers.sh foo && \
-		sed "s/^RELEASE=.*/RELEASE=${BUILDNAME}/" foo > newvers.sh && \
-		rm foo; \
-	fi
 	-test -f install.cfg && cp install.cfg ${CHROOTDIR}/usr/src/release
 	echo "#!/bin/sh"			> ${_MK}
 	echo "set -ex"				>> ${_MK}
@@ -611,7 +604,6 @@ fetch-distfiles:
 		cd ${CHROOTDIR}/usr/ports/$$i && \
 			make PORTSDIR=${CHROOTDIR}/usr/ports BATCH=yes \
 			WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes \
-			WITHOUT_SVN=yes \
 			checksum-recursive ; \
 	done
 
@@ -1173,7 +1165,7 @@ doc.1:
 	    cd /usr/ports/$$i && \
 	    env -i FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \
 		make all install clean BATCH=yes WITHOUT_X11=yes JADETEX=no \
-		WITHOUT_PYTHON=yes WITHOUT_SVN=yes FORCE_PKG_REGISTER=yes; \
+		WITHOUT_PYTHON=yes FORCE_PKG_REGISTER=yes; \
 	done
 	touch ${.TARGET}