summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorErin Kinsley2018-04-16 20:21:01 +0100
committerErin Kinsley2018-04-16 20:21:01 +0100
commitbb05e08e0374e74d49cfb2b7a837deef438d1232 (patch)
treeac684fb0ca6d4dfd8e6aa7ab12a2072bad4caa65
parent836747dab712b5ebdbe7aff445bcef23162b9002 (diff)
downloadaur-bb05e08e0374e74d49cfb2b7a837deef438d1232.tar.gz
Remove conflict with groff.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
-rw-r--r--configure.local4
3 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3c3c85196cc..36ef9f78951 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mandoc
pkgdesc = A suite of tools compiling mdoc from the OpenBSD project
pkgver = 1.14.3
- pkgrel = 1
+ pkgrel = 2
url = http://mdocml.bsd.lv/
arch = i686
arch = x86_64
@@ -9,13 +9,12 @@ pkgbase = mandoc
depends = zlib
provides = man
conflicts = man
- conflicts = groff
source = http://mdocml.bsd.lv/snapshots/mandoc-1.14.3.tar.gz
source = configure.local
source = mandoc.service
source = mandoc.timer
sha256sums = 0b0c8f67958c1569ead4b690680c337984b879dfd2ad4648d96924332fd99528
- sha256sums = 2ab7b2c4f7511de4b1132d718be04286911a562962bc415d6261c5c0ae595e6b
+ sha256sums = f0e8ddb61d063bec02a6a1f73f5d979bb548e7aabcf0a27c0d5c29c4194bfc8e
sha256sums = 2091411d5f87a3c371a5ba74b4773d1e454046446fa2cb045485979e52419bb6
sha256sums = 79d4e73b6c8cab7e12d11f8b4574790938064b42effbb02afadc1548dfcf5cc4
diff --git a/PKGBUILD b/PKGBUILD
index 7c2b6071ca4..4a3c25e9460 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,20 @@
pkgname=mandoc
pkgver=1.14.3
-pkgrel=1
+pkgrel=2
pkgdesc='A suite of tools compiling mdoc from the OpenBSD project'
arch=('i686' 'x86_64')
url='http://mdocml.bsd.lv/'
license=('custom: ISC')
depends=('zlib')
provides=('man')
-conflicts=('man' 'groff')
+conflicts=('man')
source=("http://mdocml.bsd.lv/snapshots/$pkgname-$pkgver.tar.gz"
'configure.local'
'mandoc.service'
'mandoc.timer')
sha256sums=('0b0c8f67958c1569ead4b690680c337984b879dfd2ad4648d96924332fd99528'
- '2ab7b2c4f7511de4b1132d718be04286911a562962bc415d6261c5c0ae595e6b'
+ 'f0e8ddb61d063bec02a6a1f73f5d979bb548e7aabcf0a27c0d5c29c4194bfc8e'
'2091411d5f87a3c371a5ba74b4773d1e454046446fa2cb045485979e52419bb6'
'79d4e73b6c8cab7e12d11f8b4574790938064b42effbb02afadc1548dfcf5cc4')
diff --git a/configure.local b/configure.local
index b3ea0a01539..8abc16b1b84 100644
--- a/configure.local
+++ b/configure.local
@@ -10,6 +10,10 @@ MANDIR=$PREFIX/share/man
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