diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2013-11-13 17:49:07 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2013-11-13 17:49:07 +0000 |
| commit | 20dc9c67c4aa14e9690b7319d8143058059a5074 (patch) | |
| tree | 2f05ade43f3f240b64d4028e9d7b60bf92bd49c5 /release/release.sh | |
| parent | afda932a71d12094d26aceb2286bde4a8327a062 (diff) | |
| download | src-20dc9c67c4aa14e9690b7319d8143058059a5074.tar.gz src-20dc9c67c4aa14e9690b7319d8143058059a5074.zip | |
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.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=258101
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 ad913082a06d..7ac18a952857 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 |