version 2.1.1.0-4

4 files changed, 83 insertions, 13 deletions

diff --git a/.AURINFO b/.AURINFO
new file mode 100644
index 000000000000..e68daffb332e
--- /dev/null
+++ b/.AURINFO
@@ -0,0 +1,18 @@
+pkgbase = xgalaga
+	pkgdesc = An open source remake of the classic arcade game Galaga
+	pkgver = 2.1.1.0
+	pkgrel = 4
+	url = http://rumsey.org/xgal.html
+	install = xgalaga.install
+	arch = i686
+	arch = x86_64
+	license = GPL
+	depends = libxmu
+	depends = libxpm
+	source = http://downloads.sourceforge.net/xgalaga/xgalaga-2.1.1.0.tar.gz
+	source = xgalaga.patch
+	source = xgalaga.png
+	source = xgalaga.desktop
+
+pkgname = xgalaga
+
diff --git a/.SRCINFO b/.SRCINFO
index 7d42afe5c439..0cd42724f3dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xgalaga
 	pkgdesc = An open source remake of the classic arcade game Galaga
 	pkgver = 2.1.1.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://rumsey.org/xgal.html
 	install = xgalaga.install
 	arch = i686
@@ -14,7 +14,7 @@ pkgbase = xgalaga
 	source = xgalaga.png
 	source = xgalaga.desktop
 	md5sums = f37c3377b245d2d53b33eb489966bf28
-	md5sums = db024441d3bc6d41033891ab71e2cece
+	md5sums = f96b73645d1ebbb12d8b3de5d4ec94fc
 	md5sums = 3168c3fec9bd8345946ac93c6b9d7b32
 	md5sums = e8fbde4e6049202a087ebc7daf0f0170
 
diff --git a/PKGBUILD b/PKGBUILD
index 122bec663d3a..b754ba1d5378 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=xgalaga
 pkgver=2.1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="An open source remake of the classic arcade game Galaga"
 arch=('i686' 'x86_64')
 url="http://rumsey.org/xgal.html"
@@ -14,26 +14,27 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
         $pkgname.png
         $pkgname.desktop)
 md5sums=('f37c3377b245d2d53b33eb489966bf28'
-         'db024441d3bc6d41033891ab71e2cece'
+         '6fef2b9aec46c0c4fe5055401c408ef7'
          '3168c3fec9bd8345946ac93c6b9d7b32'
          'e8fbde4e6049202a087ebc7daf0f0170')
 
-build() {
+prepare() {
   cd "$srcdir"/$pkgname-$pkgver
 
-  /bin/cp -f /usr/share/automake-1.14/config.guess .
-  /bin/cp -f /usr/share/automake-1.14/config.sub   .
+  /usr/bin/cp -f /usr/share/automake-1.14/config.guess .
+  /usr/bin/cp -f /usr/share/automake-1.14/config.sub   .
 
-  patch -Np1 -i "$srcdir"/$pkgname.patch
+  patch -Np2 -b -z .orig -i ../$pkgname.patch
+}
 
-  sed -e '/CHEATER/i#define IM_A_BIG_FAT_CHEATER' -i defs.h
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
 
   LDFLAGS='' ./configure \
 	--mandir=/usr/share/man \
 	--prefix=/usr/share/$pkgname \
 	--exec-prefix=/usr/bin \
 	--with-xpm-lib=/usr/lib
-
   make
 }
 
@@ -51,3 +52,7 @@ package() {
   install -Dm644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
   install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
 }
+md5sums=('f37c3377b245d2d53b33eb489966bf28'
+         'f96b73645d1ebbb12d8b3de5d4ec94fc'
+         '3168c3fec9bd8345946ac93c6b9d7b32'
+         'e8fbde4e6049202a087ebc7daf0f0170')
diff --git a/xgalaga.patch b/xgalaga.patch
index 8cd3f73717cf..8f1187becdb5 100644
--- a/xgalaga.patch
+++ b/xgalaga.patch
@@ -1,6 +1,53 @@
-diff -up xgalaga-2.1.1.0/Makefile.in.orig xgalaga-2.1.1.0/Makefile.in
---- xgalaga-2.1.1.0/Makefile.in.orig	2008-03-05 14:58:16.000000000 -0700
-+++ xgalaga-2.1.1.0/Makefile.in	2013-06-16 15:12:24.000000000 -0600
+diff -up src/xgalaga-2.1.1.0/defs.h.orig src/xgalaga-2.1.1.0/defs.h
+--- src/xgalaga-2.1.1.0/defs.h.orig	2008-03-05 14:58:16.000000000 -0700
++++ src/xgalaga-2.1.1.0/defs.h	2014-05-17 03:42:38.000000000 -0600
+@@ -3,6 +3,7 @@
+ /* Area for setting flags to enable changes by Bryce and Neelix */
+ 
+ /*#define ORIGINAL_XGALAGA */
++#define IM_A_BIG_FAT_CHEATER
+ /*#define IM_A_BIG_FAT_CHEATER*/
+ 
+ #ifndef ORIGINAL_XGALAGA
+@@ -15,9 +16,15 @@
+ # define NO_PRIZE_WHILE_DEAD
+ #endif
+ 
++#ifdef ORIGINAL_XGALAGA
+ #define MAXTORPS 10
+ #define MINTORPS 3
+ #define TORPSPEED 12
++#else
++#define MAXTORPS 16
++#define MINTORPS 3
++#define TORPSPEED 16
++#endif
+ 
+ #define ETORPSPEED 8
+ 
+diff -up src/xgalaga-2.1.1.0/main.c.orig src/xgalaga-2.1.1.0/main.c
+--- src/xgalaga-2.1.1.0/main.c.orig	2008-03-05 14:58:16.000000000 -0700
++++ src/xgalaga-2.1.1.0/main.c	2014-05-17 03:43:25.000000000 -0600
+@@ -1046,9 +1046,13 @@ int mx, my, but;
+                 break;
+             case 't':
+             case 256+'t':       //372:
+-                maxtorps++;
+-                if(maxtorps > MAXTORPS)
+-                    maxtorps = MINTORPS;
++                if (maxtorps < MAXTORPS)
++                    maxtorps++;
++                break;
++            case 'z':
++            case 256+'z':
++                if (movespeed < MAXSPEED)
++                    movespeed++;
+                 break;
+ #endif /* IM_A_BIG_FAT_CHEATER */
+             case '\r'+256:
+diff -up src/xgalaga-2.1.1.0/Makefile.in.orig src/xgalaga-2.1.1.0/Makefile.in
+--- src/xgalaga-2.1.1.0/Makefile.in.orig	2008-03-05 14:58:16.000000000 -0700
++++ src/xgalaga-2.1.1.0/Makefile.in	2014-05-17 03:42:38.000000000 -0600
 @@ -15,8 +15,7 @@ exec_prefix = @exec_prefix@
  bindir = $(exec_prefix)
  libdir = $(prefix)/lib