summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew T Hoare2017-07-30 21:40:12 +0100
committerMatthew T Hoare2017-07-30 21:40:12 +0100
commit473ce0c58e284a8663388b93ec7b355bfa90c061 (patch)
tree115af989de92b1e1b37c2361b518e346dc467942
parent114f41463ee1d3a9dc09558d8a77e5ad3be0a882 (diff)
downloadaur-473ce0c58e284a8663388b93ec7b355bfa90c061.tar.gz
Added other AUR mksh packages to conflicts array.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5b7ea469411..af4a1b1e3ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sun Jul 30 14:20:00 UTC 2017
+# Sun Jul 30 20:40:05 UTC 2017
pkgbase = mksh-static-git
pkgdesc = The MirBSD Korn Shell - an enhanced version of the public domain ksh
pkgver = 55
@@ -12,6 +12,8 @@ pkgbase = mksh-static-git
makedepends = git
depends = glibc
conflicts = mksh
+ conflicts = mksh-static
+ conflicts = mksh-git
source = mksh::git+http://github.com/MirBSD/mksh#branch=master
source = https://www.mirbsd.org/TaC-mksh.txt
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8b2b2c71a1a..29c5397f2ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ license=('custom')
arch=('i686' 'x86_64')
depends=('glibc') # Make namcap happy.
makedepends=('git')
-conflicts=('mksh')
+conflicts=('mksh' 'mksh-static' 'mksh-git')
install=mksh.install
source=('mksh::git+http://github.com/MirBSD/mksh#branch=master'
'https://www.mirbsd.org/TaC-mksh.txt')