boxtron-git no longer compatible with boxtron

Changes in the Makefile has made it more involved to install boxtron and
boxtron-git to separate locations so that they’re both available.
Dropping the option for co-existance for now at least.

2 files changed, 6 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f85a3ef5bdee..d2f7fc5ad6aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = boxtron-git
 	pkgdesc = Compatibility tool to run DOS games on Steam through native Linux DOSBox
 	pkgver = 0.5.3.r6.8aa2e4e
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/dreamer/boxtron
 	arch = i686
 	arch = x86_64
@@ -13,6 +13,8 @@ pkgbase = boxtron-git
 	depends = timidity++
 	optdepends = steam: The Steam client
 	optdepends = soundfont-fluid: required for MIDI support, but another soundfont can be used
+	provides = boxtron
+	conflicts = boxtron
 	source = git+https://github.com/dreamer/boxtron.git
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index c1682c33cd4b..92e8eca5a363 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,15 @@
 pkgname=boxtron-git
 _pkgname="${pkgname%-git}"
 pkgver=0.5.3.r6.8aa2e4e
-pkgrel=1
+pkgrel=2
 pkgdesc='Compatibility tool to run DOS games on Steam through native Linux DOSBox'
 arch=('i686' 'x86_64')
 url="https://github.com/dreamer/$_pkgname"
 license=('GPL')
 depends=('python' 'dosbox' 'inotify-tools' 'timidity++')
 makedepends=('git')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
 optdepends=(
   'steam: The Steam client'
   'soundfont-fluid: required for MIDI support, but another soundfont can be used')
@@ -20,12 +22,6 @@ pkgver() {
   git describe --long --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "$_pkgname"
-  sed -i -E '/^tool_(name|dir) +=/s/$/-git/' Makefile
-  sed -i -E '/^tool_name_display +=/s/$/ (git)/' Makefile
-}
-
 check() {
   cd "$_pkgname"
   make test