summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsean09212019-05-09 22:56:48 +0800
committersean09212019-05-09 22:56:48 +0800
commit193b7cfa79639e10cba3de2656d2e3783034419a (patch)
treea9cb0292af7d14b92e2e8c9e098f4837cc49cd84
parent706128b80984bb41c85b1e97d8e5729d5348b993 (diff)
downloadaur-193b7cfa79639e10cba3de2656d2e3783034419a.tar.gz
add conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 48a2f709e6c9..397fbedcf87a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,7 @@ pkgbase = gmt6
optdepends = gmt-coast: coastlines
optdepends = gmt-dcw: digital chart of the world polygon map
conflicts = gmt4
+ conflicts = gmt
source = https://github.com/GenericMappingTools/gmt/archive/587b28006fe1b0772fb2ded7bc7597815fba425f.tar.gz
md5sums = 71a72d584d9098f80f35923caa1659f8
diff --git a/PKGBUILD b/PKGBUILD
index 1e7779a2314a..6e346b92dad0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ optdepends=(
'python2-sphinx'
'gmt-coast: coastlines'
'gmt-dcw: digital chart of the world polygon map')
-conflicts=('gmt4')
+conflicts=('gmt4' 'gmt')
install='gmt.install'
#source=("ftp://ftp.soest.hawaii.edu/gmt/${_pkgname}-${pkgver}-src.tar.xz")
#source=("ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt/${_pkgname}-${pkgver}-src.tar.xz")