Revert "Increment VERSION on the head to 1.7+dev."

[nmh] / MACHINES

diff --git a/MACHINES b/MACHINES
index d18428706c838a2b48f38eafeae262c099b04419..4ff5525335abf65688ff8fd6ca5546ee0a9d2512 100644 (file)
--- a/MACHINES
+++ b/MACHINES
@@ -8,8 +8,8 @@ platforms:
     FreeBSD 9
     FreeBSD 10
     Linux (Fedora and Ubuntu distributions)
     FreeBSD 9
     FreeBSD 10
     Linux (Fedora and Ubuntu distributions)

-    Mac OS X
-    OpenBSD
+    Mac OS X 10.9
+    OpenBSD 5.4

     Solaris 11
 
 nmh was known in the distant past to compile on the following platforms (save
     Solaris 11
 
 nmh was known in the distant past to compile on the following platforms (save


@@ -28,7 +28,7 @@ Platform-specific notes follow.
 
 Run-time package requirements:
     ncurses-libs
 
 Run-time package requirements:
     ncurses-libs

-    libdb (only needed for slocal(1))
+    gdbm, db4, or libdb (only needed for slocal(1))

     readline (if you want readline support)
     cyrus-sasl-lib / libsasl2 (if configured with --with-cyrus-sasl)
     openssl-libs / libssl (if configured with --with-tls)
     readline (if you want readline support)
     cyrus-sasl-lib / libsasl2 (if configured with --with-cyrus-sasl)
     openssl-libs / libssl (if configured with --with-tls)


@@ -36,7 +36,7 @@ Run-time package requirements:
 Additional build-time package requirements:
     flex
     ncurses-devel / libncurses5-devel
 Additional build-time package requirements:
     flex
     ncurses-devel / libncurses5-devel

-    libdb-devel / libdb-dev (only needed for slocal(1))
+    gdbm-devel, db4-devel or libdb-devel/libdb-dev (only needed for slocal(1))

     readline-devel (if you want readline support)
     cyrus-sasl-devel / libsasl2-dev (if configuring with --with-cyrus-sasl)
     openssl-devel / libssl-dev (if configuring with --with-tls)
     readline-devel (if you want readline support)
     cyrus-sasl-devel / libsasl2-dev (if configuring with --with-cyrus-sasl)
     openssl-devel / libssl-dev (if configuring with --with-tls)


@@ -45,6 +45,31 @@ Packages required to regenerate the configure script:
     autoconf
     automake
 
     autoconf
     automake
 

+------------------------------------------------------------------------------
+                                   Mac OS X
+------------------------------------------------------------------------------
+
+If configured with --with-tls on Mac OS 10.7 or later, there will be
+compile warnings from mts/smtp/smtp.c about the deprecated OpenSSL
+that is supplied with that system.  nmh will build and run with that
+OpenSSL, though it may be an old version.  Alternatively, the OpenSSL
+source code is available from http://www.openssl.org/source/.  To
+build 64-bit libraries, the OpenSSL configure command should start
+with, e.g.,
+    ./Configure darwin64-x86_64-cc
+
+To build nmh with those OpenSSL libraries, the CPPFLAGS and LDFLAGS
+can be set by adding the following to the nmh configure command line,
+or in the shell environment before calling configure or build_nmh:
+    CPPFLAGS='-D__arch64__ -IOpenSSL-include-path' LDFLAGS=-LOpenSSL-lib-path
+
+------------------------------------------------------------------------------
+                                   FreeBSD
+------------------------------------------------------------------------------
+
+Additional build-time package requirements:
+    devel/autotools
+

 ------------------------------------------------------------------------------
                                     Cygwin
 ------------------------------------------------------------------------------
 ------------------------------------------------------------------------------
                                     Cygwin
 ------------------------------------------------------------------------------