svn commit: r258786 - head/release

[Glen Barber]

Author: gjb
Date: Sat Nov 30 23:56:26 2013
New Revision: 258786
URL: http://svnweb.freebsd.org/changeset/base/258786

Log:
  Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise the
  textproc/docproj port build fails.
  
  Pointyhat:	gjb
  MFC after:	3 days
  X-Before-RC1:	yes
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Sat Nov 30 23:47:18 2013	(r258785)
+++ head/release/release.sh	Sat Nov 30 23:56:26 2013	(r258786)
@@ -176,9 +176,9 @@ build_doc_ports() {
 	_OSVERSION=$(sysctl -n kern.osreldate)
 	if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then
 		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
-		PBUILD_FLAGS="${PBUILD_FLAGS} OPTIONS_UNSET='FOP IGOR'"
+		PBUILD_FLAGS="${PBUILD_FLAGS}"
 		chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
-			${PBUILD_FLAGS} install clean distclean
+			${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
 	fi
 }