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}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
