From fa3b1beeaed63e63e809489c16338b7aee75f85d Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 13 Nov 2019 15:35:48 +0300
Subject: [PATCH] Update building instructions

Remove Ubuntu 14 mention, as it contains too old Go and won't build.
---
 doc/building.texi  | 26 ++++++++++++++++++++++++
 doc/install.texi   | 17 ++++++++--------
 doc/platforms.texi | 50 ----------------------------------------------
 doc/sources.texi   |  2 +-
 4 files changed, 36 insertions(+), 59 deletions(-)
 create mode 100644 doc/building.texi
 delete mode 100644 doc/platforms.texi

diff --git a/doc/building.texi b/doc/building.texi
new file mode 100644
index 0000000..1489294
--- /dev/null
+++ b/doc/building.texi
@@ -0,0 +1,26 @@
+@node Build-instructions
+@section Build instructions
+
+Make sure that Go is installed. For example to install it from packages:
+
+@table @asis
+@item FreeBSD
+    @verb{|pkg install go|}
+@item Debian, Ubuntu
+    @verb{|apt install golang|}
+@end table
+
+@verbatim
+$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.0.0.tar.xz
+$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.0.0.tar.xz.sig
+$ gpg --verify nncp-5.0.0.tar.xz.sig nncp-5.0.0.tar.xz
+$ xz --decompress --stdout nncp-5.0.0.tar.xz | tar xf -
+$ make -C nncp-5.0.0 all
+@end verbatim
+
+There is @command{install} make-target respecting @env{DESTDIR}. It will
+install binaries and info-documentation:
+
+@verbatim
+# make -C nncp-5.0.0 install PREFIX=/usr/local
+@end verbatim
diff --git a/doc/install.texi b/doc/install.texi
index db3be1d..b94b3bc 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -5,30 +5,31 @@ Possibly NNCP package already exists for your distribution:
 
 @itemize
 @item @url{https://www.freshports.org/net/nncp/, FreeBSD ports}
+@item @url{https://github.com/DragonFlyBSD/DPorts/tree/master/net/nncp, DragonFly BSD ports}
 @item @url{https://github.com/void-linux/void-packages/blob/master/srcpkgs/nncp/template, Void Linux}
 @end itemize
 
 NNCP should run on any POSIX-compatible operating system.
 
 NNCP is written on @url{https://golang.org/, Go} programming language
-and you have to install Go compiler (1.10+ version is highly
-recommended). @emph{Make} (BSD and GNU ones are fine) is recommended for
-convenient building. @url{https://www.gnu.org/software/texinfo/,
-Texinfo} is used for building documentation.
+and you have to install Go compiler 1.10+ version. @command{Make} (BSD
+and GNU versions are fine) is recommended for convenient building.
+@url{https://www.gnu.org/software/texinfo/, Texinfo} is used for
+building documentation (although tarballs already include it).
 
 In general you must get @ref{Tarballs, the tarball}, check its
 @ref{Integrity, integrity and authenticity} and run @command{make}.
-Look for general and @ref{Platform-specific, platform-specific}
-installation instructions.
+Look for general and platform-specific @ref{Build-instructions, build
+instructions}.
 
 @menu
 * Prepared tarballs: Tarballs.
 * Tarballs integrity check: Integrity.
-* Platform-specific instructions: Platform-specific.
+* Build instructions: Build-instructions.
 * Development source code: Sources.
 @end menu
 
 @include download.texi
 @include integrity.texi
-@include platforms.texi
+@include building.texi
 @include sources.texi
diff --git a/doc/platforms.texi b/doc/platforms.texi
deleted file mode 100644
index 15da3af..0000000
--- a/doc/platforms.texi
+++ /dev/null
@@ -1,50 +0,0 @@
-@node Platform-specific
-@section Platform-specific instructions
-
-@node General
-@subsection General installation instructions
-
-Look @ref{Integrity, here} for finding public keys for tarball authentication.
-
-@verbatim
-$ wget http://www.nncpgo.org/download/nncp-5.0.0.tar.xz
-$ wget http://www.nncpgo.org/download/nncp-5.0.0.tar.xz.sig
-$ gpg --verify nncp-5.0.0.tar.xz.sig nncp-5.0.0.tar.xz
-$ xz -d --stdout nncp-5.0.0.tar.xz | tar xf nncp-5.0.0.tar
-$ make -C nncp-5.0.0 all
-@end verbatim
-
-There is @command{install} target respecting @env{DESTDIR}. It will
-install binaries and info-documentation.
-
-@node Ubuntu
-@subsection Ubuntu installation instructions
-
-Look @ref{Integrity, here} for finding public keys for tarball authentication.
-
-@table @asis
-@item Ubuntu 16.04
-
-@verbatim
-# apt install golang
-@end verbatim
-
-follow @ref{General, general} installation instructions
-
-@verbatim
-# make -C nncp-5.0.0 install PREFIX=/usr
-@end verbatim
-
-@item Ubuntu 14.04
-
-@verbatim
-# apt-get install golang-1.6
-$ wget http://www.nncpgo.org/download/nncp-3.1.tar.xz
-$ wget http://www.nncpgo.org/download/nncp-3.1.tar.xz.sig
-$ gpg --verify nncp-3.1.tar.xz.sig nncp-3.1.tar.xz
-$ tar xf nncp-3.1.tar.xz
-$ PATH=/usr/lib/go-1.6/bin:$PATH make -C nncp-3.1 all
-# make -C nncp-3.1 install PREFIX=/usr
-@end verbatim
-
-@end table
diff --git a/doc/sources.texi b/doc/sources.texi
index 1c9b386..f74985f 100644
--- a/doc/sources.texi
+++ b/doc/sources.texi
@@ -7,7 +7,7 @@ libraries source code. Because of that, it is recommended for porters
 to use @ref{Tarballs, tarballs} instead.
 
 @verbatim
-$ git clone git://git.cypherpunks.ru/nncp.git nncp
+$ git clone git://git.cypherpunks.ru/nncp.git
 $ cd nncp
 $ git checkout develop
 @end verbatim
-- 
2.44.0