- section reorder

- macro fixes
- kill whitespace at EOL

5 files changed, 58 insertions, 56 deletions

diff --git a/share/man/man7/library-specs.7 b/share/man/man7/library-specs.7
index 48916dd7407..10edafee894 100644
--- a/share/man/man7/library-specs.7
+++ b/share/man/man7/library-specs.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: library-specs.7,v 1.3 2003/04/13 11:06:21 jmc Exp $
+.\" $OpenBSD: library-specs.7,v 1.4 2003/06/06 13:44:29 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Marc Espie
 .\"
@@ -84,12 +84,12 @@ Failure to mention
 .Ev RUN_DEPENDS
 if the port needs anything beyond libraries from the dependent port will
 lead to strange errors.
-.Sh HISTORY
-Full support for library specifications first appeared in
-.Ox 3.1 .
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
 .Xr bsd.port.mk 5 ,
-.Xr packages-specs 7 ,
 .Xr packages 7 ,
+.Xr packages-specs 7 ,
 .Xr ports 7
+.Sh HISTORY
+Full support for library specifications first appeared in
+.Ox 3.1 .
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
index a097d0b8167..33951ca434b 100644
--- a/share/man/man7/mailaddr.7
+++ b/share/man/man7/mailaddr.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mailaddr.7,v 1.7 2003/06/02 23:30:15 millert Exp $
+.\"	$OpenBSD: mailaddr.7,v 1.8 2003/06/06 13:44:29 jmc Exp $
 .\"	$NetBSD: mailaddr.7,v 1.3 1994/11/30 19:07:17 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1990, 1993
@@ -163,7 +163,7 @@ respectively.
 .Xr sendmail 8
 .Pp
 Crocker, D. H.,
-.Em Standard for the Format of Arpa Internet Text Messages,
+.Em "Standard for the Format of Arpa Internet Text Messages" ,
 RFC822.
 .Sh HISTORY
 .Nm
diff --git a/share/man/man7/mirroring-ports.7 b/share/man/man7/mirroring-ports.7
index d7329c0d06f..23652baa3bd 100644
--- a/share/man/man7/mirroring-ports.7
+++ b/share/man/man7/mirroring-ports.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mirroring-ports.7,v 1.9 2003/03/16 10:30:26 avsm Exp $
+.\" $OpenBSD: mirroring-ports.7,v 1.10 2003/06/06 13:44:30 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Marc Espie
 .\"
@@ -163,6 +163,25 @@ releases happen every six months, this delay should be longer than that.
 Sample scripts are provided in the
 .Pa ${PORTSDIR}/infrastructure/fetch
 directory.
+.Sh FILES
+.Bl -tag -width XXXXXXXXX -compact
+.It Pa ${DISTDIR}/Makefile
+Main mirroring Makefile
+.It Pa ${PORTSDIR}/infrastructure/fetch/fetch-all
+Sample script usable to retrieve distfiles.
+.It Pa ${PORTSDIR}/infrastructure/fetch/check-all
+Sample script to check all distfiles checksums.
+.It Pa ${PORTSDIR}/infrastructure/fetch/link-checksums
+Populating checksums subdirectories with links, to guard against shifting
+checksums.
+.El
+.Sh SEE ALSO
+.Xr ports 7
+.Sh HISTORY
+This infrastructure was introduced for
+.Ox 2.7
+by Marc Espie, with feedback from Bob Beck, Todd Fries, Camiel Dobbelaar,
+and a few other people.
 .Sh CAVEATS
 Changing checksums is a recurring problem that is outside the direct
 control of the
@@ -196,22 +215,3 @@ Starting revision 1.281, if
 is set to true,
 .Pa bsd.port.mk
 will try to retrieve files under that naming scheme as a last resort.
-.Sh FILES
-.Bl -tag -width XXXXXXXXX -compact
-.It Pa ${DISTDIR}/Makefile
-Main mirroring Makefile
-.It Pa ${PORTSDIR}/infrastructure/fetch/fetch-all
-Sample script usable to retrieve distfiles.
-.It Pa ${PORTSDIR}/infrastructure/fetch/check-all
-Sample script to check all distfiles checksums.
-.It Pa ${PORTSDIR}/infrastructure/fetch/link-checksums
-Populating checksums subdirectories with links, to guard against shifting
-checksums.
-.El
-.Sh HISTORY
-This infrastructure was introduced for
-.Ox 2.7
-by Marc Espie, with feedback from Bob Beck, Todd Fries, Camiel Dobbelaar,
-and a few other people.
-.Sh SEE ALSO
-.Xr ports 7
diff --git a/share/man/man7/packages-specs.7 b/share/man/man7/packages-specs.7
index d55154d1dca..6809d83a5fb 100644
--- a/share/man/man7/packages-specs.7
+++ b/share/man/man7/packages-specs.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: packages-specs.7,v 1.5 2003/04/13 11:06:21 jmc Exp $
+.\" $OpenBSD: packages-specs.7,v 1.6 2003/06/06 13:44:30 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Marc Espie
 .\"
@@ -203,12 +203,12 @@ would decide to bring in
 .Qq bar ,
 and so would check on
 .Qq toughluck .
-.Sh HISTORY
-Support for these package specifications first appeared in
-.Ox 2.9 .
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
 .Xr bsd.port.mk 5 ,
 .Xr library-specs 7 ,
 .Xr packages 7 ,
 .Xr ports 7
+.Sh HISTORY
+Support for these package specifications first appeared in
+.Ox 2.9 .
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 9d3cca11c2f..43a236e8b41 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -23,7 +23,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.
 .\"
-.\" $OpenBSD: ports.7,v 1.33 2003/04/15 07:02:40 david Exp $
+.\" $OpenBSD: ports.7,v 1.34 2003/06/06 13:44:30 jmc Exp $
 .\" $FreeBSD: ports.7,v 1.7 1998/06/23 04:38:50 hoek Exp $
 .\"
 .Dd January 25, 1998
@@ -128,9 +128,11 @@ line, e.g., to avoid stopping after each problem.
 .Ed
 .Pp
 The targets that do this are
-.Ar build , checksum , clean , configure , extract , fake, fetch ,
-.Ar install , distclean , deinstall, reinstall, mirror-distfiles, obj ,
-.Ar package , cdrom-packages , link-categories, unlink-categories ,
+.Ar build , checksum , clean , configure ,
+.Ar extract , fake , fetch , install ,
+.Ar distclean , deinstall , reinstall , mirror-distfiles ,
+.Ar obj , package , cdrom-packages , link-categories ,
+.Ar unlink-categories ,
 and
 .Ar ftp-packages .
 .Pp
@@ -264,14 +266,14 @@ If
 and
 .Ev BULK
 are set to
-.Sq Yes 
+.Sq Yes
 for a package build, some shortcuts are taken to allow cleaning up working
 directories on the fly.
 .Pp
 Some important caveats apply:
-the packages already built in the package repository are assumed to be 
-up-to-date (BIN_PACKAGES), the database of installed packages is assumed 
-to be accurate (TRUST_PACKAGES), and the bulk cookies are assumed to be 
+the packages already built in the package repository are assumed to be
+up-to-date (BIN_PACKAGES), the database of installed packages is assumed
+to be accurate (TRUST_PACKAGES), and the bulk cookies are assumed to be
 up-to-date (BULK).
 .Pp
 This means that newer iterations of package buildings should make sure
@@ -309,27 +311,27 @@ Go to this site first for all files.
 The
 .Ox
 ports tree comes with a mechanism called
-.Ic FLAVORS.
+.Ic FLAVORS .
 Thanks to this mechanism, users can select specific options provided by
 a given port.
 .Pp
-If a port is "flavored", there should be a terse description of 
+If a port is "flavored", there should be a terse description of
 available flavors in the
 .Pa pkg/DESCR
 file.
 .Pp
 For example, the shells/bash port comes with a flavor called
-.Ic static.
+.Ic static .
 This changes the building process so a statically compiled version of
-the program will be built. 
-To avoid confusion with other packages or flavors, 
+the program will be built.
+To avoid confusion with other packages or flavors,
 the package name will be extended with a dash-separated list of
 the selected flavors.
 .Pp
 In this instance, the corresponding package will be called
 .Ic bash-1.14.7p1-static .
 .Pp
-To build a port with a specific flavor, just pass 
+To build a port with a specific flavor, just pass
 .Ev FLAVOR
 in the environment of the
 .Xr make 1
@@ -358,7 +360,7 @@ combinations, when such combinations do not make sense.
 Lots of ports can be built without X11 requirement and accordingly
 have a
 .Ic no_x11
-flavor. 
+flavor.
 .Pp
 Flavor settings are not propagated to dependencies.
 If a specific combination is needed, careful hand-building of the
@@ -381,7 +383,7 @@ should not be changed by the user, and are liable to change without notice.
 .It Ev PORTSDIR
 Location of the ports tree
 .Po
-usually 
+usually
 .Pa /usr/ports
 .Pc
 .It Ev DISTDIR
@@ -406,10 +408,10 @@ Directory to put the package in.
 The full path to the package.
 .El
 .It Ev BULK_COOKIES_DIR
-During bulk package building, used to store cookies for already built 
-packages to avoid rebuilding them, since the actual  
-working directory will already have been cleaned out. 
-Defaults to bulk/${MACHINE_ARCH} under 
+During bulk package building, used to store cookies for already built
+packages to avoid rebuilding them, since the actual
+working directory will already have been cleaned out.
+Defaults to bulk/${MACHINE_ARCH} under
 .Ev PORTSDIR .
 .It Ev LOCALBASE
 Where to install things in general
@@ -493,11 +495,6 @@ Ports Mechanism: http://www.openbsd.org/ports.html
 The
 .Ox
 Porting Checklist: http://www.openbsd.org/checklist.html
-.Sh AUTHORS
-This man page was originated by
-David O'Brien, from the
-.Fx
-project.
 .Sh HISTORY
 .Nm The Ports Collection
 appeared in
@@ -508,6 +505,11 @@ by Ejovi Nuwere, with much initial effort by Angelos D. Keromytis.
 Maintenance passed then to Marco S. Hyman, and then to Christopher Turan.
 It is currently managed by Marc Espie, Brad Smith, and Christian Weisgerber,
 along with a host of others found at ports@openbsd.org.
+.Sh AUTHORS
+This man page was originated by
+David O'Brien, from the
+.Fx
+project.
 .Sh BUGS
 Ports documentation is split over several places ---
 .Xr bsd.port.mk 5 ,