summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD20
-rw-r--r--configure.local14
-rw-r--r--mandoc.service11
-rw-r--r--mandoc.timer7
5 files changed, 48 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25282be82dd..d0edb12b2b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,22 @@
pkgbase = mandoc
pkgdesc = A suite of tools compiling mdoc from the OpenBSD project
- pkgver = 1.13.4
+ pkgver = 1.14.1
pkgrel = 1
url = http://mdocml.bsd.lv/
arch = i686
arch = x86_64
license = custom: ISC
- depends = sqlite
- source = http://mdocml.bsd.lv/snapshots/mdocml-1.13.4.tar.gz
+ depends = zlib
+ provides = man
+ conflicts = man
+ source = http://mdocml.bsd.lv/snapshots/mdocml-1.14.1.tar.gz
source = configure.local
- sha256sums = 0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef
- sha256sums = 3821922c5cbafb93f48f8224befbd61c48f7742f46ef608b652cb545c46f8f87
+ source = mandoc.service
+ source = mandoc.timer
+ sha256sums = 356954f141ec6f5635e938c826f2e16e4619bb361c64d84a31f6775d030a615b
+ sha256sums = 0a341e1fe4589c0becc46dcaf5a11c336a0cf9cb05e000fe3210880407dfe867
+ sha256sums = 2091411d5f87a3c371a5ba74b4773d1e454046446fa2cb045485979e52419bb6
+ sha256sums = 79d4e73b6c8cab7e12d11f8b4574790938064b42effbb02afadc1548dfcf5cc4
pkgname = mandoc
diff --git a/PKGBUILD b/PKGBUILD
index c281b3379dd..80410dba039 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,24 @@
-# Maintainer: Ralph Holmes <ybden@ybden.com>
+# Maintainer: Erin Kinsley <ybden@ybden.com>
# Contributor: Matheus de Alcantara <matheus.de.alcantara@gmail.com>
pkgname=mandoc
-pkgver=1.13.4
+pkgver=1.14.1
pkgrel=1
pkgdesc='A suite of tools compiling mdoc from the OpenBSD project'
arch=('i686' 'x86_64')
url='http://mdocml.bsd.lv/'
license=('custom: ISC')
-depends=('sqlite')
+depends=('zlib')
+provides=('man')
+conflicts=('man')
source=("http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz"
- 'configure.local')
-sha256sums=('0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef'
- '3821922c5cbafb93f48f8224befbd61c48f7742f46ef608b652cb545c46f8f87')
+ 'configure.local'
+ 'mandoc.service'
+ 'mandoc.timer')
+sha256sums=('356954f141ec6f5635e938c826f2e16e4619bb361c64d84a31f6775d030a615b'
+ '0a341e1fe4589c0becc46dcaf5a11c336a0cf9cb05e000fe3210880407dfe867'
+ '2091411d5f87a3c371a5ba74b4773d1e454046446fa2cb045485979e52419bb6'
+ '79d4e73b6c8cab7e12d11f8b4574790938064b42effbb02afadc1548dfcf5cc4')
prepare() {
cp "$srcdir"/configure.local mdocml-$pkgver
@@ -26,6 +32,6 @@ build() {
package() {
cd mdocml-$pkgver
- make -j1 install DESTDIR="$pkgdir"
+ DESTDIR="$pkgdir" make install
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/configure.local b/configure.local
index 2de54855c32..fd13d656b53 100644
--- a/configure.local
+++ b/configure.local
@@ -1,16 +1,14 @@
+# 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
-MANM_ROFF=mandoc_roff
-MANM_EQN=mandoc_eqn
-MANM_TBL=mandoc_tbl
-
-BINM_MAN=mman
-BINM_SOELIM=msoelim
-BINM_APROPOS=mapropos
-BINM_WHATIS=mwhatis
+# _FORTIFY_SOURCE doesn't work unless an optimisation level is specified.
CFLAGS="$CFLAGS -O2"
diff --git a/mandoc.service b/mandoc.service
new file mode 100644
index 00000000000..a9f903b4ebe
--- /dev/null
+++ b/mandoc.service
@@ -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
diff --git a/mandoc.timer b/mandoc.timer
new file mode 100644
index 00000000000..78e53b7fe1c
--- /dev/null
+++ b/mandoc.timer
@@ -0,0 +1,7 @@
+[Unit]
+Description=Daily manpage database update
+
+[Timer]
+OnCalendar=daily
+AccuracySec=1d
+Persistent=true