[arch-commits] Commit in abuse/repos (4 files)

Fri Aug 15 00:09:22 UTC 2008

Date: Thursday, August 14, 2008 @ 20:09:21
  Author: eric
Revision: 8652

fixing svn conflicts

Modified:
  abuse/repos/extra-x86_64/	(properties)
  abuse/repos/extra-x86_64/PKGBUILD
  abuse/repos/extra-x86_64/abuse.install
  abuse/repos/extra-x86_64/abuse.patch

---------------+
 PKGBUILD      |   63 +++++++++++++++++++++++++++++++++++++++-----------------
 abuse.install |   17 ++-------------
 abuse.patch   |   48 ++++++++++++++++++++++++++++++++----------
 3 files changed, 83 insertions(+), 45 deletions(-)


Property changes on: abuse/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /abuse/trunk:1
   + /abuse/trunk:1-8651

Modified: extra-x86_64/PKGBUILD
===================================================================

--- extra-x86_64/PKGBUILD	2008-08-14 16:09:03 UTC (rev 8651)
+++ extra-x86_64/PKGBUILD	2008-08-15 00:09:21 UTC (rev 8652)
@@ -1,28 +1,53 @@
 # $Id$
 # Committer: jlvsimoes <jlvsimoes at oninet.pt>
 # Maintainer: kevin <kevin at archlinux.org>
+
 pkgname=abuse
-pkgver=0.7.0
-pkgrel=4
-pkgdesc="Abuse is an action game that pits you --assuming the role of Nick Vrenna, res stance fighter -- against ruthless alien killers"
-arch=(i686 x86_64)
-url="http://www.labyrinth.net.au/~trandor/abuse"
-depends=('alsa-lib' 'sdl' 'gcc')
-source=(http://www.labyrinth.net.au/~trandor/abuse/files/abuse_sdl-$pkgver.tar.bz2 http://www.labyrinth.net.au/~trandor/abuse/files/abuse_datafiles.tar.gz abuse.patch)
-md5sums=('59ea4498886642aa975f04233cc92558' \
-	'2b857668849b2dc7cd29cdd84a33c19e' \
-	'd4ab1f9fcbae1d500cbbafd7829a44b4')
+pkgver=0.7.1
+pkgrel=1
+pkgdesc="A side-scroller action game that pits you against ruthless alien killers"
+url="http://abuse.zoy.org/"
+depends=('gcc-libs' 'libgl' 'sdl')
+# abuse-data below is the original commercial levels and sound effects.
+# abuse-frabs contains community created levels.
+# abuse-lib is the original demo levels.
+# abuse-sfx is the original sound effects, included in abuse-data.
+source=(http://abuse.zoy.org/raw/Downloads/abuse-${pkgver}.tar.gz
+http://abuse.zoy.org/raw/Downloads/abuse-data-2.00.tar.gz
+http://abuse.zoy.org/raw/Downloads/abuse-frabs-2.11.tar.gz
+abuse.patch)
+noextract=(abuse-data-2.00.tar.gz)
+license=('GPL' 'custom')
+arch=('i686' 'x86_64')
 install=abuse.install
+md5sums=('439b607f291560a8f9698a2f09cffa63' '2b857668849b2dc7cd29cdd84a33c19e'
+         '0686f951289fe514846903bab36a2079' '86b5256f066e994db9d57dbe1ec2a58e')
 
 build() {
-  cd $startdir/src/abuse_sdl-$pkgver
-  patch -p1 < ../abuse.patch
-  ./configure --prefix=/usr --with-x
+  cd ${srcdir}/abuse-${pkgver}
+  patch -p1 -i ${srcdir}/abuse.patch
+  ./configure --prefix=/usr --datadir=/usr/share/abuse/orig --with-x
   make || return 1
-  make prefix=$startdir/pkg/usr install
-  mkdir -p $startdir/pkg/usr/share/games/abuse
-  cd $startdir/pkg/usr/share/games/abuse
-  cp $startdir/src/abuse_sdl-$pkgver/gamma.lsp $startdir/pkg/usr/share/games/abuse
-  tar -xzf  $startdir/src/abuse_datafiles.tar.gz
-  chown -R root:root $startdir/pkg/usr/share
+  make DESTDIR=${pkgdir} install
+
+  mkdir -p ${pkgdir}/usr/share/abuse/{frabs,orig}
+  mkdir -p ${pkgdir}/usr/share/licenses/abuse
+
+  # original code license.  sdlport is gpl.
+  sed -n '1,/^$/ p' src/view.cpp > \
+      ${pkgdir}/usr/share/licenses/abuse/orig.code.license
+
+  # original game data.
+  cd ${pkgdir}/usr/share/abuse/orig
+  tar -xzf  ${srcdir}/abuse-data-2.00.tar.gz
+  mv README.datafiles ${pkgdir}/usr/share/licenses/abuse/orig.data.license
+
+  # frabs data, link to sound in orignal game data.
+  cd ${pkgdir}/usr/share/abuse/frabs
+  mv ${srcdir}/abuse-frabs-2.11/* .
+  rm -f abuse.exe setup.exe art/dos4gw.exe art/spaint.exe
+  ln -s ../orig/sfx sfx
+  cp docs/index.html ${pkgdir}/usr/share/licenses/abuse/frabs.license
+
+  chown -R root:root ${pkgdir}/usr/share
 }

Modified: extra-x86_64/abuse.install
===================================================================
--- extra-x86_64/abuse.install	2008-08-14 16:09:03 UTC (rev 8651)
+++ extra-x86_64/abuse.install	2008-08-15 00:09:21 UTC (rev 8652)
@@ -1,6 +1,8 @@
 # arg 1:  the new package version
 post_install() {
-  echo "If you get a BOSS_ANT error trying to run abuse, copy /usr/share/games/abuse/gamma.lsp to ~/.abuse"
+#  echo "If you get a BOSS_ANT error trying to run abuse, copy /usr/share/games/abuse/gamma.lsp to ~/.abuse"
+   echo "Abuse uses the original game levels by default.  To use the frabs levels"
+   echo "use '-datadir' or set 'datadir' in the abuserc to /usr/share/abuse/frabs"
 }
 
 # arg 1:  the new package version
@@ -9,16 +11,3 @@
 	post_install
 }
 
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*

Modified: extra-x86_64/abuse.patch
===================================================================
--- extra-x86_64/abuse.patch	2008-08-14 16:09:03 UTC (rev 8651)
+++ extra-x86_64/abuse.patch	2008-08-15 00:09:21 UTC (rev 8652)
@@ -1,12 +1,36 @@
-diff -urN abuse_sdl-0.7.0/src/sdlport/setup.cpp abuse_sdl-0.7.0-new/src/sdlport/setup.cpp
---- abuse_sdl-0.7.0/src/sdlport/setup.cpp	2002-12-14 21:00:32.000000000 -0800
-+++ abuse_sdl-0.7.0-new/src/sdlport/setup.cpp	2003-10-19 21:23:33.000000000 -0700
-@@ -72,7 +72,7 @@
- 	if( (fd = fopen( rcfile, "w" )) != NULL )
- 	{
- 		fputs( "; Abuse-SDL Configuration file\n\n", fd );
--		fputs( "; Location of the datafiles\ndatadir=/usr/local/share/games/abuse\n\n", fd );
-+		fputs( "; Location of the datafiles\ndatadir=/usr/share/games/abuse\n\n", fd );
- 		fputs( "; Startup fullscreen\nfullscreen=0\n\n", fd );
- 		fputs( "; Use DoubleBuffering\ndoublebuf=0\n\n", fd );
- 		fputs( "; Use mono audio only\nmono=0\n\n", fd );
+diff -Naur abuse-0.7.1.orig/Makefile.in abuse-0.7.1/Makefile.in
+--- abuse-0.7.1.orig/Makefile.in	2008-03-02 15:25:05.000000000 -0500
++++ abuse-0.7.1/Makefile.in	2008-08-11 23:34:21.000000000 -0400
+@@ -201,7 +201,7 @@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src
+ man_MANS = abuse.6
+-datafiledir = $(datadir)/games/abuse
++datafiledir = $(datadir)
+ datafile_DATA = abuse.bmp abuse.lsp abuse.png
+ EXTRA_DIST = bootstrap abuse.6 abuse.bmp abuse.lsp abuse.png
+ all: config.h
+diff -Naur abuse-0.7.1.orig/configure abuse-0.7.1/configure
+--- abuse-0.7.1.orig/configure	2008-03-02 15:25:03.000000000 -0500
++++ abuse-0.7.1/configure	2008-08-11 23:33:49.000000000 -0400
+@@ -21887,7 +21887,7 @@
+ 
+ X_LIBS=-L$x_libraries
+ 
+-EXPDATADIR="-DEXPDATADIR=\\\"$datadir/games/abuse\\\""
++EXPDATADIR="-DEXPDATADIR=\\\"$datadir\\\""
+ 
+ 
+ { echo "$as_me:$LINENO: checking for XShmAttach in -lXext" >&5
+diff -Naur abuse-0.7.1.orig/src/sdlport/setup.cpp abuse-0.7.1/src/sdlport/setup.cpp
+--- abuse-0.7.1.orig/src/sdlport/setup.cpp	2008-03-02 14:42:24.000000000 -0500
++++ abuse-0.7.1/src/sdlport/setup.cpp	2008-08-11 23:33:49.000000000 -0400
+@@ -89,7 +89,7 @@
+     if( (fd = fopen( rcfile, "w" )) != NULL )
+     {
+         fputs( "; Abuse-SDL Configuration file\n\n", fd );
+-        fputs( "; Location of the datafiles\ndatadir=/var/games/abuse\n\n", fd );
++        fputs( "; Location of the datafiles\ndatadir=/usr/share/abuse/orig\n\n", fd );
+         fputs( "; Startup fullscreen\nfullscreen=0\n\n", fd );
+         fputs( "; Use DoubleBuffering\ndoublebuf=0\n\n", fd );
+         fputs( "; Use mono audio only\nmono=0\n\n", fd );


