From owner-svn-src-all@FreeBSD.ORG  Sun Nov 17 15:58:14 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7FCFF60C;
 Sun, 17 Nov 2013 15:58:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F37324B2;
 Sun, 17 Nov 2013 15:58:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHFwEVw053802;
 Sun, 17 Nov 2013 15:58:14 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHFwE3c053801;
 Sun, 17 Nov 2013 15:58:14 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201311171558.rAHFwE3c053801@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 17 Nov 2013 15:58:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r258261 - stable/10/release
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Nov 2013 15:58:14 -0000

Author: gjb
Date: Sun Nov 17 15:58:13 2013
New Revision: 258261
URL: http://svnweb.freebsd.org/changeset/base/258261

Log:
  MFC r258101:
    Since the doc/ toolchain conversion to docbook 5.0, JADETEX
    is no longer a valid option, so remove 'WITHOUT_JADETEX=yes'
    from PBUILD_FLAGS.
  
    While here, also remove 'WITHOUT_X11=yes', since it will
    cause a dependency conflict by requiring both print/ghostscript9
    and print/ghostscript9-nox11.
  
    Switch to OPTIONSNG format (WITHOUT_* -> OPTIONS_UNSET='FOO'),
    and unset the FOP option, which requires Java (although it is
    disabled by default).  Also unset the 'IGOR' option, since
    textproc/igor is a validation tool, not necessarily a dependency
    of the doc/ build itself.
  
    While here, reduce the line length of PBUILD_FLAGS.
  
  Approved by:	re (kib)
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/release.sh
Directory Properties:
  stable/10/release/   (props changed)

Modified: stable/10/release/release.sh
==============================================================================
--- stable/10/release/release.sh	Sun Nov 17 15:14:07 2013	(r258260)
+++ stable/10/release/release.sh	Sun Nov 17 15:58:13 2013	(r258261)
@@ -174,7 +174,8 @@ build_doc_ports() {
 	## Trick the ports 'run-autotools-fixup' target to do the right thing.
 	_OSVERSION=$(sysctl -n kern.osreldate)
 	if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then
-		PBUILD_FLAGS="OSVERSION=${_OSVERSION} WITHOUT_JADETEX=yes WITHOUT_X11=yes BATCH=yes"
+		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
+		PBUILD_FLAGS="${PBUILD_FLAGS} OPTIONS_UNSET='FOP IGOR'"
 		chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
 			${PBUILD_FLAGS} install clean distclean
 	fi