[arch-commits] Commit in mandoc/repos (6 files)

Eli Schwartz eschwartz at archlinux.org
Thu Nov 26 00:24:52 UTC 2020


    Date: Thursday, November 26, 2020 @ 00:24:52
  Author: eschwartz
Revision: 761322

archrelease: copy trunk to community-x86_64

Added:
  mandoc/repos/community-x86_64/
  mandoc/repos/community-x86_64/PKGBUILD
    (from rev 761321, mandoc/trunk/PKGBUILD)
  mandoc/repos/community-x86_64/configure.local
    (from rev 761321, mandoc/trunk/configure.local)
  mandoc/repos/community-x86_64/fix-tbl-segfault.patch
    (from rev 761321, mandoc/trunk/fix-tbl-segfault.patch)
  mandoc/repos/community-x86_64/mandoc.service
    (from rev 761321, mandoc/trunk/mandoc.service)
  mandoc/repos/community-x86_64/mandoc.timer
    (from rev 761321, mandoc/trunk/mandoc.timer)

------------------------+
 PKGBUILD               |   69 +++++++++++++++++++++++++++++++++++++++++++++++
 configure.local        |   18 ++++++++++++
 fix-tbl-segfault.patch |   20 +++++++++++++
 mandoc.service         |   11 +++++++
 mandoc.timer           |    7 ++++
 5 files changed, 125 insertions(+)

Copied: mandoc/repos/community-x86_64/PKGBUILD (from rev 761321, mandoc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2020-11-26 00:24:52 UTC (rev 761322)
@@ -0,0 +1,69 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Jakub Klinkovský <j.l.k at gmx.com>
+# Contributor: Matheus de Alcantara <matheus.de.alcantara at gmail.com>
+
+pkgname=mandoc
+pkgver=1.14.5
+pkgrel=4
+pkgdesc='A suite of tools compiling mdoc from the OpenBSD project'
+arch=('x86_64')
+url='https://mdocml.bsd.lv/'
+license=('ISC')
+depends=('zlib')
+provides=('man')
+conflicts=('man')
+source=("${url}/snapshots/${pkgname}-${pkgver}.tar.gz"
+        'configure.local'
+        'mandoc.service'
+        'mandoc.timer'
+        'fix-tbl-segfault.patch')
+sha256sums=('8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7'
+            '383772d5dd7c51319588ac4b63d4e7c452490568f6a3e905d118fdd6c4aa8a68'
+            '2091411d5f87a3c371a5ba74b4773d1e454046446fa2cb045485979e52419bb6'
+            '74d6a02b97a17fffddcc0a3dc830e811348b1f6c6b84f867882c776d50f00ea4'
+            '12e6138be6ec2e8a34373876d8a5fce387a1d2b51a461ae20e1d98637af1d15c')
+
+prepare() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+
+    cp ../configure.local .
+
+    # broken script tries to execute make to get $CC, fails due to env -i
+    # see https://savannah.gnu.org/bugs/index.php?57674
+    # fixed in CVS
+    sed -i -e 's/^CC=.*/CC=cc/' ./configure
+
+    # fix segfault when formatting tables on some man pages
+    # fixed in CVS
+    patch -Np0 -i ../fix-tbl-segfault.patch
+
+    # remove useless duplicate global variables
+    # broken with gcc 10 -fno-common, unused
+    # fixed in CVS
+    sed -i -e '/^int dummy;$/d' ./compat_*.c
+}
+
+build() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+
+    # apply CFLAGS and LDFLAGS from makepkg.conf
+    {
+        echo "CFLAGS=${CFLAGS at Q}"
+        echo "LDFLAGS=${LDFLAGS at Q}"
+    } >> configure.local
+
+    ./configure
+    make
+}
+
+package() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+
+    DESTDIR="${pkgdir}" make install
+    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+    install -Dm644 "${srcdir}"/mandoc.timer "${pkgdir}"/usr/lib/systemd/system/mandoc.timer
+    install -Dm644 "${srcdir}"/mandoc.service "${pkgdir}"/usr/lib/systemd/system/mandoc.service
+    install -dm755 "${pkgdir}"/usr/lib/systemd/system/multi-user.target.wants
+    ln -s ../mandoc.timer "${pkgdir}"/usr/lib/systemd/system/multi-user.target.wants/mandoc.timer
+}

Copied: mandoc/repos/community-x86_64/configure.local (from rev 761321, mandoc/trunk/configure.local)
===================================================================
--- community-x86_64/configure.local	                        (rev 0)
+++ community-x86_64/configure.local	2020-11-26 00:24:52 UTC (rev 761322)
@@ -0,0 +1,18 @@
+# Arch $MANPATH.
+MANPATH_DEFAULT=/usr/local/share/man:/usr/share/man
+
+# Arch paths.
+PREFIX=/usr
+SBINDIR=$PREFIX/bin
+MANDIR=$PREFIX/share/man
+
+# These conflict with man(7) and mdoc(7) from man-pages.
+MANM_MAN=mandoc_man
+MANM_MDOC=mandoc_mdoc
+
+# These conflict with binaries and manpages from groff.
+BINM_SOELIM=msoelim
+MANM_ROFF=mandoc_roff
+
+# catman(8) is disabled by default.
+BUILD_CATMAN=1

Copied: mandoc/repos/community-x86_64/fix-tbl-segfault.patch (from rev 761321, mandoc/trunk/fix-tbl-segfault.patch)
===================================================================
--- community-x86_64/fix-tbl-segfault.patch	                        (rev 0)
+++ community-x86_64/fix-tbl-segfault.patch	2020-11-26 00:24:52 UTC (rev 761322)
@@ -0,0 +1,20 @@
+--- tbl_term.c	2020-08-18 12:35:27.290953791 +0200
++++ tbl_term.c	2020-08-18 12:35:23.450952148 +0200
+@@ -626,7 +626,7 @@
+ 
+ 		lw = cpp == NULL || cpn == NULL ||
+ 		    (cpn->pos != TBL_CELL_DOWN &&
+-		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
++		     (dpn == NULL || dpn->pos == TBL_DATA_NONE || strcmp(dpn->string, "\\^") != 0))
+ 		    ? hw : 0;
+ 		tbl_direct_border(tp, BHORIZ * lw,
+ 		    col->width + col->spacing / 2);
+@@ -670,7 +670,7 @@
+ 
+ 		rw = cpp == NULL || cpn == NULL ||
+ 		    (cpn->pos != TBL_CELL_DOWN &&
+-		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
++		     (dpn == NULL || dpn->pos == TBL_DATA_NONE || strcmp(dpn->string, "\\^") != 0))
+ 		    ? hw : 0;
+ 
+ 		/* The line crossing at the end of this column. */

Copied: mandoc/repos/community-x86_64/mandoc.service (from rev 761321, mandoc/trunk/mandoc.service)
===================================================================
--- community-x86_64/mandoc.service	                        (rev 0)
+++ community-x86_64/mandoc.service	2020-11-26 00:24:52 UTC (rev 761322)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Update manpage database
+RequiresMountsFor=/usr/share/man
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/makewhatis
+CPUSchedulingPolicy=batch
+Nice=19
+IOSchedulingClass=idle
+IOSchedulingPriority=7

Copied: mandoc/repos/community-x86_64/mandoc.timer (from rev 761321, mandoc/trunk/mandoc.timer)
===================================================================
--- community-x86_64/mandoc.timer	                        (rev 0)
+++ community-x86_64/mandoc.timer	2020-11-26 00:24:52 UTC (rev 761322)
@@ -0,0 +1,7 @@
+[Unit]
+Description=Daily manpage database update
+
+[Timer]
+OnCalendar=daily
+AccuracySec=12h
+Persistent=true


More information about the arch-commits mailing list