svn commit: r258313 - stable/9/release

[Glen Barber]

Author: gjb
Date: Mon Nov 18 17:06:33 2013
New Revision: 258313
URL: http://svnweb.freebsd.org/changeset/base/258313

Log:
  MFC r257942, r258101:
  
  r257942:
    Fix a few style nits.
  
  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.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/9/release/release.sh
==============================================================================
--- stable/9/release/release.sh	Mon Nov 18 17:03:11 2013	(r258312)
+++ stable/9/release/release.sh	Mon Nov 18 17:06:33 2013	(r258313)
@@ -125,10 +125,10 @@ fi
 # instead of their values.
 DOCPORTS=
 if [ "x${NOPORTS}" != "x" ]; then
- DOCPORTS="NOPORTS=yes "
+	DOCPORTS="NOPORTS=yes "
 fi
 if [ "x${NODOC}" != "x" ]; then
- DOCPORTS="${DOCPORTS}NODOC=yes"
+	DOCPORTS="${DOCPORTS}NODOC=yes"
 fi
 
 # The aggregated build-time flags based upon variables defined within
@@ -147,7 +147,7 @@ RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCO
 # Force src checkout if configured
 FORCE_SRC_KEY=
 if [ "x${SRC_FORCE_CHECKOUT}" != "x" ]; then
- FORCE_SRC_KEY="--force"
+	FORCE_SRC_KEY="--force"
 fi
 
 if [ ! ${CHROOTDIR} ]; then
@@ -189,7 +189,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