updated README. new rules for installing with --custom-bin

2 files changed, 104 insertions, 22 deletions

diff --git a/README.md b/README.md
index 62d55af..0cc31bc 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,85 @@
-TeX Live for OpenBSD
-====================
+TeX Live for *Open*BSD
+======================
 
-There are two ways to use TeX Live in OpenBSD.
+There are two ways of using TeX Live in OpenBSD.
 
 1. From ports. TeX Live is available in variety of “schemes” to wit
    different sets of package collections, of which a list can be found
-   on the
-   [openports.pl](https://openports.pl/search?file=&pkgname=texlive)
-   website.[^1]
+   on
+   [openports.pl](https://openports.pl/search?file=&pkgname=texlive)fa.[^1]
 2. By installing the “native” TeX Live over the internet, as described
    on [its home page](https://tug.org/texlive). This latter method
-   makes it easy to install new packages and to update existing
-   ones. However, the binaries for OpenBSD are not currently part of
-   the official TeX Live distribution. The reason for this is 
+   facilitates the installation of new packages and the updating of
+   existing ones.  However, the binaries for OpenBSD are not currently
+   part of the official TeX Live distribution. The reason for this is
+   that the TeX Live binaries are published once a year while the
+   OpenBSD system undergoes two updates a year.
+   
+This page provides an easy way to build one's own TeX Live binaries
+for OpenBSD—either -stable or -current—through a simple script which
+is nothing but an adapted version of the one used to build TeX Live
+for the supported systems.[^2]
 
-References
-----------
+In addition, *TeX Live for OpenBSD* provides ready-to-use binary sets
+for those who do not wish to compile their own.
+
+In addition to the standard binaries supported by TeX Live, TeX Live
+for OpenBSD provides the following:
+- xindy
+- LuaMetaTeX (ConTeXt)
+- asymptote
+
+Installing TeX Live on OpenBSD with ready-to-use binaries
+---------------------------------------------------------
+
+Please read first the reference page on this matter:
+<https://tug.org/texlive/custom-bin.html>.
+
+1. Requirements:
+   - curl
+   - gpg
+   - xz
+   - p5-Tk
+2. Import the public key used to sign the archive:
+```sh
+gpg --keyserver pgp.mit.edu  --recv 1773E9248085C8C7
+```
+3. Clone this git repository and fetch the binaries:
+```sh
+git clone https://git.sr.ht/~ralessi/texlive-openbsd
+cd texlive-openbsd
+make fetch
+```
+4. Proceed with TL installation, as per the instructions displayed on
+   the terminal.
+
+### All by hand
+Direct link to the binaries: <https://www.ekdosis.org/texlive>.
+
+Updating the binaries over the course of the year
+-------------------------------------------------
+
+The requirements are the same as above.
+
+1. Go to the directory where the texlive-openbsd git repository was
+   cloned, then do:
+```sh
+make
+```
+2. Proceed as per the instructions displayed on the terminal.
+
+Alternatively, the direct link to the binaries provided above can be
+used.
+
+Building the sources
+--------------------
+
+### References
 - General information: <https://tug.org/texlive/build.html>
 - Building GNU CLISP for xindy:
   <https://tug.org/svn/texlive/trunk/Build/source/utils/README?view=markup>
 
-Requirements
-------------
+### Requirements
 - For texlive
   - git
   - gmake
@@ -36,17 +94,26 @@ Requirements
   - freeglut
   - readline
 
-Getting the sources
--------------------
+### Getting the sources
 ```sh
-checkout-tl.sh
+./checkout-tl.sh
 ```
 
-Building the binaries
----------------------
+### Building
 ```sh
-tl-build.sh
+./tl-build.sh
 ```
 
+Acknowledgements
+----------------
+Special thanks go to the following people for their work and kind
+advice: Karl Berry, Nelson H. F. Beebe, Norbert Preining and Mojca
+Miklavec.
+
+Notes
+-----
 [^1]: More information on how TL is built for OpenBSD here:
     <https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/print/texlive>
+
+[^2]: See <https://tug.org/texlive/build.html>. The `Build` script can
+    be found here: <https://tug.org/svn/texlive/trunk/Build/source>.
diff --git a/makefile b/makefile
index 28dce7f..e5ba378 100644
--- a/makefile
+++ b/makefile
@@ -5,7 +5,7 @@ OPENBSD_VERSION!=uname -r | sed 's/\.//'
 TLBINPATH!=which latex | sed 's/\/latex//'
 TMPSOURCE?=""
 
-.MAIN: fetch
+.MAIN: update
 
 fetch:
         curl ${BINREPO}/amd64-openbsd${OPENBSD_VERSION}.tar.xz \
@@ -13,9 +13,24 @@ fetch:
         curl ${BINREPO}/amd64-openbsd${OPENBSD_VERSION}.tar.xz.asc \
                 > ${TMPDIR}/amd64-openbsd${OPENBSD_VERSION}.tar.xz.asc
         gpg --verify ${TMPDIR}/amd64-openbsd${OPENBSD_VERSION}.tar.xz.asc
+        unxz ${TMPDIR}/amd64-openbsd${OPENBSD_VERSION}.tar.xz
+        mkdir ${TMPDIR}/bin \
+                && tar xf ${TMPDIR}/amd64-openbsd${OPENBSD_VERSION}.tar \
+                -C ${TMPDIR}/bin
+        @echo "Looks good."
+        @echo "Now do this to install TeX Live with custom binaries:"
+        @echo "  cd /path/to/install-tl"
+        @echo "  ./install-tl --custom-bin=${TMPDIR}/bin"
+
+update:
+        curl ${BINREPO}/amd64-openbsd${OPENBSD_VERSION}.tar.xz \
+                > ${TMPDIR}/amd64-openbsd${OPENBSD_VERSION}.tar.xz
+        curl ${BINREPO}/amd64-openbsd${OPENBSD_VERSION}.tar.xz.asc \
+                > ${TMPDIR}/amd64-openbsd${OPENBSD_VERSION}.tar.xz.asc
+        gpg --verify ${TMPDIR}/amd64-openbsd${OPENBSD_VERSION}.tar.xz.asc
 .if "${PREFIX}" == ${TLBINPATH}
         @echo "Looks good."
-        @echo "Now do this to install or update the binaries:"
+        @echo "Now do this to update the binaries:"
         @echo "1. Remove the binaries that are currently installed:"
         @echo "   doas rm ${PREFIX}/*"
         @echo "2. Run this command:"
@@ -31,4 +46,4 @@ install:
         unxz ${TMPSOURCE}/amd64-openbsd${OPENBSD_VERSION}.tar.xz
         doas tar xf ${TMPSOURCE}/amd64-openbsd${OPENBSD_VERSION}.tar -C ${PREFIX}/
 
-.PHONY: fetch install
+.PHONY: fetch update install