Date: Sun, 17 Nov 2013 15:58:14 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> 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 Message-ID: <201311171558.rAHFwE3c053801@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311171558.rAHFwE3c053801>