diff options
| author | gjb <gjb@FreeBSD.org> | 2013-11-17 15:58:13 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-11-17 15:58:13 +0000 |
| commit | 6863a0ee58bf369e657bbde502d606cd35ee7daa (patch) | |
| tree | b900b3b7cd0fbed43b77b19c654fa047b31901ae /release/release.sh | |
| parent | 484bf089ba99a2cda5c5538e15ea7a9f7da23d0c (diff) | |
| download | FreeBSD-src-6863a0ee58bf369e657bbde502d606cd35ee7daa.zip FreeBSD-src-6863a0ee58bf369e657bbde502d606cd35ee7daa.tar.gz | |
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
Diffstat (limited to 'release/release.sh')
| -rwxr-xr-x | release/release.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/release/release.sh b/release/release.sh index a7bfc8e..07c42a1 100755 --- a/release/release.sh +++ b/release/release.sh @@ -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 |
