3 files changed, 88 insertions, 81 deletions
diff --git a/games/redeclipse/redeclipse.SlackBuild b/games/redeclipse/redeclipse.SlackBuild
index 9fc132f829fac..9e079e8177927 100644
--- a/games/redeclipse/redeclipse.SlackBuild
+++ b/games/redeclipse/redeclipse.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Red Eclipse
 
-# Copyright 2017 Jeremy Hansen  <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2020 Jeremy Hansen  <jebrhansen+SBo -at- gmail.com>
 # Copyright 2015 Erik Falor USA
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=redeclipse
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-2.0.0}
 SRCNAM=base
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -70,8 +70,8 @@ for SUBMODULE in `cat $CWD/submodules-list`; do
   if [ -d data/$SUBMODULE ]; then
     rm -r data/$SUBMODULE
   fi
-  tar xvf $CWD/${SUBMODULE}-${VERSION}.tar.gz
-  mv ${SUBMODULE}-${VERSION} data/${SUBMODULE}
+  tar xvf $CWD/${SUBMODULE}-*.tar.gz
+  mv ${SUBMODULE}-* data/${SUBMODULE}
   if [ -e data/${SUBMODULE}/.gitmodules ]; then
     rm data/${SUBMODULE}/.gitmodules
   fi
@@ -84,6 +84,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Try and fix issue with cube2font not installing properly
+# https://github.com/redeclipse/base/issues/988
+sed -i 's/m755 cube2font/&_linux/' src/system-install.mk
+
 export CXXFLAGS="$SLKCFLAGS"
 make -C src/ client server cube2font
 make -C src/ \
diff --git a/games/redeclipse/redeclipse.info b/games/redeclipse/redeclipse.info
index 531ea6ffc96da..bfc3b64fc1cdf 100644
--- a/games/redeclipse/redeclipse.info
+++ b/games/redeclipse/redeclipse.info
@@ -1,82 +1,84 @@
 PRGNAM="redeclipse"
-VERSION="1.6.0"
+VERSION="2.0.0"
 HOMEPAGE="https://www.redeclipse.net"
-DOWNLOAD="https://github.com/red-eclipse/base/archive/v1.6.0/base-1.6.0.tar.gz \
-https://github.com/red-eclipse/acerspyro/archive/v1.6.0/acerspyro-1.6.0.tar.gz \
-https://github.com/red-eclipse/actors/archive/v1.6.0/actors-1.6.0.tar.gz \
-https://github.com/red-eclipse/appleflap/archive/v1.6.0/appleflap-1.6.0.tar.gz \
-https://github.com/red-eclipse/blendbrush/archive/v1.6.0/blendbrush-1.6.0.tar.gz \
-https://github.com/red-eclipse/caustics/archive/v1.6.0/caustics-1.6.0.tar.gz \
-https://github.com/red-eclipse/crosshairs/archive/v1.6.0/crosshairs-1.6.0.tar.gz \
-https://github.com/red-eclipse/decals/archive/v1.6.0/decals-1.6.0.tar.gz \
-https://github.com/red-eclipse/dziq/archive/v1.6.0/dziq-1.6.0.tar.gz \
-https://github.com/red-eclipse/elyvisions/archive/v1.6.0/elyvisions-1.6.0.tar.gz \
-https://github.com/red-eclipse/fonts/archive/v1.6.0/fonts-1.6.0.tar.gz \
-https://github.com/red-eclipse/freezurbern/archive/v1.6.0/freezurbern-1.6.0.tar.gz \
-https://github.com/red-eclipse/john/archive/v1.6.0/john-1.6.0.tar.gz \
-https://github.com/red-eclipse/jojo/archive/v1.6.0/jojo-1.6.0.tar.gz \
-https://github.com/red-eclipse/jwin/archive/v1.6.0/jwin-1.6.0.tar.gz \
-https://github.com/red-eclipse/luckystrike/archive/v1.6.0/luckystrike-1.6.0.tar.gz \
-https://github.com/red-eclipse/maps/archive/v1.6.0/maps-1.6.0.tar.gz \
-https://github.com/red-eclipse/mayhem/archive/v1.6.0/mayhem-1.6.0.tar.gz \
-https://github.com/red-eclipse/mikeplus64/archive/v1.6.0/mikeplus64-1.6.0.tar.gz \
-https://github.com/red-eclipse/misc/archive/v1.6.0/misc-1.6.0.tar.gz \
-https://github.com/red-eclipse/nieb/archive/v1.6.0/nieb-1.6.0.tar.gz \
-https://github.com/red-eclipse/nobiax/archive/v1.6.0/nobiax-1.6.0.tar.gz \
-https://github.com/red-eclipse/particles/archive/v1.6.0/particles-1.6.0.tar.gz \
-https://github.com/red-eclipse/philipk/archive/v1.6.0/philipk-1.6.0.tar.gz \
-https://github.com/red-eclipse/projectiles/archive/v1.6.0/projectiles-1.6.0.tar.gz \
-https://github.com/red-eclipse/props/archive/v1.6.0/props-1.6.0.tar.gz \
-https://github.com/red-eclipse/skyboxes/archive/v1.6.0/skyboxes-1.6.0.tar.gz \
-https://github.com/red-eclipse/snipergoth/archive/v1.6.0/snipergoth-1.6.0.tar.gz \
-https://github.com/red-eclipse/sounds/archive/v1.6.0/sounds-1.6.0.tar.gz \
-https://github.com/red-eclipse/textures/archive/v1.6.0/textures-1.6.0.tar.gz \
-https://github.com/red-eclipse/torley/archive/v1.6.0/torley-1.6.0.tar.gz \
-https://github.com/red-eclipse/trak/archive/v1.6.0/trak-1.6.0.tar.gz \
-https://github.com/red-eclipse/ulukai/archive/v1.6.0/ulukai-1.6.0.tar.gz \
-https://github.com/red-eclipse/unnamed/archive/v1.6.0/unnamed-1.6.0.tar.gz \
-https://github.com/red-eclipse/vanities/archive/v1.6.0/vanities-1.6.0.tar.gz \
-https://github.com/red-eclipse/vegetation/archive/v1.6.0/vegetation-1.6.0.tar.gz \
-https://github.com/red-eclipse/weapons/archive/v1.6.0/weapons-1.6.0.tar.gz \
-https://github.com/red-eclipse/wicked/archive/v1.6.0/wicked-1.6.0.tar.gz"
-MD5SUM="b33238fb8124b4c640efdb2bb71623d1 \
-8155244c455c36a9b23f95ae83ca0784 \
-6acd2805729afaebfe5bf9d4f976ff3d \
-0871aad5d3f4b09cba6ed330776ddfc5 \
-69713dccf2a52d20b7361dbc8c46a04e \
-74b65cf48f831411d4e2e4559aabb626 \
-59300ea9052c798ec50a4c892ee8d592 \
-d2b03e43f558c2caf56d669a58552142 \
-78d637df6128c47b17e9f5cecd7827d9 \
-f249bb74e105cee198d5d34023d38c99 \
-0cb052d339f31e28b5d74339af1f5a90 \
-95becd0174d6c29f6841fba55c006f38 \
-72ea902c747addc3bfb00d84a7553c1b \
-5d1e4969f42aca35d48778d49d33b56c \
-e4a7cb44dbc7491102800bb88859cff6 \
-7462d25389550d10dcb62ea0364319ca \
-9473fc2f51e00637d7c0338fc9291cbf \
-efd8bc4390d1c344d6ac52ee78f65ee1 \
-924c14f7d5f1bb5a5ed2e5ab4474c8cc \
-37f03531ff2a721aecd9d82f9f3e61b5 \
-c558685cc88987e0996ee17c633db91f \
-299d0a9be904edd3af02f3243f3c4e18 \
-d451edbc96e1850f59a90085aef0c2d0 \
-a52c5fafba5bac0229c2b997e416e4f3 \
-98e530be7e84758a09fd44486718c899 \
-f99cc75fbb64ddf02a510bffb51ef5ee \
-2e09209f10f2258528c17717e445b83c \
-9c125b4bed097234d98238e961bb49da \
-52fc78f595b1ac96f5b0702cbc6d67a8 \
-06058110789ca846ebd7ce411e2be614 \
-88c975dd3376e3bcb537660cab1b9875 \
-c62dae957c88c75fe94b151d9eba4d58 \
-45c63159959bf6932c7fea016608cc51 \
-4f2a53536103cf8c918532f447300377 \
-ad80d8c0480f7250a501a280a206f231 \
-e51968e4ad040cb8bc01c849580698dd \
-bba5d43b78667f1973985b39f3d04c21 \
-a7c15faf02a7a300d94b5640802396a5"
+DOWNLOAD="https://github.com/redeclipse/base/archive/v2.0.0/base-2.0.0.tar.gz \
+https://github.com/redeclipse/acerspyro/archive/b28f9b5/acerspyro-b28f9b5.tar.gz \
+https://github.com/redeclipse/actors/archive/3964c6f/actors-3964c6f.tar.gz \
+https://github.com/redeclipse/appleflap/archive/7ecdaf1/appleflap-7ecdaf1.tar.gz \
+https://github.com/redeclipse/blendbrush/archive/11bfa45/blendbrush-11bfa45.tar.gz \
+https://github.com/redeclipse/caustics/archive/406a8c6/caustics-406a8c6.tar.gz \
+https://github.com/redeclipse/crosshairs/archive/7c8665a/crosshairs-7c8665a.tar.gz \
+https://github.com/redeclipse/decals/archive/8fd1b84/decals-8fd1b84.tar.gz \
+https://github.com/redeclipse/dziq/archive/d8f5668/dziq-d8f5668.tar.gz \
+https://github.com/redeclipse/elyvisions/archive/612185a/elyvisions-612185a.tar.gz \
+https://github.com/redeclipse/fonts/archive/5b66579/fonts-5b66579.tar.gz \
+https://github.com/redeclipse/freezurbern/archive/1e4a68f/freezurbern-1e4a68f.tar.gz \
+https://github.com/redeclipse/john/archive/a229b8b/john-a229b8b.tar.gz \
+https://github.com/redeclipse/jojo/archive/a5e6853/jojo-a5e6853.tar.gz \
+https://github.com/redeclipse/jwin/archive/920773b/jwin-920773b.tar.gz \
+https://github.com/redeclipse/luckystrike/archive/86e8784/luckystrike-86e8784.tar.gz \
+https://github.com/redeclipse/maps/archive/4b2394c/maps-4b2394c.tar.gz \
+https://github.com/redeclipse/mayhem/archive/d14343b/mayhem-d14343b.tar.gz \
+https://github.com/redeclipse/mikeplus64/archive/67404fc/mikeplus64-67404fc.tar.gz \
+https://github.com/redeclipse/misc/archive/b8d8234/misc-b8d8234.tar.gz \
+https://github.com/redeclipse/molexted/archive/a7721aa/molexted-a7721aa.tar.gz \
+https://github.com/redeclipse/nieb/archive/1584312/nieb-1584312.tar.gz \
+https://github.com/redeclipse/nobiax/archive/2cb8b07/nobiax-2cb8b07.tar.gz \
+https://github.com/redeclipse/particles/archive/5f98a74/particles-5f98a74.tar.gz \
+https://github.com/redeclipse/philipk/archive/410337c/philipk-410337c.tar.gz \
+https://github.com/redeclipse/projectiles/archive/1824538/projectiles-1824538.tar.gz \
+https://github.com/redeclipse/props/archive/ed031e5/props-ed031e5.tar.gz \
+https://github.com/redeclipse/skyboxes/archive/a9f9989/skyboxes-a9f9989.tar.gz \
+https://github.com/redeclipse/snipergoth/archive/af1bed3/snipergoth-af1bed3.tar.gz \
+https://github.com/redeclipse/sounds/archive/bf90d0e/sounds-bf90d0e.tar.gz \
+https://github.com/redeclipse/textures/archive/fbea7e1/textures-fbea7e1.tar.gz \
+https://github.com/redeclipse/torley/archive/d62afca/torley-d62afca.tar.gz \
+https://github.com/redeclipse/trak/archive/0c6355d/trak-0c6355d.tar.gz \
+https://github.com/redeclipse/ulukai/archive/4cf20f4/ulukai-4cf20f4.tar.gz \
+https://github.com/redeclipse/unnamed/archive/ebb4b0e/unnamed-ebb4b0e.tar.gz \
+https://github.com/redeclipse/vanities/archive/5574a8b/vanities-5574a8b.tar.gz \
+https://github.com/redeclipse/vegetation/archive/3bfa433/vegetation-3bfa433.tar.gz \
+https://github.com/redeclipse/weapons/archive/25a7bd6/weapons-25a7bd6.tar.gz \
+https://github.com/redeclipse/wicked/archive/5a5f64e/wicked-5a5f64e.tar.gz"
+MD5SUM="416383c554794bd7a1683b680bb0bb29 \
+38f331a54b19281c04c0d950244f6991 \
+e324ac0f83920e461a60a2a2251e4b7c \
+e580acec533b6a824ebd4c729d10b8c3 \
+0500e92f8222e65da56e8c2b2c4f4f28 \
+cd92eb2fea9b5547ce4a9c34210151b6 \
+f5d6054f25c22f72d55c8b7d2a155889 \
+153ab1f4eb6bed1f01f7c00bcef501f2 \
+89475717e9731fea0411cfffc9c0d458 \
+236671c5248fe77a39943e2467d57d4d \
+e3c92385617d7531d6cea226748b9a67 \
+3a07033a827ab47f050c0dfe1bd3723f \
+b7bb94e6acd99cdf63d9119b0e9677db \
+a16d0c1073d078921954f9a4e73ee8cd \
+fdad521f16107562399fc4c87d615a16 \
+3560442fac72264d09663bd83d39f7e9 \
+05e4fb7de6d9c19d905fca6bbb68023e \
+879c6bcb25e55cb2c5d57f3523d0e670 \
+abe35d19710e9082708e70c053c34fbb \
+2fa0160cd46ba3b6ba9c204922cda3d7 \
+ea18b6648dfd82c2ee22a541f043ad7b \
+528db6f4acdb049637dc172fff48db4b \
+ebb34365ec3851d2830f60b130b2a956 \
+108f08df866976b6533088d097e6f0b4 \
+2303921221676ffba447c46d82646721 \
+22b650a54c33f06397df290c40a6e235 \
+758769d3aa7c04225e8de86e718690aa \
+0e38fbe74060a72417f33ff298721b75 \
+fa3408a229b7f120493992086c99d170 \
+4f3ec842f7c19b23e16a0dee9eb6690c \
+65d8653ff2e2e101ae676f7c40bf8867 \
+1a0118e3d92d9221d4194b1cef4ddf08 \
+d11793c710c19f51eac8356e501dc7e5 \
+578478d00b8eca195da7c7e4c8ad306d \
+a3ce5192b4f080a140c9a31bc659da21 \
+a6a432bdf2e7c3cdd759e628c05a9c93 \
+163f118456605076230b6195673f0a0a \
+ddc56c737f146c4ce224ca61161a3ff2 \
+72b4213903f04961dfb8f2121edd016c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2 SDL2_image SDL2_mixer"
diff --git a/games/redeclipse/submodules-list b/games/redeclipse/submodules-list
index 36083edb37fd6..e7947fd9eb9be 100644
--- a/games/redeclipse/submodules-list
+++ b/games/redeclipse/submodules-list
@@ -17,6 +17,7 @@ maps
 mayhem
 mikeplus64
 misc
+molexted
 nieb
 nobiax
 particles