Version 1.0.0.4

2 files changed, 36 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 062db05d191c..5cb04c293832 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = counter-strike-2d
 	pkgdesc = More than just a freeware clone of the well known game Counter-Strike
-	pkgver = 1.0.0.2
+	pkgver = 1.0.0.4
 	pkgrel = 1
 	url = http://www.cs2d.com/
 	install = cs2d.install
@@ -8,6 +8,13 @@ pkgbase = counter-strike-2d
 	arch = x86_64
 	license = custom
 	makedepends = curl
+	depends = lib32-freetype2
+	depends = lib32-libtxc_dxtn
+	depends = lib32-glu
+	optdepends = lib32-openal: audio output
+	optdepends = lib32-ati-dri: video acceleration
+	optdepends = lib32-intel-dri: video acceleration
+	optdepends = lib32-nouveau-dri: video acceleration
 	options = emptydirs
 	backup = opt/cs2d/sys/autobuy.cfg
 	backup = opt/cs2d/sys/autoexec.cfg
@@ -16,16 +23,19 @@ pkgbase = counter-strike-2d
 	backup = opt/cs2d/sys/editor.cfg
 	backup = opt/cs2d/sys/filters.cfg
 	backup = opt/cs2d/sys/mapcycle.cfg
+	backup = opt/cs2d/sys/mods.cfg
 	backup = opt/cs2d/sys/more.cfg
 	backup = opt/cs2d/sys/server.cfg
-	backup = opt/cs2d/sys/usgn.dat
-	backup = opt/cs2d/sys/usgn_pw.dat
-	source = cs2d_1002_linux.zip::http://www.unrealsoftware.de/get.php?get=cs2d_1002_linux.zip&p=1&cid=get.php?get=cs2d_1002_linux.zip&p=1&cid=12625
-	source = cs2d_1002_win.zip::http://www.unrealsoftware.de/get.php?get=cs2d_1002_win.zip&p=1&cid=get.php?get=cs2d_1002_linux.zip&p=1&cid=12625
+	backup = opt/cs2d/sys/weapons.cfg
+	backup = opt/cs2d/sys/weapons_recoil.cfg
+	backup = opt/cs2d/sys/favorites.lst
+	backup = opt/cs2d/sys/bans.lst
+	backup = opt/cs2d/sys/serverinfo.txt
+	backup = opt/cs2d/sys/servertransfer.lst
+	source = cs2d_1004_linux.zip::http://www.unrealsoftware.de/get.php?get=cs2d_1004_linux.zip&p=1&cid=get.php?get=cs2d_1004_linux.zip&p=1&cid=1622
 	source = cs2d.desktop
 	source = cs2d.png
-	sha512sums = f385a6558f40a01324884a8b765f0fcb8dddcfb59bf983be110234a16cf937ba8c0089dce269fd1cec6b51a380810c5e1676e14a95112364b59cbb07e290a8bc
-	sha512sums = b387cd7172fa35c6e66d7457cd4ca457d5bab795944fa9b53a0879301d72d6e5f2c76b760c119df32ae4e69f158e6c593bf921a83e54e25f79cb4e3d2650965c
+	sha512sums = 56932c0326c74d943a418793720286e38a8f0d70791f8e0fbf3308ffff4c68520ec0a5f35d5a65ec9a512b3d95bc452be3a87525a47737d76c75271da258ee0d
 	sha512sums = d7d452fa4a2310ec2ac68c2c500e2a66f3a6df2291ad6615f9a957cbc6cb4ccd7f00f9578ccebeb1367aa21205e3743b16463d841c63c73f9b0bfbbf37bd6992
 	sha512sums = dfe79598af30797195fad38461119f7d611021577a1e1e624567adeceade8f9bc4c97cd110515e492d612d09b740f78faf7dce55448f64a9a698e7748f121a80
 
diff --git a/PKGBUILD b/PKGBUILD
index a7c00e19a168..555d65f9f1a0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,10 @@
 # Contributor: josephgbr <rafael.f.f1@gmail.com>
 # Contributor: Josef Lusticky <evramp@gmail.com>
 # Contributor: Jorge Barroso <jorge.barroso.11 at gmail dot com>
+# Contributor: Moses Miller <Majora320@gmail.com>
 
 pkgname=counter-strike-2d
-pkgver=1.0.0.2
+pkgver=1.0.0.4
 _ver=${pkgver//./}
 pkgrel=1
 pkgdesc="More than just a freeware clone of the well known game Counter-Strike"
@@ -28,14 +29,15 @@ fi
 
 makedepends=('curl')
 install=cs2d.install
-backup=(opt/cs2d/sys/autobuy.cfg  opt/cs2d/sys/autoexec.cfg
-        opt/cs2d/sys/config.cfg   opt/cs2d/sys/controls.cfg
-        opt/cs2d/sys/editor.cfg   opt/cs2d/sys/filters.cfg
-        opt/cs2d/sys/mapcycle.cfg opt/cs2d/sys/more.cfg
-        opt/cs2d/sys/server.cfg   opt/cs2d/sys/usgn.dat
-        opt/cs2d/sys/usgn_pw.dat)
-sha512sums=('f385a6558f40a01324884a8b765f0fcb8dddcfb59bf983be110234a16cf937ba8c0089dce269fd1cec6b51a380810c5e1676e14a95112364b59cbb07e290a8bc'
-            'b387cd7172fa35c6e66d7457cd4ca457d5bab795944fa9b53a0879301d72d6e5f2c76b760c119df32ae4e69f158e6c593bf921a83e54e25f79cb4e3d2650965c'
+backup=(opt/cs2d/sys/autobuy.cfg    opt/cs2d/sys/autoexec.cfg
+        opt/cs2d/sys/config.cfg     opt/cs2d/sys/controls.cfg
+        opt/cs2d/sys/editor.cfg     opt/cs2d/sys/filters.cfg
+        opt/cs2d/sys/mapcycle.cfg   opt/cs2d/sys/mods.cfg 
+        opt/cs2d/sys/more.cfg       opt/cs2d/sys/server.cfg 
+        opt/cs2d/sys/weapons.cfg    opt/cs2d/sys/weapons_recoil.cfg
+        opt/cs2d/sys/favorites.lst  opt/cs2d/sys/bans.lst 
+        opt/cs2d/sys/serverinfo.txt opt/cs2d/sys/servertransfer.lst)
+sha512sums=('56932c0326c74d943a418793720286e38a8f0d70791f8e0fbf3308ffff4c68520ec0a5f35d5a65ec9a512b3d95bc452be3a87525a47737d76c75271da258ee0d'
             'd7d452fa4a2310ec2ac68c2c500e2a66f3a6df2291ad6615f9a957cbc6cb4ccd7f00f9578ccebeb1367aa21205e3743b16463d841c63c73f9b0bfbbf37bd6992'
             'dfe79598af30797195fad38461119f7d611021577a1e1e624567adeceade8f9bc4c97cd110515e492d612d09b740f78faf7dce55448f64a9a698e7748f121a80')
 _url=http://www.unrealsoftware.de/get.php?get
@@ -47,7 +49,6 @@ grabcid() {
 
 _cid=$(grabcid) # this will hide the cmd line above from AUR interface
 source=(cs2d_${_ver}_linux.zip::"$_url=cs2d_${_ver}_linux.zip&p=1&cid=${_cid}"
-        cs2d_${_ver}_win.zip::"$_url=cs2d_${_ver}_win.zip&p=1&cid=${_cid}"
         "cs2d.desktop"
         "cs2d.png")
 options=(emptydirs)
@@ -57,18 +58,18 @@ package() {
   install -d "$pkgdir"/{opt/cs2d,usr/{share/{doc,licenses}/$pkgname,bin}}
 
   # data
-  cp -R bots gfx help logos maps screens sfx sys "$pkgdir"/opt/cs2d
+  cp -R bots gfx help logos maps mods screens sfx sys "$pkgdir"/opt/cs2d
 
   # executable
-  install -m755 CounterStrike2D "$pkgdir"/opt/cs2d
-  ln -s /opt/cs2d/CounterStrike2D "$pkgdir"/usr/bin/cs2d
+  install -m755 CS2D "$pkgdir"/opt/cs2d
+  ln -s /opt/cs2d/CS2D "$pkgdir"/usr/bin/cs2d
 
   # desktop launcher
   install -Dm644 cs2d.png "$pkgdir"/usr/share/pixmaps/cs2d.png
   install -Dm644 cs2d.desktop "$pkgdir"/usr/share/applications/cs2d.desktop
 
   # license
-  sed -n 84,106p Readme.txt > "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  sed -n 93,117p Readme.txt > "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
   # doc
   install -m644 *.txt "$pkgdir"/usr/share/doc/$pkgname
@@ -77,6 +78,10 @@ package() {
   chmod g+w "$pkgdir"/opt/cs2d/sys/*.{cfg,dat}
   chgrp games "$pkgdir"/opt/cs2d/sys/*.{cfg,dat}
 
+  # allow saving maps
+  chmod g+w "$pkgdir"/opt/cs2d/maps
+  chgrp games "$pkgdir"/opt/cs2d/maps 
+
   # allow logging and caching
   chmod -R g+w "$pkgdir"/opt/cs2d/sys/{logs,core}
   chgrp games -R "$pkgdir"/opt/cs2d/sys/{logs,core}