MFC r258786, r258796, r258797, r258847, r258853, r258949:

r258786:
  Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise
  the textproc/docproj port build fails.

r258796 (hrs):
  - Prevent TARGET and TARGET_ARCH from being defined as empty when
    TARGET="" and/or TARGET_ARCH="" is specified.
  - Remove extra ().

r258797 (hrs):
  Use standard CLEANFILES/CLEANDIRS and clean target in bsd.obj.mk.

r258847:
  Provide reproducibility between builds by building pkg(8) from ports,
  instead of using pkg-bootstrap.

  This should resolve a problem that was discovered during 10.0-BETA4
  freebsd-update(8) builds,

r258853:
  Turn off the dvdrom target by default.  dvd1.iso is now built by
  specifying 'WITH_DVD=1' during 'make release'.

  This caused some problems during the freebsd-update builds for
  10.0-BETA4.

r258949:
  Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluating
  to true.

Approved by:	re (hrs)
Sponsored by:	The FreeBSD Foundation

1 files changed, 5 insertions, 5 deletions

diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 9941b01..f8fc42b 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 18, 2013
+.Dd December 2, 2013
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -230,10 +230,6 @@ When set,
 will prevent the
 .Fa doc.txz
 distribution package from being created.
-.It Va NODVD
-Set to a non-empty value to skip the
-.Cm dvdrom
-target.
 .It Va NOPORTS
 Set to a non-empty value to skip the
 .Li ports/
@@ -245,6 +241,10 @@ will prevent the
 distribution package from being created.
 Setting this also sets
 .Va NODOC .
+.It Va WITH_DVD
+Set to a non-empty value to include the
+.Cm dvdrom
+target.
 .El
 .Sh MAKEFILE TARGETS
 The release makefile