Reorder alphabetically for test*, TEST_* and CDIAGFLAGS.

ok zhuk@

1 files changed, 63 insertions, 63 deletions

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 7065815512d..8261bc64cf1 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.407 2014/09/13 15:13:44 naddy Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.408 2014/10/02 23:52:09 stu Exp $
 .\"
 .\" Copyright (c) 2000-2008 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 13 2014 $
+.Dd $Mdocdate: October 2 2014 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -673,26 +673,6 @@ and
 so that the packing-list is complete.
 .It Ar rebuild
 Force rebuild of the port.
-.It Ar test
-Run regression tests for the port.
-Essentially depend on a correct build and invoke
-.Bd -literal
-env -i ${ALL_TEST_ENV} ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} \e
-	-f ${MAKE_FILE} ${TEST_TARGET} ${TEST_LOG}
-.Ed
-.Pp
-If a port needs some other ports installed to run regression tests,
-use
-.Ev TEST_DEPENDS .
-If a port needs special configuration or build options to enable regression
-testing, define a
-.Sq test
-.Ev FLAVOR .
-.It Ar test-depends
-Verify packages needed for regression tests, using the same scheme as
-.Ar build-depends .
-Only invoked when regression tests are run, or explicitly through
-.Ar depends .
 .It Ar reinstall
 Force reinstallation of a port, by first cleaning the old installation.
 Seldom needed, as
@@ -758,6 +738,26 @@ Update an existing installation to a newer package, exactly
 like
 .Ar update ,
 but affects only one single subpackage in multi-packages ports.
+.It Ar test
+Run regression tests for the port.
+Essentially depend on a correct build and invoke
+.Bd -literal
+env -i ${ALL_TEST_ENV} ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} \e
+	-f ${MAKE_FILE} ${TEST_TARGET} ${TEST_LOG}
+.Ed
+.Pp
+If a port needs some other ports installed to run regression tests,
+use
+.Ev TEST_DEPENDS .
+If a port needs special configuration or build options to enable regression
+testing, define a
+.Sq test
+.Ev FLAVOR .
+.It Ar test-depends
+Verify packages needed for regression tests, using the same scheme as
+.Ar build-depends .
+Only invoked when regression tests are run, or explicitly through
+.Ar depends .
 .It Ar unlink-categories
 Remove symbolic links in other directories that correspond to the port's
 .Ev CATEGORIES .
@@ -1171,12 +1171,6 @@ category.
 See
 .Ar link-categories ,
 .Ar unlink-categories .
-.It Ev CDIAGFLAGS
-Flags appended to
-.Ev CFLAGS
-if
-.Ev WARNINGS
-is set.
 .It Ev CCACHE_DIR
 Sets the cache directory used when
 .Ev USE_CCACHE
@@ -1188,6 +1182,12 @@ Sets additional environment variables when
 is set to yes.
 For instance, to enable verbose logging, set
 CCACHE_ENV="CCACHE_LOGFILE=/tmp/ccache.log"
+.It Ev CDIAGFLAGS
+Flags appended to
+.Ev CFLAGS
+if
+.Ev WARNINGS
+is set.
 .It Ev CDROM_SITE
 Path to a local source that holds distribution files (usually a CD-ROM
 or other similar media), used to retrieve distribution files before going
@@ -2553,41 +2553,6 @@ checksum off
 .Pa ftp.openbsd.org ,
 in the directory
 .Pa /pub/OpenBSD/distfiles/$cipher/$value/$file .
-.It Ev TEST_DEPENDS
-See
-.Ev BUILD_DEPENDS
-for specification.
-Test dependencies are only checked if the test stage is invoked.
-.It Ev TEST_ENV
-Additional environment variables passed to tests.
-Empty by default.
-.It Ev TEST_FLAGS
-Extra flags passed to ${MAKE_PROGRAM} to run the regression tests.
-Empty by default.
-.It Ev TEST_IS_INTERACTIVE
-Set to
-.Sq Yes
-if port needs human interaction to run its tests, or set to
-.Sq X11
-if the tests need an active X11 display to work.
-.It Ev TEST_LOG
-Command used to log the results of regression tests to TEST_LOGFILE.
-.It Ev TEST_LOGFILE
-Log file containing the results of regression tests.
-.It Ev TEST_TARGET
-Target to run regression tests.
-Defaults to
-.Sq regress ,
-except for
-.Sq perl
-and
-.Sq gnu
-.Ev CONFIGURE_STYLE ,
-which default to
-.Sq test
-and
-.Sq check ,
-respectively.
 .It Ev REORDER_DEPENDENCIES
 Points to a list of files that specify inter-dependencies for
 .Xr make 1 .
@@ -2862,6 +2827,41 @@ target.
 User settings.
 Defaults to
 .Pa ${PORTSDIR}/infrastructure/templates .
+.It Ev TEST_DEPENDS
+See
+.Ev BUILD_DEPENDS
+for specification.
+Test dependencies are only checked if the test stage is invoked.
+.It Ev TEST_ENV
+Additional environment variables passed to tests.
+Empty by default.
+.It Ev TEST_FLAGS
+Extra flags passed to ${MAKE_PROGRAM} to run the regression tests.
+Empty by default.
+.It Ev TEST_IS_INTERACTIVE
+Set to
+.Sq Yes
+if port needs human interaction to run its tests, or set to
+.Sq X11
+if the tests need an active X11 display to work.
+.It Ev TEST_LOG
+Command used to log the results of regression tests to TEST_LOGFILE.
+.It Ev TEST_LOGFILE
+Log file containing the results of regression tests.
+.It Ev TEST_TARGET
+Target to run regression tests.
+Defaults to
+.Sq regress ,
+except for
+.Sq perl
+and
+.Sq gnu
+.Ev CONFIGURE_STYLE ,
+which default to
+.Sq test
+and
+.Sq check ,
+respectively.
 .It Ev TRUEPREFIX
 Read-only.
 Mostly the same as ${PREFIX}, except it never gets ${DESTDIR} prepended