Add basic_trains

2 files changed, 16 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9faae87c6e1..6dff545a9216 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
-# Generated by mksrcinfo v8
-# Sat Oct 13 20:15:10 UTC 2018
 pkgbase = minetest-mod-advtrains-git
 	pkgdesc = This mod adds good-looking, realistic trains to minetest. It also introduces rails that make turns of only 30 degrees instead of 90. (Mod for Minetest)
-	pkgver = 380.a71041b
+	pkgver = 776.e04c21b.b40.c51aa6c
 	pkgrel = 1
+	epoch = 1
 	url = https://git.bananach.space/advtrains
 	install = minetest-mod-advtrains-git.install
 	arch = any
@@ -11,7 +10,10 @@ pkgbase = minetest-mod-advtrains-git
 	makedepends = git
 	optdepends = minetest-usrdir_patch
 	provides = minetest-mod-advtrains
+	provides = minetest-mod-basic_trains
 	source = minetest-mod-advtrains::git+https://git.bananach.space/advtrains.git
+	source = minetest-mod-basic_trains::git+https://git.bananach.space/basic_trains.git
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = minetest-mod-advtrains-git
diff --git a/PKGBUILD b/PKGBUILD
index d58657acc90c..46fcbe6e8bca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,10 @@
 
 pkgname=minetest-mod-advtrains-git
 _gitname=${pkgname%-git*}
-pkgver=380.a71041b
+_basic_trains=minetest-mod-basic_trains
+pkgver=776.e04c21b.b40.c51aa6c
 pkgrel=1
+epoch=1
 pkgdesc='This mod adds good-looking, realistic trains to minetest. It also introduces rails that make turns of only 30 degrees instead of 90. (Mod for Minetest)'
 arch=('any')
 url="https://git.bananach.space/advtrains"
@@ -11,19 +13,23 @@ license=('custom')
 depends=()
 optdepends=('minetest-usrdir_patch')
 makedepends=('git')
-provides=("$_gitname")
+provides=("$_gitname" "$_basic_trains")
 install=$pkgname.install
-source=("$_gitname::git+https://git.bananach.space/advtrains.git")
-md5sums=('SKIP')
+source=("$_gitname::git+https://git.bananach.space/advtrains.git"
+        "$_basic_trains::git+https://git.bananach.space/basic_trains.git")
+md5sums=('SKIP' 'SKIP')
 
 pkgver() {
   cd "$srcdir/$_gitname"
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+  echo $(git rev-list --count master).$(git rev-parse --short master).b$(git -C "$srcdir/$_basic_trains" rev-list --count master).$(git -C "$srcdir/$_basic_trains" rev-parse --short master)
 }
 
 package() {
   cd "$srcdir/$_gitname"
   mkdir -p "$pkgdir/usr/share/minetest/mods/${_gitname#*mod-}"
   cp -r * "$pkgdir/usr/share/minetest/mods/${_gitname#*mod-}"
+  cd "$srcdir/$_basic_trains"
+  mkdir -p "$pkgdir/usr/share/minetest/mods/${_basic_trains#*mod-}"
+  cp -r * "$pkgdir/usr/share/minetest/mods/${_basic_trains#*mod-}"
 }