paper: update to to 2.2

4 files changed, 127 insertions, 5 deletions

diff --git a/paper/.signature b/paper/.signature
index 645f5d9b5..f5f29b81a 100644
--- a/paper/.signature
+++ b/paper/.signature
@@ -1,5 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fXyvM8oE+XOCgywDME2qKqOOL8u1Zz1RXpcB9WLPptfwydHbO3K6f6K2lUbKv4ePp+NVOJdnw4oN7crxEG+mQs=
-SHA256 (Pkgfile) = f4a9de4b5a03191481cd127fc776a0fdd598604747c4206ce5ec0f520a23ef4e
+RWSE3ohX2g5d/fmd/BVy8YMQuBiZH+foxGRBJKZR9sFcJty/mBQNgUIfsLmp/J3ZqPDJgwYZqLbIcPQIgbiQlLt/t0LbURjUnQI=
+SHA256 (Pkgfile) = 8f8037899e8fad7344d28b660789bf30f22aa780b110fd22f22ae68608b1ed78
 SHA256 (.footprint) = 18217c4b7f4d64174776f7a7ac27f54ea3318fe593cad82a00f86b600e9807e4
-SHA256 (paper-2.0.tar.xz) = 9acfa58cbeaa61c897c9b9e0de4d3943041ea0b1340014f69f393b3d9421b651
+SHA256 (paper-2.2.tar.gz) = 853b1796901ac4b4a31d834a6a4591fc7fd8ec9ffb6218c67138675248a484fd
+SHA256 (paper.1) = 4e7f80c087c1ab270c7ae985ed681d12c4db3cd47d3754744c196e75bb8354ef
+SHA256 (paperspecs.5) = e1dedd734b71943f6bc8fe31094863bce6e99738cd0653cb4e384d57f68f90a7
diff --git a/paper/Pkgfile b/paper/Pkgfile
index e8a0453eb..d0549456d 100644
--- a/paper/Pkgfile
+++ b/paper/Pkgfile
@@ -3,16 +3,25 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=paper
-version=2.0
+version=2.2
 release=1
-source=(http://crux.s3.amazonaws.com/dist/$name-$version.tar.xz)
+source=(https://github.com/rrthomas/paper/releases/download/v$version/$name-$version.tar.gz
+        paper.1 paperspecs.5)
 
 build () {
     cd $name-$version
+
+    sed '/^SUBDIRS/s/man//' -i Makefile.in
+
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --libexecdir=/usr/lib/paper
     make
     make DESTDIR=$PKG install
+
+    install -d $PKG/usr/share/man/man{1,5}
+    install -m 0644 $SRC/paper.1 $PKG/usr/share/man/man1
+    install -m 0644 $SRC/paperspecs.5 $PKG/usr/share/man/man5
+
     rm -r $PKG/usr/share/doc
 }
diff --git a/paper/paper.1 b/paper/paper.1
new file mode 100644
index 000000000..bbbd25956
--- /dev/null
+++ b/paper/paper.1
@@ -0,0 +1,73 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
+.TH PAPER "1" "April 2020" "paper 2.2" "User Commands"
+.SH NAME
+paper - print paper size information
+.SH SYNOPSIS
+.B paper
+[\fI\,OPTION\/\fR...] [\fI\,PAPER\/\fR...\fI\,|--all\/\fR]
+.SH DESCRIPTION
+Print paper size information.
+.TP
+\fB\-\-all\fR
+print information about all known paper sizes
+.TP
+\fB\-\-name\fR
+print paper names (by default, the name is not
+printed when only one paper argument is given)
+.TP
+\fB\-\-size\fR
+print paper sizes (width followed by height)
+.TP
+\fB\-\-unit\fR=\fI\,UNIT\/\fR
+print dimensions in the given unit
+[default: PostScript points]
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+display version information and exit
+.PP
+.B paper
+prints information about the given paper sizes, which can include the
+standard form of its name, its width and height.
+The name is matched case-insensitively, and ignoring spaces.
+.PP
+If neither a paper size nor the \fB\-\-all\fR option is given, the current
+paper size is used.
+.PP
+The current paper size is obtained by looking in order at the following
+values until a non-empty value is found.
+If no paper size is configured, paper exits with an error.
+.IP \[bu]
+The \fBPAPERSIZE\fR environment variable
+.IP \[bu]
+The user's default paper size in
+.B $XDG_CONFIG_HOME/papersize
+.IP \[bu]
+The \fBLC_PAPER\fR environment variable (if supported by the system)
+.IP \[bu]
+The system default paper size in
+.B /etc/papersize
+.IP \[bu]
+The first paper size in the system list
+.IP \[bu]
+The first paper size in the user's list
+.SH "ENVIRONMENT VARIABLES"
+.TP
+.B PAPERSIZE
+Paper size to use.
+.SH FILES
+.TP
+.B /etc/papersize
+System default paper size.
+.TP
+.B $XDG_CONFIG_HOME/papersize
+User's default paper size.
+.SH AUTHOR
+Written by Reuben Thomas.
+.SH COPYRIGHT
+Copyright \(co 2013\-2020 Reuben Thomas <rrt@sc3d.org>.
+Released under the GPL version 3, or (at your option) any later version.
+.SH "SEE ALSO"
+.BR paperspecs (5)
diff --git a/paper/paperspecs.5 b/paper/paperspecs.5
new file mode 100644
index 000000000..b7557a2e4
--- /dev/null
+++ b/paper/paperspecs.5
@@ -0,0 +1,38 @@
+.TH PAPERSPECS 5 "11 January 2014"
+.SH NAME
+.B paperspecs
+\- paper size specifications
+.SH DESCRIPTION
+A CSV format list of the paper size specifications used by paper.
+Each line contains the following fields:
+.TP
+NAME,WIDTH,HEIGHT,UNIT
+.PP
+Valid units are: \fBpt\fR (PostScript points), \fBmm\fR, \fBin\fR.
+.PP
+A size may be defined more than once. Only the first definition is
+normally used. This means that the user's paperspecs file overrides
+sizes in the system file (see below).
+.PP
+Multiple definitions are also used to allow inexact definitions to be
+looked up by size. For example, the \fBLC_PAPER\fR mechanism available
+on some systems defines paper sizes in whole numbers of millimetres,
+which results in a definition for Letter size that does not exactly
+match the definition in inches.
+.SH FILES
+.TP
+.B /etc/paperspecs
+System list of paper sizes.
+.TP
+.B $XDG_CONFIG_HOME/paperspecs
+User's list of paper sizes. This is prepended to the system list.
+.SH BUGS
+The CSV format is restricted: quotes are not allowed; hence, fields
+cannot be escaped.
+.SH CREDITS
+The original list of paper names came from Ghostscript 3.68's
+gs_stadt.ps.
+.SH AUTHOR
+Reuben Thomas <rrt@sc3d.org>
+.SH SEE ALSO
+paper(1)